X-Git-Url: https://thelambdalab.xyz/gitweb/index.cgi?a=blobdiff_plain;f=src%2Fscheme.4th;h=0f2fc0d855217e422f834252203ea5be6d69cc76;hb=6f3714af79d6ecabe4ac209baea159b9f1dc708c;hp=93d249650e2fdefa3cc98f31d9fa5a413963e12e;hpb=f71c5f93aefa930fd0ac175416523bc6a101e3df;p=scheme.forth.jl.git

diff --git a/src/scheme.4th b/src/scheme.4th
index 93d2496..0f2fc0d 100644
--- 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- 2/ fixnum-type 2swap cons
 ;
 
 : make-continuation
@@ -560,18 +564,66 @@ 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 2*
+  object-stack-base @ psp0 + + psp!
+
+  R> R> 2dup cdr
+  2swap
+  stack-list-len 1- 0 swap do
+
+      2dup car
+      PSP0 object-stack-base @ + i 2* + 2 + !
+      PSP0 object-stack-base @ + i 2* + 1 + !
+      cdr
+
+  -1 +loop
+
+  2drop
 ;
 
-: restore-continuation
+: restore-return-stack ( continuation -- )
+
+    continuation->rstack-list
+
+    2dup cdr 2swap stack-list-len ( list n )
+
+    dup RSP0 + RSP! \ expand return stack to accommodate entries
+
+    ( list n )
+
+    1-  \ initial offset n-1
+    0   \ final offset 0
+    swap
+    do
+        2dup cdr 2swap car drop
+        RSP0 i 1+ + !
+    -1 +loop
+
+    2drop
+;
+
+: 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 +2156,9 @@ parse-idx-stack parse-idx-sp !
 
 \ }}}
 
+\ DEBUGGING
+xxxx
+
 \ ---- Loading files ---- {{{
 
 : load ( addr n -- finalResult )