diff options
author | ddomingo <ddomingo@redhat.com> | 2008-09-15 13:53:32 +1000 |
---|---|---|
committer | ddomingo <ddomingo@redhat.com> | 2008-09-15 13:53:32 +1000 |
commit | 58b5c08a69fa298a92ead6d9384415ff750ea2ef (patch) | |
tree | e6069a6944ccf0bcb5e9884104d3819121896dfb /runtime/regs-ia64.c | |
parent | 4ef55e8308f34b73d6a0a69850900ae0d06499ce (diff) | |
parent | 8b524b8e33e94007b15f33546819056b56435cf2 (diff) | |
download | systemtap-steved-58b5c08a69fa298a92ead6d9384415ff750ea2ef.tar.gz systemtap-steved-58b5c08a69fa298a92ead6d9384415ff750ea2ef.tar.xz systemtap-steved-58b5c08a69fa298a92ead6d9384415ff750ea2ef.zip |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'runtime/regs-ia64.c')
-rw-r--r-- | runtime/regs-ia64.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/runtime/regs-ia64.c b/runtime/regs-ia64.c index 8ce3e4c3..f884c5f8 100644 --- a/runtime/regs-ia64.c +++ b/runtime/regs-ia64.c @@ -39,10 +39,10 @@ static void ia64_stap_get_arbsp(struct unw_frame_info *info, void *arg) * bspcache: get cached unwound address and * set a probe local cache of the offset of unwound address. */ -#define bspcache(cache, regs, pp)\ +#define bspcache(cache, regs)\ if(regs) {\ static unsigned __offset = 0; /* probe local cache */\ - static const char * __pp = NULL; /* reference probe point */\ + static void * __ip = NULL; /* reference ip */\ unsigned long *bsp;\ asm volatile("{ flushrs }\n"); /* flushrs for fixing bsp */\ bsp = (void*)ia64_getreg(_IA64_REG_AR_BSP);\ @@ -53,10 +53,10 @@ static void ia64_stap_get_arbsp(struct unw_frame_info *info, void *arg) if (pa.address != 0) {\ __offset = ia64_rse_num_regs(pa.address, bsp)\ -(regs->cr_ifs & 127);\ - __pp = (const char *)pp;\ + __ip = (void *)REG_IP(regs);\ cache = pa.address;\ }\ - } else if (pp == __pp)\ + } else if ((void *)REG_IP(regs) == __ip)\ cache = ia64_rse_skip_regs(bsp,\ -(__offset + (regs->cr_ifs & 127)));\ } @@ -126,7 +126,7 @@ static void ia64_store_register(int regno, #else /* if defined __ia64__ */ -#define bspcache(cache, regs, pp) do {} while(0) +#define bspcache(cache, regs) do {} while(0) #endif /* if defined __ia64__ */ |