X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fx86-arch.c;h=1cb0de35cf91d2bdade567eac172e24742b47a6f;hb=f35f14479a64dd97f93d2d91dc154bdc141d6842;hp=1e84fd7ebe24b5b3022ff14820f7ce27b68225f6;hpb=b27fb452f72190637b03a6ef2e1333091da42a98;p=sbcl.git diff --git a/src/runtime/x86-arch.c b/src/runtime/x86-arch.c index 1e84fd7..1cb0de3 100644 --- a/src/runtime/x86-arch.c +++ b/src/runtime/x86-arch.c @@ -36,11 +36,13 @@ 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 /* @@ -64,8 +66,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 @@ -163,14 +169,6 @@ arch_remove_breakpoint(void *pc, unsigned int orig_inst) *((char *)pc + 1) = (orig_inst & 0xff00) >> 8; } -/* 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) @@ -180,69 +178,20 @@ arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst) /* Put the original instruction back. */ *((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) = (char *)pc - 9; -#endif } + 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; - 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; -#else - *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; - } - /* This is just for info in case the monitor wants to print an * approximation. */ current_control_stack_pointer = (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 */ #ifdef LISP_FEATURE_LINUX os_restore_fp_control(context); #endif @@ -252,6 +201,7 @@ 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)); + /* FSHOW((stderr, "/\n", trap, *os_context_pc_addr(context))); */ switch (trap) { case trap_PendingInterrupt: @@ -270,8 +220,8 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context) 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: @@ -287,7 +237,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; } @@ -296,6 +246,14 @@ 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; + +#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(); } @@ -315,8 +273,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()"); }