From 446a58006d31aafc2f5528ca324c089a5e6eaa6a Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sat, 2 May 2020 10:26:34 -0400
Subject: [PATCH] Remove one of the 2 indirection layers for EMIT

2 was overkill
---
 blk/081        |   4 ++--
 blk/360        |   1 -
 blk/405        |   3 +--
 blk/442        |   4 ++--
 emul/forth.bin | Bin 5866 -> 5841 bytes
 emul/xcomp.fs  |   2 +-
 6 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/blk/081 b/blk/081
index 3ff548d..b2baf2a 100644
--- a/blk/081
+++ b/blk/081
@@ -1,5 +1,5 @@
 (cont.)
-RAMSTART  INITIAL_SP    +55       EMITPTR override
+RAMSTART  INITIAL_SP    +55       RESERVED
 +02       CURRENT       +57       readln's variables
 +04       HERE          +59       blk's variables
 +06       C<?           +5b       z80a's variables
@@ -10,7 +10,7 @@ RAMSTART  INITIAL_SP    +55       EMITPTR override
 +2e       BOOT C< PTR
 +4e       INTJUMP
 +51       CURRENTPTR
-+53       EMITPTR
++53       (emit) over.
 
 
                                                         (cont.)
diff --git a/blk/360 b/blk/360
index f2d8b25..c522efc 100644
--- a/blk/360
+++ b/blk/360
@@ -12,6 +12,5 @@
 ( setup interrupt )
     0xc3 0x4e RAM+ C!  ( c3==JP, 4e==INTJUMP )
     ['] ~ACIA 0x4f RAM+ !
-    ['] (emit) 0x53 RAM+ ! ( 53==EMITPTR )
     (im1) ;
 
diff --git a/blk/405 b/blk/405
index 8e6def4..ab303b6 100644
--- a/blk/405
+++ b/blk/405
@@ -3,8 +3,7 @@
     LIT< (parse) (find) DROP (parse*) !
     CURRENT @ 0x2e RAM+ ! ( 2e == BOOT C< PTR )
     0 0x08 RAM+ !  ( 08 == C<* override )
-    LIT< (emit) (find) DROP 0x53 RAM+ ! ( 53 == EMITPTR )
-    0 0x55 RAM+ !  ( 55 == EMITPTR override )
+    0 0x53 RAM+ !  ( 53 == (emit) override )
     ( 0c == C<* )
     LIT< (boot<) (find) DROP 0x0c RAM+ !
     ( boot< always has a char waiting. 06 == C<?* )
diff --git a/blk/442 b/blk/442
index 26e6b3e..0da95a7 100644
--- a/blk/442
+++ b/blk/442
@@ -1,6 +1,6 @@
 : EMIT
-    ( 0x53==EMITPTR 0x55==override )
-    85 RAM+ @ DUP NOT IF DROP 83 RAM+ @ THEN EXECUTE ;
+    ( 0x53==(emit) override )
+    83 RAM+ @ DUP IF EXECUTE ELSE DROP (emit) THEN ;
 
 : (print)
     BEGIN
diff --git a/emul/forth.bin b/emul/forth.bin
index ed3768c9bc6e1eeac1189fe2f40765b8f2ad23fa..8dc20ee02892277ebb0c82f2f261adbf47b5f1ad 100644
GIT binary patch
delta 1740
zcmZ8hO>7fK6n?uqc6Qg^*|lRQO)a%cY8<;js7gyqAqH=Lz`=1+Y*IK>2!cr?LV^+y
z2@179Z4n0oWeyRRxS*6)%B7X6Mk)tXaR~=NR9vc{6rqYr6>1I<Qq)7;_jVl)J=i<%
zXTJC5d*94on;vb_?p}wxKLfy{AG8M5*UfAwh;6DPofT8+-llWvAgFLwDgc9Ne*tuO
z%uMC1G$fv?7o|4wnU;`Fh%4F~kqPZn&4Kpbp1y3Zlfy-h4)KfDuzf<C_B-Ho?#||e
z@FibW9mwp?Wb-;2aVQ|{s(MSNoc;M?HWzW-gRWbI^^TU9?m)IngA17Lxowakjo#v(
z&U_TU;1y|A-7L=OO+2l;Ykgj-%B!lF)u&?j^|kc&-h82$$rtNE<@fbz|5LF&@ByWr
z3ak&70@MCAeDO`->$(R48x(jT+JY&mBnE>=0ux$A62U)MRh|-$gWr{14E>@+3^mIA
z%z-|`fkTNVkUe~iU68$KcP%>A76W<1Vc!WO(N^cKE*Vp4T1}F#wnE<y@(q)(wz_0=
z_GF71Fpd*~@0qztsko(SIDVLuen(=HC&z|HPNkZmjxPr*ZgoHQ=D?EJ$hS1T$-CJt
zJf^~l?u^sBuh<-eulP<e!Pl1+-tWUf6|h6Bp~4cLCf5~kE#0-+_j#64vvOSq_A|$C
za0d!~?K%S6V7tNOnUP~D4nD5%1>Ov2M#qlYBcrG6W22`>j$$5_N{${+*$6-hqsJL~
zZwuS}DYVx58m&3;r#Tk>zjwtH$E^*as5yw*bl_&~yIy>2y(hJZCsuR$p@q`PC%wL8
z@XS;Y3*E7%8JWqUkz>Ot6a2``vQ?3uSyj1;e4+oycq)qiXO^ifTZesK6|%~VvKIIi
zJauyH=<vuuDuIMk=wCNcM-Frx5@YZ}73V{V@{&=Jh*E;_Lo(z5l`@qo%I29BL)F?~
z)S`0|iNys@oyG>N(8nQ?(LdE2eA%MX4(#j5<#)V}>=MXkR|rAypy;OF3wi!-HtDmm
zph$$xrd8F3Pf$2j`HqFG!;GBPtxz1Ei+s40TrvjOyqphHC);4s?Q>2-;TQ#YQFUNv
zD@fc_E{nzR)&pt08x}0e_rgmC{TygLK&rO^q(ylpyb{KHz;OeieS{blX(haXVFul7
zUb?1S!<J3OOP|LWMW<Ow4AsZ>(wsjuNJqco|L5?d(QeQsnnSEs#3}^_;YszTGAGgR
zHV&a<e^1|e)X@!oPwHpGZto;|TRg1aQhrpAqR#DI_jVBZqPL*tNRxJ{rJCJQJV-hq
zzG|MNm!YoNDY9E4*fyI%cm$1`=pkYcy2Rp$SsLFP2Dkj(tT9rR2UyvMAFqQHCi^0$
z^0J<uP%puOuH62@p4YIqMhub4PDkAIT_H@r8mUOM#S;z<gzT#P+=cL9*ClXszgrFm
z@h)9a;#~(~f^CHbei`SH%NB}_h&YS=Td&42pqylj5gN@d7*OWrmdK2Z*N~UQ)@a;#
z5X61GnT{rETnt9vGG`-n{#N(2ad<~ukM5La#c$D#b(h1pc`jNK!G`TxOJqQqk!__U
z`WoIZdDdneH-n5q<NN#7_~?FSiy6cZ_)LY~)@&pWTEp}DsvL)&hL`w_g`45f_~bY^
bb<NN|Iy`*%<ao*MEzo<xuhyZ|+Ccgbkx`4y

delta 1684
zcmZ8hO>7i(6o2#4?au7Xe`fZplonX(ve^|WHGGNE(w%<5mhHB7wzb3%0;OFmwIvlp
zSP9ieB_3Fy|3gC$96U5NghVfGq9GdbLOhZ5K!TUHCYr|E>cz&a@6BvA@i05{e(&S|
z-tYbX`|QBx0p-bkc=8PZY<{go{X3f=Ir`rC)f6<;JQQN!z*llb?2%(I$m4!nxWfzn
zGxc-+0{EdQI3PpG=YR^UvLO|PoBSvLEn$E=N<x_BMP>KsZDm@qp`)+2Ka=fZaElQT
z$E1?ahPSKuxhQ;&4ub5iQ<<CwpE4cO(x=jyoQg&q`zZNzWl^M<!CXF*4ZCo`h56q~
zXRbxHA=9nEEJk~93`B4c&7bbdMc@;*Am~b`x*}9W8@jSimxY*D*^B(ouPgkHdZS@o
z-7eA5mvi#zTs{PTwyu_ZfAU1&n22HL1N*dMpyb;=liv;8tKA61K!OdP)KWr`4`>$y
zx0MB9N&5w<yvM)OmS)@<>Men2tP_W18%A{-&L`?Y^y;H;R`k3*Rqu_~1`zjOsF~Fh
zt+npg1N}xDeO)K4`i0mD!X^l-em&5;dNX+iWQJ?Rg&MC)3vPK0ws%b1vmtq9dVKO~
zDgm`j*1ZrP_Gd$xhuER|*I19dh@&<#T0`3I8^|{`z-MfjpJ)4K8re_{F3`a)@f<&t
zaiVN@z_nD@>KO1Wy=rB<b?oU!w#;mB`a4vRFfryjlh-E4QVeQXBU@ulaBXV(QfzYS
zYHV!kgUL(S03DT_x}1t(0ScJ9EF-$gYmH@VyY+vm<!_o1zG0jT{@<gSe8AjqH5&yK
zvJKx>-)+2P9u`jUCuY;kZzjqrm-KoQ!821Dw))&G$z&$SC&wmI2KbO2zqKH2nH7;F
zhWN$zQxU|sOhfWp7izpy$eNKUYK<-7<jLtv6O$t@>Ex<&16AZfMb*nP2nv74O6)1)
zLWou><Abzi107{Z6_n4G*}@-LyN;%;cP*05UzKI%x9A8P20F936FZSf3O<O7FMtMa
zib~ga-P)Q9HrDG(4Bm3@`g0RGg?Z6YQ&t=*{77&#S=LA76|oSc4vxchw}XeMm$L4_
z?-d(PHiN(nX_5aBJbKhY^_%cQTo0CYdTeMOCSAt>gcqU~(n6?oh6z;db*!-<XrVRU
z9I98yxyDLzk@trh&d|1cbyCEy_<Iwc>ccu+3DRsc<`n}4__^|h^iZH@6{+kT?Ct*;
z6|u~o3PbXQ+b7BQIA0DOn%TsI?d+MoFKfsK-RvsRMk=JCt9EDpENwG}G*^+N7vbNw
zQ)IV?aUyvh%VW{Ffe4X!)+G@aB|G@<A;Y4tM{WsM#1VOXH@>_MQW(5DY)A~BqTmJC
z(48H0PVd0pS`a3!l)`R!yM^Ijh8F}%@zzh|lZ{FXc~_SP+nd1TA-RP=3)dZ4V~at&
zfEg!Whv|>8SrdBX6=6=AlSZT~@*m+f9I+inq!qC}JTKzyVMV?x64y60%<D^c)>D@}
z7kSBe9HwEL-O=KZ;U7g#3Xl2skymOLgR5*bQsm{x8%le4M4A_4Qjs5v9x*)YphP63
m5&JN@Cv-6!ho)#HR1xDa7G>D}Vg4w(L!-0r)}kz0LHGw9Lv~RB

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