0.6.12.7.flaky1:

[sbcl.git] / src / runtime / x86-arch.c

diff --git a/src/runtime/x86-arch.c b/src/runtime/x86-arch.c
index e599077..16b669a 100644 (file)
--- a/src/runtime/x86-arch.c
+++ b/src/runtime/x86-arch.c
@@ -67,7 +67,7 @@ void arch_skip_instruction(os_context_t *context)
     int vlen;
     int code;
 
-    FSHOW((stderr, "[arch_skip_inst at %x]\n", *os_context_pc_addr(context)));
+    FSHOW((stderr, "/[arch_skip_inst at %x]\n", *os_context_pc_addr(context)));
 
     /* Get and skip the Lisp interrupt code. */
     code = *(char*)(*os_context_pc_addr(context))++;
@@ -79,7 +79,7 @@ void arch_skip_instruction(os_context_t *context)
            vlen = *(char*)(*os_context_pc_addr(context))++;
            /* Skip Lisp error arg data bytes. */
            while (vlen-- > 0) {
-               (char*)(*os_context_pc_addr(context))++;
+               ( (char*)(*os_context_pc_addr(context)) )++;
            }
            break;
 
@@ -98,7 +98,7 @@ void arch_skip_instruction(os_context_t *context)
        }
 
     FSHOW((stderr,
-          "[arch_skip_inst resuming at %x]\n",
+          "/[arch_skip_inst resuming at %x]\n",
           *os_context_pc_addr(context)));
 }
 
@@ -152,7 +152,7 @@ unsigned int  single_step_save3;
 #endif
 
 void
-arch_do_displaced_inst(os_context_t *context, unsigned long orig_inst)
+arch_do_displaced_inst(os_context_t *context, unsigned int orig_inst)
 {
     unsigned int *pc = (unsigned int*)(*os_context_pc_addr(context));
 
@@ -203,7 +203,6 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
        if (*os_context_pc_addr(context) == (int)single_stepping + 1) {
            fprintf(stderr, "warning: couldn't reinstall breakpoint\n");
        } else {
-           char *ptr = (char*)single_stepping;
            *((char *)single_stepping) = BREAKPOINT_INST;       /* x86 INT3 */
            *((char *)single_stepping+1) = trap_Breakpoint;
        }
@@ -225,7 +224,7 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
     switch (trap) {
 
     case trap_PendingInterrupt:
-       FSHOW((stderr, "<trap pending interrupt>\n"));
+       FSHOW((stderr, "/<trap pending interrupt>\n"));
        arch_skip_instruction(context);
        interrupt_handle_pending(context);
        break;
@@ -256,7 +255,7 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
        break;
 
     default:
-       FSHOW((stderr,"[C--trap default %d %d %x]\n",
+       FSHOW((stderr,"/[C--trap default %d %d %x]\n",
               signal, code, context));
        interrupt_handle_now(signal, info, context);
        break;
@@ -266,8 +265,10 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
 void
 arch_install_interrupt_handlers()
 {
+    SHOW("entering arch_install_interrupt_handlers()");
     interrupt_install_low_level_handler(SIGILL , sigtrap_handler);
     interrupt_install_low_level_handler(SIGTRAP, sigtrap_handler);
+    SHOW("returning from arch_install_interrupt_handlers()");
 }
 \f
 /* This is implemented in assembly language and called from C: */
@@ -287,6 +288,7 @@ funcall0(lispobj function)
 {
     lispobj *args = NULL;
 
+    FSHOW((stderr, "/entering funcall0(0x%lx)\n", (long)function));
     return call_into_lisp(function, args, 0);
 }
 lispobj