X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fruntime%2Fx86-arch.c;h=16b669a62280239ed1260854eb8ed4e7c6f3a9c7;hb=d7f6139a91d7d9b0667a597584ae306d958bb2f4;hp=406030fc3f67b4f3bb4948e6ed225e0a289f0545;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git

diff --git a/src/runtime/x86-arch.c b/src/runtime/x86-arch.c
index 406030f..16b669a 100644
--- a/src/runtime/x86-arch.c
+++ b/src/runtime/x86-arch.c
@@ -9,10 +9,6 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
 #include <stdio.h>
 
 #include "runtime.h"
@@ -71,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))++;
@@ -83,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;
 
@@ -102,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)));
 }
 
@@ -148,15 +144,15 @@ arch_remove_breakpoint(void *pc, unsigned long orig_inst)
 
 /* When single stepping, single_stepping holds the original instruction
  * PC location. */
-unsigned int *single_stepping=NULL;
-#ifndef __linux__
+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 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));
 
@@ -164,9 +160,7 @@ arch_do_displaced_inst(os_context_t *context, unsigned long orig_inst)
     *((char *)pc) = orig_inst & 0xff;
     *((char *)pc + 1) = (orig_inst & 0xff00) >> 8;
 
-#ifdef __linux__
-    *context_eflags_addr(context) |= 0x100;
-#else
+#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
     /* Install helper instructions for the single step:
      * pushf; or [esp],0x100; popf. */
     single_step_save1 = *(pc-3);
@@ -175,11 +169,13 @@ arch_do_displaced_inst(os_context_t *context, unsigned long orig_inst)
     *(pc-3) = 0x9c909090;
     *(pc-2) = 0x00240c81;
     *(pc-1) = 0x9d000001;
+#else
+    *context_eflags_addr(context) |= 0x100;
 #endif
 
     single_stepping = (unsigned int*)pc;
 
-#ifndef __linux__
+#ifdef CANNOT_GET_TO_SINGLE_STEP_FLAG
     *os_context_pc_addr(context) = (char *)pc - 9;
 #endif
 }
@@ -191,13 +187,11 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
     os_context_t *context = (os_context_t*)void_context;
     unsigned int trap;
 
-    SHOW("entering sigtrap_handler(..)"); /* REMOVEME */
-
     if (single_stepping && (signal==SIGTRAP))
     {
 	/* fprintf(stderr,"* single step trap %x\n", single_stepping); */
 
-#ifndef __linux__
+#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;
@@ -209,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;
 	}
@@ -221,7 +214,7 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
     /* 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);
 
     /* On entry %eip points just after the INT3 byte and aims at the
      * 'kind' value (eg trap_Cerror). For error-trap and Cerror-trap a
@@ -231,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;
@@ -241,9 +234,8 @@ sigtrap_handler(int signal, siginfo_t *info, void *void_context)
 	 * 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. */
-	SHOW("in trap_Halt case of sigtrap_handler(..)"); /* REMOVEME */
 	fake_foreign_function_call(context);
-	lose("%%primitive halt called; the party is over.");
+	lose("%%PRIMITIVE HALT called; the party is over.");
 
     case trap_Error:
     case trap_Cerror:
@@ -263,19 +255,20 @@ 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;
     }
-    SHOW("leaving sigtrap_handler(..)"); /* REMOVEME */
 }
 
 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()");
 }
 
 /* This is implemented in assembly language and called from C: */
@@ -295,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