2003-04-10 Andrew Cagney <cagney@redhat.com>

* d10v-tdep.c (d10v_frame_this_id): Set the code addr to the
	frame's function's address.  Simplify.
	(d10v_frame_unwind_cache): Check that the frame's function is
	non-zero.
This commit is contained in:
Andrew Cagney 2003-04-11 03:12:58 +00:00
parent 05760fd2f6
commit 81f8a2067a
2 changed files with 17 additions and 8 deletions

View File

@ -1,3 +1,10 @@
2003-04-10 Andrew Cagney <cagney@redhat.com>
* d10v-tdep.c (d10v_frame_this_id): Set the code addr to the
frame's function's address. Simplify.
(d10v_frame_unwind_cache): Check that the frame's function is
non-zero.
2003-04-10 Jim Blandy <jimb@redhat.com>
* s390-tdep.c (s390_gdbarch_init): Put back accidentally deleted

View File

@ -710,7 +710,7 @@ d10v_frame_unwind_cache (struct frame_info *next_frame,
info->uses_frame = 0;
for (pc = frame_func_unwind (next_frame);
pc < frame_pc_unwind (next_frame);
pc > 0 && pc < frame_pc_unwind (next_frame);
pc += 4)
{
op = (unsigned long) read_memory_integer (pc, 4);
@ -1440,14 +1440,15 @@ d10v_frame_this_id (struct frame_info *next_frame,
struct d10v_unwind_cache *info
= d10v_frame_unwind_cache (next_frame, this_prologue_cache);
CORE_ADDR base;
CORE_ADDR pc;
CORE_ADDR func;
struct frame_id id;
/* The PC is easy. */
pc = frame_pc_unwind (next_frame);
/* The FUNC is easy. */
func = frame_func_unwind (next_frame);
/* This is meant to halt the backtrace at "_start". Make sure we
don't halt it at a generic dummy frame. */
if (pc == IMEM_START || pc <= IMEM_START || inside_entry_file (pc))
if (func <= IMEM_START || inside_entry_file (func))
return;
/* Hopefully the prologue analysis either correctly determined the
@ -1457,17 +1458,18 @@ d10v_frame_this_id (struct frame_info *next_frame,
if (base == STACK_START || base == 0)
return;
id = frame_id_build (base, func);
/* Check that we're not going round in circles with the same frame
ID (but avoid applying the test to sentinel frames which do go
round in circles). Can't use frame_id_eq() as that doesn't yet
compare the frame's PC value. */
if (frame_relative_level (next_frame) >= 0
&& get_frame_type (next_frame) != DUMMY_FRAME
&& get_frame_pc (next_frame) == pc
&& get_frame_base (next_frame) == base)
&& frame_id_eq (get_frame_id (next_frame), id))
return;
(*this_id) = frame_id_build (base, pc);
(*this_id) = id;
}
static void