Dev checkpoint

diff --git a/basis/cpu/x86/32/32.factor b/basis/cpu/x86/32/32.factor
index adddc4c5b207e863ff397971e414a2766c71814f..fe365f2e502f0a334f61a0b299dd90b11f281329 100755 (executable)
--- a/basis/cpu/x86/32/32.factor
+++ b/basis/cpu/x86/32/32.factor
@@ -257,11 +257,13 @@ M: x86.32 %callback-value ( ctype -- )
     ESP 12 SUB
     ! Save top of data stack in non-volatile register
     %prepare-unbox
+    push-vm-ptr
     EAX PUSH
     ! Restore data/call/retain stacks
     "unnest_stacks" f %alien-invoke
     ! Place top of data stack in EAX
     EAX POP
+    temp-reg POP
     ! Restore C stack
     ESP 12 ADD
     ! Unbox EAX

diff --git a/vm/code_heap.cpp b/vm/code_heap.cpp
index 39f0dfd52ac29c50a71abe8c6517c9f6efb05e27..d91e349db77328811b83d879816e6d3e0bbcc3cd 100755 (executable)
--- a/vm/code_heap.cpp
+++ b/vm/code_heap.cpp
@@ -17,7 +17,7 @@ bool factorvm::in_code_heap_p(cell ptr)
 
 bool in_code_heap_p(cell ptr)
 {
-       return vm->in_code_heap_p(ptr);
+       return vm->in_code_heap_p(ptr); // used by os specific signal handlers
 }
 
 /* Compile a word definition with the non-optimizing compiler. Allocates memory */

diff --git a/vm/contexts.cpp b/vm/contexts.cpp
index f5c63f1e7fab2cbace0097c5cdf4f3588e02a0da..26197a4863290d47610a699247d4dc7cad0866e1 100644 (file)
--- a/vm/contexts.cpp
+++ b/vm/contexts.cpp
@@ -90,8 +90,9 @@ void factorvm::nest_stacks()
        reset_retainstack();
 }
 
-void nest_stacks()
+void nest_stacks(factorvm *myvm)
 {
+       printf("PHIL nest_stacks %d %d\n",vm,myvm);fflush(stdout);
        return vm->nest_stacks();
 }
 
@@ -110,8 +111,9 @@ void factorvm::unnest_stacks()
        dealloc_context(old_stacks);
 }
 
-void unnest_stacks()
+void unnest_stacks(factorvm *myvm)
 {
+       printf("PHIL unnest_stacks %d %d\n",vm,myvm);fflush(stdout);
        return vm->unnest_stacks();
 }
 

diff --git a/vm/contexts.hpp b/vm/contexts.hpp
index 17f8a7eb70477447a22e117f0a2cb9de25f09ab2..060b15fad770dc4eaa910b6f5f20a813c7136ea5 100644 (file)
--- a/vm/contexts.hpp
+++ b/vm/contexts.hpp
@@ -50,8 +50,9 @@ PRIMITIVE(set_datastack);
 PRIMITIVE(set_retainstack);
 PRIMITIVE(check_datastack);
 
-VM_C_API void nest_stacks();
-VM_C_API void unnest_stacks();
+struct factorvm;
+VM_C_API void nest_stacks(factorvm *vm);
+VM_C_API void unnest_stacks(factorvm *vm);
 
 }