passing ptr in boolean boxing and save_callstack_bottom

diff --git a/vm/booleans.cpp b/vm/booleans.cpp
index 6a1bb79298c5618c8c5e89504b260163c8d7c4a3..aa3f392b3e885d8bd494ce6db1f87b5815e42cc8 100644 (file)
--- a/vm/booleans.cpp
+++ b/vm/booleans.cpp
@@ -8,9 +8,10 @@ void factorvm::box_boolean(bool value)
        dpush(value ? T : F);
 }
 
-VM_C_API void box_boolean(bool value)
+VM_C_API void box_boolean(bool value, factorvm *myvm)
 {
-       return vm->box_boolean(value);
+       ASSERTVM();
+       return VM_PTR->box_boolean(value);
 }
 
 bool factorvm::to_boolean(cell value)
@@ -18,9 +19,10 @@ bool factorvm::to_boolean(cell value)
        return value != F;
 }
 
-VM_C_API bool to_boolean(cell value)
+VM_C_API bool to_boolean(cell value, factorvm *myvm)
 {
-       return vm->to_boolean(value);
+       ASSERTVM();
+       return VM_PTR->to_boolean(value);
 }
 
 }

diff --git a/vm/booleans.hpp b/vm/booleans.hpp
index c410f67481b36fc62e8d770a6a1b566f3b8f07cc..843cd7fd669439fc4d8c961ba2eb1dfbbee92099 100644 (file)
--- a/vm/booleans.hpp
+++ b/vm/booleans.hpp
@@ -2,7 +2,7 @@ namespace factor
 {
 
 
-VM_C_API void box_boolean(bool value);
-VM_C_API bool to_boolean(cell value);
+VM_C_API void box_boolean(bool value, factorvm *vm);
+VM_C_API bool to_boolean(cell value, factorvm *vm);
 
 }

diff --git a/vm/callstack.cpp b/vm/callstack.cpp
index 676e4260c92e1cc61ef8267c40d8fbb852575a81..b89dd0cfefa9fcdcf00b2475622ca4136bdc166e 100755 (executable)
--- a/vm/callstack.cpp
+++ b/vm/callstack.cpp
@@ -246,9 +246,10 @@ void factorvm::save_callstack_bottom(stack_frame *callstack_bottom)
        stack_chain->callstack_bottom = callstack_bottom;
 }
 
-VM_ASM_API void save_callstack_bottom(stack_frame *callstack_bottom)
+VM_ASM_API void save_callstack_bottom(stack_frame *callstack_bottom, factorvm *myvm)
 {
-       return vm->save_callstack_bottom(callstack_bottom);
+       ASSERTVM();
+       return VM_PTR->save_callstack_bottom(callstack_bottom);
 }
 
 }

diff --git a/vm/callstack.hpp b/vm/callstack.hpp
index 406d8e715492073efbefd4a4fc3ce1fce9726357..d34cd618e352b06d333fe2302b8715719d87e64b 100755 (executable)
--- a/vm/callstack.hpp
+++ b/vm/callstack.hpp
@@ -13,7 +13,7 @@ PRIMITIVE(innermost_stack_frame_executing);
 PRIMITIVE(innermost_stack_frame_scan);
 PRIMITIVE(set_innermost_stack_frame_quot);
 
-VM_ASM_API void save_callstack_bottom(stack_frame *callstack_bottom);
+VM_ASM_API void save_callstack_bottom(stack_frame *callstack_bottom,factorvm *vm);