From 863540f7c6ad4913f222fded5ec674802631ce0c Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Fri, 15 May 2020 22:59:38 -0400 Subject: [PATCH] core: define H@ a bit sooner --- blk/353 | 6 ++---- blk/364 | 4 ++-- blk/368 | 11 +++++------ blk/369 | 1 - emul/forth.bin | Bin 5921 -> 5905 bytes 5 files changed, 9 insertions(+), 13 deletions(-) diff --git a/blk/353 b/blk/353 index d176462..169a7a2 100644 --- a/blk/353 +++ b/blk/353 @@ -3,10 +3,8 @@ : HERE 0x04 RAM+ ; : CURRENT* 0x51 RAM+ ; : CURRENT CURRENT* @ ; - -( w -- a f ) -: FIND CURRENT @ SWAP _find ; - +: H@ HERE @ ; +: FIND ( w -- a f ) CURRENT @ SWAP _find ; : QUIT (resRS) 0 0x08 RAM+ ! ( 08 == C<* override ) diff --git a/blk/364 b/blk/364 index dbb9719..89c12ba 100644 --- a/blk/364 +++ b/blk/364 @@ -4,8 +4,8 @@ DUP NOT IF DROP 0x0c RAM+ @ THEN ( 0c == C<* ) EXECUTE ; -: , HERE @ ! HERE @ 2+ HERE ! ; -: C, HERE @ C! HERE @ 1+ HERE ! ; +: , H@ ! H@ 2+ HERE ! ; +: C, H@ C! H@ 1+ HERE ! ; : BIT@ ( bit addr -- f ) C@ SWAP RSHIFT 0x01 AND ; : BIT! ( f bit addr -- ) SWAP 0x01 SWAP LSHIFT ROT ( addr mask f ) diff --git a/blk/368 b/blk/368 index fb4a6c0..d851922 100644 --- a/blk/368 +++ b/blk/368 @@ -1,11 +1,10 @@ -: [entry] - HERE @ ( w h ) - SWAP SCPY ( h ) - HERE @ SWAP - ( sz ) +: [entry] ( w -- ) + H@ SWAP SCPY ( h ) + H@ SWAP - ( sz ) ( write prev value ) - HERE @ CURRENT @ - , + H@ CURRENT @ - , C, ( write size ) - HERE @ CURRENT ! + H@ CURRENT ! ; : (entry) WORD [entry] ; diff --git a/blk/369 b/blk/369 index abb2c23..fa4735a 100644 --- a/blk/369 +++ b/blk/369 @@ -1,7 +1,6 @@ ( Words here until the end of the low part, unlike words preceeding them, aren't immediately needed for boot. But its better to have as many words as possible in the xcomp part. ) -: H@ HERE @ ; : IMMEDIATE CURRENT @ 1- DUP C@ 128 OR SWAP C! ; diff --git a/emul/forth.bin b/emul/forth.bin index 7b72c2f880a03ec2a47de6a905d23fc253aa9e77..387089dd9449f884237061ab5945c1299c15a542 100644 GIT binary patch delta 2843 zcma)8ZD?EP6+ZXgSF&^^T}hVZy5#FhmTNh6-6XCz*4a*UWjWC*OF~l88P8<-lucbZ z*v>MOcyhD0TQ@uim;J3NrX3jkBl}?pjAe^qgHnQjl(2PUBg0unX$&4~VWrf2&U@t! z_G>?Mb>H*xp0DSebKmK?)#KgpDH}mAG*;8UAh>I|^?4*8xvGC077dgW=bpE)L}G^}>Gca$Ba!+lqU!NLB4 zr${t7DalDm&PX=j3iVrRhkeW4qO{rXxi383=B|>5qUyS^$fP5b(1dD|PHlF)>FB-y zxXs{hib~U}*ijN%3?^1ZOf~FU)4pD#NvKu&WS7I(QKH}_ubi8iy>y{#j68-=*EEwl zDd6r^w?*UK{#8>#S+pNEJ%#7Ln>srK2&YPJ+-lLb;JY{6LS>qVUXy-3gq2?Vq^BDi zbDsZ4W6r}G_dLnIUp8?qENb^S|8F<`D-AlTcCB{VshI~gD?|E`eaJh|x$IidmR;Lo z3jY?RyTeHLvg>WoHXAf6TR9Q2f9fsP+fcSlp>jMR6E6_4Ja_M%uX`=36kaZrhJxfa zRz*}D@(T4MFKNB%$KDT-!|h#*n14XtU{KEG*9CZ-gH-CLGM$1c_8X6DBaQWK(!sW)|gCJ?3V zTGA3))qCB`@9aTRigqO-+O4nX7G+09GDF!^#eSlH@7ahCSt?~xl}rFJ-q%g?!H7j? zQl)Il%4H%z#CLrR*rNS2UwnVJzJ~tjH>+o zLky1{<$>Mr?{+=L+voPH{%`qKeL{WH&!w8S@A(f$t1z4{oWn9NJJ5om3t`>#NEp-llqar1wfWW(f7G`Rh$njXd9x4r<99zK&}{A(oW#F zr8s{5l}TPlO@<$AC~-g*(ZOPO^y4tqa=o@($x7w7H6 zMoyWruNlwd`3vJ{J!x=9$*B@Y*13Wv1!O~!#;|c}dD|${764?G+vQB~&}}H@hMlRR z%Tv1KoC1wgZkWN@7Sw|lm5XT}EG9t1iuqha(SA7?QIhs6!9(?bqE@m~_QTZ&Mqe;a z*QRGKnziXU^YZl7+C^fC?)ZK2Xom<{1CkkOL3}t-wmz`Mo3RQ zOgD|+2NU$b;KIrI3fh~-pFn%$0xd>o{Q!zdk1>ISx{7(joxu}}Gm5i)IP^@a7gRr} z&moQt(WiYGWKX_99bb9Esrm$-9Phz(OWHulqO%M^mh%!OW2m#90`NjKs?CRP8~lTZ z-+o#qmXuL#CA7jyMnmaEm=fwrs4vJJ#|Rbb5@QIWG0>T_Efx_zcc@27ICbQ7|9}?d z_~Q|5QV;H0q>jJsrcsok(<8-mD3KnFNkzVn(Y1*gd51Rb?}U%lC&CQj?!oC-&@*ZK zZsco9(f%yb-u@)Oqpe5Alc3*37;+r&y4VZ-hTY$CD8NN9=sx_pPfzTLmV+gpQc-Oy zf`|&Kp;8E`*~BuwgAjx|5K0HPB8&7dZenIXdjJ)2RAO?#MFGzrx1e6Ho|~+7?F09Q z{fCy3I=kTiUl$^Go8xqLc7B#t^f;xbr>4$bnY~mfb1=c*;g+GoJVru-?qEzTW3c23 zg<=qcBSDLj!i$MhU&%+1dhVpEmnlgf73WHukCH-I%vx09)CUdJJU&f(~sSWf3F*<6bxJ60X?SO@{#KvBls z90lqn!^Q{W>i~)~M{nxR97Q@(j6{5*bKmuaRS8LPfGTKDK<>4Kz>x6)f+ baOS>=uPwM_LDR7^);S)cAF`VLsI~t;lu9}s delta 2847 zcma)8TTC126+Scb+jz$I*v6PFkjvP3*QQ~~1<|HkAn|~?bd61ICrxD0kZv{;qD?>PE{dt4dYM%c>74y=+$5RrpI~HbEvxHiK!ckO&PmTEH{(Kw8U+X zP1$16Ak9or`r`EXcyEyJUpm~~#fDPy)ZNJ(i&W}U8@!K|$4Z0u7b*;PcXsU|vBT+* zoDRtu8qC*2{U*fOzqlHM_)z9_tt1AVx4kbl1icO9DWENb%_Kexn$XC9U7X^kP*O!5JpTEuE`sbrvh zVn?ymGkgZ&nY-!rBE2@v=p|{i^77>D^yQKLR3jsdt5*z;G_EFPtPb9jT1B7Hnd-=V zq@_yBVW^~yHw>GMffI~IDe*gF;b5~LNh@YEuhw>f`*}U)uK(gf;pI*A5j9q z!DyHUnFF~Ol;S5M5PujHDywiCdC^8T@wt9pJ1*~V?~OkP?G-WYG@3c(nlok|!t)2_ zk?Jwi-kmTBB%X_DQ4mOLN6#>V+_K&^OSAzj*`;PVAAEEdin%^_!Wi<@Q*=+kol~xl zaheV_hHNSg_wbOhfFD-O=XMmG{!mmo=2Suls+*{lY@WSvb<@m-67BF{tgFogXP2ldKH!uRMFoFEel3STOvZ&%nw6J+BCUv za@Kam5+M*=YR}f+xq@aNVLd6t?LsLy+ZkYH+TGQ`Ij3cwsuDT@T+i`3DbAH^{`2az?uy zzRgPJj?xP-CDhyDY>1nW5h~P0#t=l~pfhJnEFgStR-cq`>&WT8LbGxr^8B@^4RMaQghj zC2+QYat@;aaSpM6iVFqM^ydPs^D^Ui-3Hn&;(5^Yhqp?a;bPVZ;sXy|wQ(Wl3q0S5ROQ3Nu zU(ObXi`nui(lK6zdQ0Oi;6irEGuqtz zG{~c^O~#X?wJ1Z516~okq2F*?>keQ|k70A%gFpA^sdKt+f03tDOnVYVM1@RmF^tr# zVL#tN2tpkSmqJgX3-pAWnAr#Sp(3tITn@Mx;Q7Nk)az^K#wS~vz`fzTUpG``7Xtt5 zLiE?Q2|7D-d4}FF64Wy_F>&tV%*%xm2NSxFTY3wZF%pt=2V-I#%O+PS42Li{lC&Tx zyq!4p<$M&W=T55VOi2gmD!$5EC~b5LhDp_?7s6;&-bW_(5pSI_st5EUSUS5O0Ts+A zFFo{qJ657~u1DVyX?{!^lRFD*s63F($KZre*NxBk<8nb~bERxVI#z5ZX zFl=Z02lEN~Ca{L-)}I;78#pAY1OD$g!vFvP