From 77b2b6d4605f755f1e0d67514be5d69e5f43ec72 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Tue, 9 Sep 2003 18:29:27 +0000 Subject: [PATCH] 2003-09-09 Andrew Cagney * ppc-tdep.h (ppc_sysv_abi_push_dummy_call): Replace "ppc_sysv_abi_push_arguments". * ppc-sysv-tdep.c (ppc_sysv_abi_push_dummy_call): Replace "ppc_sysv_abi_push_arguments". * rs6000-tdep.c (rs6000_gdbarch_init): Set "push_dummy_call" instead of "push_arguments". (rs6000_push_dummy_call): Replace "rs6000_push_arguments". --- gdb/ChangeLog | 10 ++++++++++ gdb/ppc-sysv-tdep.c | 6 ++++-- gdb/ppc-tdep.h | 9 +++++++-- gdb/rs6000-tdep.c | 10 ++++++---- 4 files changed, 27 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d8a73190097..a502bca135d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2003-09-09 Andrew Cagney + + * ppc-tdep.h (ppc_sysv_abi_push_dummy_call): Replace + "ppc_sysv_abi_push_arguments". + * ppc-sysv-tdep.c (ppc_sysv_abi_push_dummy_call): Replace + "ppc_sysv_abi_push_arguments". + * rs6000-tdep.c (rs6000_gdbarch_init): Set "push_dummy_call" + instead of "push_arguments". + (rs6000_push_dummy_call): Replace "rs6000_push_arguments". + 2003-09-09 Andrew Cagney * sh64-tdep.c (sh64_push_return_address): Use ENTRY_POINT_ADDRESS diff --git a/gdb/ppc-sysv-tdep.c b/gdb/ppc-sysv-tdep.c index 6e8216cdc22..24376b9cec6 100644 --- a/gdb/ppc-sysv-tdep.c +++ b/gdb/ppc-sysv-tdep.c @@ -47,8 +47,10 @@ starting from r4. */ CORE_ADDR -ppc_sysv_abi_push_arguments (int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) +ppc_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, 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) { int argno; /* Next available general register for non-float, non-vector arguments. */ diff --git a/gdb/ppc-tdep.h b/gdb/ppc-tdep.h index 066cd99af45..0b65821101b 100644 --- a/gdb/ppc-tdep.h +++ b/gdb/ppc-tdep.h @@ -34,8 +34,13 @@ void ppc_linux_frame_init_saved_regs (struct frame_info *); CORE_ADDR ppc_linux_frame_chain (struct frame_info *); int ppc_sysv_abi_use_struct_convention (int, struct type *); int ppc_sysv_abi_broken_use_struct_convention (int, struct type *); -CORE_ADDR ppc_sysv_abi_push_arguments (int, struct value **, CORE_ADDR, int, - CORE_ADDR); +CORE_ADDR ppc_sysv_abi_push_dummy_call (struct gdbarch *gdbarch, + 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); int ppc_linux_memory_remove_breakpoint (CORE_ADDR addr, char *contents_cache); struct link_map_offsets *ppc_linux_svr4_fetch_link_map_offsets (void); void ppc_linux_supply_gregset (char *buf); diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index d03bfa8974a..17bcb2439a2 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -1118,8 +1118,10 @@ rs6000_frame_align (struct gdbarch *gdbarch, CORE_ADDR addr) starting from r4. */ static CORE_ADDR -rs6000_push_arguments (int nargs, struct value **args, CORE_ADDR sp, - int struct_return, CORE_ADDR struct_addr) +rs6000_push_dummy_call (struct gdbarch *gdbarch, 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) { int ii; int len = 0; @@ -2967,9 +2969,9 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) 64-bit code. At some point in the future, this matter needs to be revisited. */ if (sysv_abi && wordsize == 4) - set_gdbarch_deprecated_push_arguments (gdbarch, ppc_sysv_abi_push_arguments); + set_gdbarch_push_dummy_call (gdbarch, ppc_sysv_abi_push_dummy_call); else - set_gdbarch_deprecated_push_arguments (gdbarch, rs6000_push_arguments); + set_gdbarch_push_dummy_call (gdbarch, rs6000_push_dummy_call); set_gdbarch_deprecated_store_struct_return (gdbarch, rs6000_store_struct_return); set_gdbarch_extract_struct_value_address (gdbarch, rs6000_extract_struct_value_address); -- 2.30.2