From e4a2df64e7997f29444053d0747f09e843e4a4e9 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 8 May 2004 20:16:34 +0000 Subject: [PATCH] 2004-05-08 Andrew Cagney * ns32k-tdep.c (ns32k_gdbarch_init): Do not set deprecated_call_dummy_breakpoint_offset or deprecated_call_dummy_start_offset. * dummy-frame.c, arm-tdep.c: Update comments. * gdbarch.sh (DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET) (DEPRECATED_CALL_DUMMY_START_OFFSET): Delete. * gdbarch.h, gdbarch.c: Re-generate. Index: doc/ChangeLog 2004-05-08 Andrew Cagney * gdbint.texinfo (Target Architecture Definition): Delete reference to DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET. --- gdb/ChangeLog | 8 +++++++ gdb/arm-tdep.c | 2 +- gdb/doc/ChangeLog | 5 ++++ gdb/doc/gdbint.texinfo | 3 +-- gdb/dummy-frame.c | 6 +---- gdb/gdbarch.c | 52 ------------------------------------------ gdb/gdbarch.h | 22 ------------------ gdb/gdbarch.sh | 4 ---- gdb/ns32k-tdep.c | 2 -- 9 files changed, 16 insertions(+), 88 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 22a787747c0..06bb6f71ddf 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2004-05-08 Andrew Cagney + * ns32k-tdep.c (ns32k_gdbarch_init): Do not set + deprecated_call_dummy_breakpoint_offset or + deprecated_call_dummy_start_offset. + * dummy-frame.c, arm-tdep.c: Update comments. + * gdbarch.sh (DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET) + (DEPRECATED_CALL_DUMMY_START_OFFSET): Delete. + * gdbarch.h, gdbarch.c: Re-generate. + * infcall.c (legacy_push_dummy_code): Delete function. (push_dummy_code): Delete call. diff --git a/gdb/arm-tdep.c b/gdb/arm-tdep.c index 57949e15d67..4caecb76bca 100644 --- a/gdb/arm-tdep.c +++ b/gdb/arm-tdep.c @@ -191,7 +191,7 @@ static int target_is_thumb; /* Flag set by arm_fix_call_dummy that tells whether the calling function is a Thumb function. This flag is checked by - arm_pc_is_thumb and arm_call_dummy_breakpoint_offset. */ + arm_pc_is_thumb. */ static int caller_is_thumb; diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 00f666d03fb..a505fa2d56b 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2004-05-08 Andrew Cagney + + * gdbint.texinfo (Target Architecture Definition): Delete + reference to DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET. + 2004-05-07 Andrew Cagney * observer.texi (GDB Observers): Add "Debugging" section. Include diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index 769c4e11ef7..dc92c78cca6 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -3702,8 +3702,7 @@ reserved for that breakpoint, and @var{real_pc} set to @var{funaddr}. This method replaces @code{DEPRECATED_CALL_DUMMY_WORDS}, @code{DEPRECATED_SIZEOF_CALL_DUMMY_WORDS}, @code{CALL_DUMMY}, -@code{CALL_DUMMY_LOCATION}, @code{DEPRECATED_REGISTER_SIZE}, -@code{DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET}, and +@code{CALL_DUMMY_LOCATION}, @code{DEPRECATED_REGISTER_SIZE}, and @code{DEPRECATED_FIX_CALL_DUMMY}. @item DEPRECATED_PUSH_DUMMY_FRAME diff --git a/gdb/dummy-frame.c b/gdb/dummy-frame.c index d55b3bd4e00..2faac714dd1 100644 --- a/gdb/dummy-frame.c +++ b/gdb/dummy-frame.c @@ -151,11 +151,7 @@ deprecated_pc_in_call_dummy (CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR fp) FIXME: cagney/2002-11-23: This is silly. Surely "infrun.c" can figure out what the real PC (as in the resume address) is BEFORE - calling this function (Oh, and I'm not even sure that this function - is called with an decremented PC, the call to pc_in_call_dummy() in - that file is conditional on - !DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET_P yet generic dummy - targets set DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET. True?). */ + calling this function. */ static int pc_in_dummy_frame (CORE_ADDR pc) diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 0158a45e26e..0dbbe298175 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -162,8 +162,6 @@ struct gdbarch gdbarch_deprecated_dummy_write_sp_ftype *deprecated_dummy_write_sp; int deprecated_register_size; int call_dummy_location; - CORE_ADDR deprecated_call_dummy_start_offset; - CORE_ADDR deprecated_call_dummy_breakpoint_offset; LONGEST * deprecated_call_dummy_words; int deprecated_sizeof_call_dummy_words; gdbarch_deprecated_fix_call_dummy_ftype *deprecated_fix_call_dummy; @@ -321,8 +319,6 @@ struct gdbarch startup_gdbarch = 0, /* deprecated_dummy_write_sp */ 0, /* deprecated_register_size */ 0, /* call_dummy_location */ - 0, /* deprecated_call_dummy_start_offset */ - 0, /* deprecated_call_dummy_breakpoint_offset */ 0, /* deprecated_call_dummy_words */ 0, /* deprecated_sizeof_call_dummy_words */ 0, /* deprecated_fix_call_dummy */ @@ -921,22 +917,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) "gdbarch_dump: DECR_PC_AFTER_BREAK = %ld\n", (long) DECR_PC_AFTER_BREAK); #endif -#ifdef DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET # %s\n", - XSTRING (DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET)); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET = %ld\n", - (long) DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET); -#endif -#ifdef DEPRECATED_CALL_DUMMY_START_OFFSET - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_CALL_DUMMY_START_OFFSET # %s\n", - XSTRING (DEPRECATED_CALL_DUMMY_START_OFFSET)); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_CALL_DUMMY_START_OFFSET = %ld\n", - (long) DEPRECATED_CALL_DUMMY_START_OFFSET); -#endif #ifdef DEPRECATED_CALL_DUMMY_WORDS fprintf_unfiltered (file, "gdbarch_dump: DEPRECATED_CALL_DUMMY_WORDS # %s\n", @@ -3282,38 +3262,6 @@ set_gdbarch_call_dummy_location (struct gdbarch *gdbarch, gdbarch->call_dummy_location = call_dummy_location; } -CORE_ADDR -gdbarch_deprecated_call_dummy_start_offset (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_call_dummy_start_offset called\n"); - return gdbarch->deprecated_call_dummy_start_offset; -} - -void -set_gdbarch_deprecated_call_dummy_start_offset (struct gdbarch *gdbarch, - CORE_ADDR deprecated_call_dummy_start_offset) -{ - gdbarch->deprecated_call_dummy_start_offset = deprecated_call_dummy_start_offset; -} - -CORE_ADDR -gdbarch_deprecated_call_dummy_breakpoint_offset (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_call_dummy_breakpoint_offset called\n"); - return gdbarch->deprecated_call_dummy_breakpoint_offset; -} - -void -set_gdbarch_deprecated_call_dummy_breakpoint_offset (struct gdbarch *gdbarch, - CORE_ADDR deprecated_call_dummy_breakpoint_offset) -{ - gdbarch->deprecated_call_dummy_breakpoint_offset = deprecated_call_dummy_breakpoint_offset; -} - LONGEST * gdbarch_deprecated_call_dummy_words (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 4a2f69751d9..da1e9ecc3d3 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -827,28 +827,6 @@ extern void set_gdbarch_call_dummy_location (struct gdbarch *gdbarch, int call_d #define CALL_DUMMY_LOCATION (gdbarch_call_dummy_location (current_gdbarch)) #endif -/* DEPRECATED_CALL_DUMMY_START_OFFSET can be deleted. */ - -extern CORE_ADDR gdbarch_deprecated_call_dummy_start_offset (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_call_dummy_start_offset (struct gdbarch *gdbarch, CORE_ADDR deprecated_call_dummy_start_offset); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_CALL_DUMMY_START_OFFSET) -#error "Non multi-arch definition of DEPRECATED_CALL_DUMMY_START_OFFSET" -#endif -#if !defined (DEPRECATED_CALL_DUMMY_START_OFFSET) -#define DEPRECATED_CALL_DUMMY_START_OFFSET (gdbarch_deprecated_call_dummy_start_offset (current_gdbarch)) -#endif - -/* DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET can be deleted. */ - -extern CORE_ADDR gdbarch_deprecated_call_dummy_breakpoint_offset (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_call_dummy_breakpoint_offset (struct gdbarch *gdbarch, CORE_ADDR deprecated_call_dummy_breakpoint_offset); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET) -#error "Non multi-arch definition of DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET" -#endif -#if !defined (DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET) -#define DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET (gdbarch_deprecated_call_dummy_breakpoint_offset (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 32bcf47d5e4..48324326fca 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -525,10 +525,6 @@ F:2:DEPRECATED_DUMMY_WRITE_SP:void:deprecated_dummy_write_sp:CORE_ADDR val:val # DEPRECATED_REGISTER_SIZE can be deleted. v::DEPRECATED_REGISTER_SIZE:int:deprecated_register_size v::CALL_DUMMY_LOCATION:int:call_dummy_location:::::AT_ENTRY_POINT::0 -# DEPRECATED_CALL_DUMMY_START_OFFSET can be deleted. -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_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/ns32k-tdep.c b/gdb/ns32k-tdep.c index 6dc708cce61..1019b41d7d7 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -580,8 +580,6 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_call_dummy_words (gdbarch, ns32k_call_dummy_words); set_gdbarch_deprecated_sizeof_call_dummy_words (gdbarch, sizeof_ns32k_call_dummy_words); 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); /* Breakpoint info */ set_gdbarch_breakpoint_from_pc (gdbarch, ns32k_breakpoint_from_pc); -- 2.30.2