From b9d26eb9b8ee2ef2eab0bad4b0d9ed98a5cc378f Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 14 Feb 2004 17:01:01 +0000 Subject: [PATCH] 2004-02-14 Andrew Cagney * gdbarch.sh (DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED): Delete. (DEPRECATED_CALL_DUMMY_STACK_ADJUST): Delete. (DEPRECATED_CALL_DUMMY_ADDRESS): Delete. * gdbarch.h, gdbarch.c: Re-generate. * frame.c (deprecated_get_next_frame_hack): Delete function. * frame.h (deprecated_get_next_frame_hack): Delete declaration. * blockframe.c (deprecated_pc_in_call_dummy_at_entry_point): Update. * infcall.c (call_function_by_hand): Update. Index: doc/ChangeLog 2004-02-14 Andrew Cagney * gdbint.texinfo (Target Architecture Definition): Delete description of DEPRECATED_CALL_DUMMY_STACK_ADJUST. --- gdb/ChangeLog | 12 +++++ gdb/blockframe.c | 2 - gdb/doc/ChangeLog | 5 ++ gdb/doc/gdbint.texinfo | 6 --- gdb/frame.c | 6 --- gdb/frame.h | 7 --- gdb/gdbarch.c | 117 ----------------------------------------- gdb/gdbarch.h | 63 ---------------------- gdb/gdbarch.sh | 6 --- gdb/infcall.c | 42 --------------- 10 files changed, 17 insertions(+), 249 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9ecfc14d15a..8b9d95902b2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2004-02-14 Andrew Cagney + + * gdbarch.sh (DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED): Delete. + (DEPRECATED_CALL_DUMMY_STACK_ADJUST): Delete. + (DEPRECATED_CALL_DUMMY_ADDRESS): Delete. + * gdbarch.h, gdbarch.c: Re-generate. + * frame.c (deprecated_get_next_frame_hack): Delete function. + * frame.h (deprecated_get_next_frame_hack): Delete declaration. + * blockframe.c (deprecated_pc_in_call_dummy_at_entry_point): + Update. + * infcall.c (call_function_by_hand): Update. + 2004-02-14 Elena Zannoni * symfile.c (init_entry_point_info, entry_point_address): Move diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 1375a9f8881..7d240b4e53f 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -598,8 +598,6 @@ deprecated_pc_in_call_dummy_at_entry_point (CORE_ADDR pc, CORE_ADDR sp, CORE_ADDR frame_address) { CORE_ADDR addr = entry_point_address (); - if (DEPRECATED_CALL_DUMMY_ADDRESS_P ()) - addr = DEPRECATED_CALL_DUMMY_ADDRESS (); return ((pc) >= addr && (pc) <= (addr + DECR_PC_AFTER_BREAK)); } diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 6e9c2324966..99cf9a41340 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2004-02-14 Andrew Cagney + + * gdbint.texinfo (Target Architecture Definition): Delete + description of DEPRECATED_CALL_DUMMY_STACK_ADJUST. + 2004-02-12 Elena Zannoni * gdb.texinfo: Properly quote the name "C++". diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index 19458fef904..022a086bf20 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -3077,12 +3077,6 @@ See the file @file{inferior.h}. This method has been replaced by @code{push_dummy_code} (@pxref{push_dummy_code}). -@item DEPRECATED_CALL_DUMMY_STACK_ADJUST -@findex DEPRECATED_CALL_DUMMY_STACK_ADJUST -Stack adjustment needed when performing an inferior function call. This -function is no longer needed. @xref{push_dummy_call}, which can handle -all alignment directly. - @item CANNOT_FETCH_REGISTER (@var{regno}) @findex CANNOT_FETCH_REGISTER A C expression that should be nonzero if @var{regno} cannot be fetched diff --git a/gdb/frame.c b/gdb/frame.c index e608005d30f..6b0ed77303d 100644 --- a/gdb/frame.c +++ b/gdb/frame.c @@ -1227,12 +1227,6 @@ get_next_frame (struct frame_info *this_frame) return NULL; } -struct frame_info * -deprecated_get_next_frame_hack (struct frame_info *this_frame) -{ - return this_frame->next; -} - /* Flush the entire frame cache. */ void diff --git a/gdb/frame.h b/gdb/frame.h index d45fc324f2b..5d2a10662de 100644 --- a/gdb/frame.h +++ b/gdb/frame.h @@ -222,13 +222,6 @@ extern void select_frame (struct frame_info *); extern struct frame_info *get_prev_frame (struct frame_info *); extern struct frame_info *get_next_frame (struct frame_info *); -/* Given a FRAME, return the true next (more inner, younger) frame. - This one exposes the sentinel frame and, hence, never returns NULL. - It is here strictly to help old targets in their migration path to - the new frame code - the new code requires the NEXT, and not THIS - frame. */ -extern struct frame_info *deprecated_get_next_frame_hack (struct frame_info *); - /* Given a frame's ID, relocate the frame. Returns NULL if the frame is not found. */ extern struct frame_info *frame_find_by_id (struct frame_id id); diff --git a/gdb/gdbarch.c b/gdb/gdbarch.c index 2ed9973399c..2fe3db8431e 100644 --- a/gdb/gdbarch.c +++ b/gdb/gdbarch.c @@ -163,17 +163,14 @@ struct gdbarch gdbarch_deprecated_dummy_write_sp_ftype *deprecated_dummy_write_sp; int deprecated_register_size; int call_dummy_location; - gdbarch_deprecated_call_dummy_address_ftype *deprecated_call_dummy_address; CORE_ADDR deprecated_call_dummy_start_offset; CORE_ADDR deprecated_call_dummy_breakpoint_offset; int deprecated_call_dummy_length; LONGEST * deprecated_call_dummy_words; int deprecated_sizeof_call_dummy_words; - int deprecated_call_dummy_stack_adjust; gdbarch_deprecated_fix_call_dummy_ftype *deprecated_fix_call_dummy; gdbarch_push_dummy_code_ftype *push_dummy_code; gdbarch_deprecated_push_dummy_frame_ftype *deprecated_push_dummy_frame; - int deprecated_extra_stack_alignment_needed; gdbarch_deprecated_do_registers_info_ftype *deprecated_do_registers_info; gdbarch_print_registers_info_ftype *print_registers_info; gdbarch_print_float_info_ftype *print_float_info; @@ -333,17 +330,14 @@ struct gdbarch startup_gdbarch = 0, /* deprecated_dummy_write_sp */ 0, /* deprecated_register_size */ 0, /* call_dummy_location */ - 0, /* deprecated_call_dummy_address */ 0, /* deprecated_call_dummy_start_offset */ 0, /* deprecated_call_dummy_breakpoint_offset */ 0, /* deprecated_call_dummy_length */ 0, /* deprecated_call_dummy_words */ 0, /* deprecated_sizeof_call_dummy_words */ - 0, /* deprecated_call_dummy_stack_adjust */ 0, /* deprecated_fix_call_dummy */ 0, /* push_dummy_code */ 0, /* deprecated_push_dummy_frame */ - 0, /* deprecated_extra_stack_alignment_needed */ 0, /* deprecated_do_registers_info */ default_print_registers_info, /* print_registers_info */ 0, /* print_float_info */ @@ -644,14 +638,11 @@ 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_call_dummy_address, has predicate */ /* Skip verify of deprecated_call_dummy_words, invalid_p == 0 */ /* Skip verify of deprecated_sizeof_call_dummy_words, invalid_p == 0 */ - /* Skip verify of deprecated_call_dummy_stack_adjust, has predicate */ /* Skip verify of deprecated_fix_call_dummy, has predicate */ /* Skip verify of push_dummy_code, has predicate */ /* Skip verify of deprecated_push_dummy_frame, has predicate */ - /* Skip verify of deprecated_extra_stack_alignment_needed, invalid_p == 0 */ /* Skip verify of deprecated_do_registers_info, has predicate */ /* Skip verify of print_registers_info, invalid_p == 0 */ /* Skip verify of print_float_info, has predicate */ @@ -963,25 +954,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_ADDRESS_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_CALL_DUMMY_ADDRESS_P()", - XSTRING (DEPRECATED_CALL_DUMMY_ADDRESS_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_CALL_DUMMY_ADDRESS_P() = %d\n", - DEPRECATED_CALL_DUMMY_ADDRESS_P ()); -#endif -#ifdef DEPRECATED_CALL_DUMMY_ADDRESS - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_CALL_DUMMY_ADDRESS()", - XSTRING (DEPRECATED_CALL_DUMMY_ADDRESS ())); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_CALL_DUMMY_ADDRESS = <0x%08lx>\n", - (long) current_gdbarch->deprecated_call_dummy_address - /*DEPRECATED_CALL_DUMMY_ADDRESS ()*/); -#endif #ifdef DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET fprintf_unfiltered (file, "gdbarch_dump: DEPRECATED_CALL_DUMMY_BREAKPOINT_OFFSET # %s\n", @@ -998,23 +970,6 @@ gdbarch_dump (struct gdbarch *current_gdbarch, struct ui_file *file) "gdbarch_dump: DEPRECATED_CALL_DUMMY_LENGTH = %d\n", DEPRECATED_CALL_DUMMY_LENGTH); #endif -#ifdef DEPRECATED_CALL_DUMMY_STACK_ADJUST_P - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", - "DEPRECATED_CALL_DUMMY_STACK_ADJUST_P()", - XSTRING (DEPRECATED_CALL_DUMMY_STACK_ADJUST_P ())); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_CALL_DUMMY_STACK_ADJUST_P() = %d\n", - DEPRECATED_CALL_DUMMY_STACK_ADJUST_P ()); -#endif -#ifdef DEPRECATED_CALL_DUMMY_STACK_ADJUST - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_CALL_DUMMY_STACK_ADJUST # %s\n", - XSTRING (DEPRECATED_CALL_DUMMY_STACK_ADJUST)); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_CALL_DUMMY_STACK_ADJUST = %d\n", - DEPRECATED_CALL_DUMMY_STACK_ADJUST); -#endif #ifdef DEPRECATED_CALL_DUMMY_START_OFFSET fprintf_unfiltered (file, "gdbarch_dump: DEPRECATED_CALL_DUMMY_START_OFFSET # %s\n", @@ -1098,14 +1053,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_EXTRA_STACK_ALIGNMENT_NEEDED - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED # %s\n", - XSTRING (DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED)); - fprintf_unfiltered (file, - "gdbarch_dump: DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED = %d\n", - DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED); -#endif #ifdef DEPRECATED_FIX_CALL_DUMMY_P fprintf_unfiltered (file, "gdbarch_dump: %s # %s\n", @@ -3458,30 +3405,6 @@ set_gdbarch_call_dummy_location (struct gdbarch *gdbarch, gdbarch->call_dummy_location = call_dummy_location; } -int -gdbarch_deprecated_call_dummy_address_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_call_dummy_address != NULL; -} - -CORE_ADDR -gdbarch_deprecated_call_dummy_address (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - gdb_assert (gdbarch->deprecated_call_dummy_address != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_call_dummy_address called\n"); - return gdbarch->deprecated_call_dummy_address (); -} - -void -set_gdbarch_deprecated_call_dummy_address (struct gdbarch *gdbarch, - gdbarch_deprecated_call_dummy_address_ftype deprecated_call_dummy_address) -{ - gdbarch->deprecated_call_dummy_address = deprecated_call_dummy_address; -} - CORE_ADDR gdbarch_deprecated_call_dummy_start_offset (struct gdbarch *gdbarch) { @@ -3564,29 +3487,6 @@ set_gdbarch_deprecated_sizeof_call_dummy_words (struct gdbarch *gdbarch, gdbarch->deprecated_sizeof_call_dummy_words = deprecated_sizeof_call_dummy_words; } -int -gdbarch_deprecated_call_dummy_stack_adjust_p (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - return gdbarch->deprecated_call_dummy_stack_adjust != 0; -} - -int -gdbarch_deprecated_call_dummy_stack_adjust (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_call_dummy_stack_adjust called\n"); - return gdbarch->deprecated_call_dummy_stack_adjust; -} - -void -set_gdbarch_deprecated_call_dummy_stack_adjust (struct gdbarch *gdbarch, - int deprecated_call_dummy_stack_adjust) -{ - gdbarch->deprecated_call_dummy_stack_adjust = deprecated_call_dummy_stack_adjust; -} - int gdbarch_deprecated_fix_call_dummy_p (struct gdbarch *gdbarch) { @@ -3659,23 +3559,6 @@ set_gdbarch_deprecated_push_dummy_frame (struct gdbarch *gdbarch, gdbarch->deprecated_push_dummy_frame = deprecated_push_dummy_frame; } -int -gdbarch_deprecated_extra_stack_alignment_needed (struct gdbarch *gdbarch) -{ - gdb_assert (gdbarch != NULL); - /* Skip verify of deprecated_extra_stack_alignment_needed, invalid_p == 0 */ - if (gdbarch_debug >= 2) - fprintf_unfiltered (gdb_stdlog, "gdbarch_deprecated_extra_stack_alignment_needed called\n"); - return gdbarch->deprecated_extra_stack_alignment_needed; -} - -void -set_gdbarch_deprecated_extra_stack_alignment_needed (struct gdbarch *gdbarch, - int deprecated_extra_stack_alignment_needed) -{ - gdbarch->deprecated_extra_stack_alignment_needed = deprecated_extra_stack_alignment_needed; -} - int gdbarch_deprecated_do_registers_info_p (struct gdbarch *gdbarch) { diff --git a/gdb/gdbarch.h b/gdb/gdbarch.h index bce32b4b891..57c293a0519 100644 --- a/gdb/gdbarch.h +++ b/gdb/gdbarch.h @@ -838,31 +838,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 -#if defined (DEPRECATED_CALL_DUMMY_ADDRESS) -/* Legacy for systems yet to multi-arch DEPRECATED_CALL_DUMMY_ADDRESS */ -#if !defined (DEPRECATED_CALL_DUMMY_ADDRESS_P) -#define DEPRECATED_CALL_DUMMY_ADDRESS_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_call_dummy_address_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_CALL_DUMMY_ADDRESS_P) -#error "Non multi-arch definition of DEPRECATED_CALL_DUMMY_ADDRESS" -#endif -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_CALL_DUMMY_ADDRESS_P) -#define DEPRECATED_CALL_DUMMY_ADDRESS_P() (gdbarch_deprecated_call_dummy_address_p (current_gdbarch)) -#endif - -typedef CORE_ADDR (gdbarch_deprecated_call_dummy_address_ftype) (void); -extern CORE_ADDR gdbarch_deprecated_call_dummy_address (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_call_dummy_address (struct gdbarch *gdbarch, gdbarch_deprecated_call_dummy_address_ftype *deprecated_call_dummy_address); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_CALL_DUMMY_ADDRESS) -#error "Non multi-arch definition of DEPRECATED_CALL_DUMMY_ADDRESS" -#endif -#if !defined (DEPRECATED_CALL_DUMMY_ADDRESS) -#define DEPRECATED_CALL_DUMMY_ADDRESS() (gdbarch_deprecated_call_dummy_address (current_gdbarch)) -#endif - /* DEPRECATED_CALL_DUMMY_START_OFFSET can be deleted. */ extern CORE_ADDR gdbarch_deprecated_call_dummy_start_offset (struct gdbarch *gdbarch); @@ -918,32 +893,6 @@ extern void set_gdbarch_deprecated_sizeof_call_dummy_words (struct gdbarch *gdba #define DEPRECATED_SIZEOF_CALL_DUMMY_WORDS (gdbarch_deprecated_sizeof_call_dummy_words (current_gdbarch)) #endif -/* Implement PUSH_DUMMY_CALL, then delete DEPRECATED_CALL_DUMMY_STACK_ADJUST. */ - -#if defined (DEPRECATED_CALL_DUMMY_STACK_ADJUST) -/* Legacy for systems yet to multi-arch DEPRECATED_CALL_DUMMY_STACK_ADJUST */ -#if !defined (DEPRECATED_CALL_DUMMY_STACK_ADJUST_P) -#define DEPRECATED_CALL_DUMMY_STACK_ADJUST_P() (1) -#endif -#endif - -extern int gdbarch_deprecated_call_dummy_stack_adjust_p (struct gdbarch *gdbarch); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_CALL_DUMMY_STACK_ADJUST_P) -#error "Non multi-arch definition of DEPRECATED_CALL_DUMMY_STACK_ADJUST" -#endif -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) || !defined (DEPRECATED_CALL_DUMMY_STACK_ADJUST_P) -#define DEPRECATED_CALL_DUMMY_STACK_ADJUST_P() (gdbarch_deprecated_call_dummy_stack_adjust_p (current_gdbarch)) -#endif - -extern int gdbarch_deprecated_call_dummy_stack_adjust (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_call_dummy_stack_adjust (struct gdbarch *gdbarch, int deprecated_call_dummy_stack_adjust); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_CALL_DUMMY_STACK_ADJUST) -#error "Non multi-arch definition of DEPRECATED_CALL_DUMMY_STACK_ADJUST" -#endif -#if !defined (DEPRECATED_CALL_DUMMY_STACK_ADJUST) -#define DEPRECATED_CALL_DUMMY_STACK_ADJUST (gdbarch_deprecated_call_dummy_stack_adjust (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. */ @@ -1007,18 +956,6 @@ extern void set_gdbarch_deprecated_push_dummy_frame (struct gdbarch *gdbarch, gd #define DEPRECATED_PUSH_DUMMY_FRAME (gdbarch_deprecated_push_dummy_frame (current_gdbarch)) #endif -/* Implement PUSH_DUMMY_CALL, then delete - DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED. */ - -extern int gdbarch_deprecated_extra_stack_alignment_needed (struct gdbarch *gdbarch); -extern void set_gdbarch_deprecated_extra_stack_alignment_needed (struct gdbarch *gdbarch, int deprecated_extra_stack_alignment_needed); -#if (GDB_MULTI_ARCH > GDB_MULTI_ARCH_PARTIAL) && defined (DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED) -#error "Non multi-arch definition of DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED" -#endif -#if !defined (DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED) -#define DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED (gdbarch_deprecated_extra_stack_alignment_needed (current_gdbarch)) -#endif - #if defined (DEPRECATED_DO_REGISTERS_INFO) /* Legacy for systems yet to multi-arch DEPRECATED_DO_REGISTERS_INFO */ #if !defined (DEPRECATED_DO_REGISTERS_INFO_P) diff --git a/gdb/gdbarch.sh b/gdb/gdbarch.sh index ffe93cdd9ed..bdda88eb8eb 100755 --- a/gdb/gdbarch.sh +++ b/gdb/gdbarch.sh @@ -527,7 +527,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 -F::DEPRECATED_CALL_DUMMY_ADDRESS:CORE_ADDR:deprecated_call_dummy_address:void # 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. @@ -538,8 +537,6 @@ v::DEPRECATED_CALL_DUMMY_LENGTH:int:deprecated_call_dummy_length 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. v::DEPRECATED_SIZEOF_CALL_DUMMY_WORDS:int:deprecated_sizeof_call_dummy_words::::0:legacy_sizeof_call_dummy_words::0 -# Implement PUSH_DUMMY_CALL, then delete DEPRECATED_CALL_DUMMY_STACK_ADJUST. -V:2:DEPRECATED_CALL_DUMMY_STACK_ADJUST:int:deprecated_call_dummy_stack_adjust # 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 @@ -547,9 +544,6 @@ F::DEPRECATED_FIX_CALL_DUMMY:void:deprecated_fix_call_dummy:char *dummy, CORE_AD 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 # Implement PUSH_DUMMY_CALL, then delete DEPRECATED_PUSH_DUMMY_FRAME. F:2:DEPRECATED_PUSH_DUMMY_FRAME:void:deprecated_push_dummy_frame:void:- -# Implement PUSH_DUMMY_CALL, then delete -# DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED. -v:2:DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED:int:deprecated_extra_stack_alignment_needed::::0:0::0::: F:2:DEPRECATED_DO_REGISTERS_INFO:void:deprecated_do_registers_info:int reg_nr, int fpregs:reg_nr, fpregs m:2:PRINT_REGISTERS_INFO:void:print_registers_info:struct ui_file *file, struct frame_info *frame, int regnum, int all:file, frame, regnum, all:::default_print_registers_info::0 diff --git a/gdb/infcall.c b/gdb/infcall.c index f859ec3ea5a..860d9cfafd0 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -559,9 +559,6 @@ call_function_by_hand (struct value *function, int nargs, struct value **args) } real_pc = funaddr; dummy_addr = entry_point_address (); - if (DEPRECATED_CALL_DUMMY_ADDRESS_P ()) - /* Override it. */ - dummy_addr = DEPRECATED_CALL_DUMMY_ADDRESS (); /* Make certain that the address points at real code, and not a function descriptor. */ dummy_addr = gdbarch_convert_from_func_ptr_addr (current_gdbarch, @@ -763,31 +760,6 @@ You must use a pointer to function type variable. Command ignored.", arg_name); } } - /* elz: on HPPA no need for this extra alignment, maybe it is needed - on other architectures. This is because all the alignment is - taken care of in the above code (ifdef DEPRECATED_REG_STRUCT_HAS_ADDR) - and in hppa_push_arguments */ - /* NOTE: cagney/2003-03-24: The below code is very broken. Given an - odd sized parameter the below will mis-align the stack. As was - suggested back in '96, better to let PUSH_ARGUMENTS handle it. */ - if (DEPRECATED_EXTRA_STACK_ALIGNMENT_NEEDED) - { - /* MVS 11/22/96: I think at least some of this stack_align code - is really broken. Better to let push_dummy_call() adjust the - stack in a target-defined manner. */ - if (DEPRECATED_STACK_ALIGN_P () && INNER_THAN (1, 2)) - { - /* If stack grows down, we must leave a hole at the top. */ - int len = 0; - int i; - for (i = nargs - 1; i >= 0; i--) - len += TYPE_LENGTH (VALUE_ENCLOSING_TYPE (args[i])); - if (DEPRECATED_CALL_DUMMY_STACK_ADJUST_P ()) - len += DEPRECATED_CALL_DUMMY_STACK_ADJUST; - sp -= DEPRECATED_STACK_ALIGN (len) - len; - } - } - /* Create the dummy stack frame. Pass in the call dummy address as, presumably, the ABI code knows where, in the call dummy, the return address should be pointed. */ @@ -833,23 +805,9 @@ You must use a pointer to function type variable. Command ignored.", arg_name); { /* If stack grows up, we must leave a hole at the bottom, note that sp already has been advanced for the arguments! */ - if (DEPRECATED_CALL_DUMMY_STACK_ADJUST_P ()) - sp += DEPRECATED_CALL_DUMMY_STACK_ADJUST; sp = DEPRECATED_STACK_ALIGN (sp); } -/* XXX This seems wrong. For stacks that grow down we shouldn't do - anything here! */ - /* MVS 11/22/96: I think at least some of this stack_align code is - really broken. Better to let PUSH_ARGUMENTS adjust the stack in - a target-defined manner. */ - if (DEPRECATED_CALL_DUMMY_STACK_ADJUST_P ()) - if (INNER_THAN (1, 2)) - { - /* stack grows downward */ - sp -= DEPRECATED_CALL_DUMMY_STACK_ADJUST; - } - /* Store the address at which the structure is supposed to be written. */ /* NOTE: 2003-03-24: Since PUSH_ARGUMENTS can (and typically does) -- 2.30.2