[PATCH 09/22] [GDBserver] Multi-process + multi-arch: GNU/Linux SH

Pedro Alves
2013-05-29T16:27:14Z

This adjusts the GNU/Linux SH port to new interfaces.

Built with a cross sh-linux-gnu toolchain. Otherwise not tested.

2013-05-29 Pedro Alves <palves@redhat.com>

* linux-sh-low.c (tdesc_sharch): Declare.
(target_regsets): Rename to ...
(sh_regsets): ... this, and make static.
(sh_regsets_info, sh_usrregs_info, regs_info): New globals.
(sh_regs_info, sh_arch_setup): New functions.
(the_low_target): Adjust.
(initialize_low_arch): New function.
---
gdb/gdbserver/linux-sh-low.c | 49 ++++++++++++++++++++++++++++++++++++++----
1 file changed, 44 insertions(+), 5 deletions(-)

diff --git a/gdb/gdbserver/linux-sh-low.c b/gdb/gdbserver/linux-sh-low.c
index f268b55..08f0f11 100644
--- a/gdb/gdbserver/linux-sh-low.c
+++ b/gdb/gdbserver/linux-sh-low.c
@@ -21,6 +21,7 @@

/* Defined in auto-generated file reg-sh.c. */
void init_registers_sh (void);
+extern struct target_desc *tdesc_sh;

#ifdef HAVE_SYS_REG_H
#include <sys/reg.h>
@@ -102,16 +103,46 @@ static void sh_fill_gregset (struct regcache *regcache, void *buf)
collect_register (regcache, i, (char *) buf + sh_regmap[i]);
}

-struct regset_info target_regsets[] = {
+static struct regset_info sh_regsets[] = {
{ 0, 0, 0, 0, GENERAL_REGS, sh_fill_gregset, NULL },
{ 0, 0, 0, -1, -1, NULL, NULL }
};

+static struct regsets_info sh_regsets_info =
+ {
+ sh_regsets, /* regsets */
+ 0, /* num_regsets */
+ NULL, /* disabled_regsets */
+ };
+
+static struct usrregs_info sh_usrregs_info =
+ {
+ sh_num_regs,
+ sh_regmap,
+ };
+
+static struct regs_info regs_info =
+ {
+ NULL, /* regset_bitmap */
+ &sh_usrregs_info,
+ &sh_regsets_info
+ };
+
+static const struct regs_info *
+sh_regs_info (void)
+{
+ return &regs_info;
+}
+
+static void
+sh_arch_setup (void)
+{
+ current_process ()->tdesc = tdesc_sh;
+}
+
struct linux_target_ops the_low_target = {
- init_registers_sh,
- sh_num_regs,
- sh_regmap,
- NULL,
+ sh_arch_setup,
+ sh_regs_info,
sh_cannot_fetch_register,
sh_cannot_store_register,
NULL, /* fetch_register */
@@ -123,3 +154,11 @@ struct linux_target_ops the_low_target = {
0,
sh_breakpoint_at,
};
+
+void
+initialize_low_arch (void)
+{
+ init_registers_sh ();
+
+ initialize_regsets_info (&sh_regsets_info);
+}