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 7b72c2f..387089d 100644 Binary files a/emul/forth.bin and b/emul/forth.bin differ