2003-06-21 Andrew Cagney <cagney@redhat.com>

	* frame.h (deprecated_unwind_get_saved_register): Delete.
	* frame.c (deprecated_unwind_get_saved_register): Delete function.
	* mips-tdep.c (mips_get_saved_register): Use frame_register_unwind
	and deprecated_get_next_frame_hack instead of
	deprecated_unwind_get_saved_register.

4 files changed, 11 insertions, 38 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 17d3baa..2e4ff7b3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,11 @@
 2003-06-21  Andrew Cagney  <cagney@redhat.com>
 
+	* frame.h (deprecated_unwind_get_saved_register): Delete.
+	* frame.c (deprecated_unwind_get_saved_register): Delete function.
+	* mips-tdep.c (mips_get_saved_register): Use frame_register_unwind
+	and deprecated_get_next_frame_hack instead of
+	deprecated_unwind_get_saved_register.
+
 	* mips-tdep.c (mips_dump_tdep): Do not print
 	REGISTER_CONVERT_FROM_TYPE or REGISTER_CONVERT_TO_TYPE.
 
diff --git a/gdb/frame.c b/gdb/frame.c
index b873b3a..eadb77d 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -738,36 +738,6 @@ put_frame_register (struct frame_info *frame, int regnum, const void *buf)
     }
 }
 
-void
-deprecated_unwind_get_saved_register (char *raw_buffer,
-				      int *optimizedp,
-				      CORE_ADDR *addrp,
-				      struct frame_info *frame,
-				      int regnum,
-				      enum lval_type *lvalp)
-{
-  int optimizedx;
-  CORE_ADDR addrx;
-  int realnumx;
-  enum lval_type lvalx;
-
-  if (!target_has_registers)
-    error ("No registers.");
-
-  /* Keep things simple, ensure that all the pointers (except valuep)
-     are non NULL.  */
-  if (optimizedp == NULL)
-    optimizedp = &optimizedx;
-  if (lvalp == NULL)
-    lvalp = &lvalx;
-  if (addrp == NULL)
-    addrp = &addrx;
-
-  gdb_assert (frame != NULL && frame->next != NULL);
-  frame_register_unwind (frame->next, regnum, optimizedp, lvalp, addrp,
-			 &realnumx, raw_buffer);
-}
-
 /* frame_register_read ()
 
    Find and return the value of REGNUM for the specified stack frame.
diff --git a/gdb/frame.h b/gdb/frame.h
index be1b4f1..87c2057 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -568,12 +568,6 @@ extern char *deprecated_generic_find_dummy_frame (CORE_ADDR pc, CORE_ADDR fp);
 /* The DEPRECATED_GET_SAVED_REGISTER architecture interface is
    entirely redundant.  New architectures should implement per-frame
    unwinders (ref "frame-unwind.h").  */
-extern void deprecated_unwind_get_saved_register (char *raw_buffer,
-						  int *optimizedp,
-						  CORE_ADDR *addrp,
-						  struct frame_info *frame,
-						  int regnum,
-						  enum lval_type *lvalp);
 extern void deprecated_generic_get_saved_register (char *, int *, CORE_ADDR *,
 						   struct frame_info *, int,
 						   enum lval_type *);
diff --git a/gdb/mips-tdep.c b/gdb/mips-tdep.c
index c0c0163..538714c 100644
--- a/gdb/mips-tdep.c
+++ b/gdb/mips-tdep.c
@@ -5430,6 +5430,7 @@ mips_get_saved_register (char *raw_buffer,
   CORE_ADDR addrx;
   enum lval_type lvalx;
   int optimizedx;
+  int realnumx;
 
   if (!target_has_registers)
     error ("No registers.");
@@ -5441,8 +5442,10 @@ mips_get_saved_register (char *raw_buffer,
     lvalp = &lvalx;
   if (optimizedp == NULL)
     optimizedp = &optimizedx;
-  deprecated_unwind_get_saved_register (raw_buffer, optimizedp, addrp, frame,
-					regnum, lvalp);
+  frame_register_unwind (deprecated_get_next_frame_hack (frame),
+			 regnum, optimizedp, lvalp, addrp,
+			 &realnumx, raw_buffer);
+
   /* FIXME: cagney/2002-09-13: This is just so bad.  The MIPS should
      have a pseudo register range that correspons to the ABI's, rather
      than the ISA's, view of registers.  These registers would then