From 20bcf01c7a5c7ef1d08eb640b4ec3135dd8dffc8 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 17 Sep 2002 21:18:54 +0000 Subject: [PATCH] 2002-09-17 Andrew Cagney * arch-utils.c (legacy_virtual_frame_pointer): If FP_REGNUM is invalid, return SP_REGNUM. --- gdb/ChangeLog | 5 +++++ gdb/arch-utils.c | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b532ee1c927..f951d80c9cb 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2002-09-17 Andrew Cagney + + * arch-utils.c (legacy_virtual_frame_pointer): If FP_REGNUM is + invalid, return SP_REGNUM. + 2002-09-17 Michael Snyder * mips-tdep.c (mips_pop_frame): Read saved values of floating diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index 3666bd55c06..a056177553e 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -423,8 +423,19 @@ legacy_virtual_frame_pointer (CORE_ADDR pc, int *frame_regnum, LONGEST *frame_offset) { - gdb_assert (FP_REGNUM >= 0); - *frame_regnum = FP_REGNUM; + /* FIXME: cagney/2002-09-13: This code is used when identifying the + frame pointer of the current PC. It is assuming that a single + register and an offset can determine this. I think it should + instead generate a byte code expression as that would work better + with things like Dwarf2's CFI. */ + if (FP_REGNUM >= 0 && FP_REGNUM < NUM_REGS) + *frame_regnum = FP_REGNUM; + else if (SP_REGNUM >= 0 && SP_REGNUM < NUM_REGS) + *frame_regnum = SP_REGNUM; + else + /* Should this be an internal error? I guess so, it is reflecting + an architectural limitation in the current design. */ + internal_error (__FILE__, __LINE__, "No virtual frame pointer available"); *frame_offset = 0; }