Moved the stack-walking macros into m_stacktrace.

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

diff --git a/coregrind/amd64/core_arch.h b/coregrind/amd64/core_arch.h
index c14ad6d6ed759410f7e982197fd3492f5d7f1033..98d65c0a928412f8a757487a07b20ed63d29b612 100644 (file)
--- a/coregrind/amd64/core_arch.h
+++ b/coregrind/amd64/core_arch.h
@@ -56,11 +56,6 @@
 #define VGA_CLREQ_ARGS        guest_RAX
 #define VGA_CLREQ_RET         guest_RDX
 
-// Stack frame layout and linkage
-#define VGA_FIRST_STACK_FRAME(rbp)     (rbp)
-#define VGA_STACK_FRAME_RET(rbp)       (((UWord*)rbp)[1])
-#define VGA_STACK_FRAME_NEXT(rbp)      (((UWord*)rbp)[0])
-
 /* ---------------------------------------------------------------------
    Architecture-specific part of a ThreadState
    ------------------------------------------------------------------ */

diff --git a/coregrind/arm/core_arch.h b/coregrind/arm/core_arch.h
index ee5f1bf4d07d75464c5c14ce53ddc260b11ea1c4..d95fd755d8227e8a785680d0a8f142c686838b69 100644 (file)
--- a/coregrind/arm/core_arch.h
+++ b/coregrind/arm/core_arch.h
@@ -62,12 +62,6 @@
 #define VGA_CLREQ_ARGS        guest_R0
 #define VGA_CLREQ_RET         guest_R0
 
-// Stack frame layout and linkage
-// XXX ToDo: ???
-#define VGA_FIRST_STACK_FRAME(ebp)     (ebp)
-#define VGA_STACK_FRAME_RET(ebp)       (((UInt*)ebp)[1])
-#define VGA_STACK_FRAME_NEXT(ebp)      (((UInt*)ebp)[0])
-
 // Get stack pointer and frame pointer
 #define VGA_GET_REAL_STACK_PTR(esp) do {   \
    I_die_here; \

diff --git a/coregrind/m_stacktrace.c b/coregrind/m_stacktrace.c
index 36dd0dc703ca12fd6bf452cc91c1b53225a0563c..49d7dfcd43c879bdf9151aa354aa54d3cc4dcf00 100644 (file)
--- a/coregrind/m_stacktrace.c
+++ b/coregrind/m_stacktrace.c
@@ -35,6 +35,19 @@
 /*--- Exported functions.                                  ---*/
 /*------------------------------------------------------------*/
 
+// Stack frame layout and linkage
+#if defined(VGA_x86)
+#  define FIRST_STACK_FRAME(ebp)    (ebp)
+#  define STACK_FRAME_RET(ebp)      (((UWord*)ebp)[1])
+#  define STACK_FRAME_NEXT(ebp)     (((UWord*)ebp)[0])
+#elif defined(VGA_amd64)
+#  define FIRST_STACK_FRAME(rbp)    (rbp)
+#  define STACK_FRAME_RET(rbp)      (((UWord*)rbp)[1])
+#  define STACK_FRAME_NEXT(rbp)     (((UWord*)rbp)[0])
+#else
+#  error Unknown platform
+#endif
+
 /* Take a snapshot of the client's stack, putting the up to 'n_ips' IPs 
    into 'ips'.  In order to be thread-safe, we pass in the thread's IP
    and FP.  Returns number of IPs put in 'ips'.  */
@@ -82,6 +95,10 @@ UInt VG_(get_StackTrace2) ( Addr* ips, UInt n_ips,
          user-space threads package work. JRS 20021001 */
    } else {
 
+      // XXX: I think this line is needed for PPC to work, but I'm not
+      // certain, so I'm commenting it out for the moment.
+      //fp = FIRST_STACK_FRAME(fp)
+
       while (True) {
 
          if (i >= n_ips)
@@ -110,10 +127,10 @@ UInt VG_(get_StackTrace2) ( Addr* ips, UInt n_ips,
             then use this as a fallback. */
          if (fp_min <= fp && fp <= fp_max) {
             /* fp looks sane, so use it. */
-            ip = VGA_STACK_FRAME_RET(fp);
+            ip = STACK_FRAME_RET(fp);
             sp = fp + sizeof(Addr) /*saved %ebp/%rbp*/ 
                     + sizeof(Addr) /*ra*/;
-            fp = VGA_STACK_FRAME_NEXT(fp);
+            fp = STACK_FRAME_NEXT(fp);
             ips[i++] = ip;
             if (debug)
                VG_(printf)("     ipsF[%d]=%08p\n", i-1, ips[i-1]);

diff --git a/coregrind/x86/core_arch.h b/coregrind/x86/core_arch.h
index dad5515bb0e37ac205227a1da91a3e24540f0109..0f7ddae314269a8778b39e737cead855f4064167 100644 (file)
--- a/coregrind/x86/core_arch.h
+++ b/coregrind/x86/core_arch.h
@@ -56,11 +56,6 @@
 #define VGA_CLREQ_ARGS        guest_EAX
 #define VGA_CLREQ_RET         guest_EDX
 
-// Stack frame layout and linkage
-#define VGA_FIRST_STACK_FRAME(ebp)     (ebp)
-#define VGA_STACK_FRAME_RET(ebp)       (((UInt*)ebp)[1])
-#define VGA_STACK_FRAME_NEXT(ebp)      (((UInt*)ebp)[0])
-
 //extern const Char VG_(helper_wrapper_before)[];      /* in dispatch.S */
 //extern const Char VG_(helper_wrapper_return)[];      /* in dispatch.S */