steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

passing ptr in boolean boxing and save_callstack_bottom

db4
Phil Dawes 2009-08-23 14:45:09 +01:00
parent 0a15e20e12
commit 58190c06dc
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
vm/booleans.cpp
View File

@ -8,9 +8,10 @@ void factorvm::box_boolean(bool value)
dpush(value ? T : F); 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) bool factorvm::to_boolean(cell value)
@ -18,9 +19,10 @@ bool factorvm::to_boolean(cell value)
return value != F; 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);
} }
} }

4
vm/booleans.hpp
View File

@ -2,7 +2,7 @@ namespace factor
{ {
VM_C_API void box_boolean(bool value); VM_C_API void box_boolean(bool value, factorvm *vm);
VM_C_API bool to_boolean(cell value); VM_C_API bool to_boolean(cell value, factorvm *vm);
} }

5
vm/callstack.cpp
View File

@ -246,9 +246,10 @@ void factorvm::save_callstack_bottom(stack_frame *callstack_bottom)
stack_chain->callstack_bottom = 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);
} }
} }

2
vm/callstack.hpp
View File

@ -13,7 +13,7 @@ PRIMITIVE(innermost_stack_frame_executing);
PRIMITIVE(innermost_stack_frame_scan); PRIMITIVE(innermost_stack_frame_scan);
PRIMITIVE(set_innermost_stack_frame_quot); 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);