Return stack restore working.

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

diff --git a/src/scheme.4th b/src/scheme.4th
index 93d2496..0dec215 100644 (file)
--- a/src/scheme.4th
+++ b/src/scheme.4th
@@ -530,6 +530,8 @@ global-env obj!
   nil rsp@ 1- rsp0 do
     i 1+ @ fixnum-type 2swap cons
   loop
+
+  rsp@ 1- rsp0 - fixnum-type 2swap cons
 ;
 
 : cons-param-stack ( -- listobj )
@@ -545,6 +547,8 @@ global-env obj!
 
         2swap cons
     2 +loop
+
+  depth 2- fixnum-type 2swap cons
 ;
 
 : make-continuation
@@ -560,18 +564,76 @@ global-env obj!
 : continuation->rstack-list
   drop pair-type cdr ;
 
-: restore-param-stack ( continuation -- obj_stack continuation )
+: stack-list-len ( stack-list -- n )
+    car drop
+;
 
-  2dup >R >R
+: restore-param-stack ( continuation -- obj_stack )
   continuation->pstack-list
+  2dup >R >R
 
-  ( Idea: allocate stack space first using psp!,
+  ( Allocate stack space first using psp!,
     then copy objects from list. )
+
+  car drop
+  object-stack-base @ psp0 + + psp!
+
+  R> R> 2dup cdr
+  2swap
+  car drop 2- 0 swap do
+
+      2dup car
+      PSP0 object-stack-base @ + i + 2 + !
+      PSP0 object-stack-base @ + i + 1 + !
+      cdr
+
+  -2 +loop
+
+  2drop
+;
+
+: list->pad ( list n -- )
+
+    pad + 1- \ final dest addr
+    pad      \ initial dest addr
+    swap
+    do
+        2dup cdr 2swap car
+        drop i !
+    -1 +loop
+
+    2drop
+;
+
+: restore-return-stack ( continuation -- )
+
+    continuation->rstack-list
+
+    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
 ;
 
-: restore-continuation
+: restore-continuation ( continuation -- )
   \ TODO: replace current parameter and return stacks with
   \ contents of continuation object.
+
+    2dup >R >R
+
+    restore-param-stack
+
+    R> R>
+
+    restore-return-stack
 ;
 
 \ }}}
@@ -2104,6 +2166,9 @@ parse-idx-stack parse-idx-sp !
 
 \ }}}
 
+\ DEBUGGING
+xxxx
+
 \ ---- Loading files ---- {{{
 
 : load ( addr n -- finalResult )