From ca0ab0aa8194eda711cf52efe6c26cb821218476 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Thu, 10 Jan 2019 18:53:31 +0000 Subject: [PATCH] gdb/nds32: 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: * nds32-tdep.c (nds32_dummy_id): Delete. (nds32_unwind_pc): Delete. (nds32_unwind_sp): Delete. (nds32_gdbarch_init): Don't register deleted functions with gdbarch. --- gdb/ChangeLog | 8 ++++++++ gdb/nds32-tdep.c | 28 ---------------------------- 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c4ffa87f40..bf091869b7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-04-23 Andrew Burgess + + * nds32-tdep.c (nds32_dummy_id): Delete. + (nds32_unwind_pc): Delete. + (nds32_unwind_sp): Delete. + (nds32_gdbarch_init): Don't register deleted functions with + gdbarch. + 2019-04-23 Andrew Burgess * msp430-tdep.c (msp430_unwind_pc): Delete. diff --git a/gdb/nds32-tdep.c b/gdb/nds32-tdep.c index d3481e2000..8e126cb7a5 100644 --- a/gdb/nds32-tdep.c +++ b/gdb/nds32-tdep.c @@ -1387,32 +1387,7 @@ static const struct frame_unwind nds32_epilogue_frame_unwind = NULL, nds32_epilogue_frame_sniffer }; - -/* Implement the "dummy_id" gdbarch method. */ - -static struct frame_id -nds32_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) -{ - CORE_ADDR sp = get_frame_register_unsigned (this_frame, NDS32_SP_REGNUM); - - return frame_id_build (sp, get_frame_pc (this_frame)); -} - -/* Implement the "unwind_pc" gdbarch method. */ - -static CORE_ADDR -nds32_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - return frame_unwind_register_unsigned (next_frame, NDS32_PC_REGNUM); -} - -/* Implement the "unwind_sp" gdbarch method. */ -static CORE_ADDR -nds32_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - return frame_unwind_register_unsigned (next_frame, NDS32_SP_REGNUM); -} /* Floating type and struct type that has only one floating type member can pass value using FPU registers (when FPU ABI is used). */ @@ -2094,14 +2069,11 @@ nds32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) set_gdbarch_sp_regnum (gdbarch, NDS32_SP_REGNUM); set_gdbarch_pc_regnum (gdbarch, NDS32_PC_REGNUM); - set_gdbarch_unwind_sp (gdbarch, nds32_unwind_sp); - set_gdbarch_unwind_pc (gdbarch, nds32_unwind_pc); set_gdbarch_stack_frame_destroyed_p (gdbarch, nds32_stack_frame_destroyed_p); set_gdbarch_dwarf2_reg_to_regnum (gdbarch, nds32_dwarf2_reg_to_regnum); set_gdbarch_push_dummy_call (gdbarch, nds32_push_dummy_call); set_gdbarch_return_value (gdbarch, nds32_return_value); - set_gdbarch_dummy_id (gdbarch, nds32_dummy_id); set_gdbarch_skip_prologue (gdbarch, nds32_skip_prologue); set_gdbarch_inner_than (gdbarch, core_addr_lessthan); -- 2.34.1