summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Vorontsov <avorontsov@ru.mvista.com>2009-11-28 01:33:42 +0300
committerFrank Ch. Eigler <fche@elastic.org>2009-12-01 11:57:32 -0500
commit51280c12d044b671b16ce59396658ac5a0f24650 (patch)
tree27c8036e3078b0e5ae9e09b05b1f01bad3e5876c
parentf5fd3c39dcec944feb8aa91808a8cb8d94dd1e04 (diff)
downloadsystemtap-steved-51280c12d044b671b16ce59396658ac5a0f24650.tar.gz
systemtap-steved-51280c12d044b671b16ce59396658ac5a0f24650.tar.xz
systemtap-steved-51280c12d044b671b16ce59396658ac5a0f24650.zip
stack-ppc: Adjust for ppc32
Get rid of magic numbers, use appropriate defines from ptrace.h. From now on stack-ppc.c should be suitable for ppc32. Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
-rw-r--r--runtime/stack-ppc.c4
-rw-r--r--runtime/stack.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/runtime/stack-ppc.c b/runtime/stack-ppc.c
index 3267194e..df2db15d 100644
--- a/runtime/stack-ppc.c
+++ b/runtime/stack-ppc.c
@@ -21,7 +21,7 @@ static void __stp_stack_print (struct pt_regs *regs, int verbose, int levels,
return;
_sp = (unsigned long *) sp;
newsp = _sp[0];
- ip = _sp[2];
+ ip = _sp[STACK_FRAME_LR_SAVE];
if (!firstframe || ip != lr) {
if (verbose) {
_stp_printf("[0x%016lx] [0x%016lx] ", sp, ip);
@@ -38,7 +38,7 @@ static void __stp_stack_print (struct pt_regs *regs, int verbose, int levels,
* See if this is an exception frame.
* We look for the "regshere" marker in the current frame.
*/
- if ( _sp[12] == 0x7265677368657265ul) {
+ if (_sp[STACK_FRAME_MARKER] == STACK_FRAME_REGS_MARKER) {
struct pt_regs *regs = (struct pt_regs *)
(sp + STACK_FRAME_OVERHEAD);
if (verbose) {
diff --git a/runtime/stack.c b/runtime/stack.c
index ae899950..25dbdbbd 100644
--- a/runtime/stack.c
+++ b/runtime/stack.c
@@ -40,7 +40,7 @@ static void _stp_stack_print_fallback(unsigned long, int, int);
#include "stack-ia64.c"
#elif defined (__i386__)
#include "stack-i386.c"
-#elif defined (__powerpc64__)
+#elif defined (__powerpc__)
#include "stack-ppc.c"
#elif defined (__arm__)
#include "stack-arm.c"