From: Daniel Jacobowitz <drow@false.org>
Date: Tue, 15 Jul 2008 18:50:15 +0000 (+0000)
Subject: 	* frame.c (frame_sp_unwind): Delete.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d56907c103c398e1f0d67e00b70a4b3cf0e4189b;p=binutils-gdb.git

	* frame.c (frame_sp_unwind): Delete.
	(get_frame_sp): Do not use it.
	* frame.h (frame_sp_unwind): Delete prototype.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 358902e9b9f..16028417134 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-15  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* frame.c (frame_sp_unwind): Delete.
+	(get_frame_sp): Do not use it.
+	* frame.h (frame_sp_unwind): Delete prototype.
+
 2008-07-15  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* ia64-tdep.c (ia64_dummy_id): Use get_frame_pc.
diff --git a/gdb/frame.c b/gdb/frame.c
index e387b47cf3b..f5e0fad427b 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1763,22 +1763,18 @@ get_frame_arch (struct frame_info *this_frame)
 CORE_ADDR
 get_frame_sp (struct frame_info *this_frame)
 {
-  return frame_sp_unwind (this_frame->next);
-}
-
-CORE_ADDR
-frame_sp_unwind (struct frame_info *next_frame)
-{
-  struct gdbarch *gdbarch = get_frame_arch (next_frame);
+  struct gdbarch *gdbarch = get_frame_arch (this_frame);
   /* Normality - an architecture that provides a way of obtaining any
      frame inner-most address.  */
   if (gdbarch_unwind_sp_p (gdbarch))
-    return gdbarch_unwind_sp (gdbarch, next_frame);
+    /* NOTE drow/2008-06-28: gdbarch_unwind_sp could be converted to
+       operate on THIS_FRAME now.  */
+    return gdbarch_unwind_sp (gdbarch, this_frame->next);
   /* Now things are really are grim.  Hope that the value returned by
      the gdbarch_sp_regnum register is meaningful.  */
   if (gdbarch_sp_regnum (gdbarch) >= 0)
-    return frame_unwind_register_unsigned (next_frame,
-					   gdbarch_sp_regnum (gdbarch));
+    return get_frame_register_unsigned (this_frame,
+					gdbarch_sp_regnum (gdbarch));
   internal_error (__FILE__, __LINE__, _("Missing unwind SP method"));
 }
 
diff --git a/gdb/frame.h b/gdb/frame.h
index 579b4237da0..3e8f023109e 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -285,8 +285,6 @@ extern CORE_ADDR get_frame_address_in_block (struct frame_info *this_frame);
    known as top-of-stack.  */
 
 extern CORE_ADDR get_frame_sp (struct frame_info *);
-extern CORE_ADDR frame_sp_unwind (struct frame_info *);
-
 
 /* Following on from the `resume' address.  Return the entry point
    address of the function containing that resume address, or zero if