From 0163af470a636c1eb3e4b8def431f1d2e7abc462 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Fri, 15 May 2020 10:19:39 -0400 Subject: [PATCH] Fix EOT behavior after QUIT Previously, calling quit would break EOT behavior and not properly quit Collapse OS. --- blk/393 | 2 +- blk/436 | 5 ++--- emul/forth.bin | Bin 5906 -> 5917 bytes 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/blk/393 b/blk/393 index cacd355..e602432 100644 --- a/blk/393 +++ b/blk/393 @@ -10,6 +10,6 @@ : QUIT (resRS) 0 0x08 RAM+ ! ( 08 == C<* override ) - LIT< INTERPRET (find) DROP EXECUTE + LIT< (main) (find) DROP EXECUTE ; 1 25 LOADR+ ( xcomp core low ) diff --git a/blk/436 b/blk/436 index ecb6607..04580fb 100644 --- a/blk/436 +++ b/blk/436 @@ -1,3 +1,4 @@ +: (main) INTERPRET BYE ; : BOOT 0x02 RAM+ CURRENT* ! CURRENT @ 0x2e RAM+ ! ( 2e == BOOT C< PTR ) @@ -8,6 +9,4 @@ ( 0c == C<* ) ['] (boot<) 0x0c RAM+ ! ( boot< always has a char waiting. 06 == CL_E_iLOU9Yie7us55BP3~j9j8m`+L7&+Ss_eirBR#U zpwOn;L+Y#yCLS!LePzI;JgNIp;n<@X~;BBjmY}^$`8+m&R+}ME08}PPcM&#hcJ>c^oP@)mme> z{EIj3c~@?FceHh%LnA@*m@{Hs@L~T@h&0ot&32Mm!+bJ*q&qY;Y~X)V{og+_93rXp9C}Hv8*NwMv+q;_%F@LAhFsba_fW+$t$DG%e zQ7r!55HTZ<+dd3FXXRz3dwVmbB|v4Z6zj~ZcsLju>_2bov{u zvx`s9>>|H8@9m%x<3abG(fKX$Wc0jo#Bfg>Nmi-k_Cw{KF)M!>?CiZ0bf{P>6&j@o zF8E^5rVu!bkq5c41dR{&kdTQroFm<{da_DIF zIK&0Abd9)j_dS=TKfKTTEByPtd@MW}x)>7L*TVDOW&N=1gg>9i!%?wXsW%FhM!#~D zH+~}D4Da&XlXt@B+LIBRNF)%sQ$CW3!uBcx97491fhiJM_!bCvO$pK3y5** zyH%eCr~}3FxZCJKbt=}}Q)KH@9%nRuV%~;ieX7XKZlh^fu~ObrlzXD_9uY+h3v;(V95OgQI{tg={|ZE?$eYvUWl#fUOmJ=x>{SD8$&Yqf;kPh}&jL zDY7|++y>^_HM%ZGt%Jp;#n{fCZk?LXS!%vCEul?X%ev~;)2*+6JC^``((33wU{6FYy-n=jLs*X>pVe z)yB$|pZf{p9a}Y}0^9L32jMcOy%FxqY zHjJ?7y8L6;j>GIzkQHS}l&a-JyzRDwO{pGa{MH)@&~IX{#8fFiz+`^Ei;F)>ALx(h zlkz}3QTw!uw^Twq5#sQ;s2`%HEA%@cZ=%vD)uw8t#&I$*MTK@%=V9+oj4NJuSzQmX z;w=v_spd>U{y6?cPgedRzB_s|!eebfg`S~R>FJJp=47I~59@LktKcm-ev59(Liet( z@;plDZ^RLLwJ=tTAsZXmiq{aU&<0|C(Kq5N^a*z+v-j>q4P2F!8f6J!uGNhasV|Qt zxN~s}C3C9PMo9j=yVzchf0jkDo%&xuW2`!jp3cxU^!X}QM7dg>ilXx~w4x}ySva4K zN*wv*R>&Jn$%g3}Gfg?VXN(92fkT5av>GoK6O)?P$1L>#RDTX)0<@7M&Qu-)#z)r! zqlr4b$4MSPpxne~1+dluDq z2jO_o9fU|nf#GFSW-A@V>d~o*a;b}+GcSgY_H2`(?iA(SB0iI)N9DYvOIKj2T3t)+O8#;)x#%ClR7;*zLWC1 zqqoN()ohc8-fm{tq|ktp)HZ#azNGeR1@?Nod-jlEjsey&$vWm<*2WtxZGr-nP?m*5 zHg!-&6^cy;S?)iz&YT8rJ-BP4scuPZ`Z8(?*DZ;Z^06iq)|^+CpqWrokP*slb^;e_EGmoWZ@ujy;Fi;u)OI(Tw}sy5?pL!Ay__I}U9K zw)Q%#F^%o9r*GB?rOiDMX!Fgug~0!#(HCHip9fkR=j$d&kVBvE{9Xun=O*{Vz&_st z_shU94_U}~zEn9LmPr%D#i^8@FOBp^NHdp2LW$`@xucVMM0wZ!lfLK4-{JhO&K@37 zW>HsuuZfs`1hE~Wf}eA6NB=!?_LuFHk^t2NH3jVsW6$%u@o9+9p`u=^gh0jVD}yx)wAP+NBqD@5E+Xq)N5}DqH$D-8YPd)(yjhW4FLm=~mF8q0%Xc z3nXBLxG0;xTdoMT`Iqtao_jR(Z174@C}%>G{#o@|_a~vp6J0RWS1Oh(xniYR8tT%2 z;l3A2`nKFpLzikpVVg)K;JH(HE)&7si*T?TshLH)kZ6T%0e6=~Pk2^c6|Hzn*;E#? zt>FcAAD(re$9HI;aI*Z&UhQpxY52eA3?G_+{XiLV;)$sSlCf?nx(IxjdO3Rl z;_*nDre3DE%(PpG9H{*rMQeGrdM>*k{=X%;uTD*$wX0JX?Q>I?s%MEM+S2>s6*sR< zY52aI2yVH*!Rx|cC4GP{!+e^$^y`r&!L8Dsw&?rjJCO{maYZGZf%Zf51JEA$K}*q# zA#{vQe?^}PfCAqgkR#3mjN0{FRK^{@f)$%;vY?*l0g0-{ zS14#Pg)_l1dxgJlacTIzS#=rqHw@--OM7j>_}emFgXQccI6ZHDV%g*;UKw9(KQhNG zcG;nk{z9=kiLT?DZexFNiM{*Sx6}0=eMuxW8$-gQ?I~prLy718uq0lv#;lCm8l1N> z^xb+Jm$2xvyH>xa#x@1TBis)8QsFpnvt4IXa{jn?%asJ^_kbx;S=NVu;7{t~5t~lX zL-nXS6i&$Xc7hTp-U?{!?!W4J86}jnL3Wo5{wWGRN54TA?yT}B@|9Dh15$a#G0c1L zantWDrMm&vT=%J12<&IS`?FY=uhqR5YbxCfGsd;cSTeL2xiHV z$51>^B_;8Xga39M5LGHw8r`?!eKmG#C*5Ch%R>G8OXC>*46OhT7O_bRrP6Q&0Fj|N zN#O;=sjn1cNIg$bm(G-y5Y3xu%F>qJE4W`AIu^x5^8PUa=)7enr~&==kugz2r0YJ; zVHa>nqq~8li84Ll{10?W^ApmTTvFIWm1pwB1e_4cqM-y+a^dC+<-8>wD?`?k{2zbO z_&0)a@=p&I({u$*2M~KYH&`@q$WWG577Z_!lf}wlAuj2jRgZi+ih!!F-Ow