X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fbacktrace.c;h=98189b91a883d27d892753467b1976db71a525eb;hb=cc32d78e47dfcad7634e26e69797094ed683a888;hp=a0914cbf702e93b3f245eb123eccee9e626f0d6b;hpb=686a9686a8a9158faa7c60b90bee7bea5a9bb76d;p=sbcl.git

diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c
index a0914cb..98189b9 100644
--- a/src/runtime/backtrace.c
+++ b/src/runtime/backtrace.c
@@ -34,9 +34,11 @@
 #include "thread.h"
 
 #ifdef LISP_FEATURE_OS_PROVIDES_DLADDR
+# ifndef __USE_GNU
 /* __USE_GNU needed if we want dladdr() and Dl_Info from glibc. */
-#define __USE_GNU
-#include "dlfcn.h"
+# define __USE_GNU
+# endif
+# include "dlfcn.h"
 #endif
 
 #if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
@@ -165,7 +167,7 @@ previous_info(struct call_info *info)
 {
     struct call_frame *this_frame;
     struct thread *thread=arch_os_get_current_thread();
-    int free;
+    int free_ici;
 
     if (!cs_valid_pointer_p(info->frame)) {
         printf("Bogus callee value (0x%08lx).\n", (unsigned long)info->frame);
@@ -182,10 +184,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,thread)>>2;
-        while (free-- > 0) {
+        free_ici = fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread));
+        while (free_ici-- > 0) {
             os_context_t *context =
-                thread->interrupt_contexts[free];
+                thread->interrupt_contexts[free_ici];
             if ((struct call_frame *)(unsigned long)
                     (*os_context_register_addr(context, reg_CFP))
                 == info->frame) {
@@ -284,15 +286,30 @@ backtrace(int nframes)
 #else
 
 static int
+altstack_pointer_p (void *p) {
+#ifndef LISP_FEATURE_WIN32
+    void* stack_start = arch_os_get_current_thread() + dynamic_values_bytes;
+    void* stack_end = stack_start + 32*SIGSTKSZ;
+
+    return (p > stack_start && p <= stack_end);
+#else
+    /* Win32 doesn't do altstack */
+    return 0;
+#endif
+}
+
+static int
 stack_pointer_p (void *p)
 {
   /* we are using sizeof(long) here, because that is the right value on both
    * x86 and x86-64.  (But note that false positives would not cause much harm
    * given the heuristical nature of x86_call_context.) */
   unsigned long stack_alignment = sizeof(long);
-  return (p < (void *) arch_os_get_current_thread()->control_stack_end
-          && p > (void *) &p
-          && (((unsigned long) p) & (stack_alignment-1)) == 0);
+
+  return (altstack_pointer_p(p)
+          || (p < (void *) arch_os_get_current_thread()->control_stack_end
+              && (p > (void *) &p || altstack_pointer_p(&p))
+              && (((unsigned long) p) & (stack_alignment-1)) == 0));
 }
 
 static int
@@ -300,7 +317,7 @@ ra_pointer_p (void *ra)
 {
   /* the check against 4096 is still a mystery to everyone interviewed about
    * it, but recent changes to sb-sprof seem to suggest that such values
-   * do occur sometimes. */ 
+   * do occur sometimes. */
   return ((unsigned long) ra) > 4096 && !stack_pointer_p (ra);
 }
 
@@ -406,6 +423,20 @@ debug_function_from_pc (struct code* code, void *pc)
 }
 
 static void
+sbcl_putwc(wchar_t c, FILE *file)
+{
+#ifdef LISP_FEATURE_OS_PROVIDES_PUTWC
+    putwc(c, file);
+#else
+    if (c < 256) {
+        fputc(c, file);
+    } else {
+        fputc('?', file);
+    }
+#endif
+}
+
+static void
 print_string (lispobj *object)
 {
   int tag = widetag_of(*object);
@@ -420,7 +451,7 @@ print_string (lispobj *object)
       wchar_t c = (wchar_t) data[i];            \
       if (c == '\\' || c == '"')                \
         putchar('\\');                          \
-      putwc(c, stdout);                         \
+      sbcl_putwc(c, stdout);                    \
     }                                           \
   } while (0)
 
@@ -497,20 +528,15 @@ print_entry_points (struct code *code)
   }
 }
 
+/* This function has been split from backtrace() to enable Lisp
+ * backtraces from gdb with call backtrace_from_fp(...). Useful for
+ * example when debugging threading deadlocks.
+ */
 void
-backtrace(int nframes)
+backtrace_from_fp(void *fp, int nframes)
 {
-  void *fp;
   int i;
 
-#if defined(LISP_FEATURE_X86)
-  asm("movl %%ebp,%0" : "=g" (fp));
-#elif defined (LISP_FEATURE_X86_64)
-  asm("movq %%rbp,%0" : "=g" (fp));
-#else
-#error "How did we get here?"
-#endif
-
   for (i = 0; i < nframes; ++i) {
     lispobj *p;
     void *ra;
@@ -549,4 +575,20 @@ backtrace(int nframes)
   }
 }
 
+void
+backtrace(int nframes)
+{
+  void *fp;
+
+#if defined(LISP_FEATURE_X86)
+  asm("movl %%ebp,%0" : "=g" (fp));
+#elif defined (LISP_FEATURE_X86_64)
+  asm("movq %%rbp,%0" : "=g" (fp));
+#else
+#error "How did we get here?"
+#endif
+
+  backtrace_from_fp(fp, nframes);
+}
+
 #endif