From: Daniel Jacobowitz <drow@false.org>
Date: Mon, 24 Sep 2007 21:34:58 +0000 (+0000)
Subject: 	* frame.c (get_prev_frame_1): Also check for PC in the same register.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=322766326763e8d4765940a4c332a9f012f1e5a2;p=binutils-gdb.git

	* frame.c (get_prev_frame_1): Also check for PC in the same register.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5e7fd7726e4..5f34782573d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-24  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* frame.c (get_prev_frame_1): Also check for PC in the same register.
+
 2007-09-24  Vladimir Prus  <vladimir@codesourcery.com>
 	
 	* breakpoint.c (remove_sal): New.
diff --git a/gdb/frame.c b/gdb/frame.c
index 5e9eda4f4d7..9379c8cf0b2 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1231,7 +1231,7 @@ get_prev_frame_1 (struct frame_info *this_frame)
       && get_frame_type (this_frame) == NORMAL_FRAME
       && get_frame_type (this_frame->next) == NORMAL_FRAME)
     {
-      int optimized, realnum;
+      int optimized, realnum, nrealnum;
       enum lval_type lval, nlval;
       CORE_ADDR addr, naddr;
 
@@ -1240,9 +1240,10 @@ get_prev_frame_1 (struct frame_info *this_frame)
 				      &optimized, &lval, &addr, &realnum);
       frame_register_unwind_location (get_next_frame (this_frame),
 				      gdbarch_pc_regnum (current_gdbarch),
-				      &optimized, &nlval, &naddr, &realnum);
+				      &optimized, &nlval, &naddr, &nrealnum);
 
-      if (lval == lval_memory && lval == nlval && addr == naddr)
+      if ((lval == lval_memory && lval == nlval && addr == naddr)
+	  || (lval == lval_register && lval == nlval && realnum == nrealnum))
 	{
 	  if (frame_debug)
 	    {