From d0cc52bdf2e6a586cac70000518c95619970619b Mon Sep 17 00:00:00 2001 From: Shahab Vahedi Date: Wed, 15 Jan 2020 00:14:24 +0100 Subject: [PATCH] gdb: Add default reggroups for ARC There is no reggroups set in ARC. If a "maintenance print reggroups" command is issued, the default register set is dumped (which is fine). However, if a new group is added via an XML file, then that will become the _only_ group. This behavior causes gdb.xml/tdesc-regs.exp to fail. Fixes gdb.xml/tdesc-regs.exp on ARC. gdb/ChangeLog: * arc-tdep.c (arc_add_reggroups): New function. (arc_gdbarch_init): Call arc_add_reggroups. --- gdb/ChangeLog | 5 +++++ gdb/arc-tdep.c | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index c7335ee0dd8..0836eb36e6d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2021-01-26 Shahab Vahedi + + * arc-tdep.c (arc_add_reggroups): New function. + (arc_gdbarch_init): Call arc_add_reggroups. + 2021-01-26 Anton Kolesov * arc-tdep.c (arc_skip_prologue): Log "pc" address. diff --git a/gdb/arc-tdep.c b/gdb/arc-tdep.c index b19f7c5965a..8a1da1a9868 100644 --- a/gdb/arc-tdep.c +++ b/gdb/arc-tdep.c @@ -27,6 +27,7 @@ #include "frame-base.h" #include "frame-unwind.h" #include "gdbcore.h" +#include "reggroups.h" #include "gdbcmd.h" #include "objfiles.h" #include "osabi.h" @@ -1954,6 +1955,20 @@ static const struct frame_base arc_normal_base = { arc_frame_base_address }; +/* Add all the expected register sets into GDBARCH. */ + +static void +arc_add_reggroups (struct gdbarch *gdbarch) +{ + reggroup_add (gdbarch, general_reggroup); + reggroup_add (gdbarch, float_reggroup); + reggroup_add (gdbarch, system_reggroup); + reggroup_add (gdbarch, vector_reggroup); + reggroup_add (gdbarch, all_reggroup); + reggroup_add (gdbarch, save_reggroup); + reggroup_add (gdbarch, restore_reggroup); +} + static enum arc_isa mach_type_to_arc_isa (const unsigned long mach) { @@ -2352,6 +2367,9 @@ arc_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) /* This doesn't include possible long-immediate value. */ set_gdbarch_max_insn_length (gdbarch, 4); + /* Add default register groups. */ + arc_add_reggroups (gdbarch); + /* Frame unwinders and sniffers. */ dwarf2_frame_set_init_reg (gdbarch, arc_dwarf2_frame_init_reg); dwarf2_append_unwinders (gdbarch); -- 2.30.2