X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-arch.c;h=f85ed070853336910b58ae6bf1c955a03dbe4a49;hb=0285aa5ff8416027932daa001b84429be2ca559b;hp=a87196288d924917a14f239ddeaff67f86f71913;hpb=26e8f33d8639e4de75e59e3aa30bbd7478d51a69;p=sbcl.git diff --git a/src/runtime/x86-arch.c b/src/runtime/x86-arch.c index a871962..f85ed07 100644 --- a/src/runtime/x86-arch.c +++ b/src/runtime/x86-arch.c @@ -24,11 +24,19 @@ #include "interr.h" #include "breakpoint.h" #include "thread.h" +#include "pseudo-atomic.h" #include "genesis/static-symbols.h" #include "genesis/symbol.h" #define BREAKPOINT_INST 0xcc /* INT3 */ +#define UD2_INST 0x0b0f /* UD2 */ + +#ifndef LISP_FEATURE_UD2_BREAKPOINTS +#define BREAKPOINT_WIDTH 1 +#else +#define BREAKPOINT_WIDTH 2 +#endif unsigned long fast_random_state = 1; @@ -66,7 +74,7 @@ context_eflags_addr(os_context_t *context) #elif defined __OpenBSD__ return &context->sc_eflags; #elif defined LISP_FEATURE_DARWIN - return (int *)(&context->uc_mcontext->ss.eflags); + return (int *)(&context->uc_mcontext->SS.EFLAGS); #elif defined __NetBSD__ return &(context->uc_mcontext.__gregs[_REG_EFL]); #elif defined LISP_FEATURE_WIN32 @@ -105,6 +113,10 @@ void arch_skip_instruction(os_context_t *context) case trap_FunEndBreakpoint: /* not tested */ break; +#ifdef LISP_FEATURE_SB_SAFEPOINT + case trap_GlobalSafepoint: + case trap_CspSafepoint: +#endif case trap_PendingInterrupt: case trap_Halt: case trap_SingleStepAround: @@ -157,8 +169,14 @@ arch_install_breakpoint(void *pc) { unsigned int result = *(unsigned int*)pc; +#ifndef LISP_FEATURE_UD2_BREAKPOINTS *(char*)pc = BREAKPOINT_INST; /* x86 INT3 */ *((char*)pc+1) = trap_Breakpoint; /* Lisp trap code */ +#else + *(char*)pc = UD2_INST & 0xff; + *((char*)pc+1) = UD2_INST >> 8; + *((char*)pc+2) = trap_Breakpoint; +#endif return result; } @@ -168,6 +186,9 @@ arch_remove_breakpoint(void *pc, unsigned int orig_inst) { *((char *)pc) = orig_inst & 0xff; *((char *)pc + 1) = (orig_inst & 0xff00) >> 8; +#if BREAKPOINT_WIDTH > 1 + *((char *)pc + 2) = (orig_inst & 0xff0000) >> 16; +#endif } /* When single stepping, single_stepping holds the original instruction @@ -185,8 +206,7 @@ arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst) unsigned int *pc = (unsigned int*)(*os_context_pc_addr(context)); /* Put the original instruction back. */ - *((char *)pc) = orig_inst & 0xff; - *((char *)pc + 1) = (orig_inst & 0xff00) >> 8; + arch_remove_breakpoint(pc, orig_inst); #ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG /* Install helper instructions for the single step: @@ -221,11 +241,13 @@ restore_breakpoint_from_single_step(os_context_t * context) *context_eflags_addr(context) &= ~0x100; #endif /* Re-install the breakpoint if possible. */ - if (*os_context_pc_addr(context) == (int)single_stepping + 1) { + if (((char *)*os_context_pc_addr(context) > + (char *)single_stepping) && + ((char *)*os_context_pc_addr(context) <= + (char *)single_stepping + BREAKPOINT_WIDTH)) { fprintf(stderr, "warning: couldn't reinstall breakpoint\n"); } else { - *((char *)single_stepping) = BREAKPOINT_INST; /* x86 INT3 */ - *((char *)single_stepping+1) = trap_Breakpoint; + arch_install_breakpoint(single_stepping); } single_stepping = NULL; @@ -235,14 +257,14 @@ restore_breakpoint_from_single_step(os_context_t * context) void arch_handle_breakpoint(os_context_t *context) { - --*os_context_pc_addr(context); + *os_context_pc_addr(context) -= BREAKPOINT_WIDTH; handle_breakpoint(context); } void arch_handle_fun_end_breakpoint(os_context_t *context) { - --*os_context_pc_addr(context); + *os_context_pc_addr(context) -= BREAKPOINT_WIDTH; *os_context_pc_addr(context) = (int)handle_fun_end_breakpoint(context); } @@ -258,31 +280,20 @@ arch_handle_single_step_trap(os_context_t *context, int trap) #ifndef LISP_FEATURE_WIN32 void -sigtrap_handler(int signal, siginfo_t *info, void *void_context) +sigtrap_handler(int signal, siginfo_t *info, os_context_t *context) { - os_context_t *context = (os_context_t*)void_context; unsigned int trap; - if (single_stepping && (signal==SIGTRAP)) { + if (single_stepping) { restore_breakpoint_from_single_step(context); return; } /* This is just for info in case the monitor wants to print an * approximation. */ - current_control_stack_pointer = + access_control_stack_pointer(arch_os_get_current_thread()) = (lispobj *)*os_context_sp_addr(context); - /* FIXME: CMUCL puts the float control restoration code here. - Thus, it seems to me that single-stepping won't restore the - float control. Since SBCL currently doesn't support - 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 */ -#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 @@ -303,16 +314,14 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) } void -sigill_handler(int signal, siginfo_t *siginfo, void *void_context) { - os_context_t *context = (os_context_t*)void_context; - +sigill_handler(int signal, siginfo_t *siginfo, os_context_t *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) { +#if defined(LISP_FEATURE_UD2_BREAKPOINTS) && !defined(LISP_FEATURE_MACH_EXCEPTION_HANDLER) + if (*((unsigned short *)*os_context_pc_addr(context)) == UD2_INST) { *os_context_pc_addr(context) += 2; - return sigtrap_handler(signal, siginfo, void_context); + return sigtrap_handler(signal, siginfo, context); } #endif fake_foreign_function_call(context);