From c69b8bfcf66dafe950e14042f8bb1220c7c5fc69 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Fri, 7 May 2004 14:55:59 +0000 Subject: [PATCH] 2004-05-07 Andrew Cagney * gdbarch.sh (DEPRECATED_USE_GENERIC_DUMMY_FRAMES): Replace with macro defined to 1. * gdbarch.h, gdbarch.c: Re-generate. * ns32k-tdep.c (ns32k_gdbarch_init): Do not set deprecated_use_generic_dummy_frames. --- gdb/ChangeLog | 8 ++++++++ gdb/gdbarch.c | 29 ----------------------------- gdb/gdbarch.h | 13 ++----------- gdb/gdbarch.sh | 4 ++-- gdb/ns32k-tdep.c | 1 - 5 files changed, 12 insertions(+), 43 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 33621316c59..2a52700b76b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2004-05-07 Andrew Cagney + + * gdbarch.sh (DEPRECATED_USE_GENERIC_DUMMY_FRAMES): Replace with + macro defined to 1. + * gdbarch.h, gdbarch.c: Re-generate. + * ns32k-tdep.c (ns32k_gdbarch_init): Do not set + deprecated_use_generic_dummy_frames. + 2004-05-07 Brian Ford * NEWS: Mention Cygwin DWARF 2 support. diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 2523701e727..0158a45e26e 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -158,7 +158,6 @@ struct gdbarch gdbarch_deprecated_target_read_fp_ftype *deprecated_target_read_fp; gdbarch_push_dummy_call_ftype *push_dummy_call; gdbarch_deprecated_push_arguments_ftype *deprecated_push_arguments; - int deprecated_use_generic_dummy_frames; gdbarch_deprecated_push_return_address_ftype *deprecated_push_return_address; gdbarch_deprecated_dummy_write_sp_ftype *deprecated_dummy_write_sp; int deprecated_register_size; @@ -318,7 +317,6 @@ struct gdbarch startup_gdbarch = 0, /* deprecated_target_read_fp */ 0, /* push_dummy_call */ 0, /* deprecated_push_arguments */ - 0, /* deprecated_use_generic_dummy_frames */ 0, /* deprecated_push_return_address */ 0, /* deprecated_dummy_write_sp */ 0, /* deprecated_register_size */ @@ -477,7 +475,6 @@ gdbarch_alloc (const struct gdbarch_info *info, current_gdbarch->deprecated_register_raw_size = generic_register_size; current_gdbarch->deprecated_register_virtual_size = generic_register_size; current_gdbarch->deprecated_fp_regnum = -1; - current_gdbarch->deprecated_use_generic_dummy_frames = 1; current_gdbarch->call_dummy_location = AT_ENTRY_POINT; current_gdbarch->deprecated_call_dummy_words = legacy_call_dummy_words; current_gdbarch->deprecated_sizeof_call_dummy_words = legacy_sizeof_call_dummy_words; @@ -617,7 +614,6 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* Skip verify of deprecated_target_read_fp, has predicate */ /* Skip verify of push_dummy_call, has predicate */ /* Skip verify of deprecated_push_arguments, has predicate */ - /* Skip verify of deprecated_use_generic_dummy_frames, invalid_p == 0 */ /* Skip verify of deprecated_push_return_address, has predicate */ /* Skip verify of deprecated_dummy_write_sp, has predicate */ /* Skip verify of call_dummy_location, invalid_p == 0 */ @@ -1625,14 +1621,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) (long) current_gdbarch->deprecated_target_read_fp /*DEPRECATED_TARGET_READ_FP ()*/); #endif -#ifdef DEPRECATED_USE_GENERIC_DUMMY_FRAMES - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_USE_GENERIC_DUMMY_FRAMES # %s\n", - XSTRING (DEPRECATED_USE_GENERIC_DUMMY_FRAMES)); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_USE_GENERIC_DUMMY_FRAMES = %d\n", - DEPRECATED_USE_GENERIC_DUMMY_FRAMES); -#endif #ifdef DWARF2_REG_TO_REGNUM fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -3213,23 +3201,6 @@ set_gdbarch_deprecated_push_arguments (struct gdbarch *gdbarch, gdbarch->deprecated_push_arguments = deprecated_push_arguments; } -int -gdbarch_deprecated_use_generic_dummy_frames (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - /* Skip verify of deprecated_use_generic_dummy_frames, invalid_p == 0 */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_use_generic_dummy_frames called\n"); - return gdbarch->deprecated_use_generic_dummy_frames; -} - -void -set_gdbarch_deprecated_use_generic_dummy_frames (struct gdbarch *gdbarch, - int deprecated_use_generic_dummy_frames) -{ - gdbarch->deprecated_use_generic_dummy_frames = deprecated_use_generic_dummy_frames; -} - int gdbarch_deprecated_push_return_address_p (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index 660c68f9688..90545751b43 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -52,6 +52,8 @@ struct obstack; extern struct gdbarch *current_gdbarch; +/* Always one, being eliminated. */ +#define DEPRECATED_USE_GENERIC_DUMMY_FRAMES 1 /* If any of the following are defined, the target wasn't correctly converted. */ @@ -753,17 +755,6 @@ extern void set_gdbarch_deprecated_push_arguments (struct gdbarch *gdbarch, gdba #define DEPRECATED_PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) (gdbarch_deprecated_push_arguments (current_gdbarch, nargs, args, sp, struct_return, struct_addr)) #endif -/* DEPRECATED_USE_GENERIC_DUMMY_FRAMES can be deleted. Always true. */ - -extern int gdbarch_deprecated_use_generic_dummy_frames (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_use_generic_dummy_frames (struct gdbarch *gdbarch, int deprecated_use_generic_dummy_frames); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_USE_GENERIC_DUMMY_FRAMES) -#error "Non multi-arch definition of DEPRECATED_USE_GENERIC_DUMMY_FRAMES" -#endif -#if !defined (DEPRECATED_USE_GENERIC_DUMMY_FRAMES) -#define DEPRECATED_USE_GENERIC_DUMMY_FRAMES (gdbarch_deprecated_use_generic_dummy_frames (current_gdbarch)) -#endif - /* Implement PUSH_RETURN_ADDRESS, and then merge in DEPRECATED_PUSH_RETURN_ADDRESS. */ diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index ad37034159c..3a067762d67 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -517,8 +517,6 @@ F::DEPRECATED_TARGET_READ_FP:CORE_ADDR:deprecated_target_read_fp:void M::PUSH_DUMMY_CALL:CORE_ADDR:push_dummy_call:CORE_ADDR func_addr, struct regcache *regcache, CORE_ADDR bp_addr, int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr:func_addr, regcache, bp_addr, nargs, args, sp, struct_return, struct_addr # PUSH_DUMMY_CALL is a direct replacement for DEPRECATED_PUSH_ARGUMENTS. F:2:DEPRECATED_PUSH_ARGUMENTS:CORE_ADDR:deprecated_push_arguments:int nargs, struct value **args, CORE_ADDR sp, int struct_return, CORE_ADDR struct_addr:nargs, args, sp, struct_return, struct_addr -# DEPRECATED_USE_GENERIC_DUMMY_FRAMES can be deleted. Always true. -v::DEPRECATED_USE_GENERIC_DUMMY_FRAMES:int:deprecated_use_generic_dummy_frames:::::1::0 # Implement PUSH_RETURN_ADDRESS, and then merge in # DEPRECATED_PUSH_RETURN_ADDRESS. F:2:DEPRECATED_PUSH_RETURN_ADDRESS:CORE_ADDR:deprecated_push_return_address:CORE_ADDR pc, CORE_ADDR sp:pc, sp @@ -866,6 +864,8 @@ struct obstack; extern struct gdbarch *current_gdbarch; +/* Always one, being eliminated. */ +#define DEPRECATED_USE_GENERIC_DUMMY_FRAMES 1 /* If any of the following are defined, the target wasn't correctly converted. */ diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index 95475a894ca..7ca74d59694 100644 --- 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_use_generic_dummy_frames (gdbarch, 0); set_gdbarch_deprecated_pc_in_call_dummy (gdbarch, deprecated_pc_in_call_dummy_on_stack); /* Breakpoint info */ -- 2.30.2