X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-arch.c;h=84082a0f83930959fa8ecc6fe6cd42cad32854d4;hb=90c2b0563695904419451b6172efcf9c7008ad8b;hp=6d7046ccb0d8fdf2978ab9c8cd6111fed3e492b0;hpb=b66385e2031fc2cac17dd129df0af400beb48a22;p=sbcl.git diff --git a/src/runtime/x86-64-arch.c b/src/runtime/x86-64-arch.c index 6d7046c..84082a0 100644 --- a/src/runtime/x86-64-arch.c +++ b/src/runtime/x86-64-arch.c @@ -50,7 +50,7 @@ arch_get_bad_addr(int sig, siginfo_t *code, os_context_t *context) * want to get to, and on OS, which determines how we get to it.) */ -int * +os_context_register_t * context_eflags_addr(os_context_t *context) { #if defined __linux__ @@ -61,7 +61,9 @@ context_eflags_addr(os_context_t *context) * instead. */ return &context->uc_mcontext.gregs[17]; #elif defined __FreeBSD__ - return &context->uc_mcontext.mc_eflags; + return &context->uc_mcontext.mc_rflags; +#elif defined LISP_FEATURE_DARWIN + return &context->uc_mcontext->ss.rflags; #elif defined __OpenBSD__ return &context->sc_eflags; #else @@ -106,7 +108,7 @@ void arch_skip_instruction(os_context_t *context) break; default: - fprintf(stderr,"[arch_skip_inst invalid code %d\n]\n",code); + fprintf(stderr,"[arch_skip_inst invalid code %ld\n]\n",code); break; } @@ -166,6 +168,11 @@ arch_remove_breakpoint(void *pc, unsigned int orig_inst) /* When single stepping, single_stepping holds the original instruction * PC location. */ unsigned int *single_stepping = NULL; +#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG +unsigned int single_step_save1; +unsigned int single_step_save2; +unsigned int single_step_save3; +#endif void arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst) @@ -176,9 +183,48 @@ arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst) *((char *)pc) = orig_inst & 0xff; *((char *)pc + 1) = (orig_inst & 0xff00) >> 8; +#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG + /* Install helper instructions for the single step: + * pushf; or [esp],0x100; popf. */ + single_step_save1 = *(pc-3); + single_step_save2 = *(pc-2); + single_step_save3 = *(pc-1); + *(pc-3) = 0x9c909090; + *(pc-2) = 0x00240c81; + *(pc-1) = 0x9d000001; +#else *context_eflags_addr(context) |= 0x100; +#endif single_stepping = pc; + +#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG + *os_context_pc_addr(context) = (os_context_register_t)((char *)pc - 9); +#endif +} + +void +arch_handle_breakpoint(os_context_t *context) +{ + --*os_context_pc_addr(context); + handle_breakpoint(context); +} + +void +arch_handle_fun_end_breakpoint(os_context_t *context) +{ + --*os_context_pc_addr(context); + *os_context_pc_addr(context) = + (unsigned long)handle_fun_end_breakpoint(context); +} + +void +arch_handle_single_step_trap(os_context_t *context, int trap) +{ + arch_skip_instruction(context); + /* On x86-64 the fdefn / function is always in RAX, so we pass + * 0 as the register_offset. */ + handle_single_step_trap(context, trap, 0); } @@ -191,10 +237,17 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) if (single_stepping && (signal==SIGTRAP)) { +#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; +#else *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 + 1) { fprintf(stderr, "warning: couldn't reinstall breakpoint\n"); } else { *((char *)single_stepping) = BREAKPOINT_INST; /* x86 INT3 */ @@ -216,7 +269,7 @@ 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 @@ -225,62 +278,78 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) * number of bytes will follow, the first is the length of the byte * arguments to follow. */ trap = *(unsigned char *)(*os_context_pc_addr(context)); - switch (trap) { - - case trap_PendingInterrupt: - FSHOW((stderr, "/\n")); - arch_skip_instruction(context); - interrupt_handle_pending(context); - break; - - case trap_Halt: - /* Note: the old CMU CL code tried to save FPU state - * here, and restore it after we do our thing, but there - * 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.\n"); - - case trap_Error: - case trap_Cerror: - FSHOW((stderr, "\n", code)); - interrupt_internal_error(signal, info, context, code==trap_Cerror); - break; - - case trap_Breakpoint: - --*os_context_pc_addr(context); - handle_breakpoint(signal, info, context); - break; - - case trap_FunEndBreakpoint: - --*os_context_pc_addr(context); - *os_context_pc_addr(context) = - (unsigned long)handle_fun_end_breakpoint(signal, info, context); - break; - - case trap_SingleStepAround: - case trap_SingleStepBefore: - arch_skip_instruction(context); - /* On x86-64 the fdefn / function is always in RAX, 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)); - interrupt_handle_now(signal, info, context); - break; - } + + handle_trap(context, trap); } -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); - lose("fake_foreign_function_call fell through"); + lose("Unhandled SIGILL."); } +#ifdef X86_64_SIGFPE_FIXUP +#define MXCSR_IE (0x01) /* Invalid Operation */ +#define MXCSR_DE (0x02) /* Denormal */ +#define MXCSR_ZE (0x04) /* Devide-by-Zero */ +#define MXCSR_OE (0x08) /* Overflow */ +#define MXCSR_UE (0x10) /* Underflow */ +#define MXCSR_PE (0x20) /* Precision */ + +static inline int +mxcsr_to_code(unsigned int mxcsr) +{ + /* Extract unmasked exception bits. */ + mxcsr &= ~(mxcsr >> 7) & 0x3F; + + /* This order is defined at "Intel 64 and IA-32 Architectures + * Software Developerfs Manual" Volume 1: "Basic Architecture", + * 4.9.2 "Floating-Point Exception Priority". */ + if (mxcsr & MXCSR_IE) + return FPE_FLTINV; + else if (mxcsr & MXCSR_ZE) + return FPE_FLTDIV; + else if (mxcsr & MXCSR_DE) + return FPE_FLTUND; + else if (mxcsr & MXCSR_OE) + return FPE_FLTOVF; + else if (mxcsr & MXCSR_UE) + return FPE_FLTUND; + else if (mxcsr & MXCSR_PE) + return FPE_FLTRES; + + return 0; +} + +static void +sigfpe_handler(int signal, siginfo_t *siginfo, void *void_context) +{ + os_context_t *context = arch_os_get_context(&void_context); + unsigned int *mxcsr = arch_os_context_mxcsr_addr(context); + + if (siginfo->si_code == 0) { /* XMM exception */ + siginfo->si_code = mxcsr_to_code(*mxcsr); + + /* Clear sticky exception flag. */ + *mxcsr &= ~0x3F; + } + + interrupt_handle_now(signal, siginfo, context); +} +#endif + void arch_install_interrupt_handlers() { @@ -296,59 +365,18 @@ 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_MACH_EXCEPTION_HANDLER) undoably_install_low_level_interrupt_handler(SIGILL , sigill_handler); undoably_install_low_level_interrupt_handler(SIGTRAP, sigtrap_handler); +#endif + +#ifdef X86_64_SIGFPE_FIXUP + undoably_install_low_level_interrupt_handler(SIGFPE, sigfpe_handler); +#endif SHOW("returning from arch_install_interrupt_handlers()"); } -/* This is implemented in assembly language and called from C: */ -extern lispobj -call_into_lisp(lispobj fun, lispobj *args, int nargs); - -/* These functions are an interface to the Lisp call-in facility. - * Since this is C we can know nothing about the calling environment. - * The control stack might be the C stack if called from the monitor - * or the Lisp stack if called as a result of an interrupt or maybe - * even a separate stack. The args are most likely on that stack but - * could be in registers depending on what the compiler likes. So we - * copy the args into a portable vector and let the assembly language - * call-in function figure it out. */ - -lispobj -funcall0(lispobj function) -{ - lispobj *args = NULL; - - FSHOW((stderr, "/entering funcall0(0x%lx)\n", (long)function)); - return call_into_lisp(function, args, 0); -} -lispobj -funcall1(lispobj function, lispobj arg0) -{ - lispobj args[1]; - args[0] = arg0; - return call_into_lisp(function, args, 1); -} -lispobj -funcall2(lispobj function, lispobj arg0, lispobj arg1) -{ - lispobj args[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[3]; - args[0] = arg0; - args[1] = arg1; - args[2] = arg2; - return call_into_lisp(function, args, 3); -} - - #ifdef LISP_FEATURE_LINKAGE_TABLE /* FIXME: It might be cleaner to generate these from the lisp side of * things.