Call obsd_init_abi for OpenBSD/sparc64.

[deliverable/binutils-gdb.git] / gdb / sparc64obsd-tdep.c

diff --git a/gdb/sparc64obsd-tdep.c b/gdb/sparc64obsd-tdep.c
index efce431ed55172f93722226a542d797621bc9ed4..e2dce3b8876e5b0197fce7368369ae752648a104 100644 (file)
--- a/gdb/sparc64obsd-tdep.c
+++ b/gdb/sparc64obsd-tdep.c
@@ -35,14 +35,30 @@
 #include "solib-svr4.h"
 #include "bsd-uthread.h"
 
-/* OpenBSD uses the traditional NetBSD core file format, even for
-   ports that use ELF.  The core files don't use multiple register
-   sets.  Instead, the general-purpose and floating-point registers
-   are lumped together in a single section.  Unlike on NetBSD, OpenBSD
-   uses a different layout for its general-purpose registers than the
-   layout used for ptrace(2).  */
+/* Older OpenBSD versions used the traditional NetBSD core file
+   format, even for ports that use ELF.  These core files don't use
+   multiple register sets.  Instead, the general-purpose and
+   floating-point registers are lumped together in a single section.
+   Unlike on NetBSD, OpenBSD uses a different layout for its
+   general-purpose registers than the layout used for ptrace(2).
+
+   Newer OpenBSD versions use ELF core files.  Here the register sets
+   match the ptrace(2) layout.  */
 
 /* From <machine/reg.h>.  */
+const struct sparc_gregset sparc64obsd_gregset =
+{
+  0 * 8,                       /* "tstate" */
+  1 * 8,                       /* %pc */
+  2 * 8,                       /* %npc */
+  3 * 8,                       /* %y */
+  -1,                          /* %fprs */
+  -1,
+  5 * 8,                       /* %g1 */
+  20 * 8,                      /* %l0 */
+  4                            /* sizeof (%y) */
+};
+
 const struct sparc_gregset sparc64obsd_core_gregset =
 {
   0 * 8,                       /* "tstate" */
@@ -61,10 +77,24 @@ sparc64obsd_supply_gregset (const struct regset *regset,
                            struct regcache *regcache,
                            int regnum, const void *gregs, size_t len)
 {
-  const char *regs = gregs;
+  const void *fpregs = (char *)gregs + 288;
 
-  sparc64_supply_gregset (&sparc64obsd_core_gregset, regcache, regnum, regs);
-  sparc64_supply_fpregset (&sparc64_bsd_fpregset, regcache, regnum, regs + 288);
+  if (len < 832)
+    {
+      sparc64_supply_gregset (&sparc64obsd_gregset, regcache, regnum, gregs);
+      return;
+    }
+
+  sparc64_supply_gregset (&sparc64obsd_core_gregset, regcache, regnum, gregs);
+  sparc64_supply_fpregset (&sparc64_bsd_fpregset, regcache, regnum, fpregs);
+}
+
+static void
+sparc64obsd_supply_fpregset (const struct regset *regset,
+                            struct regcache *regcache,
+                            int regnum, const void *fpregs, size_t len)
+{
+  sparc64_supply_fpregset (&sparc64_bsd_fpregset, regcache, regnum, fpregs);
 }
 \f
 
@@ -379,7 +409,10 @@ sparc64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
 
   tdep->gregset = regset_alloc (gdbarch, sparc64obsd_supply_gregset, NULL);
-  tdep->sizeof_gregset = 832;
+  tdep->sizeof_gregset = 288;
+
+  tdep->fpregset = regset_alloc (gdbarch, sparc64obsd_supply_fpregset, NULL);
+  tdep->sizeof_fpregset = 272;
 
   /* Make sure we can single-step "new" syscalls.  */
   tdep->step_trap = sparcnbsd_step_trap;
@@ -388,6 +421,7 @@ sparc64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
   frame_unwind_append_unwinder (gdbarch, &sparc64obsd_trapframe_unwind);
 
   sparc64_init_abi (info, gdbarch);
+  obsd_init_abi (info, gdbarch);
 
   /* OpenBSD/sparc64 has SVR4-style shared libraries.  */
   set_solib_svr4_fetch_link_map_offsets