The Lambda Lab
/
projects
/
scheme.forth.jl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplified restore-return-stack.
[scheme.forth.jl.git]
/
src
/
scheme.4th
diff --git
a/src/scheme.4th
b/src/scheme.4th
index
4f04d8c
..
0f2fc0d
100644
(file)
--- a/
src/scheme.4th
+++ b/
src/scheme.4th
@@
-548,7
+548,7
@@
global-env obj!
2swap cons
2 +loop
2swap cons
2 +loop
- depth 2- fixnum-type 2swap cons
+ depth 2-
2/
fixnum-type 2swap cons
;
: make-continuation
;
: make-continuation
@@
-564,6
+564,10
@@
global-env obj!
: continuation->rstack-list
drop pair-type cdr ;
: continuation->rstack-list
drop pair-type cdr ;
+: stack-list-len ( stack-list -- n )
+ car drop
+;
+
: restore-param-stack ( continuation -- obj_stack )
continuation->pstack-list
2dup >R >R
: restore-param-stack ( continuation -- obj_stack )
continuation->pstack-list
2dup >R >R
@@
-571,54
+575,42
@@
global-env obj!
( Allocate stack space first using psp!,
then copy objects from list. )
( Allocate stack space first using psp!,
then copy objects from list. )
- car drop
+ car drop
2*
object-stack-base @ psp0 + + psp!
R> R> 2dup cdr
2swap
object-stack-base @ psp0 + + psp!
R> R> 2dup cdr
2swap
-
car drop 2
- 0 swap do
+
stack-list-len 1
- 0 swap do
2dup car
2dup car
- PSP0 object-stack-base @ + i + 2 + !
- PSP0 object-stack-base @ + i + 1 + !
+ PSP0 object-stack-base @ + i
2*
+ 2 + !
+ PSP0 object-stack-base @ + i
2*
+ 1 + !
cdr
cdr
- -
2
+loop
+ -
1
+loop
2drop
;
2drop
;
-: list->pad ( list -- n )
-
- 2dup car drop -rot \ keep length of list on stack
- 2dup cdr 2swap car drop \ get length from list
-
- pad + 1- \ final dest addr
- pad \ initial dest addr
- swap
- do
- 2dup cdr 2swap car
- drop i !
- -1 +loop
+: restore-return-stack ( continuation -- )
- 2drop
-;
+ continuation->rstack-list
-
: restore-return-stack ( continuation --
)
+
2dup cdr 2swap stack-list-len ( list n
)
- trace
+ dup RSP0 + RSP! \ expand return stack to accommodate entries
- continuation->rstack-list
- list->pad
- dup
- RSP0 + RSP! \ expand return stack to accommodate entries
+ ( list n )
- 0 \ initial offset
+ 1- \ initial offset n-1
+ 0 \ final offset 0
+ swap
do
do
- pad i + @ RSP0 i 1+ + !
- loop
+ 2dup cdr 2swap car drop
+ RSP0 i 1+ + !
+ -1 +loop
- trace
+ 2drop
;
: restore-continuation ( continuation -- )
;
: restore-continuation ( continuation -- )
@@
-626,12
+618,11
@@
global-env obj!
\ contents of continuation object.
2dup >R >R
\ contents of continuation object.
2dup >R >R
+
restore-param-stack
restore-param-stack
- ." ====== PARAM STACK RESTORED ======" cr
- trace
-
R> R>
R> R>
+
restore-return-stack
;
restore-return-stack
;