m2-internship/libunwind-eh_elf
1
0
Fork 0
mirror of https://github.com/tobast/libunwind-eh_elf.git synced 2024-12-24 12:13:42 +01:00
Code Issues Releases Activity

Add Debug statement for return-value.

Browse source 
2004/10/19 23:15:02-07:00 mostang.com!davidm
(update_frame_state): Take additional argument "prev_cfa".
	When we detect a NULL-frame, debug-print the IP and the CFA
	so we know where things went wrong.
(dwarf_step): Get "prev_cfa" before we call dwarf_find_save_locs(),
	since update_frame_state() doesn't actually update
	the CFA.

(Logical change 1.290)
This commit is contained in:
homeip.net!davidm 2005-05-03 09:13:17 +00:00
parent 670399d357
commit bb03dca33e
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/dwarf/Gstep.c
View file

@ -1,5 +1,5 @@
/* libunwind - a platform-independent unwind library /* libunwind - a platform-independent unwind library
Copyright (c) 2003 Hewlett-Packard Development Company, L.P. Copyright (c) 2003-2004 Hewlett-Packard Development Company, L.P.
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.
@ -27,13 +27,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
#include "tdep.h" #include "tdep.h"
static int static int
update_frame_state (struct dwarf_cursor *c) update_frame_state (struct dwarf_cursor *c, unw_word_t prev_cfa)
{ {
unw_word_t prev_ip, prev_cfa, ip; unw_word_t prev_ip, ip;
int ret; int ret;
prev_ip = c->ip; prev_ip = c->ip;
prev_cfa = c->cfa;
/* Update the IP cache (do this first: if we reach the end of the /* Update the IP cache (do this first: if we reach the end of the
frame-chain, the rest of the info may not be valid/useful frame-chain, the rest of the info may not be valid/useful
@ -110,8 +109,8 @@ update_frame_state (struct dwarf_cursor *c)
if (c->ip == prev_ip && c->cfa == prev_cfa) if (c->ip == prev_ip && c->cfa == prev_cfa)
{ {
dprintf ("%s: ip and cfa unchanged; stopping here (ip=0x%lx)\n", dprintf ("%s: ip and cfa unchanged; stopping (ip=0x%lx cfa=0x%lx)\n",
__FUNCTION__, (long) ip); __FUNCTION__, (long) prev_ip, (long) prev_cfa);
return -UNW_EBADFRAME; return -UNW_EBADFRAME;
} }
@ -122,14 +121,13 @@ update_frame_state (struct dwarf_cursor *c)
HIDDEN int HIDDEN int
dwarf_step (struct dwarf_cursor *c) dwarf_step (struct dwarf_cursor *c)
{ {
unw_word_t prev_cfa = c->cfa;
int ret; int ret;
if ((ret = dwarf_find_save_locs (c)) < 0) if ((ret = dwarf_find_save_locs (c)) >= 0
return ret; && (ret = update_frame_state (c, prev_cfa)) >= 0)
ret = (c->ip == 0) ? 0 : 1;
if ((ret = update_frame_state (c)) < 0) Debug (15, "returning %d\n", ret);
return ret; return ret;
Debug (15, "done\n");
return (c->ip == 0) ? 0 : 1;
} }