[PATCH] New sh*-*-netbsdelf* native and target configuration
Jason R Thorpe
thorpej@wasabisystems.com
Wed May 8 08:27:00 GMT 2002
Cross-debugging of userland core files works, too. I intend to make
all NetBSD target configurations look like this, over time.
Committed to trunk.
* NEWS: Note new sh*-*-netbsdelf* configuration.
* configure.host: Set gdb_host_cpu to sh for all sh*.
(sh*-*-netbsdelf*): New host.
* configure.tgt: Set gdb_target_cpu to sh for all sh*.
(sh*-*-netbsdelf*): New target.
* sh-nbsd-nat.c: New file.
* sh-nbsd-tdep.c: New file.
* sh-nbsd-tdep.h: New file.
* config/sh/nbsd.mh: New file.
* config/sh/nbsd.mt: New file.
* config/sh/nm-nbsd.h: New file.
* config/sh/tm-nbsd.h: New file.
--
-- Jason R. Thorpe <thorpej@wasabisystems.com>
-------------- next part --------------
Index: NEWS
===================================================================
RCS file: /cvs/src/src/gdb/NEWS,v
retrieving revision 1.67
diff -u -r1.67 NEWS
--- NEWS 4 May 2002 15:52:37 -0000 1.67
+++ NEWS 8 May 2002 14:57:54 -0000
@@ -10,6 +10,7 @@
* New native configurations
Alpha NetBSD alpha*-*-netbsd*
+SH NetBSD sh*-*-netbsdelf*
* OBSOLETE configurations and files
Index: configure.host
===================================================================
RCS file: /cvs/src/src/gdb/configure.host,v
retrieving revision 1.35
diff -u -r1.35 configure.host
--- configure.host 25 Apr 2002 02:44:05 -0000 1.35
+++ configure.host 8 May 2002 14:57:57 -0000
@@ -20,6 +20,7 @@
powerpc*) gdb_host_cpu=powerpc ;;
sparcv9 | sparc64) gdb_host_cpu=sparc ;;
s390*) gdb_host_cpu=s390 ;;
+sh*) gdb_host_cpu=sh ;;
x86_64*) gdb_host_cpu=i386 ;;
*) gdb_host_cpu=$host_cpu ;;
@@ -135,6 +136,8 @@
rs6000-*-*) gdb_host=rs6000 ;;
s390*-*-*) gdb_host=s390 ;;
+
+sh*-*-netbsdelf*) gdb_host=nbsd ;;
sparc-*-linux*) gdb_host=linux ;;
sparc-*-lynxos*) gdb_host=sparclynx ;;
Index: configure.tgt
===================================================================
RCS file: /cvs/src/src/gdb/configure.tgt,v
retrieving revision 1.59
diff -u -r1.59 configure.tgt
--- configure.tgt 4 May 2002 15:52:37 -0000 1.59
+++ configure.tgt 8 May 2002 14:57:57 -0000
@@ -25,6 +25,7 @@
sparc*) gdb_target_cpu=sparc ;;
thumb*) gdb_target_cpu=arm ;;
s390*) gdb_target_cpu=s390 ;;
+sh*) gdb_target_cpu=sh ;;
strongarm*) gdb_target_cpu=arm ;;
xscale*) gdb_target_cpu=arm ;;
v850*) gdb_target_cpu=v850 ;;
@@ -252,6 +253,7 @@
sh-*-linux*) gdb_target=linux
build_gdbserver=yes
;;
+sh*-*-netbsdelf*) gdb_target=nbsd ;;
sparc-*-aout*) gdb_target=sparc-em ;;
sparc-*-coff*) gdb_target=sparc-em ;;
Index: sh-nbsd-nat.c
===================================================================
RCS file: sh-nbsd-nat.c
diff -N sh-nbsd-nat.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sh-nbsd-nat.c 8 May 2002 14:58:02 -0000
@@ -0,0 +1,76 @@
+/* Native-dependent code for SuperH running NetBSD, for GDB.
+ Copyright 2002 Free Software Foundation, Inc.
+ Contributed by Wasabi Systems, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <machine/reg.h>
+
+#include "defs.h"
+#include "inferior.h"
+
+#include "sh-nbsd-tdep.h"
+
+/* Determine if PT_GETREGS fetches this register. */
+#define GETREGS_SUPPLIES(regno) \
+ (((regno) >= R0_REGNUM && (regno) <= (R0_REGNUM + 15)) \
+|| (regno) == PC_REGNUM || (regno) == PR_REGNUM \
+|| (regno) == MACH_REGNUM || (regno) == MACL_REGNUM \
+|| (regno) == SR_REGNUM)
+
+void
+fetch_inferior_registers (int regno)
+{
+ if (regno == -1 || GETREGS_SUPPLIES (regno))
+ {
+ struct reg inferior_registers;
+
+ if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+ (PTRACE_ARG3_TYPE) &inferior_registers, 0) == -1)
+ perror_with_name ("Couldn't get registers");
+
+ sh_nbsd_supply_register ((char *) &inferior_registers, regno);
+
+ if (regno != -1)
+ return;
+ }
+}
+
+void
+store_inferior_registers (int regno)
+{
+ if (regno == -1 || GETREGS_SUPPLIES (regno))
+ {
+ struct reg inferior_registers;
+
+ if (ptrace (PT_GETREGS, PIDGET (inferior_ptid),
+ (PTRACE_ARG3_TYPE) &inferior_registers, 0) == -1)
+ perror_with_name ("Couldn't get registers");
+
+ sh_nbsd_fill_register ((char *) &inferior_registers, regno);
+
+ if (ptrace (PT_SETREGS, PIDGET (inferior_ptid),
+ (PTRACE_ARG3_TYPE) &inferior_registers, 0) == -1)
+ perror_with_name ("Couldn't set registers");
+
+ if (regno != -1)
+ return;
+ }
+}
Index: sh-nbsd-tdep.c
===================================================================
RCS file: sh-nbsd-tdep.c
diff -N sh-nbsd-tdep.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sh-nbsd-tdep.c 8 May 2002 14:58:02 -0000
@@ -0,0 +1,235 @@
+/* Target-dependent code for SuperH running NetBSD, for GDB.
+ Copyright 2002 Free Software Foundation, Inc.
+ Contributed by Wasabi Systems, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include "defs.h"
+#include "gdbcore.h"
+#include "regcache.h"
+#include "value.h"
+#include "solib-svr4.h"
+
+#include "sh-nbsd-tdep.h"
+
+/* Convert an r0-r15 register number into an offset into a ptrace
+ register structure. */
+static const int regmap[] =
+{
+ (20 * 4), /* r0 */
+ (19 * 4), /* r1 */
+ (18 * 4), /* r2 */
+ (17 * 4), /* r3 */
+ (16 * 4), /* r4 */
+ (15 * 4), /* r5 */
+ (14 * 4), /* r6 */
+ (13 * 4), /* r7 */
+ (12 * 4), /* r8 */
+ (11 * 4), /* r9 */
+ (10 * 4), /* r10 */
+ ( 9 * 4), /* r11 */
+ ( 8 * 4), /* r12 */
+ ( 7 * 4), /* r13 */
+ ( 6 * 4), /* r14 */
+ ( 5 * 4), /* r15 */
+};
+
+#define SIZEOF_STRUCT_REG (21 * 4)
+
+void
+sh_nbsd_supply_registers (char *regs)
+{
+ int regno;
+
+ for (regno = R0_REGNUM; regno <= (R0_REGNUM + 15); regno++)
+ supply_register (regno, regs + regmap[regno - R0_REGNUM]);
+
+ supply_register (PC_REGNUM, regs + (0 * 4));
+ supply_register (SR_REGNUM, regs + (1 * 4));
+ supply_register (PR_REGNUM, regs + (2 * 4));
+ supply_register (MACH_REGNUM, regs + (3 * 4));
+ supply_register (MACL_REGNUM, regs + (4 * 4));
+}
+
+void
+sh_nbsd_supply_register (char *regs, int regno)
+{
+ if (regno == -1)
+ sh_nbsd_supply_registers (regs);
+
+ if (regno == PC_REGNUM)
+ supply_register (PC_REGNUM, regs + (0 * 4));
+ else if (regno == SR_REGNUM)
+ supply_register (SR_REGNUM, regs + (1 * 4));
+ else if (regno == PR_REGNUM)
+ supply_register (PR_REGNUM, regs + (2 * 4));
+ else if (regno == MACH_REGNUM)
+ supply_register (MACH_REGNUM, regs + (3 * 4));
+ else if (regno == MACL_REGNUM)
+ supply_register (MACL_REGNUM, regs + (4 * 4));
+ else if (regno >= R0_REGNUM && regno <= (R0_REGNUM + 15))
+ supply_register (regno, regs + regmap[regno - R0_REGNUM]);
+}
+
+void
+sh_nbsd_fill_registers (char *regs)
+{
+ int regno;
+
+ for (regno = R0_REGNUM; regno <= (R0_REGNUM + 15); regno++)
+ regcache_collect (regno, regs + regmap[regno - R0_REGNUM]);
+
+ regcache_collect (PC_REGNUM, regs + (0 * 4));
+ regcache_collect (SR_REGNUM, regs + (1 * 4));
+ regcache_collect (PR_REGNUM, regs + (2 * 4));
+ regcache_collect (MACH_REGNUM, regs + (3 * 4));
+ regcache_collect (MACL_REGNUM, regs + (4 * 4));
+}
+
+void
+sh_nbsd_fill_register (char *regs, int regno)
+{
+ if (regno == -1)
+ sh_nbsd_fill_registers (regs);
+
+ if (regno == PC_REGNUM)
+ regcache_collect (PC_REGNUM, regs + (0 * 4));
+ else if (regno == SR_REGNUM)
+ regcache_collect (SR_REGNUM, regs + (1 * 4));
+ else if (regno == PR_REGNUM)
+ regcache_collect (PR_REGNUM, regs + (2 * 4));
+ else if (regno == MACH_REGNUM)
+ regcache_collect (MACH_REGNUM, regs + (3 * 4));
+ else if (regno == MACL_REGNUM)
+ regcache_collect (MACL_REGNUM, regs + (4 * 4));
+ else if (regno >= R0_REGNUM && regno <= (R0_REGNUM + 15))
+ regcache_collect (regno, regs + regmap[regno - R0_REGNUM]);
+}
+
+/* Fetch (and possibly build) an appropriate link_map_offsets
+ structure for NetBSD/sh targets using the struct offsets
+ defined in <link.h> (but without actual reference to that file).
+
+ This makes it possible to access NetBSD/sh shared libraries
+ from a GDB that was not built on a NetBSD/sh host (for cross
+ debugging). */
+
+static struct link_map_offsets *
+sh_nbsd_solib_svr4_fetch_link_map_offsets (void)
+{
+ static struct link_map_offsets lmo;
+ static struct link_map_offsets *lmp = NULL;
+
+ if (lmp == NULL)
+ {
+ lmp = &lmo;
+
+ lmo.r_debug_size = 16;
+
+ lmo.r_map_offset = 4;
+ lmo.r_map_size = 4;
+
+ lmo.link_map_size = 20;
+
+ lmo.l_addr_offset = 0;
+ lmo.l_addr_size = 4;
+
+ lmo.l_name_offset = 4;
+ lmo.l_name_size = 4;
+
+ lmo.l_next_offset = 12;
+ lmo.l_next_size = 4;
+
+ lmo.l_prev_offset = 16;
+ lmo.l_prev_size = 4;
+ }
+
+ return lmp;
+}
+
+static void
+fetch_core_registers (char *core_reg_sect, unsigned core_reg_size,
+ int which, CORE_ADDR ignore)
+{
+ /* We get everything from the .reg section. */
+ if (which != 0)
+ return;
+
+ if (core_reg_size < SIZEOF_STRUCT_REG)
+ {
+ warning ("Wrong size register set in core file.");
+ return;
+ }
+
+ /* Integer registers. */
+ sh_nbsd_supply_registers (core_reg_sect);
+}
+
+static void
+fetch_elfcore_registers (char *core_reg_sect, unsigned core_reg_size,
+ int which, CORE_ADDR ignore)
+{
+ switch (which)
+ {
+ case 0: /* Integer registers. */
+ if (core_reg_size != SIZEOF_STRUCT_REG)
+ warning ("Wrong size register set in core file.");
+ else
+ sh_nbsd_supply_registers (core_reg_sect);
+ break;
+
+ default:
+ /* Don't know what kind of register request this is; just ignore it. */
+ break;
+ }
+}
+
+static struct core_fns sh_nbsd_core_fns =
+{
+ bfd_target_unknown_flavour, /* core_flavour */
+ default_check_format, /* check_format */
+ default_core_sniffer, /* core_sniffer */
+ fetch_core_registers, /* core_read_registers */
+ NULL /* next */
+};
+
+static struct core_fns sh_nbsd_elfcore_fns =
+{
+ bfd_target_elf_flavour, /* core_flavour */
+ default_check_format, /* check_format */
+ default_core_sniffer, /* core_sniffer */
+ fetch_elfcore_registers, /* core_read_registers */
+ NULL /* next */
+};
+
+static void
+sh_nbsd_init_abi (struct gdbarch_info info,
+ struct gdbarch *gdbarch)
+{
+ set_solib_svr4_fetch_link_map_offsets (gdbarch,
+ sh_nbsd_solib_svr4_fetch_link_map_offsets);
+}
+
+void
+_initialize_sh_nbsd_tdep (void)
+{
+ add_core_fns (&sh_nbsd_core_fns);
+ add_core_fns (&sh_nbsd_elfcore_fns);
+
+ sh_gdbarch_register_os_abi (SH_OSABI_NETBSD_ELF, sh_nbsd_init_abi);
+}
Index: sh-nbsd-tdep.h
===================================================================
RCS file: sh-nbsd-tdep.h
diff -N sh-nbsd-tdep.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ sh-nbsd-tdep.h 8 May 2002 14:58:02 -0000
@@ -0,0 +1,31 @@
+/* Target-dependent definitions for SuperH running NetBSD, for GDB.
+ Copyright 2002 Free Software Foundation, Inc.
+ Contributed by Wasabi Systems, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef SH_NBSD_TDEP_H
+#define SH_NBSD_TDEP_H
+
+void sh_nbsd_supply_registers (char *);
+void sh_nbsd_supply_register (char *, int);
+
+void sh_nbsd_fill_registers (char *);
+void sh_nbsd_fill_register (char *, int);
+
+#endif /* SH_NBSD_TDEP_H */
Index: config/sh/nbsd.mh
===================================================================
RCS file: config/sh/nbsd.mh
diff -N config/sh/nbsd.mh
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ config/sh/nbsd.mh 8 May 2002 14:58:03 -0000
@@ -0,0 +1,4 @@
+# Host: SuperH running NetBSD
+NAT_CLIBS=
+NATDEPFILES= infptrace.o inftarg.o fork-child.o sh-nbsd-nat.o
+NAT_FILE= nm-nbsd.h
Index: config/sh/nbsd.mt
===================================================================
RCS file: config/sh/nbsd.mt
diff -N config/sh/nbsd.mt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ config/sh/nbsd.mt 8 May 2002 14:58:03 -0000
@@ -0,0 +1,6 @@
+# Target: SuperH running NetBSD
+TDEPFILES= sh-tdep.o sh-nbsd-tdep.o corelow.o solib.o solib-svr4.o
+TM_FILE= tm-nbsd.h
+
+SIM_OBS = remote-sim.o
+SIM = ../sim/sh/libsim.a
Index: config/sh/nm-nbsd.h
===================================================================
RCS file: config/sh/nm-nbsd.h
diff -N config/sh/nm-nbsd.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ config/sh/nm-nbsd.h 8 May 2002 14:58:03 -0000
@@ -0,0 +1,28 @@
+/* Native-dependent definitions for SuperH running NetBSD, for GDB.
+ Copyright 2002 Free Software Foundation, Inc.
+ Contributed by Wasabi Systems, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef NM_NBSD_H
+#define NM_NBSD_H
+
+/* Get generic NetBSD native definitions. */
+#include "config/nm-nbsd.h"
+
+#endif /* NM_NBSD_H */
Index: config/sh/tm-nbsd.h
===================================================================
RCS file: config/sh/tm-nbsd.h
diff -N config/sh/tm-nbsd.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ config/sh/tm-nbsd.h 8 May 2002 14:58:03 -0000
@@ -0,0 +1,28 @@
+/* Target-dependent definitions for SuperH running NetBSD, for GDB.
+ Copyright 2002 Free Software Foundation, Inc.
+ Contributed by Wasabi Systems, Inc.
+
+ This file is part of GDB.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#ifndef TM_NBSD_H
+#define TM_NBSD_H
+
+#include "sh/tm-sh.h"
+#include "solib.h"
+
+#endif /* TM_NBSD_H */
More information about the Gdb-patches
mailing list