diff --git a/emul/forth/z80c.bin b/emul/forth/z80c.bin index 5ce1592..59f0d3a 100644 Binary files a/emul/forth/z80c.bin and b/emul/forth/z80c.bin differ diff --git a/forth/icore.fs b/forth/icore.fs index a072c86..afc0a88 100644 --- a/forth/icore.fs +++ b/forth/icore.fs @@ -196,17 +196,17 @@ ( system c< simply reads source from binary, starting at LATEST. Convenient way to bootstrap a new system. ) : (c<) - ( 51 == SYSTEM SCRATCHPAD ) - 0x51 _c RAM+ _c @ ( a ) + ( 60 == SYSTEM SCRATCHPAD ) + 0x60 _c RAM+ _c @ ( a ) _c DUP _c C@ ( a c ) _c SWAP 1 _c + ( c a+1 ) - 0x51 _c RAM+ _c ! ( c ) + 0x60 _c RAM+ _c ! ( c ) ; : BOOT LIT< (parse) _c (find) _c DROP _c (parse*) _c ! - ( 51 == SYSTEM SCRATCHPAD ) - _c CURRENT _c @ 0x51 _c RAM+ _c ! + ( 60 == SYSTEM SCRATCHPAD ) + _c CURRENT _c @ 0x60 _c RAM+ _c ! ( 0c == CINPTR ) LIT< (c<) _c (find) _c DROP 0x0c _c RAM+ _c ! LIT< INIT _c (find) diff --git a/forth/z80c.fs b/forth/z80c.fs index 46489c6..d12b224 100644 --- a/forth/z80c.fs +++ b/forth/z80c.fs @@ -247,8 +247,7 @@ CODE @ E (HL) LDrr, HL INCss, D (HL) LDrr, - EXDEHL, - HL PUSHqq, + DE PUSHqq, ;CODE CODE C! diff --git a/notes.txt b/notes.txt index e0aa599..2d16513 100644 --- a/notes.txt +++ b/notes.txt @@ -88,8 +88,9 @@ RAMSTART INITIAL_SP +0e WORDBUF +2e SYSVNXT +4e INTJUMP -+51 SYSTEM SCRATCHPAD -+60 RAMEND ++51 RESERVED ++60 SYSTEM SCRATCHPAD ++80 RAMEND INITIAL_SP holds the initial Stack Pointer value so that we know where to reset it on ABORT @@ -119,8 +120,8 @@ SYSTEM SCRATCHPAD is reserved for temporary system storage or can be reserved by low-level drivers. These are the current usages of this space throughout the project: -* 0x51-0x53: (c<) pointer during in-memory initialization (see below) -* 0x53-0x5b: ACIA buffer pointers in RC2014 recipes. +* 0x60-0x62: (c<) pointer during in-memory initialization (see below) +* 0x62-0x6a: ACIA buffer pointers in RC2014 recipes. *** Initialization sequence diff --git a/recipes/rc2014/conf.fs b/recipes/rc2014/conf.fs index 72fd928..e78eb9f 100644 --- a/recipes/rc2014/conf.fs +++ b/recipes/rc2014/conf.fs @@ -2,5 +2,5 @@ 0xf000 CONSTANT RS_ADDR 0x80 CONSTANT ACIA_CTL 0x81 CONSTANT ACIA_IO -RAMSTART 0x53 + CONSTANT ACIA_MEM +RAMSTART 0x62 + CONSTANT ACIA_MEM