From f9d45f7f533b3e2fd1ae02ac886946889884d482 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 30 Mar 2020 14:29:21 -0400
Subject: [PATCH] forth: Forth-ify "FLAGS"

---
 emul/forth/z80c.bin | Bin 1335 -> 1351 bytes
 forth/forth.asm     |  14 ++++----------
 forth/icore.fs      |  11 ++++++++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 56f627d934f161ee166335c896d6f2b0438a9c27..8c4ec0e57d3876007d43d182af3d9e72f915163a 100644
GIT binary patch
delta 172
zcmdnab)0L%118M^5gwii+#Jk~Om04o?!m$gtb7a#42HiPnF2#SLwFciKwJg}OU}tZ
znN%1(Cd)C4GZsuXWA<X6#aS@9nK^{@5oaQs;N&~Za)LTsliAj@D=;uJII}}Uxmjcx
zy(eq3C^LSZ?8_o4;muXUa-T^8Xe1-h$o1?U%uvJYSOOS#Pd?A0z*)(qz`)1A!R$Tx
N2a6)3!DJ~`SpXvECKUhx

delta 156
zcmX@kwVi9j118C6k>A|)+#Jk~Oo5@EAwmo+d<+T<3=F?mCv!5ZFj`F3V-{yjnC!;v
z#oWc2FnKa_2<s)zL^j6BZ<yr-Ww<7@t!GzYU}SJ+hlonE$TC__wq#Led^|apMN-0=
ztA^!1lLXL6Mxc@F**ln_hWD`qFs`0_pGAQ)lS_etkAZ{PdNK#ABBR1&Emm0obe|)u

diff --git a/forth/forth.asm b/forth/forth.asm
index c92a75b..21a184c 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -128,6 +128,7 @@ LIT:
 	.dw	RS_ADDR
 	.dw	CINPTR
 	.dw	SYSVNXT
+	.dw	FLAGS
 
 ; *** Code ***
 forthMain:
@@ -164,7 +165,7 @@ forthMain:
 .bootName:
 	.db	"BOOT", 0
 
-.fill 91
+.fill 89
 
 ; STABLE ABI
 ; Offset: 00cd
@@ -820,17 +821,10 @@ PARSEPTR_:
 	.dw sysvarWord
 	.dw PARSEPTR
 
-	.db	"FLAGS"
-	.dw	$-PARSEPTR_
-	.db	5
-FLAGS_:
-	.dw	sysvarWord
-	.dw	FLAGS
-
-.fill 65
+.fill 77
 
 	.db	"_bend"
-	.dw	$-FLAGS_
+	.dw	$-PARSEPTR_
 	.db	5
 ; Offset: 0647
 .out $
diff --git a/forth/icore.fs b/forth/icore.fs
index bfc7c76..51c0d5c 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -55,8 +55,13 @@
     ,           ( write! )
 ; IMMEDIATE
 
+: FLAGS
+    ( JTBL+44 == FLAGS )
+    [ JTBL 44 + @ LITN ]
+;
+
 : QUIT
-    0 FLAGS _c ! _c (resRS)
+    0 _c FLAGS _c ! _c (resRS)
     LIT< INTERPRET (find) _c DROP EXECUTE
 ;
 
@@ -145,9 +150,9 @@
     _c WORD
     (find)
     IF
-        1 FLAGS _c !
+        1 _c FLAGS _c !
         EXECUTE
-        0 FLAGS _c !
+        0 _c FLAGS _c !
     ELSE
         (parse*) _c @ EXECUTE
     THEN