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

put mach call_fault_handler in the vm

db4
Phil Dawes 2009-09-14 08:00:28 +01:00
parent 2cf2dab48e
commit d2afb4b344
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
vm/mach_signal.cpp
View File

@ -28,7 +28,7 @@ http://www.wodeveloper.com/omniLists/macosx-dev/2000/June/msg00137.html */
/* Modify a suspended thread's thread_state so that when the thread resumes /* Modify a suspended thread's thread_state so that when the thread resumes
executing, the call frame of the current C primitive (if any) is rewound, and executing, the call frame of the current C primitive (if any) is rewound, and
the appropriate Factor error is thrown from the top-most Factor frame. */ the appropriate Factor error is thrown from the top-most Factor frame. */
static void call_fault_handler( void factorvm::call_fault_handler(
exception_type_t exception, exception_type_t exception,
exception_data_type_t code, exception_data_type_t code,
MACH_EXC_STATE_TYPE *exc_state, MACH_EXC_STATE_TYPE *exc_state,
@ -41,33 +41,42 @@ static void call_fault_handler(
a divide by zero or stack underflow in the listener */ a divide by zero or stack underflow in the listener */
/* Are we in compiled Factor code? Then use the current stack pointer */ /* Are we in compiled Factor code? Then use the current stack pointer */
if(SIGNAL_VM_PTR()->in_code_heap_p(MACH_PROGRAM_COUNTER(thread_state))) if(in_code_heap_p(MACH_PROGRAM_COUNTER(thread_state)))
SIGNAL_VM_PTR()->signal_callstack_top = (stack_frame *)MACH_STACK_POINTER(thread_state); signal_callstack_top = (stack_frame *)MACH_STACK_POINTER(thread_state);
/* Are we in C? Then use the saved callstack top */ /* Are we in C? Then use the saved callstack top */
else else
SIGNAL_VM_PTR()->signal_callstack_top = NULL; signal_callstack_top = NULL;
MACH_STACK_POINTER(thread_state) = fix_stack_pointer(MACH_STACK_POINTER(thread_state)); MACH_STACK_POINTER(thread_state) = fix_stack_pointer(MACH_STACK_POINTER(thread_state));
/* Now we point the program counter at the right handler function. */ /* Now we point the program counter at the right handler function. */
if(exception == EXC_BAD_ACCESS) if(exception == EXC_BAD_ACCESS)
{ {
SIGNAL_VM_PTR()->signal_fault_addr = MACH_EXC_STATE_FAULT(exc_state); signal_fault_addr = MACH_EXC_STATE_FAULT(exc_state);
MACH_PROGRAM_COUNTER(thread_state) = (cell)memory_signal_handler_impl; MACH_PROGRAM_COUNTER(thread_state) = (cell)factor::memory_signal_handler_impl;
} }
else if(exception == EXC_ARITHMETIC && code != MACH_EXC_INTEGER_DIV) else if(exception == EXC_ARITHMETIC && code != MACH_EXC_INTEGER_DIV)
{ {
signal_fpu_status = fpu_status(mach_fpu_status(float_state)); signal_fpu_status = fpu_status(mach_fpu_status(float_state));
mach_clear_fpu_status(float_state); mach_clear_fpu_status(float_state);
MACH_PROGRAM_COUNTER(thread_state) = (cell)fp_signal_handler_impl; MACH_PROGRAM_COUNTER(thread_state) = (cell)factor::fp_signal_handler_impl;
} }
else else
{ {
SIGNAL_VM_PTR()->signal_number = (exception == EXC_ARITHMETIC ? SIGFPE : SIGABRT); signal_number = (exception == EXC_ARITHMETIC ? SIGFPE : SIGABRT);
MACH_PROGRAM_COUNTER(thread_state) = (cell)misc_signal_handler_impl; MACH_PROGRAM_COUNTER(thread_state) = (cell)factor::misc_signal_handler_impl;
} }
} }
static void call_fault_handler(exception_type_t exception,
exception_data_type_t code,
MACH_EXC_STATE_TYPE *exc_state,
MACH_THREAD_STATE_TYPE *thread_state,
MACH_FLOAT_STATE_TYPE *float_state)
{
SIGNAL_VM_PTR()->call_fault_handler(exception,code,exc_state,thread_state,float_state);
}
/* Handle an exception by invoking the user's fault handler and/or forwarding /* Handle an exception by invoking the user's fault handler and/or forwarding
the duty to the previously installed handlers. */ the duty to the previously installed handlers. */
extern "C" extern "C"

4
vm/vm.hpp
View File

@ -607,6 +607,10 @@ struct factorvm : factorvmdata {
#endif #endif
#ifdef __APPLE__
void call_fault_handler(exception_type_t exception, exception_data_type_t code, MACH_EXC_STATE_TYPE *exc_state, MACH_THREAD_STATE_TYPE *thread_state, MACH_FLOAT_STATE_TYPE *float_state);
#endif
void print_vm_data(); void print_vm_data();
}; };