From 0e56aeafa8e93c62a52a7b45d90550130285576b Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sat, 26 Jun 2004 10:06:35 +0000 Subject: [PATCH] Add OpenBSD/hppa support. * NEWS (New native configurations): Mention OpenBSD/hppa. * hppabsd-nat.c, hppabsd-tdep.c, config/pa/obsd.mh, config/pa/obsd.mt, config/pa/nm-obsd.h, config/pa/tm-bsd.h: New files. * Makefile.in (ALLDEPFILES): Add hppabsd-nat.c and hppabsd-tdep.c. (hppabsd-nat.o, hppabsd-tdep.c): New dependencies. * configure.host: Add hppa*-*-openbsd*. * configure.tgt: Add hppa*-*-openbsd*. --- gdb/ChangeLog | 12 ++++ gdb/Makefile.in | 6 ++ gdb/NEWS | 1 + gdb/config/pa/nm-obsd.h | 28 ++++++++ gdb/config/pa/obsd.mh | 3 + gdb/config/pa/obsd.mt | 3 + gdb/config/pa/tm-bsd.h | 28 ++++++++ gdb/configure.host | 1 + gdb/configure.tgt | 1 + gdb/hppabsd-nat.c | 119 ++++++++++++++++++++++++++++++++++ gdb/hppabsd-tdep.c | 137 ++++++++++++++++++++++++++++++++++++++++ 11 files changed, 339 insertions(+) create mode 100644 gdb/config/pa/nm-obsd.h create mode 100644 gdb/config/pa/obsd.mh create mode 100644 gdb/config/pa/obsd.mt create mode 100644 gdb/config/pa/tm-bsd.h create mode 100644 gdb/hppabsd-nat.c create mode 100644 gdb/hppabsd-tdep.c diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f2cbaa5ee69..50208388728 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,15 @@ +2004-06-26 Mark Kettenis + + Add OpenBSD/hppa support. + * NEWS (New native configurations): Mention OpenBSD/hppa. + * hppabsd-nat.c, hppabsd-tdep.c, config/pa/obsd.mh, + config/pa/obsd.mt, config/pa/nm-obsd.h, config/pa/tm-bsd.h: New + files. + * Makefile.in (ALLDEPFILES): Add hppabsd-nat.c and hppabsd-tdep.c. + (hppabsd-nat.o, hppabsd-tdep.c): New dependencies. + * configure.host: Add hppa*-*-openbsd*. + * configure.tgt: Add hppa*-*-openbsd*. + 2004-06-25 Andrew Cagney * defs.h (deprecated_ui_loop_hook): Deprecated. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 9eb471fa85d..ad7f9331b0f 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1360,6 +1360,7 @@ ALLDEPFILES = \ hppa-tdep.c hppa-hpux-tdep.c \ hppah-nat.c hpread.c \ hppa-linux-tdep.c hppa-linux-nat.c \ + hppabsd-nat.c hppabsd-tdep.c \ i386-tdep.c i386v-nat.c i386-linux-nat.c \ i386v4-nat.c i386ly-tdep.c i386-cygwin-tdep.c \ i386bsd-nat.c i386bsd-tdep.c i386fbsd-nat.c i386fbsd-tdep.c \ @@ -1876,6 +1877,11 @@ hppa-linux-tdep.o: hppa-linux-tdep.c $(defs_h) $(gdbcore_h) $(osabi_h) \ $(elf_common_h) $(value_h) hppa-linux-nat.o: hppa-linux-nat.c $(defs_h) $(gdbcore_h) $(regcache_h) \ $(gdb_string_h) $(inferior_h) +hppabsd-nat.o: hppabsd-nat.c $(defs_h) $(inferior_h) $(regcache_h) \ + $(hppa_tdep_h) +hppabsd-tdep.o: hppabsd-tdep.c $(defs_h) $(arch_utils_h) $(osabi_h) \ + $(regcache_h) $(regset_h) $(gdb_assert_h) $(gdb_string_h) \ + $(hppa_tdep_h) $(solib_svr4_h) hpread.o: hpread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(hp_symtab_h) \ $(syms_h) $(symtab_h) $(symfile_h) $(objfiles_h) $(buildsym_h) \ $(complaints_h) $(gdb_stabs_h) $(gdbtypes_h) $(demangle_h) \ diff --git a/gdb/NEWS b/gdb/NEWS index d113c17181f..ee71fb7f902 100644 --- a/gdb/NEWS +++ b/gdb/NEWS @@ -22,6 +22,7 @@ kernel. * New native configurations +OpenBSD/hppa hppa*-*-openbsd* OpenBSD/m68k m68*-*-openbsd* OpenBSD/m88k m88*-*-openbsd* OpenBSD/powerpc powerpc-*-openbsd* diff --git a/gdb/config/pa/nm-obsd.h b/gdb/config/pa/nm-obsd.h new file mode 100644 index 00000000000..ba91594fbb0 --- /dev/null +++ b/gdb/config/pa/nm-obsd.h @@ -0,0 +1,28 @@ +/* Native-dependent definitions for OpenBSD/hppa. + + Copyright 2004 Free Software Foundation, 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_OBSD_H +#define NM_OBSD_H + +/* Get generic BSD native definitions. */ +#include "config/nm-bsd.h" + +#endif /* nm-obsd.h */ diff --git a/gdb/config/pa/obsd.mh b/gdb/config/pa/obsd.mh new file mode 100644 index 00000000000..bc94246841e --- /dev/null +++ b/gdb/config/pa/obsd.mh @@ -0,0 +1,3 @@ +# Host: OpenBSD/hppa +NATDEPFILES= fork-child.o infptrace.o inftarg.o hppabsd-nat.o +NAT_FILE= nm-obsd.h diff --git a/gdb/config/pa/obsd.mt b/gdb/config/pa/obsd.mt new file mode 100644 index 00000000000..1b1df18854a --- /dev/null +++ b/gdb/config/pa/obsd.mt @@ -0,0 +1,3 @@ +# Target: OpenBSD/hppa +TDEPFILES= hppa-tdep.o hppabsd-tdep.o corelow.o solib.o solib-svr4.o +TM_FILE= tm-bsd.h diff --git a/gdb/config/pa/tm-bsd.h b/gdb/config/pa/tm-bsd.h new file mode 100644 index 00000000000..ebd5e9f1d16 --- /dev/null +++ b/gdb/config/pa/tm-bsd.h @@ -0,0 +1,28 @@ +/* Target-dependent definitions for HP PA-RISC BSD's. + + Copyright 2004 Free Software Foundation, 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_BSD_H +#define TM_BSD_H + +/* Shared library support. */ +#include "solib.h" + +#endif /* tm-bsd.h */ diff --git a/gdb/configure.host b/gdb/configure.host index 886615559ee..a2a8d5d36a0 100644 --- a/gdb/configure.host +++ b/gdb/configure.host @@ -50,6 +50,7 @@ hppa*64*-*-hpux11*) gdb_host=hpux11w ;; hppa*-*-hpux11*) gdb_host=hpux11 ;; hppa*-*-hpux*) gdb_host=hppahpux ;; hppa*-*-linux*) gdb_host=linux ;; +hppa*-*-openbsd*) gdb_host=obsd ;; i[34567]86-ncr-*) gdb_host=ncr3000 ;; i[34567]86-*-dgux*) gdb_host=i386v4 ;; diff --git a/gdb/configure.tgt b/gdb/configure.tgt index 46df10132bf..9d3063e543a 100644 --- a/gdb/configure.tgt +++ b/gdb/configure.tgt @@ -76,6 +76,7 @@ hppa*64*-*-hpux11*) gdb_target=hppa64 ;; hppa*-*-hpux*) gdb_target=hppahpux ;; hppa*-*-hiux*) gdb_target=hppahpux ;; hppa*-*-linux*) gdb_target=linux ;; +hppa*-*-openbsd*) gdb_target=obsd ;; hppa*-*-*) gdb_target=hppa ;; i[34567]86-ncr-*) gdb_target=ncr3000 ;; diff --git a/gdb/hppabsd-nat.c b/gdb/hppabsd-nat.c new file mode 100644 index 00000000000..1962ded6ffd --- /dev/null +++ b/gdb/hppabsd-nat.c @@ -0,0 +1,119 @@ +/* Native-dependent code for HP PA-RISC BSD's. + + Copyright 2004 Free Software Foundation, 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 "inferior.h" +#include "regcache.h" + +#include +#include +#include + +#include "hppa-tdep.h" + +static int +hppabsd_gregset_supplies_p (int regnum) +{ + return (regnum >= HPPA_R0_REGNUM && regnum <= HPPA_PCOQ_TAIL_REGNUM); +} + +/* Supply the general-purpose registers stored in GREGS to REGCACHE. */ + +static void +hppabsd_supply_gregset (struct regcache *regcache, const void *gregs) +{ + const char *regs = gregs; + int regnum; + + for (regnum = HPPA_R1_REGNUM; regnum <= HPPA_R31_REGNUM; regnum++) + regcache_raw_supply (regcache, regnum, regs + regnum * 4); + + regcache_raw_supply (regcache, HPPA_SAR_REGNUM, regs); + regcache_raw_supply (regcache, HPPA_PCOQ_HEAD_REGNUM, regs + 32 * 4); + regcache_raw_supply (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 33 * 4); +} + +/* Collect the general-purpose registers from REGCACHE and store them + in GREGS. */ + +static void +hppabsd_collect_gregset (const struct regcache *regcache, + void *gregs, int regnum) +{ + char *regs = gregs; + int i; + + for (i = HPPA_R1_REGNUM; i <= HPPA_R31_REGNUM; i++) + { + if (regnum == -1 || regnum == i) + regcache_raw_collect (regcache, i, regs + i * 4); + } + + if (regnum == -1 || regnum == HPPA_SAR_REGNUM) + regcache_raw_collect (regcache, HPPA_SAR_REGNUM, regs); + if (regnum == -1 || regnum == HPPA_PCOQ_HEAD_REGNUM) + regcache_raw_collect (regcache, HPPA_PCOQ_HEAD_REGNUM, regs + 32 * 4); + if (regnum == -1 || regnum == HPPA_PCOQ_TAIL_REGNUM) + regcache_raw_collect (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 33 * 4); +} + + +/* Fetch register REGNUM from the inferior. If REGNUM is -1, do this + for all registers (including the floating-point registers). */ + +void +fetch_inferior_registers (int regnum) +{ + struct regcache *regcache = current_regcache; + + if (regnum == -1 || hppabsd_gregset_supplies_p (regnum)) + { + struct reg regs; + + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); + + hppabsd_supply_gregset (regcache, ®s); + } +} + +/* Store register REGNUM back into the inferior. If REGNUM is -1, do + this for all registers (including the floating-point registers). */ + +void +store_inferior_registers (int regnum) +{ + if (regnum == -1 || hppabsd_gregset_supplies_p (regnum)) + { + struct reg regs; + + if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't get registers"); + + hppabsd_collect_gregset (current_regcache, ®s, regnum); + + if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), + (PTRACE_ARG3_TYPE) ®s, 0) == -1) + perror_with_name ("Couldn't write registers"); + } +} diff --git a/gdb/hppabsd-tdep.c b/gdb/hppabsd-tdep.c new file mode 100644 index 00000000000..0a54371527d --- /dev/null +++ b/gdb/hppabsd-tdep.c @@ -0,0 +1,137 @@ +/* Target-dependent code for HP PA-RISC BSD's. + + Copyright 2004 Free Software Foundation, 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 "arch-utils.h" +#include "osabi.h" +#include "regcache.h" +#include "regset.h" + +#include "gdb_assert.h" +#include "gdb_string.h" + +#include "hppa-tdep.h" +#include "solib-svr4.h" + +/* Core file support. */ + +/* Sizeof `struct reg' in . */ +#define HPPABSD_SIZEOF_GREGS (34 * 4) + +/* Supply register REGNUM from the buffer specified by GREGS and LEN + in the general-purpose register set REGSET to register cache + REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */ + +static void +hppabsd_supply_gregset (const struct regset *regset, struct regcache *regcache, + int regnum, const void *gregs, size_t len) +{ + const char *regs = gregs; + size_t offset; + int i; + + gdb_assert (len >= HPPABSD_SIZEOF_GREGS); + + for (i = HPPA_R1_REGNUM, offset = 4; i <= HPPA_R31_REGNUM; i++, offset += 4) + { + if (regnum == -1 || regnum == i) + regcache_raw_supply (regcache, i, regs + offset); + } + + if (regnum == -1 || regnum == HPPA_SAR_REGNUM) + regcache_raw_supply (regcache, HPPA_SAR_REGNUM, regs); + if (regnum == -1 || regnum == HPPA_PCOQ_HEAD_REGNUM) + regcache_raw_supply (regcache, HPPA_PCOQ_HEAD_REGNUM, regs + 32 * 4); + if (regnum == -1 || regnum == HPPA_PCOQ_TAIL_REGNUM) + regcache_raw_supply (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 33 * 4); +} + +/* OpenBSD/hppa register set. */ + +static struct regset hppabsd_gregset = +{ + NULL, + hppabsd_supply_gregset +}; + +/* Return the appropriate register set for the core section identified + by SECT_NAME and SECT_SIZE. */ + +static const struct regset * +hppabsd_regset_from_core_section (struct gdbarch *gdbarch, + const char *sect_name, size_t sect_size) +{ + if (strcmp (sect_name, ".reg") == 0 && sect_size >= HPPABSD_SIZEOF_GREGS) + return &hppabsd_gregset; + + return NULL; +} + + +static void +hppabsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + + /* Core file support. */ + set_gdbarch_regset_from_core_section + (gdbarch, hppabsd_regset_from_core_section); + + /* OpenBSD and NetBSD use ELF. */ + tdep->is_elf = 1; + + /* OpenBSD and NetBSD uses SVR4-style shared libraries. */ + set_gdbarch_in_solib_call_trampoline + (gdbarch, generic_in_solib_call_trampoline); + set_solib_svr4_fetch_link_map_offsets + (gdbarch, svr4_ilp32_fetch_link_map_offsets); +} + + +/* OpenBSD uses uses the traditional NetBSD core file format, even for + ports that use ELF. */ +#define GDB_OSABI_NETBSD_CORE GDB_OSABI_OPENBSD_ELF + +static enum gdb_osabi +hppabsd_core_osabi_sniffer (bfd *abfd) +{ + if (strcmp (bfd_get_target (abfd), "netbsd-core") == 0) + return GDB_OSABI_NETBSD_CORE; + + return GDB_OSABI_UNKNOWN; +} + + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_hppabsd_tdep (void); + +void +_initialize_hppabsd_tdep (void) +{ + /* BFD doesn't set a flavour for NetBSD style a.out core files. */ + gdbarch_register_osabi_sniffer (bfd_arch_hppa, bfd_target_unknown_flavour, + hppabsd_core_osabi_sniffer); + + gdbarch_register_osabi (bfd_arch_hppa, 0, GDB_OSABI_NETBSD_ELF, + hppabsd_init_abi); + gdbarch_register_osabi (bfd_arch_hppa, 0, GDB_OSABI_OPENBSD_ELF, + hppabsd_init_abi); +} -- 2.30.2