diff --git a/blk/263 b/blk/263 index 6dc146a..bf2ad7b 100644 --- a/blk/263 +++ b/blk/263 @@ -9,6 +9,7 @@ VARIABLE XCURRENT : XIMM XCON IMMEDIATE XCOFF ; : _xapply ( a -- a-off ) DUP ORG @ > IF ORG @ - BIN( @ + THEN ; +: X['] XCON ' _xapply LITA XCOFF ; : XCOMPILE XCON ' _xapply LITA LIT< , (find) DROP _xapply , XCOFF ; diff --git a/blk/409 b/blk/409 index c7e90d4..36a5086 100644 --- a/blk/409 +++ b/blk/409 @@ -5,10 +5,10 @@ NOT IF (parse) ELSE EXECUTE THEN C DROP I 2- @ ( I I a ) diff --git a/blk/411 b/blk/411 index 38365a9..22a0271 100644 --- a/blk/411 +++ b/blk/411 @@ -6,7 +6,7 @@ 0 0x55 RAM+ ! ( 55 == (key) override ) 0 0x0a RAM+ ! ( NLPTR ) ( 0c == C<* ) - LIT< (boot<) (find) DROP 0x0c RAM+ ! + ['] (boot<) 0x0c RAM+ ! ( boot< always has a char waiting. 06 == CR ( boot ptr ) BLK@ BLK( 0x2e RAM+ ! ( Point to beginning of BLK ) - [ LITN ( from PSP, B432 ) ] 0x08 RAM+ ! + ['] _ 0x08 RAM+ ! 1 0x06 RAM+ ! ( 06 == C 0x2e RAM+ ! R> 0x06 RAM+ ! diff --git a/emul/forth.bin b/emul/forth.bin index ae9856c..f4efd95 100644 Binary files a/emul/forth.bin and b/emul/forth.bin differ diff --git a/emul/xcomp.fs b/emul/xcomp.fs index 5d62af7..0879310 100644 --- a/emul/xcomp.fs +++ b/emul/xcomp.fs @@ -4,6 +4,7 @@ 212 LOAD ( z80 assembler ) 262 LOAD ( xcomp ) : CODE XCODE ; +: ['] X['] ; IMMEDIATE : COMPILE XCOMPILE ; IMMEDIATE : [COMPILE] X[COMPILE] ; IMMEDIATE : IMMEDIATE XIMM ; diff --git a/recipes/rc2014/xcomp.fs b/recipes/rc2014/xcomp.fs index ab5c42f..3f53c5f 100644 --- a/recipes/rc2014/xcomp.fs +++ b/recipes/rc2014/xcomp.fs @@ -10,6 +10,7 @@ RAMSTART 0x70 + CONSTANT ACIA_MEM 212 LOAD ( z80 assembler ) 262 LOAD ( xcomp ) : CODE XCODE ; +: ['] X['] ; IMMEDIATE : COMPILE XCOMPILE ; IMMEDIATE : [COMPILE] X[COMPILE] ; IMMEDIATE : IMMEDIATE XIMM ; diff --git a/recipes/ti84/xcomp.fs b/recipes/ti84/xcomp.fs index b3da866..14d6a83 100644 --- a/recipes/ti84/xcomp.fs +++ b/recipes/ti84/xcomp.fs @@ -9,6 +9,7 @@ RAMSTART 0x72 + CONSTANT KBD_MEM 262 LOAD ( xcomp ) 522 LOAD ( font compiler ) : CODE XCODE ; +: ['] X['] ; IMMEDIATE : COMPILE XCOMPILE ; IMMEDIATE : [COMPILE] X[COMPILE] ; IMMEDIATE : IMMEDIATE XIMM ; diff --git a/recipes/trs80/xcomp.fs b/recipes/trs80/xcomp.fs index da36a54..5722dd7 100644 --- a/recipes/trs80/xcomp.fs +++ b/recipes/trs80/xcomp.fs @@ -4,6 +4,7 @@ RS_ADDR 0x80 - CONSTANT RAMSTART 212 LOAD ( z80 assembler ) 262 LOAD ( xcomp ) : CODE XCODE ; +: ['] X['] ; IMMEDIATE : COMPILE XCOMPILE ; IMMEDIATE : [COMPILE] X[COMPILE] ; IMMEDIATE : IMMEDIATE XIMM ;