restore-continuation working.

[scheme.forth.jl.git] / src / scheme.4th

diff --git a/src/scheme.4th b/src/scheme.4th
index 4f04d8c..d9c8aa5 100644 (file)
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -548,7 +548,7 @@ global-env obj!
         2swap cons
     2 +loop
 
-  depth 2- fixnum-type 2swap cons
+  depth 2- 2/ fixnum-type 2swap cons
 ;
 
 : make-continuation
@@ -564,6 +564,10 @@ global-env obj!
 : 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
@@ -571,27 +575,24 @@ global-env obj!
   ( 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
-  car drop 2- 0 swap do
+  car drop 1- 0 swap do
 
       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
 
-  -2 +loop
+  -1 +loop
 
   2drop
 ;
 
-: list->pad ( list -- n )
-
-    2dup car drop -rot \ keep length of list on stack
-    2dup cdr 2swap car drop \ get length from list
+: list->pad ( list n -- )
 
     pad + 1- \ final dest addr
     pad      \ initial dest addr
@@ -606,19 +607,20 @@ global-env obj!
 
 : restore-return-stack ( continuation -- )
 
-    trace
-
     continuation->rstack-list
-    list->pad
-    dup
-    RSP0 + RSP! \ expand return stack to accommodate entries
 
+    2dup stack-list-len -rot ( n stack-list )
+    2dup cdr 2swap stack-list-len  ( n list n )
+
+    list->pad  ( n )
+
+    dup RSP0 + RSP! \ expand return stack to accommodate entries
+
+    ( n )
     0   \ initial offset
     do
         pad i + @ RSP0 i 1+ + !
     loop
-
-    trace
 ;
 
 : restore-continuation ( continuation -- )
@@ -626,12 +628,11 @@ global-env obj!
   \ contents of continuation object.
 
     2dup >R >R
+
     restore-param-stack
 
-    ." ====== PARAM STACK RESTORED ======" cr
-    trace
-    
     R> R>
+
     restore-return-stack
 ;