From 4756fb7763dea3e8902add1c821e1e0250a18aa6 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 30 Mar 2020 17:21:13 -0400
Subject: [PATCH] forth: Forth-ify "(parsed)"

---
 emul/forth/z80c.bin | Bin 1417 -> 1455 bytes
 forth/forth.asm     |  36 +++++++-----------------------------
 forth/icore.fs      |   2 +-
 forth/z80c.fs       |  16 ++++++++++++++++
 4 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index ec98338f40a310070404e43f2f5886c9b26366df..8eb6d75ce68047207576e901247b1eacafb24467 100644
GIT binary patch
delta 344
zcmXwzu}i~H5XQf}_mY>S8tEWfwKfQ9tAeXYKuYOQu~pmbC8CoK5;qYv2vX<U#7XEJ
z!NsxA$wH^nS==1l^bhc*)#dK^zVGgS_o+Db{KD4r=RtUJa$Ly3oWVywi@t}vnFfZ#
z?i_|`4M{IoD}Ih%*{#+jk1uDQtRfq47N#H_=vG&}Gl3pm@|?Cx4}5L&$Lgt6$y)$(
z;9}ylBU@Yv8%`obR!0tGQe9{$$%wvrUia+4I3-ssrtfSr;y-V!?u$&2<lFX<_}^>D
zz=*6^-WZM1EmD3%n!IW!2~tjxRcd~@eo!y_JFpzI?JGq(tAI2#mEYnnFq*EJiICpJ
wk`~gJ*jkxR71>_JuN^`p{4PvxD*o+BL=FbF3r8t!+STV}sGha>Bc18lUpKB&HUIzs

delta 308
zcmZ3_-O0USGZU+;uV;wp<a<objFyv=m{lcfI31ZZ3KENoQ#JV+*!dV-SP!$@XJTPk
zGI;^BJR{@e1I${?=Qx*4e#<N^7|nTr{W3d<RA69aaAuF5EXkt5D#n$_<~rGpMXo-9
zYckt<s2o_7>ps)F|9jaK82DZQZAr~5DXP@e2H65Kqn;~?1!h(-dm>vj=X&-AwqUUN
zxj^|~b`EBBE|7{`po}Avr(cL`P(YAth&=-*A45G?4bYtu3?P?S0_8iH6?hmJz|49k
z4hEme?^%=>eI^UBS}?umn(V_W&AFBf=ne)B=K9G6tkNnzKyy2o%ed>AZvA&;vNmOC
W<O7=J$i%@M%Tdhc$P~}dzz6`!^hnhJ

diff --git a/forth/forth.asm b/forth/forth.asm
index 5f07e45..cdf0455 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -116,22 +116,23 @@
 	jp	nativeWord
 	jp	next
 	jp	chkPS
-; 24
+; 32
 	.dw	numberWord
 	.dw	litWord
 	.dw	INITIAL_SP
 	.dw	WORDBUF
 	jp	flagsToBC
-; 35
+; 43
 	jp	strcmp
 	.dw	RS_ADDR
 	.dw	CINPTR
 	.dw	SYSVNXT
 	.dw	FLAGS
-; 46
+; 54
 	.dw	PARSEPTR
 	.dw	HERE
 	.dw	CURRENT
+	jp	parseDecimal
 
 ; *** Code ***
 forthMain:
@@ -162,7 +163,7 @@ forthMain:
 .bootName:
 	.db	"BOOT", 0
 
-.fill 101
+.fill 98
 
 ; STABLE ABI
 ; Offset: 00cd
@@ -762,33 +763,10 @@ NOT:
 	jp	next
 
 
-.fill 100
-
-	.db	"(parsed)"
-	.dw	$-NOT
-	.db	8
-PARSED:
-	.dw	nativeWord
-	pop	hl
-	call	chkPS
-	call	parseDecimal
-	jr	z, .success
-	; error
-	ld	de, 0
-	push	de	; dummy
-	push	de	; flag
-	jp	next
-.success:
-	push	de
-	ld	de, 1		; flag
-	push	de
-	jp	next
-
-
-.fill 224
+.fill 362
 
 	.db	"_bend"
-	.dw	$-PARSED
+	.dw	$-NOT
 	.db	5
 ; Offset: 0647
 .out $
diff --git a/forth/icore.fs b/forth/icore.fs
index cb1eb57..b4e4ec5 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -85,7 +85,7 @@
 ( This is only the "early parser" in earlier stages. No need
   for an abort message )
 : (parse)
-    (parsed) NOT IF _c ABORT THEN
+    _c (parsed) NOT IF _c ABORT THEN
 ;
 
 ( a -- )
diff --git a/forth/z80c.fs b/forth/z80c.fs
index 0ea8c10..0accf92 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -347,3 +347,19 @@ CODE CMP
     BC PUSHqq,
 ;CODE
 
+CODE (parsed)
+    HL POPqq,
+    chkPS,
+    ( 60 == parseDecimal )
+    60 CALLnn,
+    10 JRZe, ( success )
+    ( error )
+    DE 0 LDddnn,
+    DE PUSHqq,  ( dummy )
+    DE PUSHqq,  ( flag )
+    JPNEXT,
+( success )
+    DE PUSHqq,
+    DE 1 LDddnn,
+    DE PUSHqq,
+;CODE