From 5e13dcedf33a466bc90f100d87da43f9e5d93154 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Wed, 28 Oct 2020 16:00:58 -0400
Subject: [PATCH] Make KEY and EMIT into switch words

---
 blk/381                 |   4 +---
 blk/387                 |   5 +----
 blk/396                 |   4 ++--
 cvm/forth.bin           | Bin 5289 -> 5249 bytes
 recipes/trs80/README.md |  12 ++++++------
 recipes/trs80/xcomp.fs  |   4 ++--
 6 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/blk/381 b/blk/381
index 12767c1..12b65f1 100644
--- a/blk/381
+++ b/blk/381
@@ -1,6 +1,4 @@
-: EMIT
-    ( 0x53==(emit) override )
-    0x53 RAM+ @ ?DUP IF EXECUTE ELSE (emit) THEN ;
+SYSVARS 0x53 + :** EMIT
 : (print) C@+ ( a len ) 0 DO C@+ EMIT LOOP DROP ;
 : BS 8 EMIT ; : LF 10 EMIT ; : CR 13 EMIT ;
 : CRLF CR LF ; : SPC 32 EMIT ;
diff --git a/blk/387 b/blk/387
index d44789d..e88f70c 100644
--- a/blk/387
+++ b/blk/387
@@ -8,9 +8,6 @@
 ;
 ( del is same as backspace )
 : BS? DUP 0x7f = SWAP 0x8 = OR ;
-
-: KEY
-    0x55 RAM+ @ ( (key) override )
-    ?DUP IF EXECUTE ELSE (key) THEN ;
+SYSVARS 0x55 + :** KEY
 ( cont.: read one char into input buffer and returns whether we
   should continue, that is, whether CR was not met. )
diff --git a/blk/396 b/blk/396
index aefaaa5..95d534f 100644
--- a/blk/396
+++ b/blk/396
@@ -3,8 +3,8 @@
     0x02 RAM+ CURRENT* !
     CURRENT @ 0x2e RAM+ ! ( 2e == BOOT C< PTR )
     0 0x08 RAM+ !  ( 08 == C<* override )
-    0 0x53 RAM+ !  ( 53 == (emit) override )
-    0 0x55 RAM+ !  ( 55 == (key) override )
+    ['] (emit) ['] EMIT **!
+    ['] (key) ['] KEY **!
     ['] CRLF ['] NL **!
     ( 0c == C<* )
     ['] (boot<) 0x0c RAM+ !
diff --git a/cvm/forth.bin b/cvm/forth.bin
index c8e06f861e33392b519d9501a8b0647fdca99e27..d6d2875fe42862ddb54405713a6c67ee64acd091 100644
GIT binary patch
delta 674
zcmXv~O-NKx6#mY8^BkGE@6CJjhD@5Q#-EvynxS$bjzm5r(@evZek2_+8tumk2_hIM
zW0V#l#gV{8h${&~``HvltrCQ3Q`FG3DzIg>sTP5B-&7Y4_dDOY_dDl1_u^CW5aju2
zeG#Y1$jwmkFf=Iq+S`rT#mVuBOK~61iUaD3SmdI3Mf>=!UPBpvuD2ds(X+yhFcQbB
zp^yVm6&3ZO9>%Z%qC6b5AS?1H>ILDz1Ew_csQveJLGrS~`;A1TBxTwM4j&nUhZe<x
z{8@=AT0j!&61m?ze9NfQSQG^FQ==}Wz1xUQo<2V@8u!6V$CO&StbA9JsC3{%J=8VB
zZSRB2dGAQ5%g)P2650*k8Q3G<8xA!5merq&d^XTPd--;tiH`DWpg}E&41Wt$t4{(2
z_M0&(ag&+y6+{=5?75sM@f9;eBmBv<sfK@;J>h9HjPBmH_C6CDEy=ml=#c(1dPz+4
zu(h3{e9ema(^d|T)DBW;j2~N($p3tv-ng9Ag3qf6BX(hAd?KDeg;f7#?K<S(zTc6H
zJn3=pOrkZzMK9$_OJ#1vbRe)!TjgSR%Sc-;YLqc%o%GDhyP{mJF=sd%+^k6l;x*q4
zc2kZ&1fw*^WREKAK|W)<$*f)7F=RI@%Op*8_D8Caml9owdYcudly`@oN3-%mU6wu@
z<(oug8?Mu=?I0(j-Z0vn-oE~bg&BIlU+sAPTrefsfu8=(?oF7MQpvJZCH*Z71~Da#
RwuZL2Bb*4;x!2WD;~z4qqU`_x

delta 791
zcmZ9KT}V_x6vxlG`=##OyZ2*D%k_ixW4%@@Mp9@LUUf~;)?7_dN<||ib47)y70TL7
zi9#3<glL~)3sNw!m!yXz-y*1&dI*-nCt>lW9txr}TS0VTxM$9p`OoivW@gPNrWfe5
z>EGGyOeAKof6d#^iqL`xY-0)DgDP-NLmAkfx_wYFF*!OuZ5HxtEM(hc>wJ^F#!kK<
z7h;S*mXDv>l%q@x9|U{%fkZNZxws?m$UYcQ05J|0)IyZSVMk6e3+%vg5aLksXK8}+
zRN)7epg&DAjos}X=fRHaEI~W7AQuxvWJ{vhmd9t5Qb&@dSdu?dO2eel{U7xUK|MJ#
zHa=_?f(v`361*bqN>z|$L5{HXNfAgnAabrH3T2{srBs3A0k?Y&v!99u4){UUZ|mIh
zlw&_1^&BC)4?X2YDHbDRZ7q?my~OBuTcBqAG-DD|o)rJ$slYU6YF$o>wSpAAw8+x@
zjCyg;f-1~xV*xG`v@;Wh_#5@KZ$%}+aD8K^3Jy|9z#ueJ*J5&-t?;8-F@|}sR^gu4
zX5g8v86{lgcQwEN?|d2GiJVpopSOUlUmhAAH-q5B5Pz#3y3Xk|aj^x|zu(O&p#OWi
zh&1c7TOhbtrfxwsRpvEOucWc4_1XVnRaZT&U>}&eI(0I;72FNcv9Y0vsSCy72w7xb
zH6PSg-lqpJk}dAI&J}Qp43FtG1iYpPaD#u;hb7tICyYS;hMu59e9+VuX)+*A$CW|A
zwT!pybNq&pf1pN=!!hZlZI${V)&>1Va1);!gvEq%y%p~4@@p`MANZDGlK8HXXKv_q
qRO{Da7DLq4b544Hy|6@WX$ZG>w6rxTa0kz35ks}NRG{>DD}Mp6TDTPe

diff --git a/recipes/trs80/README.md b/recipes/trs80/README.md
index fbc9a30..c8e049c 100644
--- a/recipes/trs80/README.md
+++ b/recipes/trs80/README.md
@@ -233,14 +233,14 @@ blocks per disk.
 You'll need to send those blocks through RS-232. Begin by taking over the
 prompt:
 
-    ' *CL> 0x53 RAM+ !
-    ' *CL< 0x55 RAM+ !
+    ' *CL> ' EMIT **!
+    ' *CL< ' KEY **!
 
 See B80 for details about those RAM offsets. Your serial link now has the
 prompt. You will also have to make your newlines CRLF. The TRS-80 wants CR
 only, but serial communications (and `blkup`) expect CRLF:
 
-    ' CRLF 0x0a RAM+ !
+    ' CRLF ' NL **!
 
 Now, you can use `/tools/blkup` to send a disk's contents. First, 
 extract the first 100 blocks from blkfs:
@@ -264,9 +264,9 @@ own Collapse OS floppy set. See Usage guide (B3) for details.
 
 Once you're done, you will want to go back to local control:
 
-    ' CR 0x0a RAM+ !
-    0 0x55 RAM+ !
-    0 0x53 RAM+ !
+    ' CR ' NL **!
+    ' (emit) ' EMIT **!
+    ' (key) ' KEY **!
 
 ## Self-hosting
 
diff --git a/recipes/trs80/xcomp.fs b/recipes/trs80/xcomp.fs
index 40943f7..8a8c6cb 100644
--- a/recipes/trs80/xcomp.fs
+++ b/recipes/trs80/xcomp.fs
@@ -14,7 +14,7 @@ RS_ADDR 0x80 - CONSTANT SYSVARS
 (entry) _
 ( Update LATEST )
 PC ORG @ 8 + !
-( 0x0a == NLPTR. TRS-80 wants CR-only newlines )
-," ' CR 0x0a RAM+ ! BLK$ FD$ " EOT,
+( TRS-80 wants CR-only newlines )
+," ' CR ' NL **! BLK$ FD$ " EOT,
 ORG @ 256 /MOD 2 PC! 2 PC!
 H@ 256 /MOD 2 PC! 2 PC!