From 68b867f30eeca7e9585e9ee16e824f5a18e2bc6c Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Wed, 19 Dec 2018 22:34:19 +0000 Subject: [PATCH] gdb/ft32: 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: * gdb/ft32-tdep.c (ft32_dummy_id): Delete. (ft32_unwind_pc): Delete. (ft32_unwind_sp): Delete. (ft32_gdbarch_init): Don't register deleted functions with gdbarch. --- gdb/ChangeLog | 8 ++++++++ gdb/ft32-tdep.c | 33 --------------------------------- 2 files changed, 8 insertions(+), 33 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index cb8f6749c8..ba877061d7 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2019-02-27 Andrew Burgess + + * gdb/ft32-tdep.c (ft32_dummy_id): Delete. + (ft32_unwind_pc): Delete. + (ft32_unwind_sp): Delete. + (ft32_gdbarch_init): Don't register deleted functions with + gdbarch. + 2019-02-27 Andrew Burgess * gdb/frv-tdep.c (frv_dummy_id): Delete. diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c index 9a13051a94..bded02fae4 100644 --- a/gdb/ft32-tdep.c +++ b/gdb/ft32-tdep.c @@ -383,14 +383,6 @@ ft32_address_class_name_to_type_flags (struct gdbarch *gdbarch, return 0; } -/* Implement the "unwind_sp" gdbarch method. */ - -static CORE_ADDR -ft32_unwind_sp (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - return frame_unwind_register_unsigned (next_frame, FT32_SP_REGNUM); -} - /* Given a return value in `regbuf' with a type `valtype', extract and copy its value into `valbuf'. */ @@ -492,14 +484,6 @@ ft32_frame_cache (struct frame_info *this_frame, void **this_cache) return cache; } -/* Implement the "unwind_pc" gdbarch method. */ - -static CORE_ADDR -ft32_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - return frame_unwind_register_unsigned (next_frame, FT32_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. */ @@ -567,14 +551,6 @@ static const struct frame_base ft32_frame_base = ft32_frame_base_address }; -static struct frame_id -ft32_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) -{ - CORE_ADDR sp = get_frame_register_unsigned (this_frame, FT32_SP_REGNUM); - - return frame_id_build (sp, get_frame_pc (this_frame)); -} - /* Allocate and initialize the ft32 gdbarch object. */ static struct gdbarch * @@ -602,8 +578,6 @@ ft32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) func_void_type); TYPE_INSTANCE_FLAGS (tdep->pc_type) |= TYPE_INSTANCE_FLAG_ADDRESS_CLASS_1; - set_gdbarch_unwind_sp (gdbarch, ft32_unwind_sp); - set_gdbarch_num_regs (gdbarch, FT32_NUM_REGS); set_gdbarch_sp_regnum (gdbarch, FT32_SP_REGNUM); set_gdbarch_pc_regnum (gdbarch, FT32_PC_REGNUM); @@ -622,13 +596,6 @@ ft32_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) frame_base_set_default (gdbarch, &ft32_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, ft32_dummy_id); - - set_gdbarch_unwind_pc (gdbarch, ft32_unwind_pc); - /* Hook in ABI-specific overrides, if they have been registered. */ gdbarch_init_osabi (info, gdbarch); -- 2.34.1