From 9158e522db2f3d5675438b535000ce862259f14d Mon Sep 17 00:00:00 2001 From: Tommi Rantala Date: Tue, 31 Jul 2012 15:18:03 +0300 Subject: [PATCH] Fix IP vs. PC confusion in tests on ARM The intention in the test cases is to print the "instruction pointer" value at certain places, and on ARM we will want to get the Program Counter in these cases. IP is a scratch register, and not very interesting. --- tests/Gtest-trace.c | 2 +- tests/test-coredump-unwind.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Gtest-trace.c b/tests/Gtest-trace.c index a064b766..ed34e58d 100644 --- a/tests/Gtest-trace.c +++ b/tests/Gtest-trace.c @@ -208,7 +208,7 @@ sighandler (int signal, void *siginfo, void *context) printf (" @ %lx", (unsigned long) uc->uc_mcontext.mc_rip); #endif #elif defined UNW_TARGET_ARM - printf (" @ %lx", (unsigned long) uc->uc_mcontext.arm_ip); + printf (" @ %lx", (unsigned long) uc->uc_mcontext.arm_pc); #endif printf ("\n"); } diff --git a/tests/test-coredump-unwind.c b/tests/test-coredump-unwind.c index 96752f25..d66c1695 100644 --- a/tests/test-coredump-unwind.c +++ b/tests/test-coredump-unwind.c @@ -214,7 +214,7 @@ void handle_sigsegv(int sig, siginfo_t *info, void *ucontext) #elif defined(UNW_TARGET_X86_64) ip = uc->uc_mcontext.gregs[REG_RIP]; #elif defined(UNW_TARGET_ARM) - ip = uc->uc_mcontext.arm_ip; + ip = uc->uc_mcontext.arm_pc; #endif #elif defined(__FreeBSD__) #ifdef __i386__