From 27f113c8e9b2361caf3dfcf15437020306bf93b9 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 10 Jan 2019 18:48:53 +0000 Subject: [PATCH] gdb/moxie: Use default gdbarch methods where possible Make use of the default gdbarch methods for gdbarch_dummy_id, gdbarch_unwind_pc, and gdbarch_unwind_sp where possible. I have not tested this change but, by inspecting the code, I believe the default methods are equivalent to the code being deleted. gdb/ChangeLog: * moxie-tdep.c (moxie_unwind_sp): Delete. (moxie_unwind_pc): Delete. (moxie_dummy_id): Delete. (moxie_gdbarch_init): Don't register deleted functions with gdbarch. --- gdb/ChangeLog | 8 ++++++++ gdb/moxie-tdep.c | 33 --------------------------------- 2 files changed, 8 insertions(+), 33 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c2539c5..c25fe59 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2019-04-23 Andrew Burgess + * moxie-tdep.c (moxie_unwind_sp): Delete. + (moxie_unwind_pc): Delete. + (moxie_dummy_id): Delete. + (moxie_gdbarch_init): Don't register deleted functions with + gdbarch. + +2019-04-23 Andrew Burgess + * mn10300-tdep.c (mn10300_dummy_id): Delete. (mn10300_unwind_pc): Delete. (mn10300_unwind_sp): Delete. diff --git a/gdb/moxie-tdep.c b/gdb/moxie-tdep.c index 3a1737f..251c267 100644 --- a/gdb/moxie-tdep.c +++ b/gdb/moxie-tdep.c @@ -447,14 +447,6 @@ moxie_software_single_step (struct regcache *regcache) return next_pcs; } -/* Implement the "unwind_sp" gdbarch method. */ - -static CORE_ADDR -moxie_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - return frame_unwind_register_unsigned (next_frame, MOXIE_SP_REGNUM); -} - /* Given a return value in `regbuf' with a type `valtype', extract and copy its value into `valbuf'. */ @@ -556,14 +548,6 @@ moxie_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } -/* Implement the "unwind_pc" gdbarch method. */ - -static CORE_ADDR -moxie_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - return frame_unwind_register_unsigned (next_frame, MOXIE_PC_REGNUM); -} - /* Given a GDB frame, determine the address of the calling function's frame. This will be used to create a new GDB frame struct. */ @@ -629,14 +613,6 @@ static const struct frame_base moxie_frame_base = { moxie_frame_base_address }; -static struct frame_id -moxie_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) -{ - CORE_ADDR sp = get_frame_register_unsigned (this_frame, MOXIE_SP_REGNUM); - - return frame_id_build (sp, get_frame_pc (this_frame)); -} - /* Parse the current instruction and record the values of the registers and memory that will be changed in current instruction to "record_arch_list". Return -1 if something wrong. */ @@ -1089,8 +1065,6 @@ moxie_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_wchar_bit (gdbarch, 32); set_gdbarch_wchar_signed (gdbarch, 0); - set_gdbarch_unwind_sp (gdbarch, moxie_unwind_sp); - set_gdbarch_num_regs (gdbarch, MOXIE_NUM_REGS); set_gdbarch_sp_regnum (gdbarch, MOXIE_SP_REGNUM); set_gdbarch_pc_regnum (gdbarch, MOXIE_PC_REGNUM); @@ -1109,13 +1083,6 @@ moxie_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) frame_base_set_default (gdbarch, &moxie_frame_base); - /* Methods for saving / extracting a dummy frame's ID. The ID's - stack address must match the SP value returned by - PUSH_DUMMY_CALL, and saved by generic_save_dummy_frame_tos. */ - set_gdbarch_dummy_id (gdbarch, moxie_dummy_id); - - set_gdbarch_unwind_pc (gdbarch, moxie_unwind_pc); - /* Hook in ABI-specific overrides, if they have been registered. */ gdbarch_init_osabi (info, gdbarch); -- 2.7.4