(more) Merge with trunk.

4 files changed, 2 insertions, 28 deletions

diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c
index d60eeb36ed7..b79a02a76ab 100644
--- a/gdb/arch-utils.c
+++ b/gdb/arch-utils.c
@@ -118,22 +118,6 @@ legacy_register_sim_regno (int regnum)
 }
 
 int
-legacy_register_sim_regno (int regnum)
-{
-  /* Only makes sense to supply raw registers.  */
-  gdb_assert (regnum >= 0 && regnum < NUM_REGS);
-  /* NOTE: cagney/2002-05-13: The old code did it this way and it is
-     suspected that some GDB/SIM combinations may rely on this
-     behavour.  The default should be one2one_register_sim_regno
-     (below).  */
-  if (REGISTER_NAME (regnum) != NULL
-      && REGISTER_NAME (regnum)[0] != '\0')
-    return regnum;
-  else
-    return LEGACY_SIM_REGNO_IGNORE;
-}
-
-int
 generic_frameless_function_invocation_not (struct frame_info *fi)
 {
   return 0;
diff --git a/gdb/frame.h b/gdb/frame.h
index a0a965edf24..27bd7ff8943 100644
--- a/gdb/frame.h
+++ b/gdb/frame.h
@@ -140,11 +140,6 @@ struct frame_info
     frame_register_unwind_ftype *register_unwind;
     void *register_unwind_cache;
 
-    /* See description above.  Return the register value for the
-       previous frame.  */
-    frame_register_unwind_ftype *register_unwind;
-    void *register_unwind_cache;
-
     /* Pointers to the next (down, inner) and previous (up, outer)
        frame_info's in the frame cache.  */
     struct frame_info *next; /* down, inner */
diff --git a/gdb/infrun.c b/gdb/infrun.c
index ec6c7d98da5..c605126f176 100644
--- a/gdb/infrun.c
+++ b/gdb/infrun.c
@@ -3916,9 +3916,6 @@ struct inferior_status
   /* A frame unique identifier.  */
   struct frame_id selected_frame_id;
 
-  /* A frame unique identifier.  */
-  struct frame_id selected_frame_id;
-
   int breakpoint_proceeded;
   int restore_stack_info;
   int proceed_to_finish;
diff --git a/gdb/values.c b/gdb/values.c
index a72b7fa3ccd..b5b3bb96e38 100644
--- a/gdb/values.c
+++ b/gdb/values.c
@@ -1231,7 +1231,6 @@ value_being_returned (struct type *valtype, struct regcache *retbuf,
   struct value *val;
   CORE_ADDR addr;
 
-#if 0
   /* If this is not defined, just use EXTRACT_RETURN_VALUE instead.  */
   if (EXTRACT_STRUCT_VALUE_ADDRESS_P ())
     if (struct_return)
@@ -1241,13 +1240,13 @@ value_being_returned (struct type *valtype, struct regcache *retbuf,
 	  error ("Function return value unknown.");
 	return value_at (valtype, addr, NULL);
       }
-#endif
 
   /* If this is not defined, just use EXTRACT_RETURN_VALUE instead.  */
   if (DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS_P ())
     if (struct_return)
       {
-	addr = DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS (retbuf);
+	void *regs = deprecated_grub_regcache_for_registers (retbuf);
+	addr = DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS (regs);
 	if (!addr)
 	  error ("Function return value unknown.");
 	return value_at (valtype, addr, NULL);
@@ -1266,7 +1265,6 @@ value_being_returned (struct type *valtype, struct regcache *retbuf,
 
   val = allocate_value (valtype);
   CHECK_TYPEDEF (valtype);
-#define EXTRACT_RETURN_VALUE DEPRECATED_EXTRACT_RETURN_VALUE
   EXTRACT_RETURN_VALUE (valtype, retbuf, VALUE_CONTENTS_RAW (val));
 
   return val;