1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-07-03 06:01:45 +02:00

Adjust for "ia64_rse" to "rse" prefix change.

2004/10/25 07:52:30-07:00 hp.com!davidm
(unw_step): Add Debug statement to print return-value.

2004/10/25 05:21:51-07:00 hp.com!davidm
(unw_step): Print IP along with cursor address.

(Logical change 1.290)
This commit is contained in:
mostang.com!davidm 2005-05-03 09:13:17 +00:00
parent bf832fc29e
commit 87081cebab

View file

@ -1,5 +1,5 @@
/* libunwind - a platform-independent unwind library /* libunwind - a platform-independent unwind library
Copyright (C) 2001-2004 Hewlett-Packard Co Copyright (C) 2001-2005 Hewlett-Packard Co
Contributed by David Mosberger-Tang <davidm@hpl.hp.com> Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
This file is part of libunwind. This file is part of libunwind.
@ -204,8 +204,8 @@ check_rbs_switch (struct cursor *c)
&loadrs) < 0)) &loadrs) < 0))
return ret; return ret;
loadrs >>= 16; loadrs >>= 16;
ndirty = ia64_rse_num_regs (c->bsp - loadrs, c->bsp); ndirty = rse_num_regs (c->bsp - loadrs, c->bsp);
saved_bspstore = ia64_rse_skip_regs (saved_bsp, -ndirty); saved_bspstore = rse_skip_regs (saved_bsp, -ndirty);
} }
if (saved_bsp == c->bsp) if (saved_bsp == c->bsp)
@ -302,7 +302,7 @@ update_frame_state (struct cursor *c)
return ret; return ret;
} }
c->bsp = ia64_rse_skip_regs (c->bsp, -num_regs); c->bsp = rse_skip_regs (c->bsp, -num_regs);
c->sp = c->psp; c->sp = c->psp;
c->abi_marker = 0; c->abi_marker = 0;
@ -333,15 +333,12 @@ unw_step (unw_cursor_t *cursor)
struct cursor *c = (struct cursor *) cursor; struct cursor *c = (struct cursor *) cursor;
int ret; int ret;
Debug (1, "(cursor=%p)\n", c); Debug (1, "(cursor=%p, ip=0x%016lx)\n", c, (unsigned long) c->ip);
ret = ia64_find_save_locs (c); if ((ret = ia64_find_save_locs (c)) >= 0
if (ret < 0) && (ret = update_frame_state (c)) >= 0)
ret = (c->ip == 0) ? 0 : 1;
Debug (2, "returning %d\n", ret);
return ret; return ret;
ret = update_frame_state (c);
if (ret < 0)
return ret;
return (c->ip == 0) ? 0 : 1;
} }