From 1ac839b8ccd88fb376204225b0912678140653b5 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sat, 8 May 2004 22:19:30 +0000 Subject: [PATCH] 2004-05-08 Andrew Cagney * infcall.c (call_function_by_hand): When no DEPRECATED_SAVE_DUMMY_FRAME_TOS call generic_save_dummy_frame_tos. * rs6000-tdep.c (rs6000_gdbarch_init): Do not set DEPRECATED_SAVE_DUMMY_FRAME_TOS. * mn10300-tdep.c (mn10300_gdbarch_init): Ditto. * mcore-tdep.c (mcore_gdbarch_init): Ditto. --- gdb/ChangeLog | 7 +++++++ gdb/infcall.c | 14 ++++++-------- gdb/mcore-tdep.c | 1 - gdb/mn10300-tdep.c | 1 - gdb/rs6000-tdep.c | 1 - 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e6054e5e08d..5984baf707b 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,12 @@ 2004-05-08 Andrew Cagney + * infcall.c (call_function_by_hand): When no + DEPRECATED_SAVE_DUMMY_FRAME_TOS call generic_save_dummy_frame_tos. + * rs6000-tdep.c (rs6000_gdbarch_init): Do not set + DEPRECATED_SAVE_DUMMY_FRAME_TOS. + * mn10300-tdep.c (mn10300_gdbarch_init): Ditto. + * mcore-tdep.c (mcore_gdbarch_init): Ditto. + * gdbarch.sh (DEPRECATED_FIX_CALL_DUMMY): Delete. * gdbarch.h, gdbarch.c: Re-generate. * ns32k-tdep.c (ns32k_gdbarch_init): Do not set diff --git a/gdb/infcall.c b/gdb/infcall.c index 4985884ab07..0f0ffc9e9ac 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -721,15 +721,13 @@ You must use a pointer to function type variable. Command ignored.", arg_name); if (DEPRECATED_DUMMY_WRITE_SP_P ()) DEPRECATED_DUMMY_WRITE_SP (sp); - if (gdbarch_unwind_dummy_id_p (current_gdbarch)) - { - /* Sanity. The exact same SP value is returned by - PUSH_DUMMY_CALL, saved as the dummy-frame TOS, and used by - unwind_dummy_id to form the frame ID's stack address. */ - generic_save_dummy_frame_tos (sp); - } - else if (DEPRECATED_SAVE_DUMMY_FRAME_TOS_P ()) + if (DEPRECATED_SAVE_DUMMY_FRAME_TOS_P ()) DEPRECATED_SAVE_DUMMY_FRAME_TOS (sp); + else + /* Sanity. The exact same SP value is returned by + PUSH_DUMMY_CALL, saved as the dummy-frame TOS, and used by + unwind_dummy_id to form the frame ID's stack address. */ + generic_save_dummy_frame_tos (sp); /* Now proceed, having reached the desired place. */ clear_proceed_status (); diff --git a/gdb/mcore-tdep.c b/gdb/mcore-tdep.c index 58fe0e8ef7f..50aa2c5580c 100644 --- a/gdb/mcore-tdep.c +++ b/gdb/mcore-tdep.c @@ -1055,7 +1055,6 @@ mcore_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Call Dummies: */ - set_gdbarch_deprecated_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); set_gdbarch_deprecated_saved_pc_after_call (gdbarch, mcore_saved_pc_after_call); set_gdbarch_breakpoint_from_pc (gdbarch, mcore_breakpoint_from_pc); set_gdbarch_deprecated_push_return_address (gdbarch, mcore_push_return_address); diff --git a/gdb/mn10300-tdep.c b/gdb/mn10300-tdep.c index ffcdf7acd67..a065e184f4a 100644 --- a/gdb/mn10300-tdep.c +++ b/gdb/mn10300-tdep.c @@ -1189,7 +1189,6 @@ mn10300_gdbarch_init (struct gdbarch_info info, set_gdbarch_deprecated_reg_struct_has_addr (gdbarch, mn10300_reg_struct_has_addr); set_gdbarch_deprecated_push_return_address (gdbarch, mn10300_push_return_address); - set_gdbarch_deprecated_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); set_gdbarch_use_struct_convention (gdbarch, mn10300_use_struct_convention); tdep->am33_mode = am33_mode; diff --git a/gdb/rs6000-tdep.c b/gdb/rs6000-tdep.c index bdc7e5e19ac..26633248c1e 100644 --- a/gdb/rs6000-tdep.c +++ b/gdb/rs6000-tdep.c @@ -2904,7 +2904,6 @@ rs6000_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) frame_base_append_sniffer (gdbarch, rs6000_frame_base_sniffer); break; default: - set_gdbarch_deprecated_save_dummy_frame_tos (gdbarch, generic_save_dummy_frame_tos); set_gdbarch_believe_pcc_promotion (gdbarch, 1); set_gdbarch_unwind_pc (gdbarch, rs6000_unwind_pc); -- 2.30.2