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

	* ns32k-tdep.c (ns32k_gdbarch_init): Do not set deprecated
	pc_in_call_dummy.
	* inferior.h (deprecated_pc_in_call_dummy_on_stack): Delete.
	* blockframe.c (deprecated_pc_in_call_dummy_on_stack): Delete.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 285f9da557e15d9b4123fa04657110f6b62d478c..643cd2e9cce1d89be04c2267ddc3e4a61ba70a86 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-08  Andrew Cagney  <cagney@redhat.com>
+
+       * ns32k-tdep.c (ns32k_gdbarch_init): Do not set deprecated
+       pc_in_call_dummy.
+       * inferior.h (deprecated_pc_in_call_dummy_on_stack): Delete.
+       * blockframe.c (deprecated_pc_in_call_dummy_on_stack): Delete.
+
 2004-05-08  Mark Kettenis  <kettenis@gnu.org>
 
        * alphanbsd-tdep.c: Include "gdb_string.h".

diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index 6e9cf58af23cb2638156efaf6a272cdd6fb31eea..a4c209a7a8243d4c3cfe712984af50d9275b212b 100644 (file)
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -519,33 +519,6 @@ block_innermost_frame (struct block *block)
    below is for infrun.c, which may give the macro a pc without that
    subtracted out.  */
 
-/* Is the PC in a call dummy?  SP and FRAME_ADDRESS are the bottom and
-   top of the stack frame which we are checking, where "bottom" and
-   "top" refer to some section of memory which contains the code for
-   the call dummy.  Calls to this macro assume that the contents of
-   SP_REGNUM and DEPRECATED_FP_REGNUM (or the saved values thereof),
-   respectively, are the things to pass.
-
-   This won't work on the 29k, where SP_REGNUM and
-   DEPRECATED_FP_REGNUM don't have that meaning, but the 29k doesn't
-   use ON_STACK.  This could be fixed by generalizing this scheme,
-   perhaps by passing in a frame and adding a few fields, at least on
-   machines which need them for DEPRECATED_PC_IN_CALL_DUMMY.
-
-   Something simpler, like checking for the stack segment, doesn't work,
-   since various programs (threads implementations, gcc nested function
-   stubs, etc) may either allocate stack frames in another segment, or
-   allocate other kinds of code on the stack.  */
-
-int
-deprecated_pc_in_call_dummy_on_stack (CORE_ADDR pc, CORE_ADDR sp,
-                                     CORE_ADDR frame_address)
-{
-  return (INNER_THAN ((sp), (pc))
-         && (frame_address != 0)
-         && INNER_THAN ((pc), (frame_address)));
-}
-
 /* Returns true for a user frame or a call_function_by_hand dummy
    frame, and false for the CRT0 start-up frame.  Purpose is to
    terminate backtrace.  */

diff --git a/gdb/inferior.h b/gdb/inferior.h
index ab5a25bfc8698dadcad626e9b6c248a0faeb3c82..cd2ada8139d92e8ddb62d1c821131981ba841a4a 100644 (file)
--- a/gdb/inferior.h
+++ b/gdb/inferior.h
@@ -452,17 +452,6 @@ extern int attach_flag;
 #endif
 
 
-/* Are we in a call dummy? */
-
-/* NOTE: cagney/2002-11-24 cagney/2004-03-22: Targets need to both
-   switch to generic dummy frames.  The generic version should be able
-   to handle all cases since that code works by saving the address of
-   the dummy's breakpoint (where ever it is).  */
-
-extern int deprecated_pc_in_call_dummy_on_stack (CORE_ADDR pc,
-                                                CORE_ADDR sp,
-                                                CORE_ADDR frame_address);
-
 /* If STARTUP_WITH_SHELL is set, GDB's "run"
    will attempts to start up the debugee under a shell.
    This is in order for argument-expansion to occur. E.g.,

diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c
index 7ca74d59694713fa76aad501342ca81c250e63e8..6dc708cce61a08f2349060c3c4ef1937cb8e66e0 100644 (file)
--- a/gdb/ns32k-tdep.c
+++ b/gdb/ns32k-tdep.c
@@ -582,7 +582,6 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches)
   set_gdbarch_deprecated_fix_call_dummy (gdbarch, ns32k_fix_call_dummy);
   set_gdbarch_deprecated_call_dummy_start_offset (gdbarch, 3);
   set_gdbarch_deprecated_call_dummy_breakpoint_offset (gdbarch, 15);
-  set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack);
 
   /* Breakpoint info */
   set_gdbarch_breakpoint_from_pc (gdbarch, ns32k_breakpoint_from_pc);