2004-04-02 Andrew Cagney <cagney@redhat.com>

	* sh64-tdep.c (sh64_init_extra_frame_info): Replace
	DEPRECATED_CALL_DUMMY_LENGTH with 0, simplify.
	* dummy-frame.h: Delete out-of-date comments.
	* gdbarch.sh (DEPRECATED_CALL_DUMMY_LENGTH): Delete.
	* gdbarch.h, gdbarch.c: Re-generate.

8 files changed, 15 insertions, 59 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3e3b759..3520d11 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2004-04-02  Andrew Cagney  <cagney@redhat.com>
+
+	* sh64-tdep.c (sh64_init_extra_frame_info): Replace
+	DEPRECATED_CALL_DUMMY_LENGTH with 0, simplify.
+	* dummy-frame.h: Delete out-of-date comments.
+	* gdbarch.sh (DEPRECATED_CALL_DUMMY_LENGTH): Delete.
+	* gdbarch.h, gdbarch.c: Re-generate.
+
 2004-04-02  Joel Brobecker  <brobecker@gnat.com>
 	
 	Committed by Andrew Cagney <cagney@redhat.com>.
diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog
index 72c5e6a..63ffa77 100644
--- a/gdb/doc/ChangeLog
+++ b/gdb/doc/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-02  Andrew Cagney  <cagney@redhat.com>
+
+	* gdbint.texinfo (Target Architecture Definition): Delete
+	reference to DEPRECATED_CALL_DUMMY_LENGTH.
+
 2004-03-28  Stephane Carrez  <stcarrez@nerim.fr>
 
 	* gdb.texinfo (TUI Commands): Document tui reg commands.
diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo
index 0013a41..9066f73 100644
--- a/gdb/doc/gdbint.texinfo
+++ b/gdb/doc/gdbint.texinfo
@@ -3057,7 +3057,7 @@ This method has been replaced by @code{push_dummy_code}
 @item DEPRECATED_SIZEOF_CALL_DUMMY_WORDS
 @findex DEPRECATED_SIZEOF_CALL_DUMMY_WORDS
 The size of @code{DEPRECATED_CALL_DUMMY_WORDS}.  This must return a
-positive value.  See also @code{DEPRECATED_CALL_DUMMY_LENGTH}.
+positive value.
 
 This method has been replaced by @code{push_dummy_code}
 (@pxref{push_dummy_code}).
diff --git a/gdb/dummy-frame.h b/gdb/dummy-frame.h
index 6d565d1..7f4c38f 100644
--- a/gdb/dummy-frame.h
+++ b/gdb/dummy-frame.h
@@ -27,24 +27,6 @@ struct regcache;
 struct frame_unwind;
 struct frame_id;
 
-/* GENERIC DUMMY FRAMES
-  
-   The following code serves to maintain the dummy stack frames for
-   inferior function calls (ie. when gdb calls into the inferior via
-   call_function_by_hand).  This code saves the machine state before
-   the call in host memory, so we must maintain an independent stack
-   and keep it consistant etc.  I am attempting to make this code
-   generic enough to be used by many targets.
- 
-   The cheapest and most generic way to do CALL_DUMMY on a new target
-   is probably to define CALL_DUMMY to be empty,
-   DEPRECATED_CALL_DUMMY_LENGTH to zero, and CALL_DUMMY_LOCATION to
-   AT_ENTRY.  Then you must remember to define PUSH_RETURN_ADDRESS,
-   because no call instruction will be being executed by the target.
-   Also DEPRECATED_FRAME_CHAIN_VALID as
-   generic_{file,func}_frame_chain_valid and do not set
-   DEPRECATED_FIX_CALL_DUMMY.  */
-
 /* If the PC falls in a dummy frame, return a dummy frame
    unwinder.  */
 
diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c
index 19462ca..ff1d687 100644
--- a/gdb/gdbarch.c
+++ b/gdb/gdbarch.c
@@ -165,7 +165,6 @@ struct gdbarch
   int call_dummy_location;
   CORE_ADDR deprecated_call_dummy_start_offset;
   CORE_ADDR deprecated_call_dummy_breakpoint_offset;
-  int deprecated_call_dummy_length;
   LONGEST * deprecated_call_dummy_words;
   int deprecated_sizeof_call_dummy_words;
   gdbarch_deprecated_fix_call_dummy_ftype *deprecated_fix_call_dummy;
@@ -331,7 +330,6 @@ struct gdbarch startup_gdbarch =
   0,  /* call_dummy_location */
   0,  /* deprecated_call_dummy_start_offset */
   0,  /* deprecated_call_dummy_breakpoint_offset */
-  0,  /* deprecated_call_dummy_length */
   0,  /* deprecated_call_dummy_words */
   0,  /* deprecated_sizeof_call_dummy_words */
   0,  /* deprecated_fix_call_dummy */
@@ -957,14 +955,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file)
                       "gdbarch_dump: DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET = %ld\n",
                       (long) DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET);
 #endif
-#ifdef DEPRECATED_CALL_DUMMY_LENGTH
-  fprintf_unfiltered (file,
-                      "gdbarch_dump: DEPRECATED_CALL_DUMMY_LENGTH # %s\n",
-                      XSTRING (DEPRECATED_CALL_DUMMY_LENGTH));
-  fprintf_unfiltered (file,
-                      "gdbarch_dump: DEPRECATED_CALL_DUMMY_LENGTH = %d\n",
-                      DEPRECATED_CALL_DUMMY_LENGTH);
-#endif
 #ifdef DEPRECATED_CALL_DUMMY_START_OFFSET
   fprintf_unfiltered (file,
                       "gdbarch_dump: DEPRECATED_CALL_DUMMY_START_OFFSET # %s\n",
@@ -3440,22 +3430,6 @@ set_gdbarch_deprecated_call_dummy_breakpoint_offset (struct gdbarch *gdbarch,
   gdbarch->deprecated_call_dummy_breakpoint_offset = deprecated_call_dummy_breakpoint_offset;
 }
 
-int
-gdbarch_deprecated_call_dummy_length (struct gdbarch *gdbarch)
-{
-  gdb_assert (gdbarch != NULL);
-  if (gdbarch_debug >= 2)
-    fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_call_dummy_length called\n");
-  return gdbarch->deprecated_call_dummy_length;
-}
-
-void
-set_gdbarch_deprecated_call_dummy_length (struct gdbarch *gdbarch,
-                                          int deprecated_call_dummy_length)
-{
-  gdbarch->deprecated_call_dummy_length = deprecated_call_dummy_length;
-}
-
 LONGEST *
 gdbarch_deprecated_call_dummy_words (struct gdbarch *gdbarch)
 {
diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h
index 86c118d..d881eb2 100644
--- a/gdb/gdbarch.h
+++ b/gdb/gdbarch.h
@@ -861,17 +861,6 @@ extern void set_gdbarch_deprecated_call_dummy_breakpoint_offset (struct gdbarch
 #define DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET (gdbarch_deprecated_call_dummy_breakpoint_offset (current_gdbarch))
 #endif
 
-/* DEPRECATED_CALL_DUMMY_LENGTH can be deleted. */
-
-extern int gdbarch_deprecated_call_dummy_length (struct gdbarch *gdbarch);
-extern void set_gdbarch_deprecated_call_dummy_length (struct gdbarch *gdbarch, int deprecated_call_dummy_length);
-#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_CALL_DUMMY_LENGTH)
-#error "Non multi-arch definition of DEPRECATED_CALL_DUMMY_LENGTH"
-#endif
-#if !defined (DEPRECATED_CALL_DUMMY_LENGTH)
-#define DEPRECATED_CALL_DUMMY_LENGTH (gdbarch_deprecated_call_dummy_length (current_gdbarch))
-#endif
-
 /* DEPRECATED_CALL_DUMMY_WORDS can be deleted. */
 
 extern LONGEST * gdbarch_deprecated_call_dummy_words (struct gdbarch *gdbarch);
diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh
index b3100b3..e46c64f 100755
--- a/gdb/gdbarch.sh
+++ b/gdb/gdbarch.sh
@@ -531,8 +531,6 @@ v::CALL_DUMMY_LOCATION:int:call_dummy_location:::::AT_ENTRY_POINT::0
 v::DEPRECATED_CALL_DUMMY_START_OFFSET:CORE_ADDR:deprecated_call_dummy_start_offset
 # DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET can be deleted.
 v::DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET:CORE_ADDR:deprecated_call_dummy_breakpoint_offset
-# DEPRECATED_CALL_DUMMY_LENGTH can be deleted.
-v::DEPRECATED_CALL_DUMMY_LENGTH:int:deprecated_call_dummy_length
 # DEPRECATED_CALL_DUMMY_WORDS can be deleted.
 v::DEPRECATED_CALL_DUMMY_WORDS:LONGEST *:deprecated_call_dummy_words::::0:legacy_call_dummy_words::0:0x%08lx
 # Implement PUSH_DUMMY_CALL, then delete DEPRECATED_SIZEOF_CALL_DUMMY_WORDS.
diff --git a/gdb/sh64-tdep.c b/gdb/sh64-tdep.c
index 1d7b313..229cdf7 100644
--- a/gdb/sh64-tdep.c
+++ b/gdb/sh64-tdep.c
@@ -1224,7 +1224,7 @@ sh64_init_extra_frame_info (int fromleaf, struct frame_info *fi)
       get_frame_extra_info (fi)->return_pc = 
 	deprecated_read_register_dummy (get_frame_pc (fi),
 					get_frame_base (fi), PC_REGNUM);
-      get_frame_extra_info (fi)->f_offset = -(DEPRECATED_CALL_DUMMY_LENGTH + 4);
+      get_frame_extra_info (fi)->f_offset = -4;
       get_frame_extra_info (fi)->leaf_function = 0;
       return;
     }