From 2af2aeb01d35bef158d942c1c1e285f7b934c853 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Fri, 5 Dec 2003 21:14:49 +0000 Subject: [PATCH] From Ulrich Weigand : * dwarf2-frame.c (dwarf2_frame_cache): Use the untranslated RA column instead of translating it. --- gdb/ChangeLog | 6 ++++++ gdb/dwarf2-frame.c | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index da73f777b0c..a898867a25a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2003-12-05 Mark Kettenis + + From Ulrich Weigand : + * dwarf2-frame.c (dwarf2_frame_cache): Use the untranslated RA + column instead of translating it. + 2003-12-04 Michael Chastain Partial fix for PR c++/1465. diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index 34b21f86e96..59f4481bef3 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -618,14 +618,13 @@ dwarf2_frame_cache (struct frame_info *next_frame, void **this_cache) } else { - int reg = DWARF2_REG_TO_REGNUM (fs->retaddr_column); - if (reg != PC_REGNUM) + if (DWARF2_REG_TO_REGNUM (fs->retaddr_column) != PC_REGNUM) { /* See comment above about PC_REGNUM being negative. If this assertion fails, it's a problem with this code and not the architecture. */ gdb_assert (PC_REGNUM >= 0); - cache->reg[PC_REGNUM].loc.reg = reg; + cache->reg[PC_REGNUM].loc.reg = fs->retaddr_column; cache->reg[PC_REGNUM].how = REG_SAVED_REG; } }