X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fbacktrace.c;h=98189b91a883d27d892753467b1976db71a525eb;hb=94e0f68a627ce839d59e88b4c8faad486e75af91;hp=b4503ad8b37a08764724b75a479f6f2b054de71b;hpb=077b294463eb6819c0eba67bb8ce71ec66d61ba8;p=sbcl.git

diff --git a/src/runtime/backtrace.c b/src/runtime/backtrace.c
index b4503ad..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))
@@ -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
@@ -511,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;
@@ -563,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