From a6e1e39e23a9126ad41b692893f76b24f5cc7382 Mon Sep 17 00:00:00 2001 From: Phil Dawes Date: Sun, 23 Aug 2009 14:45:09 +0100 Subject: [PATCH] passing ptr in boolean boxing and save_callstack_bottom --- vm/booleans.cpp | 10 ++++++---- vm/booleans.hpp | 4 ++-- vm/callstack.cpp | 5 +++-- vm/callstack.hpp | 2 +- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/vm/booleans.cpp b/vm/booleans.cpp index 6a1bb79298..aa3f392b3e 100644 --- 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 c410f67481..843cd7fd66 100644 --- 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 676e4260c9..b89dd0cfef 100755 --- 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 406d8e7154..d34cd618e3 100755 --- 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);