816563e2e3
This is done by adding a "C<* override" layer that is reset to 0 on ABORT. The problem was that when ABORT happened during a LOAD, we had a resetted RSP and started from a clean INTERPRET, but LOAD didn't have the opportunity to restore C<*, which caused it to continue interpreting from the faulty BLK. With a C<* override, we don't need to *restore* C<*, we just need to clear the override.
92 lines
1.8 KiB
Forth
92 lines
1.8 KiB
Forth
( I/O blocks )
|
|
|
|
: BLKMEM+ 0x57 RAM+ @ + ;
|
|
( n -- Fetches block n and write it to BLK( )
|
|
: BLK@* 0 BLKMEM+ ;
|
|
( n -- Write back BLK( to storage at block n )
|
|
: BLK!* 2 BLKMEM+ ;
|
|
( Current blk pointer in ( )
|
|
: BLK> 4 BLKMEM+ ;
|
|
( Whether buffer is dirty )
|
|
: BLKDTY 6 BLKMEM+ ;
|
|
: BLK( 8 BLKMEM+ ;
|
|
|
|
: BLK$
|
|
H@ 0x57 RAM+ !
|
|
( 1024 for the block, 8 for variables )
|
|
1032 ALLOT
|
|
( LOAD detects end of block with ASCII EOT. This is why
|
|
we write it there. EOT == 0x04 )
|
|
4 C,
|
|
0 BLKDTY !
|
|
-1 BLK> !
|
|
;
|
|
|
|
( -- )
|
|
: BLK!
|
|
BLK> @ BLK!* @ EXECUTE
|
|
0 BLKDTY !
|
|
;
|
|
|
|
( n -- )
|
|
: BLK@
|
|
DUP BLK> @ = IF DROP EXIT THEN
|
|
BLKDTY @ IF BLK! THEN
|
|
DUP BLK> ! BLK@* @ EXECUTE
|
|
;
|
|
|
|
: BLK!! 1 BLKDTY ! ;
|
|
|
|
: .2 DUP 10 < IF SPC THEN . ;
|
|
|
|
: LIST
|
|
BLK@
|
|
16 0 DO
|
|
I 1+ .2 SPC
|
|
64 I * BLK( + (print)
|
|
CRLF
|
|
LOOP
|
|
;
|
|
|
|
: _
|
|
(boot<)
|
|
DUP 4 = IF
|
|
( We drop our char, but also "a" from WORD: it won't
|
|
have the opportunity to balance PSP because we're
|
|
EXIT!ing. )
|
|
2DROP
|
|
( We're finished interpreting )
|
|
EXIT!
|
|
THEN
|
|
;
|
|
|
|
: LOAD
|
|
( save BLK>, C<* override and boot< ptr to RSP )
|
|
BLK> @ >R
|
|
0x08 RAM+ @ >R
|
|
0x2e RAM+ @ >R
|
|
BLK@
|
|
( Point to beginning of BLK )
|
|
BLK( 0x2e RAM+ !
|
|
( 08 == C<* override )
|
|
['] _ 0x08 RAM+ !
|
|
INTERPRET
|
|
R> 0x2e RAM+ !
|
|
( Before we restore C<* are we restoring it to "_"?
|
|
if yes, it means we're in a nested LOAD which means we
|
|
should also load back the saved BLK>. Otherwise, we can
|
|
ignore the BLK> from RSP. )
|
|
I 0x08 RAM+ @ = IF
|
|
( nested load )
|
|
R> DROP ( C<* )
|
|
R> BLK@
|
|
ELSE
|
|
( not nested )
|
|
R> 0x08 RAM+ !
|
|
R> DROP ( BLK> )
|
|
THEN
|
|
;
|
|
|
|
( b1 b2 -- )
|
|
: LOADR 1+ SWAP DO I DUP . CRLF LOAD LOOP ;
|