X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-arch.c;h=0401c482f6216440bdc2b1bc6574e7211c956a8a;hb=0f234877047c56ca945fe54e9e77a9cc2c8141cb;hp=5b4f674a2584664456ed7b400172739d9f0068ae;hpb=78fa16bf55be44cc16845be84d98023e83fb14bc;p=sbcl.git diff --git a/src/runtime/x86-64-arch.c b/src/runtime/x86-64-arch.c index 5b4f674..0401c48 100644 --- a/src/runtime/x86-64-arch.c +++ b/src/runtime/x86-64-arch.c @@ -24,18 +24,24 @@ #include "interrupt.h" #include "interr.h" #include "breakpoint.h" -#include "monitor.h" #include "thread.h" #include "genesis/static-symbols.h" #include "genesis/symbol.h" -#define BREAKPOINT_INST 0xcc /* INT3 */ +#define BREAKPOINT_INST 0xcc /* INT3 */ unsigned long fast_random_state = 1; void arch_init(void) {} + +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; +} + /* * hacking signal contexts @@ -44,7 +50,7 @@ void arch_init(void) * 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__ @@ -53,9 +59,11 @@ context_eflags_addr(os_context_t *context) * gregs[], but it's conditional on __USE_GNU and not defined, so * we need to do this nasty absolute index magic number thing * instead. */ - return &context->uc_mcontext.gregs[16]; + 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 @@ -73,38 +81,40 @@ void arch_skip_instruction(os_context_t *context) int vlen; long code; - + /* Get and skip the Lisp interrupt code. */ code = *(char*)(*os_context_pc_addr(context))++; switch (code) - { - case trap_Error: - case trap_Cerror: - /* Lisp error arg vector length */ - vlen = *(char*)(*os_context_pc_addr(context))++; - /* Skip Lisp error arg data bytes. */ - while (vlen-- > 0) { - ( (char*)(*os_context_pc_addr(context)) )++; - } - break; - - case trap_Breakpoint: /* not tested */ - case trap_FunEndBreakpoint: /* not tested */ - break; - - case trap_PendingInterrupt: - case trap_Halt: - /* only needed to skip the Code */ - break; - - default: - fprintf(stderr,"[arch_skip_inst invalid code %d\n]\n",code); - break; - } + { + case trap_Error: + case trap_Cerror: + /* Lisp error arg vector length */ + vlen = *(char*)(*os_context_pc_addr(context))++; + /* Skip Lisp error arg data bytes. */ + while (vlen-- > 0) { + ++*os_context_pc_addr(context); + } + break; + + case trap_Breakpoint: /* not tested */ + case trap_FunEndBreakpoint: /* not tested */ + break; + + case trap_PendingInterrupt: + case trap_Halt: + case trap_SingleStepAround: + case trap_SingleStepBefore: + /* only needed to skip the Code */ + break; + + default: + fprintf(stderr,"[arch_skip_inst invalid code %ld\n]\n",code); + break; + } FSHOW((stderr, - "/[arch_skip_inst resuming at %x]\n", - *os_context_pc_addr(context))); + "/[arch_skip_inst resuming at %x]\n", + *os_context_pc_addr(context))); } unsigned char * @@ -116,33 +126,40 @@ 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 */ + *(char*)pc = BREAKPOINT_INST; /* x86 INT3 */ + *((char*)pc+1) = trap_Breakpoint; /* Lisp trap code */ return result; } 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; @@ -150,17 +167,17 @@ arch_remove_breakpoint(void *pc, unsigned long orig_inst) /* When single stepping, single_stepping holds the original instruction * PC location. */ -unsigned long *single_stepping = NULL; +unsigned int *single_stepping = NULL; #ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG -unsigned long single_step_save1; -unsigned long single_step_save2; -unsigned long single_step_save3; +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) { - unsigned long *pc = (unsigned long*)(*os_context_pc_addr(context)); + unsigned int *pc = (unsigned int*)(*os_context_pc_addr(context)); /* Put the original instruction back. */ *((char *)pc) = orig_inst & 0xff; @@ -179,12 +196,13 @@ 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; + *os_context_pc_addr(context) = (os_context_register_t)((char *)pc - 9); #endif } + void sigtrap_handler(int signal, siginfo_t *info, void *void_context) @@ -192,36 +210,34 @@ 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; - sigset_t ss; if (single_stepping && (signal==SIGTRAP)) { - /* 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; - } - - single_stepping = NULL; - return; + /* Re-install the breakpoint if possible. */ + 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 */ + *((char *)single_stepping+1) = trap_Breakpoint; + } + + single_stepping = NULL; + return; } /* This is just for info in case the monitor wants to print an * approximation. */ current_control_stack_pointer = - (lispobj *)*os_context_sp_addr(context); + (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 @@ -229,7 +245,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 @@ -241,54 +257,120 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) switch (trap) { case trap_PendingInterrupt: - FSHOW((stderr, "/\n")); - arch_skip_instruction(context); - sigemptyset(&ss); - sigaddset(&ss,SIGTRAP); - sigprocmask(SIG_UNBLOCK,&ss,0); - interrupt_handle_pending(context); - break; + 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."); + /* 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; + FSHOW((stderr, "\n", trap)); + interrupt_internal_error(signal, info, context, trap==trap_Cerror); + break; case trap_Breakpoint: - (char*)(*os_context_pc_addr(context)) -= 1; - handle_breakpoint(signal, info, context); - break; + --*os_context_pc_addr(context); + handle_breakpoint(signal, info, context); + break; case trap_FunEndBreakpoint: - (char*)(*os_context_pc_addr(context)) -= 1; - *os_context_pc_addr(context) = - (int)handle_fun_end_breakpoint(signal, info, context); - break; + --*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; + FSHOW((stderr,"/[C--trap default %d %d %x]\n", + signal, code, 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_function_call fell through"); } +#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() { @@ -304,8 +386,14 @@ 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()"); } @@ -362,7 +450,7 @@ funcall3(lispobj function, lispobj arg0, lispobj arg1, lispobj arg2) * things. */ -void +void arch_write_linkage_table_jmp(char * reloc, void * fun) { unsigned long addr = (unsigned long) fun; @@ -376,8 +464,8 @@ arch_write_linkage_table_jmp(char * reloc, void * fun) *reloc++ = 0x00; /* ... */ for (i = 0; i < 8; i++) { - *reloc++ = addr & 0xff; - addr >>= 8; + *reloc++ = addr & 0xff; + addr >>= 8; } /* write a nop for good measure. */ @@ -391,3 +479,57 @@ arch_write_linkage_table_ref(void * reloc, void * data) } #endif + +/* These setup and check *both* the sse2 and x87 FPUs. While lisp code + only uses the sse2 FPU, other code (such as libc) may use the x87 FPU. + */ + +unsigned int +arch_get_fp_modes() +{ + unsigned int temp; + unsigned int result; + /* return the x87 exception flags ored in with the sse2 + * control+status flags */ + asm ("fnstsw %0" : "=m" (temp)); + result = temp; + result &= 0x3F; + asm ("stmxcsr %0" : "=m" (temp)); + result |= temp; + /* flip exception mask bits */ + return result ^ (0x3F << 7); +} + +struct fpenv +{ + unsigned short cw; + unsigned short unused1; + unsigned short sw; + unsigned short unused2; + unsigned int other_regs[5]; +}; + +void +arch_set_fp_modes(unsigned int mxcsr) +{ + struct fpenv f_env; + unsigned int temp; + + /* turn trap enable bits into exception mask */ + mxcsr ^= 0x3F << 7; + + /* set x87 modes */ + asm ("fnstenv %0" : "=m" (f_env)); + /* set control word: always long double precision + * get traps and rounding from mxcsr word */ + f_env.cw = 0x300 | ((mxcsr >> 7) & 0x3F) | (((mxcsr >> 13) & 0x3) << 10); + /* set status word: only override exception flags, from mxcsr */ + f_env.sw &= ~0x3F; + f_env.sw |= (mxcsr & 0x3F); + + asm ("fldenv %0" : : "m" (f_env)); + + /* now, simply, load up the mxcsr register */ + temp = mxcsr; + asm ("ldmxcsr %0" : : "m" (temp)); +}