From 1b6286dcfe8c2d8846eed22fc302980e349d1992 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Thu, 9 Apr 2020 11:20:54 -0400
Subject: [PATCH] Make (find) 2-layered, the lower layer having CURRENT as a
 param

---
 emul/forth/boot.bin | Bin 451 -> 451 bytes
 emul/forth/z80c.bin | Bin 1681 -> 1702 bytes
 forth/boot.fs       |  10 ++++++----
 forth/icore.fs      |   3 +++
 forth/z80c.fs       |   6 ++++--
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/emul/forth/boot.bin b/emul/forth/boot.bin
index 879248db975e385f4e02c4a4a215822dad43e61d..bb5b52c4063aacdf03c1f7485c6cb5cae940d1e6 100644
GIT binary patch
delta 143
zcmX@ie3)7H@G^$OM;XB2a2w;{JjTQPjEAKd|Gs269Ljjuig706az>EsVK&CY-4k_t
zrC%#9WH`&raP{y+hNDk`QtRJttbFTYtD)zwJ@H0_t}5f(Xr>oX1y8jYUT6cs_P0e3
nFGxJT`}Cn8!-wr}gDyy1KP$^{)^l<sV<Ja<Qfgj`AtNgQ2IM$w

delta 143
zcmX@ie3)7H@G^$OM;O51a4X~CT*kvfjE7|z|Gs269Kv|ml5qy(GDeW>VNS-wT@!VC
z<rEh(oMmRXdUztk(WgL}^=~&;zICzHF!I-a8_o1$;?)RE4MwPfr&<gzw1Hsz+oFdT
nB%a@W`cRPJ!}hm97bI?<m1Q{VF*%Ack&_`lDK#&}kdYMt;2<}S

diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 46520bbecbf03f507490d2733dbc527a8ba74ea3..66265d01c39d15266a5b52785d449f3d28de7b8e 100644
GIT binary patch
delta 458
zcmYL_%}PQ+7>3_DXJ+(-9&3?-P#y)zF2JPd2b&}gl$xBtO<4552{HFwK}gIdh_*ps
z&;_)yP3ve86fIi03R?t$1U8dKyP5Z4zHgrQG<X@jxiA9d-GjsJFxUv*9^{oVN@DWf
z*gH<@cw!LTMvHppH`%8Gt81<|2x`Lta7~37r*XJBFIy}WvmQFMP3jQHEaZz`0?bB;
z2AROD1!5yln})zl|LmaK%_ue(>@f!f`kt(8R*!bJ<(U}?Wmp9fw25X<Mol)&*zk(V
z1~6sl9|*iEW?@}^nOUpGnnnc_DVe2Jmf)|XDsQPXbizZ1Fncq4={p@Go(!;Yv%z2F
zB#TDV+~bc*v!$HGztKD_8x7u(HMUvMc6W;FIvi}^T>B%rH8b%m?jX>Q+?=bssKAdp
zO5n<1$tSSvdbvWcJO^o>mI<C*O!E)3O$4Sxx(4QRU@N9ps^?*)XZioeP?eXI`kh)|
O$EUA^=dM6G1@Z%(&SrN2

delta 411
zcmXw#ze_?<6vw~!-5+M?v!x^<dOnH_93l`(Dyf^$qfoOKSP&LO@rFVgqJN=D;tmbb
z6a)=H|AGxQw-f{t%|SXewAsB`+d1FE`JV6RTu0BMcb8TqwHF-jj>jS5cvm;p5OLI_
zwZFZ(?)f&D4F|w2lhkD{yn>%Em&$n`0c(*uB<2^2Wq%ahMvQ$kiP<oSjUsDU5;K3b
zgH9*SCFY{tnFE5fx}qboG_N6n7BR|;RaMV4**~SVUQAo&u0&JM!dOxfmJe5X!>WP7
zQJd_D_lYLiQcuj8I1w>R(yqs^Dr)%b7zY~{I@6jgZKMrKlN{3~$*CkCqvzs5E%RaO
zikv#&gSrpYDc>Q1`rwI-!E+EX>(pR-hPZ|v)KP)Zi6=u6E1q8{bzkJb6|TyP)S@fe
rv_&McF$3EcCWI@ryIvpA3BE%AHcaakje5^~TE|<cg4d2jH3RYkWN=qh

diff --git a/forth/boot.fs b/forth/boot.fs
index 34db9b1..795a8cf 100644
--- a/forth/boot.fs
+++ b/forth/boot.fs
@@ -123,14 +123,16 @@ PC ORG @ 1 + ! ( main )
     0x08 LDHL(nn),
     RAMSTART 0x02 + LD(nn)HL, ( RAM+02 == CURRENT )
     RAMSTART 0x04 + LD(nn)HL, ( RAM+04 == HERE )
+    EXDEHL,
     HL L1 @ LDddnn,
     0x03 CALLnn,        ( 03 == find )
     DE PUSHqq,
     L2 @ 2 + JPnn,
 
 PC ORG @ 4 + ! ( find )
-( Find the entry corresponding to word where (HL) points to
-  and sets DE to point to that entry. Z if found, NZ if not.
+( Find the entry corresponding to word name where (HL) points
+  to in dictionary having its tip at DE and sets DE to point
+  to that entry. Z if found, NZ if not.
 )
 
     BC PUSHqq,
@@ -154,7 +156,6 @@ PC ORG @ 4 + ! ( find )
   adjust. Because the compare loop pre-decrements, instead
   of DECing HL twice, we DEC it once. )
     HL DECss,
-    DE RAMSTART 0x02 + LDdd(nn),   ( RAM+02 == CURRENT )
 L3 BSET ( inner )
     ( DE is a wordref, first step, do our len correspond? )
     HL PUSHqq,          ( --> lvl 1 )
@@ -241,6 +242,7 @@ PC ORG @ 0x15 + ! ( popRS )
 '(' A, 'u' A, 'f' A, 'l' A, 'w' A, ')' A, 0 A,
 L1 BSET ( abortUnderflow )
     HL PC 7 - LDddnn,
+    DE RAMSTART 0x02 + LDdd(nn),   ( RAM+02 == CURRENT )
     0x03 CALLnn, ( find )
     DE PUSHqq,
     L2 @ 2 + JPnn, ( EXECUTE, skip nativeWord )
@@ -366,7 +368,7 @@ PC ORG @ 0x22 + ! ( litWord )
     JPNEXT,
 
 ( filler )
-NOP, NOP, NOP, NOP, NOP, NOP,
+NOP, NOP, NOP, NOP, NOP,
 
 ( DICT HOOK )
 ( This dummy dictionary entry serves two purposes:
diff --git a/forth/icore.fs b/forth/icore.fs
index ff15d27..e445dd1 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -37,6 +37,9 @@
 : HERE 0x04 RAM+ ;
 : CURRENT 0x02 RAM+ ;
 
+( w -- a f )
+: (find) CURRENT @ SWAP _find ;
+
 : QUIT
     0 FLAGS ! (resRS)
     LIT< INTERPRET (find) DROP EXECUTE
diff --git a/forth/z80c.fs b/forth/z80c.fs
index d2091ec..82dcf86 100644
--- a/forth/z80c.fs
+++ b/forth/z80c.fs
@@ -354,8 +354,10 @@ CODE CMP
     BC PUSHqq,
 ;CODE
 
-CODE (find)
-    HL POPqq,
+( cur w -- a f )
+CODE _find
+    HL POPqq,       ( w )
+    DE POPqq,       ( cur )
     chkPS,
     ( 3 == find )
     3 CALLnn,