From 0b3a328e6547b3b56808497dc6276724fd6eced6 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 2 May 2020 10:37:37 -0400
Subject: [PATCH] Add a layer of indirection for KEY

---
 blk/081        |  18 +++++++++---------
 blk/359        |   2 +-
 blk/405        |   1 +
 blk/454        |   6 +++---
 blk/493        |   2 +-
 emul/forth.bin | Bin 5841 -> 5876 bytes
 emul/xcomp.fs  |   5 ++---
 7 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/blk/081 b/blk/081
index b2baf2a..c1aa219 100644
--- a/blk/081
+++ b/blk/081
@@ -1,16 +1,16 @@
 (cont.)
-RAMSTART  INITIAL_SP    +55       RESERVED
-+02       CURRENT       +57       readln's variables
-+04       HERE          +59       blk's variables
-+06       C<?           +5b       z80a's variables
-+08       C<* override  +5d       adev's variables
-+0a       PARSEPTR      +5f       FUTURE USES
-+0c       C<*           +70       DRIVERS
-+0e       WORDBUF       +80       RAMEND
+RAMSTART  INITIAL_SP           +55       (key) override
++02       CURRENT              +57       readln's variables
++04       HERE                 +59       blk's variables
++06       C<?                  +5b       z80a's variables
++08       C<* override         +5d       adev's variables
++0a       PARSEPTR             +5f       FUTURE USES
++0c       C<*                  +70       DRIVERS
++0e       WORDBUF              +80       RAMEND
 +2e       BOOT C< PTR
 +4e       INTJUMP
 +51       CURRENTPTR
-+53       (emit) over.
++53       (emit) override
 
 
                                                         (cont.)
diff --git a/blk/359 b/blk/359
index 4e8634c..04e7aa8 100644
--- a/blk/359
+++ b/blk/359
@@ -1,4 +1,4 @@
-: KEY
+: (key)
     ( inc then fetch )
     ACIAR> @ 1+ DUP ACIA) @ = IF
         DROP ACIA( @
diff --git a/blk/405 b/blk/405
index ab303b6..9886dcc 100644
--- a/blk/405
+++ b/blk/405
@@ -4,6 +4,7 @@
     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 )
     ( 0c == C<* )
     LIT< (boot<) (find) DROP 0x0c RAM+ !
     ( boot< always has a char waiting. 06 == C<?* )
diff --git a/blk/454 b/blk/454
index 864385b..f3eb716 100644
--- a/blk/454
+++ b/blk/454
@@ -7,9 +7,9 @@
     SPC BS
 ;
 
-
-
-
+: KEY
+    85 RAM+ @ ( (key) override )
+    DUP IF EXECUTE ELSE DROP (key) THEN ;
 
 
 ( cont.: read one char into input buffer and returns whether we
diff --git a/blk/493 b/blk/493
index b3d2717..420b8f2 100644
--- a/blk/493
+++ b/blk/493
@@ -1,4 +1,4 @@
-CODE KEY
+CODE (key)
     A 0x01 LDrn, ( @KEY )
     0x28 RSTn,
     L A LDrr, H 0 LDrn,
diff --git a/emul/forth.bin b/emul/forth.bin
index 8dc20ee02892277ebb0c82f2f261adbf47b5f1ad..4195a579fc07b9ce17ad745252dce342b5f77cd0 100644
GIT binary patch
delta 1629
zcmZWpUrbw782|2{mfqXmbMNgxV8~XmtL<bgW{yQ1&|WB8ODRYTO3Yj~kh(zVoHGkJ
zhc4=3mQ>}$pnV}RhL{i%j0q$rL?;i#z6=uIrU_Bv6EPv;OJl6xxwpgzAMU;9`+fg@
z=R3c1cTOLkmNq|!&2ItV@N4N8ha)`s>P*B1HoEVa;JRo=3UPTlD;*!7m99tzbPx0o
zCQ@+%_Xz`nP_P&52E1IwFZ<y`bTG(>UreN3@IEO!42WHfCDJk)LC9cA*|Eg4nBjCb
zk@A{wj=}VADc;{G8<6Og;2s8>s3QP8L=nwiil=?>9w~BV$20OeSK$qar!sLJF{`i@
z`JcZ`3-a3ykL05Y-2>@NHkQtMz(F3#1^cfw<UG%n=_}5VGv_SWs~zb_&iR^cX8;7)
zreRlv%h4g%HRr5U<UV!ni531X{m%8(oLND>&*i`Ywfu-^z>s3Vl~6tKR(15<<1KHp
z>b=v^0Q}QeZFwcsQDd$iD0e#9YKCFe6=D|{HpQ^&>VXpPPh=$!NdSkqDysB%<+ys_
zDw;j)$iRSI>LF+An@Cbz!oAoC8*<DT7|J#`zy~BouaJ{-HZo$v<H;ZotmJ@Q<echt
znwD%@-9wh8RIOC6f?Ze0A~7H{*e!#Ai2>6YzCAq=A=t@AN~9TX=WmV&rt`M~6Zto%
z#}Q_&!uiQa01L2y{G^EJ2CY%o^dss=!%Nc_G#~v<z5GAVU+8JkYt<ZxV8EBv?^Cp(
zJ<CPtrq(>SqoHWhVT&3MmWetR$V06lGBbRAdSWV~f*pr*pcT12t-><_A%5+Rh!62S
zO%)Ebt2V0(v*tt=RU)6@#{1%<&F033+3ba)dFr!V2JEoRo%{nu9=<s~H9Zz-h8nXJ
z=&Y2CgOc&QL>SQNYkKI!u2SUK*qPG~r*s1t7geaBfcCUTx}rC>x%FE*6Hd9ZNDef{
z0j1TGN?$mJ!(+i`%>FJgQ)E_sU*DT|KXI&#m*qtySm7UPICEIwqq18Mg5;)c?(y)h
zGA6F`ue%wA=U~R9u*{)ulnm@w4CrbFj;O*a{lVSV7R3vo!DD{ky{oXtfYz6ov;zR#
zW8Uxadr<5I6Iiu&tWo6ro)T^K)Jx1+A_Xx=2R#ja?4a8fCYhh`eHYf0xWaD5GUl~n
zUe1|=pDSMo%N%<)aM(S={e$nKWERPf+=w`3@?`q%rfZ(FbBEa2NcA<H!v7Sq;h_q2
zGMTbnSM8qcC_C=}&bf+&tq8}F9btCTi#rk*usjwGs)(>Dj+#@%lM<u&`w(Hto)p`?
z6@E;-9>$NwAcDbRuPW5xGs{^42K1(eGneX+TRXx`O`mzq@TiXA-*}50OR>(M4WHQ+
zUNTEqWt&2nJR-K!9dGTq5?OWQ4NYXSwV1wzWHm^N>)gCBFN_H{#DBac++q~QgmpgY
zUEuM0ksNLG1(j_V<_*Mp>KRL#_C2X?dD&)L&8^`dlfL8Y;<o7bzLuI*_Xf%Pa`aE%
z^HS0~CM@s)AxF>q&#9JmMqopTA@-L4glEbdgciSqw1aTNUx(jLy5g^MvECoope#Co
F`xl#<b8P?s

delta 1677
zcmZWpUu;ul6hHS*yWZR0@813$bCF%3bS=s-sHn&`cDD{Xx^AQ0bS6ee*`{G^iW0y~
z8;ME?*_`_x7MtJ$lEq|+!Nk}^9*7|(<$(#lqKiQ!m=O0cNg5xh=iJ-jgAeV!=l7lS
zJLmg-zwiFN{pNP%>gRCvdjPokjq<C<eIPlkg2eywj0vrLP>Bgg`LwbzbW(X$v7ocB
zw?CCmGC0E!;9o0|-6xe<w*^*mUn=8+k6FcILC3z1R7S-h3R#$SS3HX%<qT$WsdUJO
z#|h>Sm1J+DYC)=7fzz05qaG7PXhSr&KbZ-`N31ARJUi5qP!%mmrn5;uVh*vB`QLhl
z&#CV>URT!{I{Px&Tt_As1P{Be&boi&aqn|Ng}?5Nc}Kmo?pjCwnRmW!*=vFX%Y2(J
zA&l~z?~wPTQWUuFj$9R|`47IY3O0j!Mi>VV)Qdy11^t=@uf-Zbbl7q2wCJq%)K;fk
z8$o<x#C24Qwbt2hXSL}zdOJl}?G3R#giR1udpoNods8_DWM-m>mt>va(>Cg>zM|d3
zjT2a~!o%$8h9=e{FXCP#Mk04ueFt-!8{rey&PUkRg2aYgcsyC01DQOqf-|SPy>_J9
zQRhJ?(rQt<Tf?qP>^!p|+uw<1z(UhrjGvesOE7RTiIv%AI5BnXusJ#Pt~oY!eDW~n
zQLFgWk%Wl^lrVKfM)WdQ^zZ!ZqpypX<~Q_X|3lXh4f8jQdVg3S2N^85P<w9WbH+15
zGyl=pT=>aA(`4e#Xd*aa!iT-C7_%~k@i!;OCK5WhQJhtyDBL!xA{hwrL+>QQh~GAJ
zY1J5UIbA3!$dpxPpW?>j#|}?S<`XffvlAcMi7LvV;%Ue--1qQv{#etBRuo88qH#mq
zZvnN^r7HU4w$aFM_#ZDA{sBMv;-BhywrWrd3l4UrGkYFGAt`x>R76wxz%Egd9<KQv
zyhlFeGLiTan$RhV?!=-B-jSDV@QQ&_!-CkR8vZEU^_xgT$wTs^GCmO)h_7gQxg=%+
zH0=v;%AR&fKnH1AxL>uPy#)lOOEdhBz^+|wcoht|C0+}xX!Nt7<z+It2_W1O*8*z+
zv^~QDV%v=zMPV&a<^#co0xg!=tUT%+hkMlv(vm>GC0nB&xg^X>^AZ{1d5tXfGyZ=7
z-)fy2-5SbjK{l%W<x%ZrJdCcv-u@5KQs>z<VMv~^rziiL!II6qD3*jQ+^Jgp&)}BA
z%^><cePGizA4)}^f*R09wkEl1aaV4b{6Rw1khqiKS&tJGH-}6Bc>&uYX;epq<R7+W
z#-o?p@N*->qPs_~4^_pyTyWvTnIM75u8=N02<p;%f|FoDcX}|pe*?}|k4xmf;~_hJ
zuOHLrLPdc}97E9&QCt=8+7u4$rWh6v+3oOXcGB&olTd+_k#|9v&EN^8Q`uZSGG4^_
z4OkaHFTEw-3YBr!dm%5C#OBa~h&Pmt^1b1xw(P^YzK*U28l1l!-lAU&(f(WP-A3Ul
z{$;pbxX6DGKUp^uxXjYwQ67oBs5FQ2(t>D8qx_Y~v$_-QkVuyf#J-3$1yi9YD3QCt
Zsu+dd$OC-h<%n$XQSZ4r^iwMc{{q8QgjN6m

diff --git a/emul/xcomp.fs b/emul/xcomp.fs
index e840670..9cb12d2 100644
--- a/emul/xcomp.fs
+++ b/emul/xcomp.fs
@@ -16,8 +16,7 @@ H@ 256 /MOD 2 PC! 2 PC!
 ( Update LATEST )
 PC ORG @ 8 + !
 ," CURRENT @ HERE ! "
-," : (emit) 0 PC! ; "
-," : KEY 0 PC@ ; "
+," : (emit) 0 PC! ; : (key) 0 PC@ ; "
 422 470 XPACKR
-," ' KEY 12 RAM+ ! "
+," ' (key) 12 RAM+ ! "
 H@ 256 /MOD 2 PC! 2 PC!