From d8de8a058a9abef42b3fb2872821980e841cfe6a Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 15 Apr 2020 15:15:31 -0400
Subject: [PATCH] Make word routine refs 1b instead of 2

Saves quite a bit of binary space. More than 300 bytes in forth1.bin
---
 blk/077             |   2 +-
 blk/078             |   4 +++-
 emul/forth/z80c.bin | Bin 2239 -> 2170 bytes
 forth/boot.fs       |   3 +--
 forth/core.fs       |   6 +++---
 forth/icore.fs      |   2 +-
 forth/link.fs       |   4 ++--
 forth/xcomp.fs      |   2 +-
 forth/z80a.fs       |   2 +-
 9 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/blk/077 b/blk/077
index 37a2eb3..17e7a12 100644
--- a/blk/077
+++ b/blk/077
@@ -6,7 +6,7 @@ A dictionary entry has this structure:
   bigger than input buffer, of course). not null-terminated
 - 2b prev offset
 - 1b size + IMMEDIATE flag
-- 2b code pointer
+- 1b code pointer (always jumps in the <0x100 range)
 - Parameter field (PF)
 
 The prev offset is the number of bytes between the prev field
diff --git a/blk/078 b/blk/078
index f7dcc86..5b0f02c 100644
--- a/blk/078
+++ b/blk/078
@@ -1,7 +1,9 @@
 (cont.) The code pointer point to "word routines". These
 routines expect to be called with IY pointing to the PF. They
 themselves are expected to end by jumping to the address at
-(IP). They will usually do so with "jp next".
+(IP). They will usually do so with "jp next". They are 1b
+because all those routines live in the first 0x100 bytes of
+the boot binary. The 0 MSB is assumed.
 
 That's for "regular" words (words that are part of the dict
 chain). There are also "special words", for example NUMBER,
diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin
index 19c0d5793e5f6ffb23fc564c59d920cd07f7b540..2ca9802e6fec60c4f7eeca6937f6091f9fe87e74 100644
GIT binary patch
literal 2170
zcmYjSUu;u#6h6Ou+q>>x_YW9bA-P?b*{*<NxJYyZ#%-MwwsyB2j35&JO^4bo8>kG8
z_&{P}VoZGBgAwIHL)ak17m}^%!$Ov@NN1vHVrMRvkZTAr(WrHP=XY16OV)e7bIy0p
z`Odj%`fExrlKiAU5$P$Bt`O;sqWFN)agpv4m+5o540n34kp4_K-=oeqMMwIRM6O0!
z+CVK@A>GV0!IP7rdIsCI!fSy;;U>ou+zWgoxf?0Jw3Xh!8T=XkK)`W2p=@M90?WGA
z7qhQB&i%1il6L;JW=~Ne=ch;hONAC!q1{6*O5vgZ3tCbso8Cnk3te5auV1huJ;5EZ
zu$A>S-~aGCz0&9F^@W>n>q_mP%lY6Y%jffDAELAT^juK2&4+pY-nH)h{9-PEzw?wk
zCl+%l%8iO#I2T?Fo*#Yd-4OY8VINfr>$R+QDunU5Wl!esZvG`_<?HCtE!(`i`3DTQ
z6hW+3IQeEngPo8fWQ#m>F-2`u3_QSmOLbJV@^XBj#Zh5lf}(}ti&inE6h~F7m`{75
zaMT!1M!Q5=BLd7=vW(Qm{PH~5vQ`G+k>PkPLjWvJkC?Hz7wYHnoH*PYFX!iF_Oi0E
zLs7G)gk&YuDH+y-05M4?v(#f(d8X;)tV*_)=bbsMOx7yO@||3x=_y~y(K{H~AX`Q0
zi&w^{zkHpEV`e=mPCplKj!)l^;7H7DcoO>U`1Cgt9gHO<iu@05_=$88V1{r#35TGG
z&Fxh%mw9@q&p^AE0oDgOdul^>8t&A0xXL?3Ly!KL1D+j-Mf{LJ#=NK1BJBA)b&d8}
z+w4%9s%szj$-(^oQk|*5B+~X(vkh7t4l8N+y`@Q}*xXmeCj6;3;xci=UxT6M8M4PD
zu+Pf?>^8FB;Fx~y)j2h3K2r^jT<YK4=o;Iv@NBu%Ke<tP7<){1GarrzZgUUYc=I@R
z|B+}V*x$ipaPrJlA|9%uvPSzN@k_~wnF!SY;r9nfqNf76Qa3@A!OP*f6==}^$V-il
zf%ulvLLe(5f^K!UQdyZn>haOB)afm9<J^i$L622Ocmta$TPNgqaO~}!Asr$1p}zr}
zy#wJ&a(Q*4!kl8zO9y-V5?*ox@X(mcpy0%b$*D8#p*r#atB}~sQ8QXClU&j^hD|d%
zm~3}qhMvZ1smwd;3acRE-a^%+c{8wA#cq%f4fiK;@?4#!T|U)TTd03988zc(G)Y<4
zinuBa>fIkRldb6KC-qk(^>|2ln_M&Kw%d8sX>F~^ZO|Sp1s<IQv3Y#r^odia>bRoN
zadNHh2@J4;XF&$()Ikdhd*~_8+L}R(mD8>#(TuGEtDx_dIfdg(vYZYbg)A9yK;@k6
zs5(KL*DK5^SKJ&sD;AVhOu^5qqR*WX+{Ko4o)y8&g67c40d*FZ6H!=mrkE8g$aR(w
zItwwcxM!3Ja*-DU8r?OdK)fm_9#&bZZMa(R3=E&j|8-KpJOgDBysZhrjCQa4xT@nj
zoY>n;DwzD_$Oi}HO~ww#%t#{yY}GO%r8$)i3^+o+K@|4-<odkm;A8D~;X_HLb>b%w
z#e=ffpo9@W5=OKm*N|k>z{S#V&IsKH=g~8%bCVa2wP955byeKcoJoY-7WcafMH%Be
zT2Q()P)UoY49fISH`2e-ikk8NIn`1*psb5G#0B}@u0ng~@<wp(pMvEoM*9(M1W%5S
zpX&~Ff=8zvQeW=7v@8eXg8Ty*kQyk6ngwY~X<hPwKLx^#mNMXVsHNB09q059;^&&X
z^APvI!o<o9I@q5ad{xrx)TMRtKm!BO$X>o`o?<~c0P0J04C{Kao<8!n;yAms+bZk&
l0$)RS882W+b7tR!>)z@qRdFG71lQ<HUhZ*bKmHtv{{VOsW~~4K

literal 2239
zcmYjS?Q2tK6hF_s$!+?UCPr;-CgjDJn?`M|h<j;k>rJK=o5Y(`E9#21X6w48rPXb%
z8*?87zl_257i{bWWFj)F?8~5BiUcWGx-eM{7{-+=a)<b3V=l|id7iY|LUYgWobx;9
z{LZ<J@dFrn;6KLa%(%deI%aHO<;P&8n6Z~#hOgi<x{ZWoe96RTR(wKys6PYXXoki0
z5K=6om1xwFsmMA4+Z5}q@UiG7;ZgS^z5$%gP+Hs!AJ3@|(H{;ArwApZfFx*{*AFJ`
z8^U=YnasfMe=7DgSj8Yb4PLTB4y(-tA<23Y{00_fC>VQS!Njhv+c#$HShu<>88r+3
z)<>WI9H{sE`~1<?UjmZn@1>Hu(e(TMg(uiqY4#^ow)H2az^~W4O7r<*7=JH7@jS~H
zb5P8(Vzd~|s~58GeHejYfY~P{t6Ix!11pL@x9zFYy_P?UX2}arZ`=C4mfvu=#Tdpa
z*2uWeXQ#Ocg)$9Y&cQY)hs)u|IN_of%4UfRfOt8}Oq`)?;`n8=oRi8~*({d~H)<T$
z1~c(}tfm<-LQiH~Aft#&^T=2*7ce0<nDTNA5tA5VdNS2SD=49nKHitA<Hi#CN#NwM
zxb9hl3LNX?ER;iGh!IgIG5Pq?h^mtk8@RbNFGeyK3TByi(Mg3`Uv{o~`Vz4XqGx2j
z_}#?pw{H`9Qul#Wt#@&5V)iCShm!jG7s1yiW`E>xBAF2|QhahV2oPXlB8mEdRXH}1
zy|a<*C6XKWK}cH@M@TMA>+wYH`tGjlaMX4%Uw7acMYInjV<D1*Yx<Gm!MJ^Qz0LN!
zw%#FaYV<ri$R`Yj)@n_Mr!cYC%>iV_b0T52VAI-2(`5HHavLLZ+kk4Nw4jH^o2L%#
zF^=>$aRh;FV826A{k&&!h1}lmCZ1yMzhbsRz+paSG52pV%WtMf=K(~DhlK%p4+rqY
zr0@eL;tf>e1AJDe&P}INkw(CSvM&O?wFK$uh=(A0!w^b$*Hc9<Bm-E$_s4ZR><j!=
z;<9T4sm*I!LZLB4b;_?w_4NywJe(cNjcyjFKpn}Tx=b(NYuXA0FXNx;*!#O9L5i`D
zJx5&c8;CZ5!wmtzo+J(4JkobC-2_fTT=0cM19kGu)bzPF{O{r-u#SU=;(FXI@*Et{
z26a82$h1|Xj=l_fp~ejl9KAA<QI8QfC~kO)fW=N>g`<Q08GJE#6Y#a8U3NP{(4WY}
z^^_jZ0CTRet4xEw14%uzm0Ei)uXk$DT?@<&U5;zmc31T|0F}xi^!4DT$QJ+xWDie{
zo;iDV9o5aV0G?#VIf<jJ;4=da$LfG(i9GO<r&7^)bS;doMH6OWTpgH_AyNFQLZgvW
zq)?uX$V9Xg>rO&TwS*zvcT(^iTb3-Gg`O=o<IFQ^V{4UYg%LFa16vu9=g<-nRz=J)
z$5t>`EF>~cs@`{AlP19dT{xrG<pGIAY(VjQWs+<MUbGwTpw%wZ-vCHReg`GS@Exrb
zPOx5eQf1*hp5E^VnaF}w6%C1W&Loc~^;iq(ctXju?-fyA!!d{8Pt=CouZUf`v5k4<
zIcvwV#4HjfF^uLVuLfx?bz%pF3)!x4J_XrGB1#&9N632eT<-kT%<1hkGBs?mrW!F1
z<9nl~EtHlpx~pYrT)CnMi)K}Mex#f7A1bfaXfMvo3$=tXzAUOq2Y40N0Q_kP--27n
zcopaS9XnA+CMM2zMfMO=0CsVusrS{z35;se7w8tDgoI%akT$fsJATu*5TRyQQ_w5O
zxmT=_a{3eaeNX+lfVv=cKF0};^k)*M1%Cj>m2m}!8W@Pj_VX*JNtUG%B)<e>xVSfb
w@R=L7;I)n`4`kB!b$%N&HMELxMJTWl_b}{Qt>i#_2+vc@f7m4y7~Tu)f6h5_G5`Po

diff --git a/forth/boot.fs b/forth/boot.fs
index 3081cd8..03c630e 100644
--- a/forth/boot.fs
+++ b/forth/boot.fs
@@ -315,7 +315,6 @@ PC ORG @ 0x34 + ! ( execute )
     H 0 LDrn,
     ( HL points to code pointer )
     IY INCss,
-    IY INCss,
     ( IY points to PFA )
     JP(HL),
 
@@ -338,7 +337,7 @@ PC ORG @ 0x0f + ! ( compiledWord )
     0x33 JPnn,      ( 33 == execute )
 
 PC ORG @ 0x0c + ! ( cellWord )
-( Pushes the PFA directly )
+( Pushes PFA directly )
     IY PUSHqq,
     JPNEXT,
 
diff --git a/forth/core.fs b/forth/core.fs
index 174a460..b8cdab3 100644
--- a/forth/core.fs
+++ b/forth/core.fs
@@ -58,7 +58,7 @@
 : CREATE
     (entry)            ( empty header with name )
     11                 ( 11 == cellWord )
-    ,                  ( write it )
+    C,                 ( write it )
 ;
 
 ( We run this when we're in an entry creation context. Many
@@ -71,11 +71,11 @@
 : DOES>
     ( Overwrite cellWord in CURRENT )
     ( 43 == doesWord )
-    43 CURRENT @ !
+    43 CURRENT @ C!
     ( When we have a DOES>, we forcefully place HERE to 4
       bytes after CURRENT. This allows a DOES word to use ","
       and "C," without messing everything up. )
-    CURRENT @ 4 + HERE !
+    CURRENT @ 3 + HERE !
     ( HERE points to where we should write R> )
     R> ,
     ( We're done. Because we've popped RS, we'll exit parent
diff --git a/forth/icore.fs b/forth/icore.fs
index 3f78412..1f8757f 100644
--- a/forth/icore.fs
+++ b/forth/icore.fs
@@ -237,7 +237,7 @@ XCURRENT @ ( to PSP )
     ( We cannot use LITN as IMMEDIATE because of bootstrapping
       issues. Same thing for ",".
       32 == NUMBER 14 == compiledWord )
-    [ 32 H@ ! 2 ALLOT 14 H@ ! 2 ALLOT ] ,
+    [ 32 H@ ! 2 ALLOT 14 H@ ! 2 ALLOT ] C,
     BEGIN
     WORD
     (find)
diff --git a/forth/link.fs b/forth/link.fs
index 6188626..f869fb3 100644
--- a/forth/link.fs
+++ b/forth/link.fs
@@ -82,7 +82,7 @@
 )
 ( ol o a1 a2 -- )
 : RLWORD
-    SWAP DUP @              ( ol o a2 a1 n )
+    SWAP DUP C@             ( ol o a2 a1 n )
     ( 0e == compiledWord, 2b == doesWord )
     DUP <>{ 0x0e &= 0x2b |= <>} NOT IF
         ( unwind all args )
@@ -95,7 +95,7 @@
     ( ol o a2 a1 n )
     0x2b = IF 2 + THEN
     ( ol o a2 a1 )
-    2 +                         ( ol o a2 a1+2 )
+    1 +                         ( ol o a2 a1+1 )
     BEGIN                       ( ol o a2 a1 )
         2OVER                   ( ol o a2 a1 ol o )
         SWAP                    ( ol o a2 a1 o ol )
diff --git a/forth/xcomp.fs b/forth/xcomp.fs
index 76cfc6f..310ec7d 100644
--- a/forth/xcomp.fs
+++ b/forth/xcomp.fs
@@ -34,7 +34,7 @@ VARIABLE XOFF
 : X:
     (xentry)
     ( 0e == compiledWord )
-    [ 0x0e LITN ] ,
+    [ 0x0e LITN ] C,
     BEGIN
     WORD
     ( cross compile CURRENT )
diff --git a/forth/z80a.fs b/forth/z80a.fs
index e095fc2..a9a4328 100644
--- a/forth/z80a.fs
+++ b/forth/z80a.fs
@@ -324,7 +324,7 @@
     ( same as CREATE, but with native word )
     (entry)
     ( 23 == nativeWord )
-    23 ,
+    23 C,
 ;
 
 : ;CODE JPNEXT, ;