From 788453b89c2f090396ee472fe9baea71d78202a7 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Wed, 28 Oct 2020 11:35:32 -0400 Subject: [PATCH] Simplify NL I think that when I added NL, I had troubles having access to CRLF's address at boot time, which is why I had this system. But now that CRLF is easily accessible during BOOT, we can simplify. (and that will help us in the hopefully-upcoming change, which is quite nice...) --- blk/381 | 2 +- blk/396 | 2 +- cvm/forth.bin | Bin 5283 -> 5275 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/blk/381 b/blk/381 index 12d7936..c3ddc8d 100644 --- a/blk/381 +++ b/blk/381 @@ -4,7 +4,7 @@ : (print) C@+ ( a len ) 0 DO C@+ EMIT LOOP DROP ; : BS 8 EMIT ; : LF 10 EMIT ; : CR 13 EMIT ; : CRLF CR LF ; : SPC 32 EMIT ; -: NL 0x0a RAM+ @ ( NLPTR ) ?DUP IF EXECUTE ELSE CRLF THEN ; +: NL 0x0a RAM+ @ ( NLPTR ) EXECUTE ; : (uflw) LIT" stack underflow" ERR ; XCURRENT @ _xapply ORG @ 0x06 ( stable ABI uflw ) + ! : (oflw) LIT" stack overflow" ERR ; diff --git a/blk/396 b/blk/396 index 6f30215..dbf139e 100644 --- a/blk/396 +++ b/blk/396 @@ -5,7 +5,7 @@ 0 0x08 RAM+ ! ( 08 == C<* override ) 0 0x53 RAM+ ! ( 53 == (emit) override ) 0 0x55 RAM+ ! ( 55 == (key) override ) - 0 0x0a RAM+ ! ( NLPTR ) + ['] CRLF 0x0a RAM+ ! ( NLPTR ) ( 0c == C<* ) ['] (boot<) 0x0c RAM+ ! ['] C@ A@* ! ['] C! A!* ! diff --git a/cvm/forth.bin b/cvm/forth.bin index f06405dbf8d270051694859cce865f2c9ba6515a..7f5efefd17f0adde4e3f4185f85da192f7e98bae 100644 GIT binary patch delta 642 zcmYjPO=uHQ5T4nzNo?M3_9r%Kx0=Qln;;1lLqnC)tj3ZO8*Nqyh}c??8h=ifM(|Qu zD=O$=XdqbWp@Nsl?Yu18wTgkURX$2^iw>*9M#pGSf!`x!Mz)*E99{uRoM;-Ish2OmfBKn zIIRJq2M&yYD?DgXuNL(&M8n!~4A4z&vFD8@@h}V z5Khpo@O~cnB0Shr<;KNA+3ki741^refp8ke@gcq?MgO?9raKUX&)AC%UdG>!GW1=a zv{!UymU4%ubm-*ks~~9}RMq!lg(^mDc+{{VHGynRWo*@G$GfQ6m4*9 z6YP`VGCelz(2{W#Hhkl#;2M1};_-iZ1K-J-F#?}nN*gcEoV%1rfgdxp!^~wIcqXKN zxvv9qckwqK;;FKh#AW{fr$xU{cTBrWGuhxXvvcR~(i8ItHtCl+tNb=;+S)VIG*_8t zL%vwfTi|h*0T6)(&UMtRtkPtpSa9RfHZs9TRw0Z9`c)6I%5z_nt&!|hd>359N0tNg zLIha7Q<`$)1}x!g`eG%VrWxbviAlFm?1t++B;9Tm#7*F&35%Fv&rkXJ8C0Oo@(-1c X9xD{{8r;AGL0+~T>6bfSi6s93)Lx87 delta 573 zcmYk3&uddb5XZms(k4~+<^8NS z5XFN9Ven8rQJ+;h*9O4f8#9CzbfAdT`*Knit-5kQxg? zAs3(>)KD9$gYh7UYH-nqyr`j}eh@BNz%+pxIyaBjWxT=rf+xt}ncys~F=@8{Z7_}2 z2OQS+(=X0yJ(TB)c0ksAqs8U=RSVHN|JJ^=S9KR{_(2hxmlyh*s-GKr)>+UUjN~$h zM|HH)BGoa0K}l0mSH%KnjVK-EX`_RxeAjT|b)%C?aF98kJAEW56FkVe#2h4r?i;u8 z+UKd~{Mm@b{`vE?;>CGJWR2vd#Gwe9baSKmn1MUA!r!b!_mUZv n(No#{v61b#ExFPVfnKGJ{%)K#F)JHN*vr-Fmr927