[PATCH 03/22] [GDBserver] Multi-process + multi-arch: GNU/Linux SPARC

Pedro Alves
2013-05-30T12:14:02Z

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

Previously tested on sparc64-unknown-linux-gnu (Debian), local
gdbserver.

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

* linux-sparc-low.c (tdesc_sparc64): Declare.
(sparc_fill_gregset_to_stack, sparc_store_gregset_from_stack):
Adjust.
(sparc_arch_setup): New function.
(sparc_regsets_info, sparc_usrregs_info, regs_info): New globals.
(the_low_target): Adjust.
(initialize_low_arch): New function.
---
gdb/gdbserver/linux-sparc-low.c | 60 +++++++++++++++++++++++++++++++++------
1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/gdb/gdbserver/linux-sparc-low.c b/gdb/gdbserver/linux-sparc-low.c
index 32590b2..444d446 100644
--- a/gdb/gdbserver/linux-sparc-low.c
+++ b/gdb/gdbserver/linux-sparc-low.c
@@ -100,6 +100,7 @@ static const struct regs_range_t fpregs_ranges[] = {

/* Defined in auto-generated file reg-sparc64.c. */
void init_registers_sparc64 (void);
+extern const struct target_desc *tdesc_sparc64;

static int
sparc_cannot_store_register (int regno)
@@ -119,12 +120,12 @@ sparc_fill_gregset_to_stack (struct regcache *regcache, const void *buf)
int i;
CORE_ADDR addr = 0;
unsigned char tmp_reg_buf[8];
- const int l0_regno = find_regno ("l0");
+ const int l0_regno = find_regno (regcache->tdesc, "l0");
const int i7_regno = l0_regno + 15;

/* These registers have to be stored in the stack. */
memcpy (&addr,
- ((char *) buf) + sparc_regmap[find_regno ("sp")],
+ ((char *) buf) + sparc_regmap[find_regno (regcache->tdesc, "sp")],
sizeof (addr));

addr += BIAS;
@@ -171,12 +172,12 @@ sparc_store_gregset_from_stack (struct regcache *regcache, const void *buf)
int i;
CORE_ADDR addr = 0;
unsigned char tmp_reg_buf[8];
- const int l0_regno = find_regno ("l0");
+ const int l0_regno = find_regno (regcache->tdesc, "l0");
const int i7_regno = l0_regno + 15;

/* These registers have to be obtained from the stack. */
memcpy (&addr,
- ((char *) buf) + sparc_regmap[find_regno ("sp")],
+ ((char *) buf) + sparc_regmap[find_regno (regcache->tdesc, "sp")],
sizeof (addr));

addr += BIAS;
@@ -269,8 +270,13 @@ sparc_reinsert_addr (void)
return lr;
}

+static void
+sparc_arch_setup (void)
+{
+ current_process ()->tdesc = tdesc_sparc64;
+}

-struct regset_info target_regsets[] = {
+static struct regset_info sparc_regsets[] = {
{ PTRACE_GETREGS, PTRACE_SETREGS, 0, sizeof (elf_gregset_t),
GENERAL_REGS,
sparc_fill_gregset, sparc_store_gregset },
@@ -280,12 +286,37 @@ struct regset_info target_regsets[] = {
{ 0, 0, 0, -1, -1, NULL, NULL }
};

+static struct regsets_info sparc_regsets_info =
+ {
+ sparc_regsets, /* regsets */
+ 0, /* num_regsets */
+ NULL, /* disabled_regsets */
+ };
+
+static struct usrregs_info sparc_usrregs_info =
+ {
+ sparc_num_regs,
+ /* No regmap needs to be provided since this impl. doesn't use
+ USRREGS. */
+ NULL
+ };
+
+static struct regs_info regs_info =
+ {
+ NULL, /* regset_bitmap */
+ &sparc_usrregs_info,
+ &sparc_regsets_info
+ };
+
+static const struct regs_info *
+sparc_regs_info (void)
+{
+ return &regs_info;
+}
+
struct linux_target_ops the_low_target = {
- init_registers_sparc64,
- sparc_num_regs,
- /* No regmap needs to be provided since this impl. doesn't use USRREGS. */
- NULL,
- NULL,
+ sparc_arch_setup,
+ sparc_regs_info,
sparc_cannot_fetch_register,
sparc_cannot_store_register,
NULL, /* fetch_register */
@@ -300,3 +331,12 @@ struct linux_target_ops the_low_target = {
NULL, NULL, NULL, NULL,
NULL, NULL
};
+
+void
+initialize_low_arch (void)
+{
+ /* Initialize the Linux target descriptions. */
+ init_registers_sparc64 ();
+
+ initialize_regsets_info (&sparc_regsets_info);
+}