From f1b38a579122b37f86f25c35e23eb75b72978bd1 Mon Sep 17 00:00:00 2001 From: Randolph Chung Date: Wed, 8 Dec 2004 01:44:02 +0000 Subject: [PATCH] 2004-12-07 Randolph Chung * hppa-tdep.c (hppa_stub_Frame_unwind_cache): Stop unwinding if unwinding from a frame with pc == 0. (hppa_stub_frame_this_id): Likewise. (hppa_stub_frame_prev_register): Only provide real values if the frame cache is not NULL. --- gdb/ChangeLog | 8 ++++++++ gdb/hppa-tdep.c | 18 +++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6ef5c2949de..a337deaf48f 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2004-12-07 Randolph Chung + + * hppa-tdep.c (hppa_stub_Frame_unwind_cache): Stop unwinding if + unwinding from a frame with pc == 0. + (hppa_stub_frame_this_id): Likewise. + (hppa_stub_frame_prev_register): Only provide real values if the frame + cache is not NULL. + 2004-12-07 Randolph Chung * solib-som.c: New file. diff --git a/gdb/hppa-tdep.c b/gdb/hppa-tdep.c index 3bd058d9a90..ae7c5192409 100644 --- a/gdb/hppa-tdep.c +++ b/gdb/hppa-tdep.c @@ -2092,6 +2092,9 @@ hppa_stub_frame_unwind_cache (struct frame_info *next_frame, if (*this_cache) return *this_cache; + if (frame_pc_unwind (next_frame) == 0) + return NULL; + info = FRAME_OBSTACK_ZALLOC (struct hppa_stub_unwind_cache); *this_cache = info; info->saved_regs = trad_frame_alloc_saved_regs (next_frame); @@ -2126,7 +2129,11 @@ hppa_stub_frame_this_id (struct frame_info *next_frame, { struct hppa_stub_unwind_cache *info = hppa_stub_frame_unwind_cache (next_frame, this_prologue_cache); - *this_id = frame_id_build (info->base, frame_pc_unwind (next_frame)); + + if (info) + *this_id = frame_id_build (info->base, frame_func_unwind (next_frame)); + else + *this_id = null_frame_id; } static void @@ -2138,8 +2145,13 @@ hppa_stub_frame_prev_register (struct frame_info *next_frame, { struct hppa_stub_unwind_cache *info = hppa_stub_frame_unwind_cache (next_frame, this_prologue_cache); - hppa_frame_prev_register_helper (next_frame, info->saved_regs, regnum, - optimizedp, lvalp, addrp, realnump, valuep); + + if (info) + hppa_frame_prev_register_helper (next_frame, info->saved_regs, regnum, + optimizedp, lvalp, addrp, realnump, + valuep); + else + error ("Requesting registers from null frame.\n"); } static const struct frame_unwind hppa_stub_frame_unwind = { -- 2.30.2