From 5c03b33982aef940117abd78436fd22729ae140a Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 30 Mar 2020 21:19:48 -0400
Subject: [PATCH] forth: remove sysvarWord type

Not needed anymore. CONSTANT does the trick.
---
 emul/forth/z80c.bin | Bin 1549 -> 1549 bytes
 forth/core.fs       |  11 ++++-------
 forth/forth.asm     |  16 ++++------------
 3 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 4d5549fe7b71d0e29835b6e877bcd1efd76aeabf..8056642322800b15bde44f41b744e5a47ce70f47 100644
GIT binary patch
delta 560
zcmYL`yGsK>5XQgk-tI*SXQc=R)S%+|sKiQ9GzL8cBk{yoh{zeiN92e(#42bbDXfB>
zg;l^p@IOc$>@0(gjfkL)t)eqY)Mi=co5ydyxrkgu?zW{ax4(vS;nJR5EmTxhJ{mDN
zOKu{yoJzQet3Z_DU}iR%a{HkyR1KjW4EkHSqm11K(?YkJmp%*()#JI{!@S+jaZh|n
zPq3y@5f08(4?@_GX*_>ZhhXR6*dBnk5W`V^%iA9<O&P5PS972EWE8?e4<au$$pG;Y
zivv%pCf_8#jb2Yg>|kwWx(kxidm)=s<|*zb*OIBZPM&e4J#nuapbi3&#ydf<9EHJ^
z*2}ZL6xBkraU<WStcqZffHQ~r+=)HRt1*BwGwK&4ON%nfnaI}RK1k2XB5pNjeAFTT
zOr1uH1!cySk4_pK0^44uAL!RoC4a(rP_<H0MW@*R2a;nL^d@aO2X7D|#}*Uo_2aNZ
zO}USCpNh*!(>VeWlx|dXVaz0c6q^$}=q%U9e^!xlTX`H2e41(0$d!q4oU$bjRUI1v
Joo=%Yp&uJvfnERr

delta 560
zcmYL`J4*vW6opS_c4k%9O{GLkp+Ut(?X>cRkARD4G)9b#BEIkuU6M$!S}X%9NPd7_
zKr1_cL+W57ViiOX#Li0e-Xv->4ELP5_nUJstPAUIOX|zEXKTkQ?8{}pq{{Neh`^ms
zMB@wbXaaM}7e%<3n2f~}-B32lhNWHfdK>A?wiASD!%>UUgMq<nJ-v67by~Qd5~h(7
ztZ9^li!0TE0Cr^(FW=PRWalvF^g!E)Ad}tLJQyg98BPA0<~~y+VF()?uwE;Y0jBzG
zF1)FV{FHpwdc6^`i<PDEc1X5&qPae0k?M)qN-RDd;u%Gq5)Zlt>cSUEyb}b=VHo_<
ze*MtbqU_fj*Zdy2N`gfK-ag8vPn|yg8UqB)WAzJ?lPSR{=OR~y`yxFj^SIaS_^Lww
zg*uK#8$okUc?i+q066v{-9Wd-GUd~NCsirLRCtW@e<C@8-pvt**1<opD6!e-YIQlB
zP+jg~-J{1vBxxPK@C!F8JTqz%Kl1g7t+bX~<KLAhZxfFr0^N|rBc(DtgfouBrB`Q$
KPpexGBJcye)q?y0

diff --git a/forth/core.fs b/forth/core.fs
index 104591b..574b8ed 100644
--- a/forth/core.fs
+++ b/forth/core.fs
@@ -108,15 +108,12 @@
   in dictionary.txt )
 
 : (sysv)
-    (entry)
-    ( 8 == sysvarWord )
-    8 ,
-    ( 50 == SYSVNXT )
-    [ 50 @ LITN ] DUP    ( a a )
     ( Get new sysv addr )
-    @ ,                         ( a )
+    ( 50 == SYSVNXT )
+    50 @ @
+    CONSTANT
     ( increase current sysv counter )
-    2 SWAP +!
+    2 50 @ +!
 ;
 
 : ."
diff --git a/forth/forth.asm b/forth/forth.asm
index 9982687..68ee473 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -53,9 +53,9 @@
 	jp	forthMain
 ; 3
 	jp	find
-	.dw	0	; unused
-; 8
-	jp	sysvarWord
+	nop \ nop	; unused
+	nop \ nop \ nop	; unused
+; 11
 	jp	cellWord
 	jp	compiledWord
 	jp	pushRS
@@ -512,13 +512,6 @@ cellWord:
 	push	iy
 	jp	next
 
-; Pushes the address in the first word of the PF
-sysvarWord:
-	ld	l, (iy)
-	ld	h, (iy+1)
-	push	hl
-	jp	next
-
 ; The word was spawned from a definition word that has a DOES>. PFA+2 (right
 ; after the actual cell) is a link to the slot right after that DOES>.
 ; Therefore, what we need to do push the cell addr like a regular cell, then
@@ -561,10 +554,9 @@ litWord:
 ;    entry, we always have a predictable prev offset for the grafter's first
 ;    entry.
 ; 2. Tell icore's "_c" routine where the boot binary ends. See comment there.
-
 	.db	"_bend"
 	.dw	$-EXECUTE
 	.db	5
 
-; Offset: 0253
+; Offset: 0249
 .out $