X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.c;h=c32aed7f723aa7e3ec7e16d9456005195a1ef2f6;hb=8e9908b6f79b7bb52a281cfcbf0712d4b914f3cf;hp=8fba683461e041ea12a4b81dfda5d4e1db670acd;hpb=40e3ba03d0e1b824e4d1ae75d74246b975b70964;p=sbcl.git diff --git a/src/runtime/x86-arch.c b/src/runtime/x86-arch.c index 8fba683..c32aed7 100644 --- a/src/runtime/x86-arch.c +++ b/src/runtime/x86-arch.c @@ -23,7 +23,6 @@ #include "interrupt.h" #include "interr.h" #include "breakpoint.h" -#include "monitor.h" #include "thread.h" #include "genesis/static-symbols.h" @@ -35,6 +34,15 @@ unsigned long fast_random_state = 1; void arch_init(void) {} + +#ifndef LISP_FEATURE_WIN32 +os_vm_address_t +arch_get_bad_addr(int sig, siginfo_t *code, os_context_t *context) +{ + return (os_vm_address_t)code->si_addr; +} +#endif + /* * hacking signal contexts @@ -57,8 +65,12 @@ context_eflags_addr(os_context_t *context) return &context->uc_mcontext.mc_eflags; #elif defined __OpenBSD__ return &context->sc_eflags; +#elif defined LISP_FEATURE_DARWIN + return &context->uc_mcontext->ss.eflags; #elif defined __NetBSD__ return &(context->uc_mcontext.__gregs[_REG_EFL]); +#elif defined LISP_FEATURE_WIN32 + return (int *)&context->EFlags; #else #error unsupported OS #endif @@ -95,6 +107,8 @@ void arch_skip_instruction(os_context_t *context) case trap_PendingInterrupt: case trap_Halt: + case trap_SingleStepAround: + case trap_SingleStepBefore: /* only needed to skip the Code */ break; @@ -117,24 +131,31 @@ arch_internal_error_arguments(os_context_t *context) boolean arch_pseudo_atomic_atomic(os_context_t *context) { - return SymbolValue(PSEUDO_ATOMIC_ATOMIC,arch_os_get_current_thread()); + return get_pseudo_atomic_atomic(arch_os_get_current_thread()); } void arch_set_pseudo_atomic_interrupted(os_context_t *context) { - SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(1), - arch_os_get_current_thread()); + struct thread *thread = arch_os_get_current_thread(); + set_pseudo_atomic_interrupted(thread); +} + +void +arch_clear_pseudo_atomic_interrupted(os_context_t *context) +{ + struct thread *thread = arch_os_get_current_thread(); + clear_pseudo_atomic_interrupted(thread); } /* * This stuff seems to get called for TRACE and debug activity. */ -unsigned long +unsigned int arch_install_breakpoint(void *pc) { - unsigned long result = *(unsigned long*)pc; + unsigned int result = *(unsigned int*)pc; *(char*)pc = BREAKPOINT_INST; /* x86 INT3 */ *((char*)pc+1) = trap_Breakpoint; /* Lisp trap code */ @@ -143,7 +164,7 @@ arch_install_breakpoint(void *pc) } void -arch_remove_breakpoint(void *pc, unsigned long orig_inst) +arch_remove_breakpoint(void *pc, unsigned int orig_inst) { *((char *)pc) = orig_inst & 0xff; *((char *)pc + 1) = (orig_inst & 0xff00) >> 8; @@ -180,7 +201,7 @@ arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst) *context_eflags_addr(context) |= 0x100; #endif - single_stepping = (unsigned int*)pc; + single_stepping = pc; #ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG *os_context_pc_addr(context) = (char *)pc - 9; @@ -188,35 +209,42 @@ arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst) } void -sigtrap_handler(int signal, siginfo_t *info, void *void_context) +restore_breakpoint_from_single_step(os_context_t * context) { - int code = info->si_code; - os_context_t *context = (os_context_t*)void_context; - unsigned int trap; - - if (single_stepping && (signal==SIGTRAP)) - { - /* fprintf(stderr,"* single step trap %x\n", single_stepping); */ - + /* fprintf(stderr,"* single step trap %x\n", single_stepping); */ #ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG - /* Un-install single step helper instructions. */ - *(single_stepping-3) = single_step_save1; - *(single_stepping-2) = single_step_save2; - *(single_stepping-1) = single_step_save3; + /* Un-install single step helper instructions. */ + *(single_stepping-3) = single_step_save1; + *(single_stepping-2) = single_step_save2; + *(single_stepping-1) = single_step_save3; #else - *context_eflags_addr(context) ^= 0x100; + *context_eflags_addr(context) &= ~0x100; #endif - /* Re-install the breakpoint if possible. */ - if (*os_context_pc_addr(context) == (int)single_stepping + 1) { - fprintf(stderr, "warning: couldn't reinstall breakpoint\n"); - } else { - *((char *)single_stepping) = BREAKPOINT_INST; /* x86 INT3 */ - *((char *)single_stepping+1) = trap_Breakpoint; - } + /* Re-install the breakpoint if possible. */ + if (*os_context_pc_addr(context) == (int)single_stepping + 1) { + fprintf(stderr, "warning: couldn't reinstall breakpoint\n"); + } else { + *((char *)single_stepping) = BREAKPOINT_INST; /* x86 INT3 */ + *((char *)single_stepping+1) = trap_Breakpoint; + } - single_stepping = NULL; + single_stepping = NULL; + return; +} + +void +sigtrap_handler(int signal, siginfo_t *info, void *void_context) +{ + os_context_t *context = (os_context_t*)void_context; + unsigned int trap; + +#ifndef LISP_FEATURE_WIN32 + /* On Windows this is done in the SE handler. */ + if (single_stepping && (signal==SIGTRAP)) { + restore_breakpoint_from_single_step(context); return; } +#endif /* This is just for info in case the monitor wants to print an * approximation. */ @@ -229,15 +257,28 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) single-stepping (as far as I can tell) this is somewhat moot, but it might be worth either moving this code up or deleting the single-stepping code entirely. -- CSR, 2002-07-15 */ -#ifdef LISP_FEATURE_LINUX +#if defined(LISP_FEATURE_LINUX) || defined(RESTORE_FP_CONTROL_FROM_CONTEXT) os_restore_fp_control(context); #endif + +#ifdef LISP_FEATURE_SUNOS + /* For some reason the breakpoints that :ENCAPSULATE NIL tracing sets up + * cause a trace trap (i.e. processor single-stepping trap) on the following + * instruction on Solaris 10/x86. -- JES, 2006-04-07 + */ + if (info->si_code == TRAP_TRACE) { + lose("foo"); + return; + } +#endif + /* On entry %eip points just after the INT3 byte and aims at the * 'kind' value (eg trap_Cerror). For error-trap and Cerror-trap a * number of bytes will follow, the first is the length of the byte * arguments to follow. */ trap = *(unsigned char *)(*os_context_pc_addr(context)); + /* FSHOW((stderr, "/\n", trap, *os_context_pc_addr(context))); */ switch (trap) { case trap_PendingInterrupt: @@ -252,12 +293,12 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) * seems to be no point in doing that, since we're just * going to lose(..) anyway. */ fake_foreign_function_call(context); - lose("%%PRIMITIVE HALT called; the party is over."); + lose("%%PRIMITIVE HALT called; the party is over.\n"); case trap_Error: case trap_Cerror: - FSHOW((stderr, "\n", code)); - interrupt_internal_error(signal, info, context, code==trap_Cerror); + FSHOW((stderr, "\n", trap)); + interrupt_internal_error(signal, info, context, trap==trap_Cerror); break; case trap_Breakpoint: @@ -271,19 +312,38 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) (int)handle_fun_end_breakpoint(signal, info, context); break; + case trap_SingleStepAround: + case trap_SingleStepBefore: + arch_skip_instruction(context); + /* On x86 the fdefn / function is always in EAX, so we pass 0 + * as the register_offset. */ + handle_single_step_trap(context, trap, 0); + break; + default: FSHOW((stderr,"/[C--trap default %d %d %x]\n", - signal, code, context)); + signal, trap, context)); interrupt_handle_now(signal, info, context); break; } } -static void +void sigill_handler(int signal, siginfo_t *siginfo, void *void_context) { os_context_t *context = (os_context_t*)void_context; + + /* Triggering SIGTRAP using int3 is unreliable on OS X/x86, so + * we need to use illegal instructions for traps. + */ +#if defined(LISP_FEATURE_DARWIN) && !defined(LISP_FEATURE_MACH_EXCEPTION_HANDLER) + if (*((unsigned short *)*os_context_pc_addr(context)) == 0x0b0f) { + *os_context_pc_addr(context) += 2; + return sigtrap_handler(signal, siginfo, void_context); + } +#endif + fake_foreign_function_call(context); - monitor_or_something(); + lose("fake_foreign_call fell through"); } void @@ -301,8 +361,10 @@ arch_install_interrupt_handlers() * OS I haven't tested on?) and we have to go back to the old CMU * CL way, I hope there will at least be a comment to explain * why.. -- WHN 2001-06-07 */ +#if !defined(LISP_FEATURE_WIN32) && !defined(LISP_FEATURE_MACH_EXCEPTION_HANDLER) undoably_install_low_level_interrupt_handler(SIGILL , sigill_handler); undoably_install_low_level_interrupt_handler(SIGTRAP, sigtrap_handler); +#endif SHOW("returning from arch_install_interrupt_handlers()"); }