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

diff --git a/src/scheme.4th b/src/scheme.4th
index 135bdab..0f2fc0d 100644
--- 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,32 +575,42 @@ 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
+  stack-list-len 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
 ;
 
 : restore-return-stack ( continuation -- )
 
-    R> -rot \ store top of return stack on PS
     continuation->rstack-list
-    2dup print 2dup
 
-    \ TODO: Implement body of return stack restoration
+    2dup cdr 2swap stack-list-len ( list n )
+
+    dup RSP0 + RSP! \ expand return stack to accommodate entries
 
-    >R \ restore original top of return stack
+    ( 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 -- )
@@ -604,12 +618,11 @@ global-env obj!
   \ contents of continuation object.
 
     2dup >R >R
+
     restore-param-stack
 
-    ." ====== PARAM STACK RESTORED ======" cr
-    trace
-    
     R> R>
+
     restore-return-stack
 ;