X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbacktrace.c;h=429807f7510f49f078ea4a06d90261c72e5ba0ac;hb=5cc68148d1a5f9bacf4eb12e396b680d992fc2c2;hp=78955973f1eb5c23f940b3af358ff3c65e1ad69c;hpb=81cfdf526490d642c73602ebac9bcacb8af644e1;p=sbcl.git

diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c
index 7895597..429807f 100644
--- a/src/runtime/backtrace.c
+++ b/src/runtime/backtrace.c
@@ -15,14 +15,20 @@
 
 #include <stdio.h>
 #include <signal.h>
-#include "runtime.h"
 #include "sbcl.h"
+#include "runtime.h"
 #include "globals.h"
 #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__
+#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
 
 /* KLUDGE: Sigh ... I know what the call frame looks like and it had
  * better not change. */
@@ -66,14 +72,13 @@ code_pointer(lispobj object)
 
     headerp = (lispobj *) native_pointer(object);
     header = *headerp;
-    type = TypeOf(header);
+    type = widetag_of(header);
 
     switch (type) {
-        case type_CodeHeader:
+        case CODE_HEADER_WIDETAG:
             break;
-        case type_ReturnPcHeader:
-        case type_FunctionHeader:
-        case type_ClosureFunctionHeader:
+        case RETURN_PC_HEADER_WIDETAG:
+        case SIMPLE_FUN_HEADER_WIDETAG:
             len = HEADER_LENGTH(header);
             if (len == 0)
                 headerp = NULL;
@@ -90,8 +95,8 @@ code_pointer(lispobj object)
 static boolean
 cs_valid_pointer_p(struct call_frame *pointer)
 {
-  /* lose("stub: hasn't been updated for X86"); */
-    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));
 }
 
@@ -113,8 +118,8 @@ call_info_from_context(struct call_info *info, os_context_t *context)
     unsigned long pc;
 
     info->interrupted = 1;
-    if (LowtagOf(*os_context_register_addr(context, reg_CODE))
-	== type_FunctionPointer) {
+    if (lowtag_of(*os_context_register_addr(context, reg_CODE))
+	== FUN_POINTER_LOWTAG) {
         /* We tried to call a function, but crapped out before $CODE could
          * be fixed up. Probably an undefined function. */
         info->frame =
@@ -147,10 +152,11 @@ 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)) {
-        printf("Bogus callee value (0x%08x).\n", (unsigned long)info->frame);
+        printf("Bogus callee value (0x%08lx).\n", (unsigned long)info->frame);
         return 0;
     }
 
@@ -164,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) {
@@ -201,13 +207,13 @@ backtrace(int nframes)
     call_info_from_lisp_state(&info);
 
     do {
-        printf("<Frame 0x%08x%s, ", (unsigned long) info.frame,
+        printf("<Frame 0x%08lx%s, ", (unsigned long) info.frame,
                 info.interrupted ? " [interrupted]" : "");
 
         if (info.code != (struct code *) 0) {
             lispobj function;
 
-            printf("CODE: 0x%08X, ", (unsigned long) info.code | type_OtherPointer);
+            printf("CODE: 0x%08lX, ", (unsigned long) info.code | OTHER_POINTER_LOWTAG);
 
 #ifndef alpha
             function = info.code->entry_points;
@@ -215,29 +221,30 @@ backtrace(int nframes)
             function = ((struct code *)info.code)->entry_points;
 #endif
             while (function != NIL) {
-                struct function *header;
+                struct simple_fun *header;
                 lispobj name;
 
-                header = (struct function *) native_pointer(function);
+                header = (struct simple_fun *) native_pointer(function);
                 name = header->name;
 
-                if (LowtagOf(name) == type_OtherPointer) {
+                if (lowtag_of(name) == OTHER_POINTER_LOWTAG) {
                     lispobj *object;
 
                     object = (lispobj *) native_pointer(name);
 
-                    if (TypeOf(*object) == type_SymbolHeader) {
+                    if (widetag_of(*object) == SYMBOL_HEADER_WIDETAG) {
                         struct symbol *symbol;
 
                         symbol = (struct symbol *) object;
                         object = (lispobj *) native_pointer(symbol->name);
                     }
-                    if (TypeOf(*object) == type_SimpleString) {
+                    if (widetag_of(*object) == SIMPLE_BASE_STRING_WIDETAG) {
                         struct vector *string;
 
                         string = (struct vector *) object;
                         printf("%s, ", (char *) string->data);
                     } else
+			/* FIXME: broken from (VECTOR NIL) */
                         printf("(Not simple string??\?), ");
                 } else
                     printf("(Not other pointer??\?), ");
@@ -250,7 +257,7 @@ backtrace(int nframes)
             printf("CODE: ???, ");
 
         if (info.lra != NIL)
-            printf("LRA: 0x%08x, ", (unsigned long)info.lra);
+            printf("LRA: 0x%08lx, ", (unsigned long)info.lra);
         else
             printf("<no LRA>, ");
 
@@ -264,6 +271,8 @@ backtrace(int nframes)
 
 #else
 
+
+
 void
 backtrace(int nframes)
 {