From 5b01f797fc1e4c08e460437a303d81a16fe2a9bd Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Mon, 30 Mar 2020 17:36:15 -0400
Subject: [PATCH] forth: Forth-ify "(find)"

---
 emul/forth/z80c.bin | Bin 1479 -> 1512 bytes
 forth/forth.asm     |  31 ++++++-------------------------
 forth/icore.fs      |  13 +++++++------
 forth/z80c.fs       |  16 ++++++++++++++++
 4 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index cdba5f0bfd58ed933556836868e3bb4d11dfc1f6..03f9ff6bd6728ef02e081867f346a34c208a54d8 100644
GIT binary patch
delta 442
zcmYL^KS%>H6vkhZyCj#Z2L-VzwVd_eRTOcRf}G`sqE;=3Ac9yGK?*L#xw=Rfr!1Ys
z!O1SJc5!gHrH+N7(BdEzoLrn7OxmhTUiiNEJ-%OHcFg-vH0>OpoE{~|fkff$8H2;#
zBLI!3QD{U$-RZ4o{FwMcj{ZGZ3EN@<Z_iYWfWEK<WU{`O+st`BxJHqbv5VZ5jhsIP
zx&;Ay6*oAFFc%Lv9@-a8Ji9Q@F?Ufq6$4~}4dG6cs#JQ;QbNsW(hsU$8$z&4YhqDz
z^fR6(w_;C=M;^H#LEr1CSK3Hk?YH=W_M0ovJgLco=cLfRRhNE&GJMI^MqN5C`YXN+
zh6OF|8f`Qz3xz<Tm9Y)b{gn`ds-SwjqyVeZOMr8jN=jajwow=ou<Gq}=@m`io>YEY
zM$5Q_G$@j+>7uoapWOmYVcWnklh{iGaA85%w84@}uf-7L$u;{AGkJnTmB{L4+z@yA
F*bh!VYf%6I

delta 389
zcmX|+KTE?v7>D27pWNjd1A@>BT0>EcqPR<;#G0X~RYMTOsfsQgJ9H_u;u5;v)Wt7Q
z5eFxsgHr~-K<N@F4uwvRZr;`Ea=g6H`#XNmB$H%bz7P#gD$$zEVvl|<b!;vV@x^A-
zO4x`Opi+&3@GJ}>Xpx2)V;}hkr(v`K)PaP*$#<MZV@r;3-YCg$yuD|OvE`$3aRrbA
zF4&VH)2Z@~qZd7E$fiucE*NmddNL#)jYQ3SkZqD*d=%15=InR-OqOf<eju*NU#`w-
zW=|FDnDyCTeZ}jH<6EIG`il7Izjz5O2L_@=Qj}AL4A5#Zb^&Hn8*%7LkLK^RU{|pM
zcsIo@<r}aR*-(I^;BscKZRU7g^HfD++(rZ%=5EGE$Caph4n%9az%f_a`wMXIz*M;4
UsEuwRpJ<MCRm~W`$`88w19tXa%K!iX

diff --git a/forth/forth.asm b/forth/forth.asm
index 6b323d9..96ae17e 100644
--- a/forth/forth.asm
+++ b/forth/forth.asm
@@ -107,7 +107,10 @@
 ; comment indicating what that number refers to.
 ; We're at 0 here
 	jp	forthMain
-.fill 0x08-$
+; 3
+	jp	find
+	.dw	0	; unused
+; 8
 	jp	sysvarWord
 	jp	cellWord
 	jp	compiledWord
@@ -721,32 +724,10 @@ SCPY:
 	jp	next
 
 
-	.db	"(find)"
-	.dw	$-SCPY
-	.db	6
-; STABLE ABI
-; Offset: 047c
-.out $
-FIND_:
-	.dw	nativeWord
-	pop	hl
-	call	find
-	jr	z, .found
-	; not found
-	push	hl
-	ld	de, 0
-	push	de
-	jp	next
-.found:
-	push	de
-	ld	de, 1
-	push	de
-	jp	next
-
-.fill 427
+.fill 460
 
 	.db	"_bend"
-	.dw	$-FIND_
+	.dw	$-SCPY
 	.db	5
 ; Offset: 0647
 .out $
diff --git a/forth/icore.fs b/forth/icore.fs
index a6f5589..a8d53b2 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -77,7 +77,7 @@
 
 : QUIT
     0 _c FLAGS _c ! _c (resRS)
-    LIT< INTERPRET (find) _c DROP EXECUTE
+    LIT< INTERPRET _c (find) _c DROP EXECUTE
 ;
 
 : ABORT _c (resSP) _c QUIT ;
@@ -163,7 +163,7 @@
 : INTERPRET
     BEGIN
     _c WORD
-    (find)
+    _c (find)
     IF
         1 _c FLAGS _c !
         EXECUTE
@@ -175,11 +175,12 @@
 ;
 
 : BOOT
-    LIT< (parse) (find) _c DROP _c (parse*) _c !
-    LIT< (c<) (find) _c NOT IF LIT< KEY (find) _c DROP THEN
+    LIT< (parse) _c (find) _c DROP _c (parse*) _c !
+    LIT< (c<) _c (find) _c
+    NOT IF LIT< KEY _c (find) _c DROP THEN
     ( 48 == CINPTR )
     [ 48 @ LITN ] _c !
-    LIT< (c<$) (find) IF EXECUTE ELSE _c DROP THEN
+    LIT< (c<$) _c (find) IF EXECUTE ELSE _c DROP THEN
     _c INTERPRET
 ;
 
@@ -201,7 +202,7 @@
     [ 32 , 14 , ] ,
     BEGIN
     _c WORD
-    (find)
+    _c (find)
     ( is word )
     IF _c DUP _c IMMED? IF EXECUTE ELSE , THEN
     ( maybe number )
diff --git a/forth/z80c.fs b/forth/z80c.fs
index ca4f799..0f30aed 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -376,3 +376,19 @@ CODE (parsed)
     DE 1 LDddnn,
     DE PUSHqq,
 ;CODE
+
+CODE (find)
+    HL POPqq,
+    ( 3 == find )
+    3 CALLnn,
+    10 JRZe, ( found )
+    ( not found )
+    HL PUSHqq,
+    DE 0 LDddnn,
+    DE PUSHqq,
+    JPNEXT,
+( found )
+    DE PUSHqq,
+    DE 1 LDddnn,
+    DE PUSHqq,
+;CODE