X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fhppaobsd-tdep.c;h=9ec7fdff81d4e9ddad842fdaf82a3d49907792ae;hb=d35b90fb6ec3374f4d5d8d19bb8e41c8b1970315;hp=bc4c8e7e1d24f5ba92c8b4e3c16c5356a8cf626e;hpb=af5ca30dc3dea6cf168332e1f87306acc51a0fd5;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/hppaobsd-tdep.c b/gdb/hppaobsd-tdep.c
index bc4c8e7e1d..9ec7fdff81 100644
--- a/gdb/hppaobsd-tdep.c
+++ b/gdb/hppaobsd-tdep.c
@@ -1,12 +1,12 @@
/* Target-dependent code for OpenBSD/hppa
- Copyright (C) 2004, 2005, 2006, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2004-2015 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
+ the Free Software Foundation; either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -15,87 +15,153 @@
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., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
#include "defs.h"
#include "osabi.h"
#include "regcache.h"
#include "regset.h"
-#include "gdb_assert.h"
-#include "gdb_string.h"
-
#include "hppa-tdep.h"
+#include "hppabsd-tdep.h"
/* Core file support. */
/* Sizeof `struct reg' in . */
-#define HPPABSD_SIZEOF_GREGS (34 * 4)
+#define HPPAOBSD_SIZEOF_GREGS (34 * 4) /* OpenBSD 5.1 and earlier. */
+#define HPPANBSD_SIZEOF_GREGS (46 * 4) /* NetBSD and OpenBSD 5.2 and later. */
+
+/* Sizeof `struct fpreg' in . */
+#define HPPAOBSD_SIZEOF_FPREGS (32 * 8)
/* 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)
+hppaobsd_supply_gregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *gregs, size_t len)
{
+ gdb_byte zero[4] = { 0 };
const gdb_byte *regs = gregs;
size_t offset;
int i;
- gdb_assert (len >= HPPABSD_SIZEOF_GREGS);
+ gdb_assert (len >= HPPAOBSD_SIZEOF_GREGS);
+ if (regnum == -1 || regnum == HPPA_R0_REGNUM)
+ regcache_raw_supply (regcache, HPPA_R0_REGNUM, &zero);
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);
+ if (len >= HPPANBSD_SIZEOF_GREGS)
+ {
+ if (regnum == -1 || regnum == HPPA_IPSW_REGNUM)
+ regcache_raw_supply (regcache, HPPA_IPSW_REGNUM, regs);
+ if (regnum == -1 || regnum == HPPA_SAR_REGNUM)
+ regcache_raw_supply (regcache, HPPA_SAR_REGNUM, regs + 32 * 4);
+ if (regnum == -1 || regnum == HPPA_PCSQ_HEAD_REGNUM)
+ regcache_raw_supply (regcache, HPPA_PCSQ_HEAD_REGNUM, regs + 33 * 4);
+ if (regnum == -1 || regnum == HPPA_PCSQ_TAIL_REGNUM)
+ regcache_raw_supply (regcache, HPPA_PCSQ_TAIL_REGNUM, regs + 34 * 4);
+ if (regnum == -1 || regnum == HPPA_PCOQ_HEAD_REGNUM)
+ regcache_raw_supply (regcache, HPPA_PCOQ_HEAD_REGNUM, regs + 35 * 4);
+ if (regnum == -1 || regnum == HPPA_PCOQ_TAIL_REGNUM)
+ regcache_raw_supply (regcache, HPPA_PCOQ_TAIL_REGNUM, regs + 36 * 4);
+ if (regnum == -1 || regnum == HPPA_SR0_REGNUM)
+ regcache_raw_supply (regcache, HPPA_SR0_REGNUM, regs + 37 * 4);
+ if (regnum == -1 || regnum == HPPA_SR1_REGNUM)
+ regcache_raw_supply (regcache, HPPA_SR1_REGNUM, regs + 38 * 4);
+ if (regnum == -1 || regnum == HPPA_SR2_REGNUM)
+ regcache_raw_supply (regcache, HPPA_SR2_REGNUM, regs + 39 * 4);
+ if (regnum == -1 || regnum == HPPA_SR3_REGNUM)
+ regcache_raw_supply (regcache, HPPA_SR3_REGNUM, regs + 40 * 4);
+ if (regnum == -1 || regnum == HPPA_SR4_REGNUM)
+ regcache_raw_supply (regcache, HPPA_SR4_REGNUM, regs + 41 * 4);
+ if (regnum == -1 || regnum == HPPA_SR5_REGNUM)
+ regcache_raw_supply (regcache, HPPA_SR5_REGNUM, regs + 42 * 4);
+ if (regnum == -1 || regnum == HPPA_SR6_REGNUM)
+ regcache_raw_supply (regcache, HPPA_SR6_REGNUM, regs + 43 * 4);
+ if (regnum == -1 || regnum == HPPA_SR7_REGNUM)
+ regcache_raw_supply (regcache, HPPA_SR7_REGNUM, regs + 44 * 4);
+ if (regnum == -1 || regnum == HPPA_CR26_REGNUM)
+ regcache_raw_supply (regcache, HPPA_CR26_REGNUM, regs + 45 * 4);
+ if (regnum == -1 || regnum == HPPA_CR27_REGNUM)
+ regcache_raw_supply (regcache, HPPA_CR27_REGNUM, regs + 46 * 4);
+ }
+ else
+ {
+ 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. */
+/* Supply register REGNUM from the buffer specified by FPREGS and LEN
+ in the floating-point register set REGSET to register cache
+ REGCACHE. If REGNUM is -1, do this for all registers in REGSET. */
-static struct regset hppabsd_gregset =
+static void
+hppaobsd_supply_fpregset (const struct regset *regset,
+ struct regcache *regcache,
+ int regnum, const void *fpregs, size_t len)
+{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ const gdb_byte *regs = fpregs;
+ int i;
+
+ gdb_assert (len >= HPPAOBSD_SIZEOF_FPREGS);
+
+ for (i = HPPA_FP0_REGNUM; i <= HPPA_FP31R_REGNUM; i++)
+ {
+ if (regnum == i || regnum == -1)
+ regcache_raw_supply (regcache, i, regs + (i - HPPA_FP0_REGNUM) * 4);
+ }
+}
+
+/* OpenBSD/hppa register sets. */
+
+static const struct regset hppaobsd_gregset =
{
NULL,
- hppabsd_supply_gregset
+ hppaobsd_supply_gregset
};
-/* Return the appropriate register set for the core section identified
- by SECT_NAME and SECT_SIZE. */
-
-static const struct regset *
-hppaobsd_regset_from_core_section (struct gdbarch *gdbarch,
- const char *sect_name, size_t sect_size)
+static const struct regset hppaobsd_fpregset =
{
- if (strcmp (sect_name, ".reg") == 0 && sect_size >= HPPABSD_SIZEOF_GREGS)
- return &hppabsd_gregset;
+ NULL,
+ hppaobsd_supply_fpregset
+};
+
+/* Iterate over supported core file register note sections. */
- return NULL;
+static void
+hppaobsd_iterate_over_regset_sections (struct gdbarch *gdbarch,
+ iterate_over_regset_sections_cb *cb,
+ void *cb_data,
+ const struct regcache *regcache)
+{
+ cb (".reg", HPPAOBSD_SIZEOF_GREGS, &hppaobsd_gregset, NULL, cb_data);
+ cb (".reg2", HPPAOBSD_SIZEOF_FPREGS, &hppaobsd_fpregset, NULL, cb_data);
}
-void hppabsd_init_abi (struct gdbarch_info, struct gdbarch *);
-
-void
+static void
hppaobsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
/* Obviously OpenBSD is BSD-based. */
hppabsd_init_abi (info, gdbarch);
/* Core file support. */
- set_gdbarch_regset_from_core_section
- (gdbarch, hppaobsd_regset_from_core_section);
-
+ set_gdbarch_iterate_over_regset_sections
+ (gdbarch, hppaobsd_iterate_over_regset_sections);
}