X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbacktrace.c;h=c4840cc7051e9d6a137e2668a1c473480c29c5de;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=18f93a021c4a2fce6a2c98e68b8fa28a5651b9eb;hpb=6e662062162ad5a6f09d6d3a5ec1249520e813a5;p=sbcl.git

diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c
index 18f93a0..c4840cc 100644
--- a/src/runtime/backtrace.c
+++ b/src/runtime/backtrace.c
@@ -21,8 +21,14 @@
 #include "os.h"
 #include "interrupt.h"
 #include "lispregs.h"
+#ifdef LISP_FEATURE_GENCGC
+#include "gencgc-alloc-region.h"
+#endif
+#include "genesis/static-symbols.h"
+#include "genesis/primitive-objects.h"
+#include "thread.h"
 
-#ifndef __i386__
+#ifndef LISP_FEATURE_X86
 
 /* KLUDGE: Sigh ... I know what the call frame looks like and it had
  * better not change. */
@@ -73,7 +79,6 @@ code_pointer(lispobj object)
             break;
         case RETURN_PC_HEADER_WIDETAG:
         case SIMPLE_FUN_HEADER_WIDETAG:
-        case CLOSURE_FUN_HEADER_WIDETAG:
             len = HEADER_LENGTH(header);
             if (len == 0)
                 headerp = NULL;
@@ -90,7 +95,8 @@ code_pointer(lispobj object)
 static boolean
 cs_valid_pointer_p(struct call_frame *pointer)
 {
-    return (((char *) CONTROL_STACK_START <= (char *) pointer) &&
+    struct thread *thread=arch_os_get_current_thread();
+    return (((char *) thread->control_stack_start <= (char *) pointer) &&
 	    ((char *) pointer < (char *) current_control_stack_pointer));
 }
 
@@ -146,6 +152,7 @@ static int
 previous_info(struct call_info *info)
 {
     struct call_frame *this_frame;
+    struct thread *thread=arch_os_get_current_thread();
     int free;
 
     if (!cs_valid_pointer_p(info->frame)) {
@@ -163,10 +170,10 @@ previous_info(struct call_info *info)
 
     if (info->lra == NIL) {
         /* We were interrupted. Find the correct signal context. */
-        free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX)>>2;
+        free = SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)>>2;
         while (free-- > 0) {
 	    os_context_t *context = 
-		lisp_interrupt_contexts[free];
+		thread->interrupt_contexts[free];
             if ((struct call_frame *)(*os_context_register_addr(context,
 								reg_CFP))
 		== info->frame) {
@@ -231,7 +238,7 @@ backtrace(int nframes)
                         symbol = (struct symbol *) object;
                         object = (lispobj *) native_pointer(symbol->name);
                     }
-                    if (widetag_of(*object) == SIMPLE_STRING_WIDETAG) {
+                    if (widetag_of(*object) == SIMPLE_BASE_STRING_WIDETAG) {
                         struct vector *string;
 
                         string = (struct vector *) object;
@@ -263,6 +270,8 @@ backtrace(int nframes)
 
 #else
 
+
+
 void
 backtrace(int nframes)
 {