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

diff --git a/src/runtime/x86-64-arch.c b/src/runtime/x86-64-arch.c
index a0d8276..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"
@@ -101,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;
 
@@ -123,21 +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)
 {
-    SetSymbolValue(PSEUDO_ATOMIC_INTERRUPTED, make_fixnum(0),
-                   arch_os_get_current_thread());
+    struct thread *thread = arch_os_get_current_thread();
+    clear_pseudo_atomic_interrupted(thread);
 }
 
 /*
@@ -162,6 +163,9 @@ 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;
 
 void
 arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst)
@@ -171,7 +175,12 @@ 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;
+
+    *context_eflags_addr(context) |= 0x100;
+
+    single_stepping = pc;
 }
+
 
 void
 sigtrap_handler(int signal, siginfo_t *info, void *void_context)
@@ -180,11 +189,33 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
     os_context_t *context = (os_context_t*)void_context;
     unsigned int trap;
 
+    if (single_stepping && (signal==SIGTRAP))
+    {
+        *context_eflags_addr(context) ^= 0x100;
+
+        /* 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
@@ -227,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));
@@ -239,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