izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2025-03-31 09:48:48 +11:00
Code Issues Releases Wiki Activity

Stop LOADing on ABORT

Browse Source 
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.
This commit is contained in:
Virgil Dupras 2020-04-24 14:10:40 -04:00
parent af39b37dd1
commit 816563e2e3
7 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blk/081
View File

@ -3,7 +3,7 @@ RAMSTART INITIAL_SP +53 readln's variables
+02 CURRENT +55 adev's variables +02 CURRENT +55 adev's variables
+04 HERE +57 blk's variables +04 HERE +57 blk's variables
+06 C<?* +59 z80a's variables +06 C<?* +59 z80a's variables
+08 FUTURE USES +5b FUTURE USES +08 C<* override +5b FUTURE USES
+0a PARSEPTR +70 DRIVERS +0a PARSEPTR +70 DRIVERS
+0c C<* +80 RAMEND +0c C<* +80 RAMEND
+0e WORDBUF +0e WORDBUF

4
blk/082
View File

@ -9,8 +9,8 @@ IP is the Interpreter Pointer
PARSEPTR holds routine address called on (parse) PARSEPTR holds routine address called on (parse)
C<* holds routine address called on C< C<* holds routine address called on C<. If the C<* override
at 0x08 is nonzero, this routine is called instead.
(cont.) (cont.)

6
blk/393
View File

@ -7,5 +7,9 @@
( w -- a f ) ( w -- a f )
: (find) CURRENT @ SWAP _find ; : (find) CURRENT @ SWAP _find ;
: QUIT (resRS) LIT< INTERPRET (find) DROP EXECUTE ; : QUIT
(resRS)
0 0x08 RAM+ ! ( 08 == C<* override )
LIT< INTERPRET (find) DROP EXECUTE
;
394 407 LOADR 394 407 LOADR

6
blk/398
View File

@ -3,7 +3,11 @@
: (parse) (parsed) NOT IF ABORT THEN ; : (parse) (parsed) NOT IF ABORT THEN ;
: C<? 0x06 RAM+ @ DUP 2 > IF EXECUTE THEN ( 06 == C<?* ) ; : C<? 0x06 RAM+ @ DUP 2 > IF EXECUTE THEN ( 06 == C<?* ) ;
: C< 0x0c RAM+ @ EXECUTE ( 0c == C<* ) ; : C<
0x08 RAM+ @ ( 08 == C<* override )
DUP NOT IF DROP 0x0c RAM+ @ THEN ( 0c == C<* )
EXECUTE
;
: , HERE @ ! HERE @ 2+ HERE ! ; : , HERE @ ! HERE @ 2+ HERE ! ;

1
blk/405
View File

@ -3,6 +3,7 @@
LIT< (parse) (find) DROP (parse*) ! LIT< (parse) (find) DROP (parse*) !
( 2e == SYSTEM SCRATCHPAD ) ( 2e == SYSTEM SCRATCHPAD )
CURRENT @ 0x2e RAM+ ! CURRENT @ 0x2e RAM+ !
0 0x08 RAM+ ! ( 08 == C<* override )
( 0c == C<* ) ( 0c == C<* )
LIT< (boot<) (find) DROP 0x0c RAM+ ! LIT< (boot<) (find) DROP 0x0c RAM+ !
( boot< always has a char waiting. 06 == C<?* ) ( boot< always has a char waiting. 06 == C<?* )

BIN
emul/forth/z80c.bin
View File

Binary file not shown.

16
forth/blk.fs
View File

@ -61,28 +61,28 @@
; ;
: LOAD : LOAD
( save BLK>, CINPTR and boot< ptr to RSP ) ( save BLK>, C<* override and boot< ptr to RSP )
BLK> @ >R BLK> @ >R
0x0c RAM+ @ >R 0x08 RAM+ @ >R
0x2e RAM+ @ >R 0x2e RAM+ @ >R
BLK@ BLK@
( Point to beginning of BLK ) ( Point to beginning of BLK )
BLK( 0x2e RAM+ ! BLK( 0x2e RAM+ !
( 0c == CINPTR ) ( 08 == C<* override )
['] _ 0x0c RAM+ ! ['] _ 0x08 RAM+ !
INTERPRET INTERPRET
R> 0x2e RAM+ ! R> 0x2e RAM+ !
( Before we restore CINPTR, are we restoring it to "_"? ( Before we restore C<* are we restoring it to "_"?
if yes, it means we're in a nested LOAD which means we if yes, it means we're in a nested LOAD which means we
should also load back the saved BLK>. Otherwise, we can should also load back the saved BLK>. Otherwise, we can
ignore the BLK> from RSP. ) ignore the BLK> from RSP. )
I 0x0c RAM+ @ = IF I 0x08 RAM+ @ = IF
( nested load ) ( nested load )
R> DROP ( CINPTR ) R> DROP ( C<* )
R> BLK@ R> BLK@
ELSE ELSE
( not nested ) ( not nested )
R> 0x0c RAM+ ! R> 0x08 RAM+ !
R> DROP ( BLK> ) R> DROP ( BLK> )
THEN THEN
; ;