From 8f3891f7d36cf79bdd2cf7558b9b3a0d24285047 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 28 Oct 2020 16:34:49 -0400 Subject: [PATCH] Move EMIT to low core This allows us to remove one layer of indirection in (wnf). This is possible now that EMIT is a switch word. --- blk/{381 => 356} | 1 + blk/363 | 2 -- blk/364 | 4 ++++ blk/382 | 4 ---- cvm/forth.bin | Bin 5251 -> 5237 bytes 5 files changed, 5 insertions(+), 6 deletions(-) rename blk/{381 => 356} (88%) delete mode 100644 blk/382 diff --git a/blk/381 b/blk/356 similarity index 88% rename from blk/381 rename to blk/356 index 12b65f1..38a6c6e 100644 --- a/blk/381 +++ b/blk/356 @@ -7,3 +7,4 @@ SYSVARS 0x0a + :** NL XCURRENT @ _xapply ORG @ 0x06 ( stable ABI uflw ) + ! : (oflw) LIT" stack overflow" ERR ; XCURRENT @ _xapply ORG @ 0x13 ( stable ABI oflw ) + ! +: (wnf) (print) LIT" word not found" ERR ; diff --git a/blk/363 b/blk/363 index a5da7b5..2a1e2d3 100644 --- a/blk/363 +++ b/blk/363 @@ -1,5 +1,3 @@ -: (wnf) LIT" (print)" FIND DROP EXECUTE - LIT" word not found" ERR ; : (parse) ( a -- n ) _pc IF EXIT THEN _ph IF EXIT THEN diff --git a/blk/364 b/blk/364 index 32db8f0..7369907 100644 --- a/blk/364 +++ b/blk/364 @@ -5,3 +5,7 @@ SYSVARS 0x0c + :** C<* ?DUP NOT IF C<* ELSE EXECUTE THEN ; : , H@ ! H@ 2+ HERE ! ; : C, H@ C! H@ 1+ HERE ! ; +: ," + BEGIN + C< DUP 34 ( ASCII " ) = IF DROP EXIT THEN C, + AGAIN ; diff --git a/blk/382 b/blk/382 deleted file mode 100644 index 8bc9584..0000000 --- a/blk/382 +++ /dev/null @@ -1,4 +0,0 @@ -: ," - BEGIN - C< DUP 34 ( ASCII " ) = IF DROP EXIT THEN C, - AGAIN ; diff --git a/cvm/forth.bin b/cvm/forth.bin index c69304ac20a627fc69ab5f8e4aa5a1fddee133db..a9e9fe2e8264ba2deb5514b696432fcd88eb38b1 100644 GIT binary patch delta 1941 zcmYjSU2IcT9RHu&b9=wmudN$`x2|-IwgXqmn9fSvdb~8&IN(C6vshqAFNW(Q7ih6DTUacQ5eT z;iJcc3RnrdRne>kjt?IWJ`N&Tr0h#;jnp^t(!jxkwQQaa3ZICqN&HS2w6g!i*U3L@ z!s-i*42+H)3ie{4P1X=tbojLV(IxZtlW2Z&BKyO-g%sF&DdgMib79EeNO>^82dhE| zM2>4&s)yfo=*_h1EGzk+SeA6iCVP|Vb_WlRTmY`JPAWT7mXMQ3y9tPy@CtHK=GSb-4yHUmSlObV#gK)8nWq+Ab{A(^@4 zh^2@?mh1Dtk_>W49uvw@hGAT;S5MU&l`Y@|EuH^qw56_q`u>cW)Fy4A7VsAd3A0eu>Yt_=>%M2ld+HiYZJ zdIO!LVVRKwnulB@Df~6%*4Lw4N~M!FuR}*-S7yg!*Z>ERjIb|hrgWPVrSrh$ zA69Hh;{*?B4Vf0oR?)0TrcGy9n0N~DQc@0(k&mdmqD*aXt;Re|le{*nv7Dw?ENL^a zqH%MVG&ZY61*ETNE&Q{wVu#S@WQOgTX5R97sIi0qAwP+Ye3976(>C5p&w`9(vz6v) zJ>1fvHH_7(BYmu3+ZLa-%~SsB(71c8IWj=jkOkXvg-{fMwcXHZ`TE{9p0#fI&Nl8sH;>#Vn_U%XA( z7xpN*%vSAg+vj!+^esDwGEbSyvB`GBZh#1PaTe~BD2qGl$tHHpu~qDH7*Jqy4sXsc z_F<%ncqUte?p6@K(+qGsws*n718#%un2b?PFrl;|#u?~G+7@%>KQuSUpUq+zzSkk% zosFea=~%WC6ztA2Nvi%x@Yb8go7FtI*-d8ySz#roN8&9ckWNl{ zj45g-XwhRwj}DBC9r7kKJQY`5I)od}W4`%VQygnPvEhaWCs`*MMcft~dotyKJW|3YMJDGe`Ep3av)$ELZ3A1YXj%WxVE})K%S~$_zRh41T)DTR}c3!U#suiqQ% L$h5H`_uBsf)hL^X delta 2010 zcmYjSZERCz6h80m?Y+0Rx8K_sdZ)EzX;>2OxJ8-~7OUCE9FL^2nUvO_5>5A|Y@zOTY z(|LGwu&x7)BnhH_eB$8fR9&2#gDFUY&3$-mqTf9_Hsu~1n;z}|mQ%q$-ZwEhP*)Ek z*>4PiL51t(SF4~?<}y_h=sRKqk?7}Qi0{lbIcc@zdmPRqK`We zf}cw;FG^$ytpbEu2p7d#FwBee8!1w;EXEOlPXa=olOCYD0kaI4+N3c_0|Sgn^qA=d z?o)~0Hu)0Ormfr-&PyZ`6eA)#*APTMFgi7Hq|Srrm&KS#g=jVw$;T{+=8#DP4j95+ zk!&KOrD86S$jc_$DL0t+Nd1aSpR^@L~9!fz9lB5=|@3CGeYBl>0Ir zQlbpd`^whxtAajM8i!L}Z##;+f)jiZd!zGk4L7p@tml`!0A$!fU@;D`niOe-p+ z;%1$abt;-IQ=#mx;roswO$P7#Uz<(3HeMyYps4i!~f$dI&10J znc0u17L*d&OThH7y$g7&dO^0*X{%Q#Dl1A+p=Yg8&kZXJBkS<6FB(`d!iQGO`zU_%m7C4n0oI-#s8bcel>o0aLSc8}L@Uc$L#8=(eEH(+OFVdo-J zf`0PQ&+Gx>r@z^2qHOdza>|Zi(vg;|9p`*uEz<&wSXPx&_AvapCf%&!beAnk`lVr@ zHq&;8-`wvw3g->2=xdlBcX&MObdjtuo+AuDT)}zukMtcJ#kDCA554RN&78-|O)GnO z4L-rs4J$ic#_Fx=JUw}l@ftAseg^{-z-QR8m;WCe`>ZVqe9z>O$(Sh#=IGe)aNqdk zfIFRIwfV}SLO3vs4Pd*8$KAx%PB;*-gF)7LM#iJZoW7Y8%2nKrE$K~g0>kt|5LX_< zp3c~yfSj<-k;t5rZMak--(HFB*Km-6x>vsf$MFk7>XyY<@ao^gI5wQ^L#85$h^(g(VWv z(%HPn0k4zu$h*n~=_Oaq3@gDp;EwiuB2@*iVT5uv>w+#P;`ZPWbqff0H?Y+dP4CPk zQZXyMLH0?vo$Dp)TH|+D!6_85z+Jv>8BXe2xD4>agnN9G+vkqObIo*L#m4^tzFwcS