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

vm: fix crash when doing GC with profiling enabled

db4
Slava Pestov 2010-09-03 01:40:16 -05:00
parent 1aec1ce9b9
commit 7b35f82bf4
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
vm/entry_points.cpp
View File

@ -19,25 +19,29 @@ void factor_vm::c_to_factor(cell quot)
c_to_factor_func(quot); c_to_factor_func(quot);
} }
template<typename Func> Func factor_vm::get_entry_point(cell n)
{
/* We return word->code->entry_point() and not word->entry_point,
because if profiling is enabled, we don't want to go through the
entry point's profiling stub. This clobbers registers, since entry
points use the C ABI and not the Factor ABI. */
tagged<word> entry_point_word(special_objects[n]);
return (Func)entry_point_word->code->entry_point();
}
void factor_vm::unwind_native_frames(cell quot, stack_frame *to) void factor_vm::unwind_native_frames(cell quot, stack_frame *to)
{ {
tagged<word> unwind_native_frames_word(special_objects[UNWIND_NATIVE_FRAMES_WORD]); get_entry_point<unwind_native_frames_func_type>(UNWIND_NATIVE_FRAMES_WORD)(quot,to);
unwind_native_frames_func_type unwind_native_frames_func = (unwind_native_frames_func_type)unwind_native_frames_word->entry_point;
unwind_native_frames_func(quot,to);
} }
cell factor_vm::get_fpu_state() cell factor_vm::get_fpu_state()
{ {
tagged<word> get_fpu_state_word(special_objects[GET_FPU_STATE_WORD]); return get_entry_point<get_fpu_state_func_type>(GET_FPU_STATE_WORD)();
get_fpu_state_func_type get_fpu_state_func = (get_fpu_state_func_type)get_fpu_state_word->entry_point;
return get_fpu_state_func();
} }
void factor_vm::set_fpu_state(cell state) void factor_vm::set_fpu_state(cell state)
{ {
tagged<word> set_fpu_state_word(special_objects[SET_FPU_STATE_WORD]); get_entry_point<set_fpu_state_func_type>(GET_FPU_STATE_WORD)(state);
set_fpu_state_func_type set_fpu_state_func = (set_fpu_state_func_type)set_fpu_state_word->entry_point;
set_fpu_state_func(state);
} }
} }

1
vm/vm.hpp
View File

@ -652,6 +652,7 @@ struct factor_vm
// entry points // entry points
void c_to_factor(cell quot); void c_to_factor(cell quot);
template<typename Func> Func get_entry_point(cell n);
void unwind_native_frames(cell quot, stack_frame *to); void unwind_native_frames(cell quot, stack_frame *to);
cell get_fpu_state(); cell get_fpu_state();
void set_fpu_state(cell state); void set_fpu_state(cell state);