2004-05-08 Andrew Cagney <cagney@redhat.com>

	* breakpoint.h (deprecated_frame_in_dummy): Delete declaration.
	(struct frame_info): Delete opaque declaration.
	* breakpoint.c (deprecated_frame_in_dummy): Delete function.
	* frame.c (get_frame_type): Delete call.

4 files changed, 5 insertions, 44 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 643cd2e..001a8d4 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,10 @@
 2004-05-08  Andrew Cagney  <cagney@redhat.com>
 
+	* breakpoint.h (deprecated_frame_in_dummy): Delete declaration.
+	(struct frame_info): Delete opaque declaration.
+	* breakpoint.c (deprecated_frame_in_dummy): Delete function.
+	* frame.c (get_frame_type): Delete call.
+
 	* ns32k-tdep.c (ns32k_gdbarch_init): Do not set deprecated
 	pc_in_call_dummy.
 	* inferior.h (deprecated_pc_in_call_dummy_on_stack): Delete.
diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 650ea2a..96cf0f9 100644
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -1767,37 +1767,6 @@ software_breakpoint_inserted_here_p (CORE_ADDR pc)
   return 0;
 }
 
-/* Return nonzero if FRAME is a dummy frame.  We can't use
-   DEPRECATED_PC_IN_CALL_DUMMY because figuring out the saved SP would
-   take too much time, at least using frame_register() on the 68k.
-   This means that for this function to work right a port must use the
-   bp_call_dummy breakpoint.  */
-
-int
-deprecated_frame_in_dummy (struct frame_info *frame)
-{
-  struct breakpoint *b;
-
-  /* This function is used by two files: get_frame_type(), after first
-     checking that !DEPRECATED_USE_GENERIC_DUMMY_FRAMES; and
-     sparc-tdep.c, which doesn't yet use generic dummy frames anyway.  */
-  gdb_assert (!DEPRECATED_USE_GENERIC_DUMMY_FRAMES);
-
-  ALL_BREAKPOINTS (b)
-  {
-    if (b->type == bp_call_dummy
-	&& frame_id_eq (b->frame_id, get_frame_id (frame))
-    /* We need to check the PC as well as the frame on the sparc,
-       for signals.exp in the testsuite.  */
-	&& (get_frame_pc (frame)
-	    >= (b->loc->address
-		- DEPRECATED_SIZEOF_CALL_DUMMY_WORDS / sizeof (LONGEST) * DEPRECATED_REGISTER_SIZE))
-	&& get_frame_pc (frame) <= b->loc->address)
-      return 1;
-  }
-  return 0;
-}
-
 /* breakpoint_thread_match (PC, PTID) returns true if the breakpoint at
    PC is valid for process/thread PTID.  */
 
diff --git a/gdb/breakpoint.h b/gdb/breakpoint.h
index 76bd183..93b6850 100644
--- a/gdb/breakpoint.h
+++ b/gdb/breakpoint.h
@@ -619,13 +619,6 @@ extern int breakpoint_inserted_here_p (CORE_ADDR);
 
 extern int software_breakpoint_inserted_here_p (CORE_ADDR);
 
-/* FIXME: cagney/2002-11-10: The current [generic] dummy-frame code
-   implements a functional superset of this function.  The only reason
-   it hasn't been removed is because some architectures still don't
-   use the new framework.  Once they have been fixed, this can go.  */
-struct frame_info;
-extern int deprecated_frame_in_dummy (struct frame_info *);
-
 extern int breakpoint_thread_match (CORE_ADDR, ptid_t);
 
 extern void until_break_command (char *, int, int);
diff --git a/gdb/frame.c b/gdb/frame.c
index eba8605..bc55484 100644
--- a/gdb/frame.c
+++ b/gdb/frame.c
@@ -1983,12 +1983,6 @@ frame_relative_level (struct frame_info *fi)
 enum frame_type
 get_frame_type (struct frame_info *frame)
 {
-  /* Some targets still don't use [generic] dummy frames.  Catch them
-     here.  */
-  if (!DEPRECATED_USE_GENERIC_DUMMY_FRAMES
-      && deprecated_frame_in_dummy (frame))
-    return DUMMY_FRAME;
-
   /* Some legacy code, e.g, mips_init_extra_frame_info() wants
      to determine the frame's type prior to it being completely
      initialized.  Don't attempt to lazily initialize ->unwind for