X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.c;h=9a835fa979f7932ec9009d3bbbddf84f87add5bf;hb=223a19cb93b3ace1b039f3afb3152723027a1fe9;hp=5b330acfdccc20536bc6ec8f2410c006c4d63b98;hpb=5c4c126f50e6fb8184bf9ae4411d17327c24cb91;p=sbcl.git diff --git a/src/runtime/x86-arch.c b/src/runtime/x86-arch.c index 5b330ac..9a835fa 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 @@ -126,6 +138,13 @@ arch_set_pseudo_atomic_interrupted(os_context_t *context) SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(1), arch_os_get_current_thread()); } + +void +arch_clear_pseudo_atomic_interrupted(os_context_t *context) +{ + SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(0), + arch_os_get_current_thread()); +} /* * This stuff seems to get called for TRACE and debug activity. @@ -190,10 +209,10 @@ arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst) void sigtrap_handler(int signal, siginfo_t *info, void *void_context) { - int code = info->si_code; os_context_t *context = (os_context_t*)void_context; unsigned int trap; +#ifndef LISP_FEATURE_WIN32 if (single_stepping && (signal==SIGTRAP)) { /* fprintf(stderr,"* single step trap %x\n", single_stepping); */ @@ -204,7 +223,7 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) *(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) { @@ -217,6 +236,7 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) single_stepping = NULL; return; } +#endif /* This is just for info in case the monitor wants to print an * approximation. */ @@ -229,15 +249,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 +285,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: @@ -273,7 +306,7 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) default: FSHOW((stderr,"/[C--trap default %d %d %x]\n", - signal, code, context)); + signal, trap, context)); interrupt_handle_now(signal, info, context); break; } @@ -282,8 +315,19 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) static 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) + 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 +345,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 */ +#ifndef LISP_FEATURE_WIN32 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()"); }