From 480e46cfc5cf4976c1f1a00bc6254d78e9c45447 Mon Sep 17 00:00:00 2001 From: Andrew Burgess Date: Sun, 9 Sep 2018 16:48:59 +0100 Subject: [PATCH] gdb/alpha: Use default gdbarch methods where possible Make use of the default gdbarch methods for gdbarch_dummy_id, and gdbarch_unwind_pc. 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/alpha-tdep.c (alpha_dummy_id): Delete. (alpha_unwind_pc): Delete. (alpha_gdbarch_init): Don't register deleted functions with gdbarch. --- gdb/ChangeLog | 7 +++++++ gdb/alpha-tdep.c | 29 ----------------------------- 2 files changed, 7 insertions(+), 29 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e06d2d9c725..42742f185a4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2019-02-27 Andrew Burgess + + * gdb/alpha-tdep.c (alpha_dummy_id): Delete. + (alpha_unwind_pc): Delete. + (alpha_gdbarch_init): Don't register deleted functions with + gdbarch. + 2019-02-27 Andrew Burgess * gdb/aarch64-tdep.c (aarch64_dummy_id): Delete. diff --git a/gdb/alpha-tdep.c b/gdb/alpha-tdep.c index 2f996e8b3d1..af9b9b97407 100644 --- a/gdb/alpha-tdep.c +++ b/gdb/alpha-tdep.c @@ -1463,29 +1463,6 @@ reinit_frame_cache_sfunc (const char *args, { reinit_frame_cache (); } - - -/* Assuming NEXT_FRAME->prev is a dummy, return the frame ID of that - dummy frame. The frame ID's base needs to match the TOS value - saved by save_dummy_frame_tos(), and the PC match the dummy frame's - breakpoint. */ - -static struct frame_id -alpha_dummy_id (struct gdbarch *gdbarch, struct frame_info *this_frame) -{ - ULONGEST base; - base = get_frame_register_unsigned (this_frame, ALPHA_SP_REGNUM); - return frame_id_build (base, get_frame_pc (this_frame)); -} - -static CORE_ADDR -alpha_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) -{ - ULONGEST pc; - pc = frame_unwind_register_unsigned (next_frame, ALPHA_PC_REGNUM); - return pc; -} - /* Helper routines for alpha*-nat.c files to move register sets to and from core files. The UNIQUE pointer is allowed to be NULL, as most @@ -1807,12 +1784,6 @@ alpha_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* Settings for calling functions in the inferior. */ set_gdbarch_push_dummy_call (gdbarch, alpha_push_dummy_call); - /* Methods for saving / extracting a dummy frame's ID. */ - set_gdbarch_dummy_id (gdbarch, alpha_dummy_id); - - /* Return the unwound PC value. */ - set_gdbarch_unwind_pc (gdbarch, alpha_unwind_pc); - set_gdbarch_inner_than (gdbarch, core_addr_lessthan); set_gdbarch_skip_trampoline_code (gdbarch, find_solib_trampoline_target); -- 2.30.2