X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fmips-arch.c;h=ac3b0ffe498a9e6d9f53858393e775eab95f6566;hb=b5c69cfe906a31ae57bb0f18c67af9d2eaa1dfef;hp=87220217e0a4183e694d6684117dad807c63e218;hpb=3da4a7fbba3015abf8572946dc4481dc2980b943;p=sbcl.git diff --git a/src/runtime/mips-arch.c b/src/runtime/mips-arch.c index 8722021..ac3b0ff 100644 --- a/src/runtime/mips-arch.c +++ b/src/runtime/mips-arch.c @@ -19,14 +19,13 @@ #include "interrupt.h" #include "interr.h" #include "breakpoint.h" -#include "monitor.h" #include "genesis/constants.h" #define INSN_LEN sizeof(unsigned int) void -arch_init() +arch_init(void) { return; } @@ -265,7 +264,18 @@ arch_internal_error_arguments(os_context_t *context) boolean arch_pseudo_atomic_atomic(os_context_t *context) { - return os_context_register(context, reg_ALLOC) & 1; + /* FIXME: this foreign_function_call_active test is dubious at + * best. If a foreign call is made in a pseudo atomic section + * (?) or more likely a pseudo atomic section is in a foreign + * call then an interrupt is executed immediately. Maybe it + * has to do with C code not maintaining pseudo atomic + * properly. MG - 2005-08-10 + * + * The foreign_function_call_active used to live at each call-site + * to arch_pseudo_atomic_atomic, but this seems clearer. + * --NS 2007-05-15 */ + return (!foreign_function_call_active) + && os_context_register(context, reg_ALLOC) & 1; } void @@ -274,6 +284,12 @@ arch_set_pseudo_atomic_interrupted(os_context_t *context) *os_context_register_addr(context, reg_NL4) |= -1LL<<31; } +void +arch_clear_pseudo_atomic_interrupted(os_context_t *context) +{ + *os_context_register_addr(context, reg_NL4) &= ~(-1LL<<31); +} + unsigned int arch_install_breakpoint(void *pc) { @@ -358,55 +374,53 @@ arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst) displaced_after_inst = arch_install_after_breakpoint(next_pc); } -static void -sigtrap_handler(int signal, siginfo_t *info, void *void_context) +void +arch_handle_breakpoint(os_context_t *context) { - os_context_t *context = arch_os_get_context(&void_context); - unsigned int code = (os_context_insn(context) >> 6) & 0xfffff; - - switch (code) { - case trap_Halt: - fake_foreign_function_call(context); - lose("%%primitive halt called; the party is over.\n"); - - case trap_PendingInterrupt: - arch_skip_instruction(context); - interrupt_handle_pending(context); - break; - - case trap_Error: - case trap_Cerror: - interrupt_internal_error(signal, info, context, code == trap_Cerror); - break; + handle_breakpoint(context); +} - case trap_Breakpoint: - handle_breakpoint(signal, info, context); - break; +void +arch_handle_fun_end_breakpoint(os_context_t *context) +{ + *os_context_pc_addr(context) + = (os_context_register_t)(unsigned int) + handle_fun_end_breakpoint(context); +} - case trap_FunEndBreakpoint: - *os_context_pc_addr(context) - = (os_context_register_t)(unsigned int) - handle_fun_end_breakpoint(signal, info, context); - break; +void +arch_handle_after_breakpoint(os_context_t *context) +{ + arch_install_breakpoint(skipped_break_addr); + arch_remove_breakpoint((unsigned int *)os_context_pc(context), + displaced_after_inst); + *os_context_sigmask_addr(context) = orig_sigmask; +} - case trap_AfterBreakpoint: - arch_install_breakpoint(skipped_break_addr); - arch_remove_breakpoint((unsigned int *)os_context_pc(context), - displaced_after_inst); - *os_context_sigmask_addr(context) = orig_sigmask; - break; +void +arch_handle_single_step_trap(os_context_t *context, int trap) +{ + unsigned int code = *((u32 *)(*os_context_pc_addr(context))); + int register_offset = code >> 11 & 0x1f; + handle_single_step_trap(context, trap, register_offset); + arch_skip_instruction(context); +} - case 0x10: - /* Clear the pseudo-atomic flag. */ - *os_context_register_addr(context, reg_NL4) &= ~(-1LL<<31); +static void +sigtrap_handler(int signal, siginfo_t *info, void *void_context) +{ + os_context_t *context = arch_os_get_context(&void_context); + unsigned int code = (os_context_insn(context) >> 6) & 0xfffff; + /* FIXME: This magic number is pseudo-atomic-trap from parms.lisp. + * Genesis should provide the proper #define, but it specialcases + * pseudo-atomic-trap to work around some oddity on SPARC. + * Eventually this should go into handle_trap. */ + if (code==0x10) { + arch_clear_pseudo_atomic_interrupted(context); arch_skip_instruction(context); interrupt_handle_pending(context); - return; - - default: - interrupt_handle_now(signal, info, context); - break; - } + } else + handle_trap(context,code & 0x1f); } #define FIXNUM_VALUE(lispobj) (((int)lispobj) >> N_FIXNUM_TAG_BITS) @@ -471,58 +485,12 @@ sigfpe_handler(int signal, siginfo_t *info, void *void_context) } void -arch_install_interrupt_handlers() +arch_install_interrupt_handlers(void) { undoably_install_low_level_interrupt_handler(SIGTRAP,sigtrap_handler); undoably_install_low_level_interrupt_handler(SIGFPE,sigfpe_handler); } -extern lispobj call_into_lisp(lispobj fun, lispobj *args, int nargs); - -lispobj -funcall0(lispobj function) -{ - lispobj *args = current_control_stack_pointer; - - return call_into_lisp(function, args, 0); -} - -lispobj -funcall1(lispobj function, lispobj arg0) -{ - lispobj *args = current_control_stack_pointer; - - current_control_stack_pointer += 1; - args[0] = arg0; - - return call_into_lisp(function, args, 1); -} - -lispobj -funcall2(lispobj function, lispobj arg0, lispobj arg1) -{ - lispobj *args = current_control_stack_pointer; - - current_control_stack_pointer += 2; - args[0] = arg0; - args[1] = arg1; - - return call_into_lisp(function, args, 2); -} - -lispobj -funcall3(lispobj function, lispobj arg0, lispobj arg1, lispobj arg2) -{ - lispobj *args = current_control_stack_pointer; - - current_control_stack_pointer += 3; - args[0] = arg0; - args[1] = arg1; - args[2] = arg2; - - return call_into_lisp(function, args, 3); -} - #ifdef LISP_FEATURE_LINKAGE_TABLE /* Linkage tables for MIPS