From 40a756cf1c20f748a5a9d754e084560f31e23697 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Thu, 14 May 2020 08:18:53 -0400
Subject: [PATCH] Move a bunch of words from XPACKed core to xcomp core

---
 blk/412                 |   6 +++---
 blk/434                 |   4 ++++
 blk/435                 |   4 ----
 blk/444                 |   1 +
 blk/445                 |   8 --------
 emul/forth.bin          | Bin 5888 -> 5888 bytes
 emul/xcomp.fs           |   2 +-
 recipes/rc2014/xcomp.fs |   2 +-
 recipes/ti84/xcomp.fs   |   2 +-
 recipes/trs80/xcomp.fs  |   2 +-
 10 files changed, 12 insertions(+), 19 deletions(-)
 delete mode 100644 blk/445

diff --git a/blk/412 b/blk/412
index 11f255d..abb2c23 100644
--- a/blk/412
+++ b/blk/412
@@ -4,13 +4,13 @@
 : H@ HERE @ ;
 : IMMEDIATE
     CURRENT @ 1-
-    DUP C@ 128 OR SWAP C!
-;
+    DUP C@ 128 OR SWAP C! ;
+: IMMED? 1- C@ 0x80 AND ;
 : +! SWAP OVER @ + SWAP ! ;
 : -^ SWAP - ;
 : / /MOD SWAP DROP ;
 : MOD /MOD DROP ;
-
 : ALLOT HERE +! ;
 : CREATE (entry) 11 ( 11 == cellWord ) C, ;
+: VARIABLE CREATE 2 ALLOT ;
 : LEAVE R> R> DROP I 1- >R >R ;
diff --git a/blk/434 b/blk/434
index db838a0..0819e39 100644
--- a/blk/434
+++ b/blk/434
@@ -2,3 +2,7 @@
 ( b1 b2 -- )
 : LOADR 1+ SWAP DO I DUP . NL LOAD LOOP ;
 : LOADR+ BLK> @ + SWAP BLK> @ + SWAP LOADR ;
+( Now we have "as late as possible" stuff )
+: DO COMPILE 2>R H@ ; IMMEDIATE
+: LOOP COMPILE (loop) H@ - , ; IMMEDIATE
+( LEAVE is implemented in low xcomp )
diff --git a/blk/435 b/blk/435
index 60f0030..325af37 100644
--- a/blk/435
+++ b/blk/435
@@ -1,9 +1,5 @@
-( LITN has to be defined after the last immediate usage of
-  it to avoid bootstrapping issues )
 : LITN 32 , , ( 32 == NUMBER ) ;
 
-: IMMED? 1- C@ 0x80 AND ;
-
 ( ';' can't have its name right away because, when created, it
   is not an IMMEDIATE yet and will not be treated properly by
   xcomp. )
diff --git a/blk/444 b/blk/444
index 4bd8e56..6bad060 100644
--- a/blk/444
+++ b/blk/444
@@ -11,4 +11,5 @@
     ( We're done. Because we've popped RS, we'll exit parent
       definition )
 ;
+: CONSTANT CREATE , DOES> @ ;
 
diff --git a/blk/445 b/blk/445
deleted file mode 100644
index 415ab82..0000000
--- a/blk/445
+++ /dev/null
@@ -1,8 +0,0 @@
-: VARIABLE CREATE 2 ALLOT ;
-: CONSTANT CREATE , DOES> @ ;
-
-( In addition to pushing H@ this compiles 2>R so that loop
-  variables are sent to PS at runtime )
-: DO COMPILE 2>R H@ ; IMMEDIATE
-: LOOP COMPILE (loop) H@ - , ; IMMEDIATE
-( LEAVE is implemented in xcomp )
diff --git a/emul/forth.bin b/emul/forth.bin
index 26cbbc61564d140830c1e170a8aa631458236bbc..e71fa1959369c7b8b8322429734a1dc8659639da 100644
GIT binary patch
delta 1398
zcmXw3U1%d!6h4`I`;$)Q&P@KgS*e};&?H-p7U_fS;<nSKG;Er*O}exesr^YyX-M3r
zODj?mbaA_71FIKb_DQg;5M1#=)?IuMcJW07fAFC%S|U|cmW737@yUAbBz>3}&Ntt8
z&bi;Y_f}$+*caDjUt(e+K6;@GTG<i3Lky_EH<AgxewE*lP1^zgLGE;48lFxJo5{Ef
z+SwD?014_cKbBvxz07sTa@)Ma00Q&;9mfZbK?jvOm3+%C0fnDYB9mFg1T%Tjf6f6d
zOh}u+YYI?|>1jNgol~(116og!NQ2RS8b?K3<2RM=avhtX&}XmFTgonZNcZsFC=*4_
zo>C<{_#E3B|4kT6&Sb{VU<0=hUPI}>jjo1tq`MfEgyip*H7xGI)r)wStXnA>Y5hGY
zzH3!8A;M$qylshZu%2X@W#IS(Ntqx>*nK;cnF+};*@`->Xk@w(Da|N3CRXw%J49w?
za-;(Y3JoapUs?C-&k&3hH=^B0A!-1M8*spM6~Qa3`R%A1Jqkc+YjJtQxKdcjZLa2v
z+sOE>1sU6g)#&rs=z*o&E^e+Eh2oa6T0|xs@Js3|!5eCg_SsE{1$20qeXfR3>%(~1
zOiyPKd!IevpQ&@vGJ8n-$sa0}40si6t*6$A^*+M&UWkE>RY^$WF|B{<XPk!ybL35}
z%*2EFXML6fV4EZR+P-GO0z-vJH-I)!X<s9%7-EgyN58AM^90q8xcI}r)XuretOCEE
zh_#Q-OiV7KA&2~l=COUn+w{m{TsI++iZtAlpb<tLmYGBFm<k}WURcdXb@Z%8b2^n~
z^<5%%3gSzps0Z;`y-ISr7(E3OM07+2i>Tl6o4OIYEXJ|9k}oVr1JGvCw=8-GPOJkm
zDEpTGqKCW1n#A}UyXa#qF3MH0++9p~z|T6n2KMxSbOT!8DVBS7a>#PJC}qO*XfkzP
z3{D8{5Gt*K11y;=3M@Hi`DJI1x`p%*c}(l_o*sht_-$vH5*0`AlQS?A#yzB2Zq~_<
z^pR7zI|OyoPil$>Q;Nug{@zDSlxTIWVgDZKtV5I#R{w=oSKt8-H<=zDokF|!__!-b
z!g%Nku8UHb@vmK7ZQ`hS$R<B>d0z}^y1MDAz|*E^x>sBz4Tj%3RHCHUjT20F@~}7P
zPA0M`7p4{)-e(s(Z_vRL?jFyF@*28#Y!lu1>=`_XpSJJttM19(LC1fXU?e>;nMlSN
zTw?+VHP!P?{0%Q$XM_C2o$IU1CS=FsDGyx5nJmcnWWOX_jwds59kCEj&1Y}iV%C5D
zk!Sh2k#s7P9ZqG#)*a`wd%RVl8Osc*JnaqIYP{rq3E!W1g9G0yA(-;6;~f!#Yu+9F
k-g5?Eq4ahMCOQHzQq1QU-zw#dbf$TB7Y4zWNF}ny|1fPb5C8xG

delta 1450
zcmXw3ZAe>Z6h684jT&?Bdvg<S*8H&Ed`y!nigXs#I?Xi^Lt~=3ahsjfIju4($*7jP
zA8ICJrEDo|FKlc-#^_*$U}5`H=#Z_n|K=EO4BQ8-+fceM{8dIlhCA=Q@yGo*=RM~+
zAI~{&slC+x={2|58Vs--Zo_}wZNOkI8P6wWsG+5L9o*3AVjii@L0F$OTiYS&AVLSb
zDZMQz5)uBE7M-i&_YzCU(b1@EfRR2IJSBmX>L5T>@w5yCWpXSh@)HWe>riv7iP{!*
z$8wCzYivtyTHkha&rVl`6y#O$KAFU~9VUi0lX6*1<Fn_m&kYz#kDJ3MFo6Q97tr-<
zJF5W|%^%7{;4XhU7cjUc7{KLKvCo3AVS~-+eA|j<K$M-QXB}tQd$c)iQWN%$(8vsf
zfZ5l9NexI3xh<*Qk_L0OBv+;M5U=EOx`~$N=wLmF=%|CqTuRduU!gKuyclajlU*8u
z;zd}Y`;_%7C!buQzc}&qN?|^B67yNH46YO}&FO{WvOZtDT$qCuwxOI3zo=A5r^|r$
zkO~`gLx~_r0Oh!m&E-+|27Q<PpiIO}dY^QOcN8M%&<&27;|}n${=u^P+rdH0;$wxK
z_jHYIVcR`0AwK0XDSr_ExqwwDI3~m?&y>f2X^I{kt_Q0n!jxy%V!1-@U|Y+g4%{?|
zdVa!w^_;>SO7Q#9KB6VYM@DC`?oAp*fI5s66gXQuguB1VPOH(GfNDT06SbQrfGx%(
ztA_({K)53Ma$$Zkrs6nNNViIaHg#3x1A_XOmSP&}+tjkyt#ZZ*7{H|mgj?;>580Ng
zN0OX{OLL2b*;oi_E%RZ^ydH@{R?+SKcf2j@yhNU<Jv+-7n@1~SwA+Yx-OW$s>ZvAF
zNEJ198FQFazfg5>!XwP$-=j_1t?~>E$R*O5vz%WJbW0@I0tsw59`}sb)>nw5hJE5~
zREE(nA|8-!_oNzuXW4h&7P3o`vj4oH@k5zY#@qLsxI^xGIU57`-zBce8e(%v!#4AC
z9_uIX0@kMq2W}pVQ}YK>Q-XUq4C!n<F^2R^vSnXbJe1ei2flN{q0Aoo8rS&-Y2uL2
zHp_W1{~coE65+A3PltRZcvMBnwKnnwSS~?p`FIY0apzP%6TldJAp$NwvZ;}gWTKyw
z`GDNQ`6<DdxT3ujUZWA@F5vox?<`{tC$yf11>|DS!BY>oOx)(1b<ON<!)U7_-D|*G
zEITrqN+&5?rCbrIMtHuef58vesKR=+3+guBdHLaFMuXRp;c52`_L&x_-9|q7|F_y~
z$20L<DsH5cEl@{)#=Q`L`wV6?W<H+D`z&q1^`llsMiW_?Wg5cH<d8YwV_ARLvBsAC
z9r*s(AMW``j=-3|4{w|ZT=l2%`<6EZ(@U=|!AN}w28)Y}Gp{UN(6gp>6X1&Vf+Lkl
H<@Nso`7$`u

diff --git a/emul/xcomp.fs b/emul/xcomp.fs
index 4b0d727..9a2f5b7 100644
--- a/emul/xcomp.fs
+++ b/emul/xcomp.fs
@@ -14,7 +14,7 @@
 ( Update LATEST )
 PC ORG @ 8 + !
 ," CURRENT @ HERE ! "
-440 445 XPACKR
+440 444 XPACKR
 ," ' (key) 12 RAM+ ! "
 ORG @ 256 /MOD 2 PC! 2 PC!
 H@ 256 /MOD 2 PC! 2 PC!
diff --git a/recipes/rc2014/xcomp.fs b/recipes/rc2014/xcomp.fs
index 28c62cb..0e18143 100644
--- a/recipes/rc2014/xcomp.fs
+++ b/recipes/rc2014/xcomp.fs
@@ -18,7 +18,7 @@ RAMSTART 0x70 + CONSTANT ACIA_MEM
 (entry) _
 ( Update LATEST )
 PC ORG @ 8 + !
-440 445 XPACKR ( core )
+440 444 XPACKR ( core )
 123 132 XPACKR ( linker )
 ," : _ ACIA$ RDLN$ (ok) ; _ "
 ORG @ 256 /MOD 2 PC! 2 PC!
diff --git a/recipes/ti84/xcomp.fs b/recipes/ti84/xcomp.fs
index 45a5ae4..b133a31 100644
--- a/recipes/ti84/xcomp.fs
+++ b/recipes/ti84/xcomp.fs
@@ -68,7 +68,7 @@ CREATE ~FNT CPFNT3x5
 (entry) _
 ( Update LATEST )
 PC ORG @ 8 + !
-440 445 XPACKR ( core )
+440 444 XPACKR ( core )
 ," : _ LCD$ KBD$ (ok) RDLN$ ; _ "
 ORG @ 0x100 - 256 /MOD 2 PC! 2 PC!
 H@ 256 /MOD 2 PC! 2 PC!
diff --git a/recipes/trs80/xcomp.fs b/recipes/trs80/xcomp.fs
index cf82d63..338b405 100644
--- a/recipes/trs80/xcomp.fs
+++ b/recipes/trs80/xcomp.fs
@@ -14,7 +14,7 @@ RS_ADDR 0x80 - CONSTANT RAMSTART
 ( Update LATEST )
 PC ORG @ 8 + !
 ," CURRENT @ HERE ! "
-440 445 XPACKR ( core )
+440 444 XPACKR ( core )
 499 500 XPACKR ( trs80.fs )
 ( 0x0a == NLPTR. TRS-80 wants CR-only newlines )
 ," : _ ['] CR 0x0a RAM+ ! BLK$ FD$ (ok) RDLN$ ; _ "