X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fx86-64-arch.c;h=6d7046ccb0d8fdf2978ab9c8cd6111fed3e492b0;hb=2cb068e245e00505076e9c325424df2a1260bfb1;hp=5f1006057e2affa48d5c3f5019a63fcebf04f2d3;hpb=5c4c126f50e6fb8184bf9ae4411d17327c24cb91;p=sbcl.git

diff --git a/src/runtime/x86-64-arch.c b/src/runtime/x86-64-arch.c
index 5f10060..6d7046c 100644
--- a/src/runtime/x86-64-arch.c
+++ b/src/runtime/x86-64-arch.c
@@ -24,7 +24,6 @@
 #include "interrupt.h"
 #include "interr.h"
 #include "breakpoint.h"
-#include "monitor.h"
 #include "thread.h"
 
 #include "genesis/static-symbols.h"
@@ -36,6 +35,13 @@ 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
@@ -94,6 +100,8 @@ void arch_skip_instruction(os_context_t *context)
 
         case trap_PendingInterrupt:
         case trap_Halt:
+        case trap_SingleStepAround:
+        case trap_SingleStepBefore:
             /* only needed to skip the Code */
             break;
 
@@ -116,14 +124,21 @@ 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);
 }
 
 /*
@@ -151,11 +166,6 @@ 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 long  single_step_save1;
-unsigned long  single_step_save2;
-unsigned long  single_step_save3;
-#endif
 
 void
 arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst)
@@ -166,25 +176,11 @@ 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) = (char *)pc - 9;
-#endif
 }
+
 
 void
 sigtrap_handler(int signal, siginfo_t *info, void *void_context)
@@ -195,16 +191,8 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
 
     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");
@@ -251,7 +239,7 @@ 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:
@@ -270,6 +258,14 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_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));
@@ -282,7 +278,7 @@ static void
 sigill_handler(int signal, siginfo_t *siginfo, void *void_context) {
     os_context_t *context = (os_context_t*)void_context;
     fake_foreign_function_call(context);
-    monitor_or_something();
+    lose("fake_foreign_function_call fell through");
 }
 
 void