From 0434d0281829d10eefc144d479b41599af663520 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 13 May 2020 13:24:58 -0400
Subject: [PATCH] xcomp: implement X[']

---
 blk/263                 |   1 +
 blk/409                 |   4 ++--
 blk/411                 |   2 +-
 blk/432                 |   1 -
 blk/433                 |   2 +-
 emul/forth.bin          | Bin 5894 -> 5884 bytes
 emul/xcomp.fs           |   1 +
 recipes/rc2014/xcomp.fs |   1 +
 recipes/ti84/xcomp.fs   |   1 +
 recipes/trs80/xcomp.fs  |   1 +
 10 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/blk/263 b/blk/263
index 6dc146a..bf2ad7b 100644
--- a/blk/263
+++ b/blk/263
@@ -9,6 +9,7 @@ VARIABLE XCURRENT
 : XIMM XCON IMMEDIATE XCOFF ;
 : _xapply ( a -- a-off )
     DUP ORG @ > IF ORG @ - BIN( @ + THEN ;
+: X['] XCON ' _xapply LITA XCOFF ;
 : XCOMPILE
     XCON ' _xapply LITA
     LIT< , (find) DROP _xapply , XCOFF ;
diff --git a/blk/409 b/blk/409
index c7e90d4..36a5086 100644
--- a/blk/409
+++ b/blk/409
@@ -5,10 +5,10 @@
     NOT IF (parse) ELSE EXECUTE THEN
     C<? NOT IF LIT< (ok) (find) IF EXECUTE THEN THEN
     AGAIN ;
-XCURRENT @ _xapply ( to PSP )
+
 ( Drop RSP until I-2 == INTERPRET. )
 : EXIT!
-    [ LITN ]            ( I, from PSP )
+    ['] INTERPRET       ( I )
     BEGIN               ( I )
     DUP                 ( I I )
     R> DROP I 2- @      ( I I a )
diff --git a/blk/411 b/blk/411
index 38365a9..22a0271 100644
--- a/blk/411
+++ b/blk/411
@@ -6,7 +6,7 @@
     0 0x55 RAM+ !  ( 55 == (key) override )
     0 0x0a RAM+ !  ( NLPTR )
     ( 0c == C<* )
-    LIT< (boot<) (find) DROP 0x0c RAM+ !
+    ['] (boot<) 0x0c RAM+ !
     ( boot< always has a char waiting. 06 == C<?* )
     1 0x06 RAM+ !
     LIT< INIT (find)
diff --git a/blk/432 b/blk/432
index c36efdb..da09ad2 100644
--- a/blk/432
+++ b/blk/432
@@ -9,7 +9,6 @@
         EXIT!
     THEN
 ;
-XCURRENT @ _xapply ( to PSP, for LOAD )
 ( pre-comment for tight LOAD: The 0x08==I check after INTERPRET
   is to check whether we're restoring to "_", the word above.
   if yes, then we're in a nested load. Also, the 1 in 0x06 is
diff --git a/blk/433 b/blk/433
index fa14c65..13fec92 100644
--- a/blk/433
+++ b/blk/433
@@ -5,7 +5,7 @@
     0x2e RAM+ @ >R  ( boot ptr )
     BLK@
     BLK( 0x2e RAM+ ! ( Point to beginning of BLK )
-    [ LITN ( from PSP, B432 ) ]  0x08 RAM+ ! 
+    ['] _ 0x08 RAM+ ! 
     1 0x06 RAM+ !  ( 06 == C<? )
     INTERPRET
     R> 0x2e RAM+ ! R> 0x06 RAM+ !
diff --git a/emul/forth.bin b/emul/forth.bin
index ae9856cb98d1c137d0c9bedb39c702be825234f4..f4efd95e527e3e3f96b0bba9dc1526d654b600b6 100644
GIT binary patch
delta 1480
zcmYLJUrZcj5TD)s4(@huzumiIFQU@!!b<NX&{WbIiM8zB9WCwNpKuUM#54#Tl3uu4
zG>r)aVk-WL*J!>MAAM_r^}&#kpwSR{Fm0mn;)BLuYKwu!^ud@uXe-XQ3;J+(nfc~7
z^P8F9++x?mPI+As)>8t&!{q1kyRu+2CNB~jR%CWW=@c%pA>}n;mVK)@!XGRW9cyff
znjk?7n~8p;JW`1GW3(EYlfGe^nx0RpF1X$~>**+js0kwMJ6=$MpiK_!?BK8l4d`h&
z@T7u>@PVD?c2zY2h#~n&Z4Etn#e`w-u%HQHvWgagW055?qRvU{Wa=#b1Psy`d{(VX
zJ@~mR1OYDec|+whk0G}abWbAoi-2%%48wm=iO3<lp-JRrh%Rt@PU`Se1Zk~y1h0@0
zW>ObNHAdS7hrLg`=RcrJ<XFUp3T=+K;JC$s!PX~Wk=~#-Y=yYbEvq16%VBV+3tpe%
zTe5Fu1_Ddnx4b^y{sX#$k>yfG1_^<t|5)%2fL^FB5pfa|-W3|lKII0M(aI@@u9M?Z
zuSP@@o&%xbpdE*n;rBfkPIZAm>(V^?T02o%!Wrr?EPbgtlz&|4I^XP517TR&*0wbl
zE>HyUY&}SUh}&91<AYx!t2m-Mu7ZbJ=*Jh9)jQG-U4UQrEQDr<@}*JiWrtdb4`U$<
zDHGTv935vL>#5OCbQk&ysh~>{0y7=;o9>1Cgga7G)0JvEhN4*_YdR5^^*M>}8vU=#
zqz&{h>vd^O=gTAD0=Ir4JSw66#H^TUcVla*%j4DQv2-gm`r#XXxQvsPp^Pw-O~j5I
z<}Grnfe!x0;=EiP%dKF-S@vnH<-{F57Xwt#Uwb=rP3L7?7|42s=O0IX@Zit<)kMLE
zC_MRBv1Rs8>`8-5_(fmB8wj+e`zYf(>}b3jna;C`cw254Wv~0wy)A8$b8$ZHUbrnC
zm#V6PdAVia99PlD>rBKau>nK;*{{QAzq4nt@8T)pEPD`d({@#UNL_wS8@^|$#3^By
zy_z_b<#IQqdvVlb(a8?zNPd$9iHSI`S=zn$0{n@R@t-?daLfV3@-KyxxW;ZJ%EneA
z&>?TMIl{$wJ$#Ej(^SeoQYuX@WQzGxzn7!%4&@FTgZNFnwC{g83Gd;9e<r!p{e>vJ
zji-)xblT}J$Y|KOpXNxOZ8Rl?Jo~Mw{Ujfw2&))0cqUgc;3{q{uY9OjBHu;ME8~K$
z?&E^U|KIbh-<Udo^S=z4Vxc_f6b2IzrZ<troKeRd*`f+>VTM&+8S8k(VoCFJF8Cf>
z;(SxJi|GUkJfXEh?IPa4#pLASrz&(SgpXIIE9pZx)r$XqrFMDToUXlYR%&ldk3)qO
zlAS`8%_fiH_l;!Rv)5D`O34oV)3ISO*@M4YycI6Yyg362xfL?CYIXF|%!FAi^FrFN
KjJJ6bgnt3?N;y&h

delta 1531
zcmYjRZ%7+w7=P~WjV8I=pCn#f=29>5rgu%Xbi<C8I`vF!UD8BM#AdP;TN{x&lc}?8
zAj;V6{NUL3!YKQ;?ZZIWhd~kgK{m+7K=wiCKCCcWw#n$At)PAy1^2vny6wZ|^8DWC
z`MtmA-#u+#?(o+{u4Zxob&cQnKk#!prT%4K0?aFw%G^1Nwuc(&NwJB0hi1e#xn;T`
z_Hs|@fq1pPEuez{ZFDm5u~;7<{2zfS&w}t1^+?vDF4<sbGx6gA@W?vwa0t9C0YRG_
z*{NblfjUI$ju6xJ@E+L~v*#rpfM|k4YAA?|h&q%Yix=wPB{j4Nobs)ava}%7$YK#+
zt^y04i_)r)!e^Uv9c<{&4i_#wgWAdnPhjl#uHc>^x<8Nz&qDt4OrS1}w}IIULZ?IF
z(#Bgcc-^_q2J_k*lXDhJWQ}}__nP#Ce1hwsCApQ$&?WiB@~3!m%4a}Tj{0oqwev&8
zL=!B_>#_m&Jq)u867X0EFJxpJvi+iC`5mio$hD+HE8EYC0?ICW76$wLAYh;l85&iZ
zIhCGK3T8&Gkxt<ih44C@0j};SlZ;$|M+Y`^cK|1^3M=%sa{BabET0M`;Rhunv&V*x
zOHt>3;7Y=dvZL5=S;hdyb{0hten*K>UDZ77Fh<X+Nh>2S!S4r2bWIIk92`S|yK)@;
zy+|DAS&g^I8o2|{(GOK~Y)!RcAZNPLd2mfD;AGMRPY46d$?5Wx6?DqFsS<ueT@YAX
z5x+8PX^3yAtHP$r`b5A6W<4OxE2eDI#-MI=VJha#_|)`OD*^S6`#s0qkLB`10mF{d
z(O_FMONmK!TkZ+6mNU8qVI2vV>F2@N;$t-*1RR#X4|e5Em0e@QP%4`{_biSAbN*T&
zm}dZ-5RsAp7<BP9!qu@EXY=X?882WE8{!cMyoY>-@B|0>v6^sM;Y*K(ngY)GI?-uY
zs0kBWp`)Re^d2sR3ap&J30q`16jOBQ!T+7YyriKFW@%V<cFtr~LKB#;#{cQaVy$|3
zkfgPc$rb6NP>ZrBu@&n$T&Q2@v2ZuHM_&&gOR+`Jg#8fCWWF~wq@wIC;t~^nMM*0A
zp(WVIiE@sUG3<&P5_fipiMU0-3m3G9;R!78Hpl7`^%bxhUwMC~X2alkeW2Q4Ltp;l
z;6OGl!%dk120F357(K*ai@*vVIIEIAKadN+`&d8RrSrW5IX@Z(wlnG*5e<R)4Cjgi
z*#-xmU@-l)p|y+En}-@k6)&W78oY;H9}zzj<2-9iI$KBw5p#)L&;QOxXty?b>F&P_
zefeCW*qbYc!7JYtqrRKkDsrUq61<BHcN{6KDEUFf;avKkIJ0uy3gd#rlmt|+<3}O+
zNu>Gts(jyr<9cJdY#qZYSDoV<m6>sUx-zGiD{oDYLzSi??c6+_iJZjWFCr~3-I5G=
tHPVTnCj&l;r0^XLCE)Vx+p`e%C!nt~H8ob9y{6|2>>j1$$5rkE?jM1IL=gZ0

diff --git a/emul/xcomp.fs b/emul/xcomp.fs
index 5d62af7..0879310 100644
--- a/emul/xcomp.fs
+++ b/emul/xcomp.fs
@@ -4,6 +4,7 @@
 212 LOAD  ( z80 assembler )
 262 LOAD  ( xcomp )
 : CODE XCODE ;
+: ['] X['] ; IMMEDIATE
 : COMPILE XCOMPILE ; IMMEDIATE
 : [COMPILE] X[COMPILE] ; IMMEDIATE
 : IMMEDIATE XIMM ;
diff --git a/recipes/rc2014/xcomp.fs b/recipes/rc2014/xcomp.fs
index ab5c42f..3f53c5f 100644
--- a/recipes/rc2014/xcomp.fs
+++ b/recipes/rc2014/xcomp.fs
@@ -10,6 +10,7 @@ RAMSTART 0x70 + CONSTANT ACIA_MEM
 212 LOAD  ( z80 assembler )
 262 LOAD  ( xcomp )
 : CODE XCODE ;
+: ['] X['] ; IMMEDIATE
 : COMPILE XCOMPILE ; IMMEDIATE
 : [COMPILE] X[COMPILE] ; IMMEDIATE
 : IMMEDIATE XIMM ;
diff --git a/recipes/ti84/xcomp.fs b/recipes/ti84/xcomp.fs
index b3da866..14d6a83 100644
--- a/recipes/ti84/xcomp.fs
+++ b/recipes/ti84/xcomp.fs
@@ -9,6 +9,7 @@ RAMSTART 0x72 + CONSTANT KBD_MEM
 262 LOAD  ( xcomp )
 522 LOAD  ( font compiler )
 : CODE XCODE ;
+: ['] X['] ; IMMEDIATE
 : COMPILE XCOMPILE ; IMMEDIATE
 : [COMPILE] X[COMPILE] ; IMMEDIATE
 : IMMEDIATE XIMM ;
diff --git a/recipes/trs80/xcomp.fs b/recipes/trs80/xcomp.fs
index da36a54..5722dd7 100644
--- a/recipes/trs80/xcomp.fs
+++ b/recipes/trs80/xcomp.fs
@@ -4,6 +4,7 @@ RS_ADDR 0x80 - CONSTANT RAMSTART
 212 LOAD  ( z80 assembler )
 262 LOAD  ( xcomp )
 : CODE XCODE ;
+: ['] X['] ; IMMEDIATE
 : COMPILE XCOMPILE ; IMMEDIATE
 : [COMPILE] X[COMPILE] ; IMMEDIATE
 : IMMEDIATE XIMM ;