diff options
Diffstat (limited to 'gdb/dwarf2-frame.c')
| -rw-r--r-- | gdb/dwarf2-frame.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/gdb/dwarf2-frame.c b/gdb/dwarf2-frame.c index 7694218..f406e64 100644 --- a/gdb/dwarf2-frame.c +++ b/gdb/dwarf2-frame.c @@ -550,9 +550,21 @@ dwarf2_frame_cache (struct frame_info *next_frame, void **this_cache) cache->reg[regnum] = fs->regs.reg[reg]; } - /* Stored the location of the return addess. */ - if (fs->retaddr_column < fs->regs.num_regs) + /* Store the location of the return addess. If the return address + column (adjusted) is not the same as gdb's PC_REGNUM, then this + implies a copy from the ra column register. */ + if (fs->retaddr_column < fs->regs.num_regs + && fs->regs.reg[fs->retaddr_column].how != REG_UNSAVED) cache->reg[PC_REGNUM] = fs->regs.reg[fs->retaddr_column]; + else + { + reg = DWARF2_REG_TO_REGNUM (fs->retaddr_column); + if (reg != PC_REGNUM) + { + cache->reg[PC_REGNUM].loc.reg = reg; + cache->reg[PC_REGNUM].how = REG_SAVED_REG; + } + } do_cleanups (old_chain); |