From 289541793e83d187b77c4897b30057ca90baeebd Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 8 May 2004 21:52:50 +0000 Subject: [PATCH] 2004-05-08 Andrew Cagney * gdbint.texinfo (Target Architecture Definition): Delete references to DEPRECATED_FIX_CALL_DUMMY. 2004-05-08 Andrew Cagney * gdbarch.sh (DEPRECATED_FIX_CALL_DUMMY): Delete. * gdbarch.h, gdbarch.c: Re-generate. * ns32k-tdep.c (ns32k_gdbarch_init): Do not set deprecated_fix_call_dummy. * v850-tdep.c (v850_gdbarch_init): Ditto. * infcall.c (call_function_by_hand): Do not call DEPRECATED_FIX_CALL_DUMMY. --- gdb/ChangeLog | 8 ++++++++ gdb/doc/ChangeLog | 3 +++ gdb/doc/gdbint.texinfo | 3 +-- gdb/gdbarch.c | 46 ------------------------------------------ gdb/gdbarch.h | 30 --------------------------- gdb/gdbarch.sh | 4 ---- gdb/infcall.c | 12 ----------- gdb/ns32k-tdep.c | 1 - gdb/v850-tdep.c | 1 - 9 files changed, 12 insertions(+), 96 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index bac242ffb9d..e6054e5e08d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2004-05-08 Andrew Cagney + * gdbarch.sh (DEPRECATED_FIX_CALL_DUMMY): Delete. + * gdbarch.h, gdbarch.c: Re-generate. + * ns32k-tdep.c (ns32k_gdbarch_init): Do not set + deprecated_fix_call_dummy. + * v850-tdep.c (v850_gdbarch_init): Ditto. + * infcall.c (call_function_by_hand): Do not call + DEPRECATED_FIX_CALL_DUMMY. + * gdbarch.sh (DEPRECATED_CALL_DUMMY_WORDS) (DEPRECATED_SIZEOF_CALL_DUMMY_WORDS): Delete. * gdbarch.h, gdbarch.c: Re-generate. diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 8eab12ddc43..61a0f73ad20 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,5 +1,8 @@ 2004-05-08 Andrew Cagney + * gdbint.texinfo (Target Architecture Definition): Delete + references to DEPRECATED_FIX_CALL_DUMMY. + * gdbint.texinfo (Target Architecture Definition): Delete description of DEPRECATED_CALL_DUMMY_WORDS, DEPRECATED_SIZEOF_CALL_DUMMY_WORDS, and CALL_DUMMY. diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index 7d2965d4f79..bf267711271 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -3658,7 +3658,6 @@ This method replaces @code{DEPRECATED_PUSH_ARGUMENTS}. @item CORE_ADDR push_dummy_code (@var{gdbarch}, @var{sp}, @var{funaddr}, @var{using_gcc}, @var{args}, @var{nargs}, @var{value_type}, @var{real_pc}, @var{bp_addr}) @findex push_dummy_code -@findex DEPRECATED_FIX_CALL_DUMMY @anchor{push_dummy_code} Given a stack based call dummy, push the instruction sequence (including space for a breakpoint) to which the called function should return. @@ -3672,7 +3671,7 @@ By default, the stack is grown sufficient to hold a frame-aligned reserved for that breakpoint, and @var{real_pc} set to @var{funaddr}. This method replaces @code{CALL_DUMMY_LOCATION}, -@code{DEPRECATED_REGISTER_SIZE}, and @code{DEPRECATED_FIX_CALL_DUMMY}. +@code{DEPRECATED_REGISTER_SIZE}. @item DEPRECATED_REGISTER_BYTES @findex DEPRECATED_REGISTER_BYTES diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 6e41a2a5200..df0a03e3215 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -162,7 +162,6 @@ struct gdbarch gdbarch_deprecated_dummy_write_sp_ftype *deprecated_dummy_write_sp; int deprecated_register_size; int call_dummy_location; - gdbarch_deprecated_fix_call_dummy_ftype *deprecated_fix_call_dummy; gdbarch_push_dummy_code_ftype *push_dummy_code; gdbarch_deprecated_do_registers_info_ftype *deprecated_do_registers_info; gdbarch_print_registers_info_ftype *print_registers_info; @@ -316,7 +315,6 @@ struct gdbarch startup_gdbarch = 0, /* deprecated_dummy_write_sp */ 0, /* deprecated_register_size */ 0, /* call_dummy_location */ - 0, /* deprecated_fix_call_dummy */ 0, /* push_dummy_code */ 0, /* deprecated_do_registers_info */ default_print_registers_info, /* print_registers_info */ @@ -605,7 +603,6 @@ verify_gdbarch (struct gdbarch *current_gdbarch) /* 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 */ - /* Skip verify of deprecated_fix_call_dummy, has predicate */ /* Skip verify of push_dummy_code, has predicate */ /* Skip verify of deprecated_do_registers_info, has predicate */ /* Skip verify of print_registers_info, invalid_p == 0 */ @@ -973,25 +970,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) (long) current_gdbarch->deprecated_extract_struct_value_address /*DEPRECATED_EXTRACT_STRUCT_VALUE_ADDRESS ()*/); #endif -#ifdef DEPRECATED_FIX_CALL_DUMMY_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FIX_CALL_DUMMY_P()", - XSTRING (DEPRECATED_FIX_CALL_DUMMY_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FIX_CALL_DUMMY_P() = %d\n", - DEPRECATED_FIX_CALL_DUMMY_P ()); -#endif -#ifdef DEPRECATED_FIX_CALL_DUMMY - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_FIX_CALL_DUMMY(dummy, pc, fun, nargs, args, type, gcc_p)", - XSTRING (DEPRECATED_FIX_CALL_DUMMY (dummy, pc, fun, nargs, args, type, gcc_p))); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_FIX_CALL_DUMMY = <0x%08lx>\n", - (long) current_gdbarch->deprecated_fix_call_dummy - /*DEPRECATED_FIX_CALL_DUMMY ()*/); -#endif #ifdef DEPRECATED_FP_REGNUM fprintf_unfiltered (file, "gdbarch_dump: DEPRECATED_FP_REGNUM # %s\n", @@ -3216,30 +3194,6 @@ set_gdbarch_call_dummy_location (struct gdbarch *gdbarch, gdbarch->call_dummy_location = call_dummy_location; } -int -gdbarch_deprecated_fix_call_dummy_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_fix_call_dummy != NULL; -} - -void -gdbarch_deprecated_fix_call_dummy (struct gdbarch *gdbarch, char *dummy, CORE_ADDR pc, CORE_ADDR fun, int nargs, struct value **args, struct type *type, int gcc_p) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_fix_call_dummy != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_fix_call_dummy called\n"); - gdbarch->deprecated_fix_call_dummy (dummy, pc, fun, nargs, args, type, gcc_p); -} - -void -set_gdbarch_deprecated_fix_call_dummy (struct gdbarch *gdbarch, - gdbarch_deprecated_fix_call_dummy_ftype deprecated_fix_call_dummy) -{ - gdbarch->deprecated_fix_call_dummy = deprecated_fix_call_dummy; -} - int gdbarch_push_dummy_code_p (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index f5ef8cb490c..3efa2ec5ae1 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -827,36 +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_FIX_CALL_DUMMY can be deleted. For the SPARC, implement - PUSH_DUMMY_CODE and set CALL_DUMMY_LOCATION to ON_STACK. */ - -#if defined (DEPRECATED_FIX_CALL_DUMMY) -/* Legacy for systems yet to multi-arch DEPRECATED_FIX_CALL_DUMMY */ -#if !defined (DEPRECATED_FIX_CALL_DUMMY_P) -#define DEPRECATED_FIX_CALL_DUMMY_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_fix_call_dummy_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FIX_CALL_DUMMY_P) -#error "Non multi-arch definition of DEPRECATED_FIX_CALL_DUMMY" -#endif -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_FIX_CALL_DUMMY_P) -#define DEPRECATED_FIX_CALL_DUMMY_P() (gdbarch_deprecated_fix_call_dummy_p (current_gdbarch)) -#endif - -typedef void (gdbarch_deprecated_fix_call_dummy_ftype) (char *dummy, CORE_ADDR pc, CORE_ADDR fun, int nargs, struct value **args, struct type *type, int gcc_p); -extern void gdbarch_deprecated_fix_call_dummy (struct gdbarch *gdbarch, char *dummy, CORE_ADDR pc, CORE_ADDR fun, int nargs, struct value **args, struct type *type, int gcc_p); -extern void set_gdbarch_deprecated_fix_call_dummy (struct gdbarch *gdbarch, gdbarch_deprecated_fix_call_dummy_ftype *deprecated_fix_call_dummy); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_FIX_CALL_DUMMY) -#error "Non multi-arch definition of DEPRECATED_FIX_CALL_DUMMY" -#endif -#if !defined (DEPRECATED_FIX_CALL_DUMMY) -#define DEPRECATED_FIX_CALL_DUMMY(dummy, pc, fun, nargs, args, type, gcc_p) (gdbarch_deprecated_fix_call_dummy (current_gdbarch, dummy, pc, fun, nargs, args, type, gcc_p)) -#endif - -/* This is a replacement for DEPRECATED_FIX_CALL_DUMMY et.al. */ - extern int gdbarch_push_dummy_code_p (struct gdbarch *gdbarch); typedef CORE_ADDR (gdbarch_push_dummy_code_ftype) (struct gdbarch *gdbarch, CORE_ADDR sp, CORE_ADDR funaddr, int using_gcc, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr); diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index b076ad3f42a..12aac5b9cbb 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_FIX_CALL_DUMMY can be deleted. For the SPARC, implement -# PUSH_DUMMY_CODE and set CALL_DUMMY_LOCATION to ON_STACK. -F::DEPRECATED_FIX_CALL_DUMMY:void:deprecated_fix_call_dummy:char *dummy, CORE_ADDR pc, CORE_ADDR fun, int nargs, struct value **args, struct type *type, int gcc_p:dummy, pc, fun, nargs, args, type, gcc_p -# This is a replacement for DEPRECATED_FIX_CALL_DUMMY et.al. M::PUSH_DUMMY_CODE:CORE_ADDR:push_dummy_code:CORE_ADDR sp, CORE_ADDR funaddr, int using_gcc, struct value **args, int nargs, struct type *value_type, CORE_ADDR *real_pc, CORE_ADDR *bp_addr:sp, funaddr, using_gcc, args, nargs, value_type, real_pc, bp_addr F:2:DEPRECATED_DO_REGISTERS_INFO:void:deprecated_do_registers_info:int reg_nr, int fpregs:reg_nr, fpregs diff --git a/gdb/infcall.c b/gdb/infcall.c index 4d1f1c7f346..4985884ab07 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -451,18 +451,6 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) } break; case AT_ENTRY_POINT: - if (DEPRECATED_FIX_CALL_DUMMY_P () - && !gdbarch_push_dummy_call_p (current_gdbarch)) - { - /* Sigh. Some targets use DEPRECATED_FIX_CALL_DUMMY to - shove extra stuff onto the stack or into registers. That - code should be in PUSH_DUMMY_CALL, however, in the mean - time ... */ - /* If the target is manipulating DUMMY1, it looses big time. */ - void *dummy1 = NULL; - DEPRECATED_FIX_CALL_DUMMY (dummy1, sp, funaddr, nargs, args, - value_type, using_gcc); - } real_pc = funaddr; dummy_addr = entry_point_address (); /* Make certain that the address points at real code, and not a diff --git a/gdb/ns32k-tdep.c b/gdb/ns32k-tdep.c index cfdcb4b97d3..a37bc6f718a 100644 --- a/gdb/ns32k-tdep.c +++ b/gdb/ns32k-tdep.c @@ -551,7 +551,6 @@ ns32k_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Call dummy info */ set_gdbarch_deprecated_pop_frame (gdbarch, ns32k_pop_frame); set_gdbarch_call_dummy_location (gdbarch, ON_STACK); - set_gdbarch_deprecated_fix_call_dummy (gdbarch, ns32k_fix_call_dummy); /* Breakpoint info */ set_gdbarch_breakpoint_from_pc (gdbarch, ns32k_breakpoint_from_pc); diff --git a/gdb/v850-tdep.c b/gdb/v850-tdep.c index 7e829cbf74f..4ba78e85e48 100644 --- a/gdb/v850-tdep.c +++ b/gdb/v850-tdep.c @@ -1254,7 +1254,6 @@ v850_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_deprecated_store_struct_return (gdbarch, v850_store_struct_return); set_gdbarch_deprecated_store_return_value (gdbarch, v850_store_return_value); set_gdbarch_use_struct_convention (gdbarch, v850_use_struct_convention); - set_gdbarch_deprecated_fix_call_dummy (gdbarch, v850_fix_call_dummy); set_gdbarch_breakpoint_from_pc (gdbarch, v850_breakpoint_from_pc); set_gdbarch_int_bit (gdbarch, 4 * TARGET_CHAR_BIT); -- 2.30.2