Commit Tom's improved-stack-unwinding patch.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5021

diff --git a/coregrind/m_libcassert.c b/coregrind/m_libcassert.c
index 4d61668f83991e18806dc2bec5a2efbac4191725..fb9ab3e45aae58a2fe373bce13f59d861151cdc3 100644 (file)
--- a/coregrind/m_libcassert.c
+++ b/coregrind/m_libcassert.c
@@ -44,22 +44,28 @@
    ------------------------------------------------------------------ */
 
 #if defined(VGP_x86_linux)
-#  define GET_REAL_SP_AND_FP(sp, fp) \
-      asm("movl %%esp, %0;" \
-          "movl %%ebp, %1;" \
-          : "=r" (sp),\
+#  define GET_REAL_PC_SP_AND_FP(pc, sp, fp)      \
+      asm("call m_libcassert_get_ip;" \
+          "m_libcassert_get_ip: popl %0;" \
+          "movl %%esp, %1;" \
+          "movl %%ebp, %2;" \
+          : "=r" (pc),\
+            "=r" (sp),\
             "=r" (fp));
 #elif defined(VGP_amd64_linux)
-#  define GET_REAL_SP_AND_FP(sp, fp) \
-      asm("movq %%rsp, %0;" \
-          "movq %%rbp, %1;" \
-          : "=r" (sp),\
+#  define GET_REAL_PC_SP_AND_FP(pc, sp, fp)      \
+      asm("leaq 0(%%rip), %0;" \
+          "movq %%rsp, %1;" \
+          "movq %%rbp, %2;" \
+          : "=r" (pc),\
+            "=r" (sp),\
             "=r" (fp));
 #elif defined(VGP_ppc32_linux)
-#  define GET_REAL_SP_AND_FP(sp, fp) \
+#  define GET_REAL_PC_SP_AND_FP(pc, sp, fp)      \
       asm("mr %0,1;" \
           "mr %1,1;" \
-          : "=r" (sp),\
+          : "=r" (pc),\
+            "=r" (sp),\
             "=r" (fp));
 #else
 #  error Unknown platform
@@ -105,8 +111,7 @@ static void report_and_quit ( const Char* report,
    // state.  Could cause problems if we got the panic/exception within the
    // execontext/stack dump/symtab code.  But it's better than nothing.
    if (0 == ip && 0 == sp && 0 == fp) {
-       ip = (Addr)__builtin_return_address(0);
-       GET_REAL_SP_AND_FP(sp, fp);
+       GET_REAL_PC_SP_AND_FP(ip, sp, fp);
    }
  
    stacktop = tst->os_state.valgrind_stack_init_SP;