X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Finterr.c;h=5734ac1183b85734d7d2cfa8a3b5de41ca162061;hb=ded744f74ab2f1a97679ad4f91e0eb8d995daef2;hp=13338817e9f461f752a04dcd93cd03bc02262084;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git

diff --git a/src/runtime/interr.c b/src/runtime/interr.c
index 1333881..5734ac1 100644
--- a/src/runtime/interr.c
+++ b/src/runtime/interr.c
@@ -15,15 +15,19 @@
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <stdlib.h>
 
+#include "sbcl.h"
 #include "arch.h"
 #include "signal.h"
 
 #include "runtime.h"
-#include "sbcl.h"
 #include "interr.h"
 #include "print.h"
 #include "lispregs.h"
+#include "genesis/static-symbols.h"
+#include "genesis/vector.h"
+#include "thread.h"
 
 /* the way that we shut down the system on a fatal error */
 
@@ -39,11 +43,20 @@ set_lossage_handler(void handler(void))
     lossage_handler = handler;
 }
 
-void
+never_returns
 lose(char *fmt, ...)
 {
     va_list ap;
-    fprintf(stderr, "fatal error encountered in SBCL runtime system");
+    fprintf(stderr, "fatal error encountered in SBCL pid %d",getpid());
+    /* freeze all the other threads, so we have a chance of debugging them 
+     */
+    if(all_threads) {
+	struct thread *th1,*th=arch_os_get_current_thread();
+	for_each_thread(th1) {
+	    if(th1!=th) kill(th1->pid,SIGSTOP);
+	}
+    }
+
     if (fmt) {
 	fprintf(stderr, ":\n");
 	va_start(ap, fmt);
@@ -53,6 +66,8 @@ lose(char *fmt, ...)
     fprintf(stderr, "\n");
     fflush(stderr);
     lossage_handler();
+    fprintf(stderr, "Argh! lossage_handler() returned, total confusion..\n");
+    exit(1);
 }
 
 /* internal error handler for when the Lisp error system doesn't exist
@@ -99,7 +114,7 @@ describe_internal_error(os_context_t *context)
 
 	case sc_BaseCharReg:
 	    ch = *os_context_register_addr(context, offset);
-#ifdef __i386__
+#ifdef LISP_FEATURE_X86
 	    if (offset&1)
 		ch = ch>>8;
 	    ch = ch & 0xff;
@@ -150,6 +165,16 @@ describe_internal_error(os_context_t *context)
 
 lispobj debug_print(lispobj string)
 {
-    fprintf(stderr, "%s\n", (char *)(((struct vector *)PTR(string))->data));
+    /* This is a kludge.  It's not actually safe - in general - to use 
+       %primitive print on the alpha, because it skips half of the
+       number stack setup that should usually be done on a function call,
+       so the called routine (i.e. this one) ends up being able to overwrite
+       local variables in the caller.  Rather than fix this everywhere
+       that %primitive print is used (it's only a debugging aid anyway)
+       we just put guarantee our safety by putting an unused buffer on
+       the stack before doing anything else here */
+    char untouched[32]; /* GCC warns about not using this, but that's the point.. */
+    fprintf(stderr, "%s\n", 
+	    (char *)(((struct vector *)native_pointer(string))->data),untouched);
     return NIL;
 }