From: Mark Kettenis <kettenis@gnu.org>
Date: Fri, 5 Dec 2003 21:14:49 +0000 (+0000)
Subject: From Ulrich Weigand  <weigand@informatik.uni-erlangen.de>:
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2af2aeb01d35bef158d942c1c1e285f7b934c853;p=binutils-gdb.git

From Ulrich Weigand  <weigand@informatik.uni-erlangen.de>:
* dwarf2-frame.c (dwarf2_frame_cache): Use the untranslated RA
column instead of translating it.
---

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  <kettenis@gnu.org>
+
+	From Ulrich Weigand  <weigand@informatik.uni-erlangen.de>:
+	* dwarf2-frame.c (dwarf2_frame_cache): Use the untranslated RA
+	column instead of translating it.
+
 2003-12-04  Michael Chastain  <mec.gnu@mindspring.com>
 
 	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;
 	}
     }