/* Target-dependent code for OpenBSD/sparc64.
- Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+ Copyright (C) 2004-2015 Free Software Foundation, Inc.
This file is part of GDB.
#include "objfiles.h"
#include "trad-frame.h"
-#include "gdb_assert.h"
-
#include "obsd-tdep.h"
#include "sparc64-tdep.h"
#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_core_gregset =
+const struct sparc_gregmap sparc64obsd_gregmap =
+{
+ 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_gregmap sparc64obsd_core_gregmap =
{
0 * 8, /* "tstate" */
1 * 8, /* %pc */
struct regcache *regcache,
int regnum, const void *gregs, size_t len)
{
- const char *regs = gregs;
+ const void *fpregs = (char *)gregs + 288;
+
+ if (len < 832)
+ {
+ sparc64_supply_gregset (&sparc64obsd_gregmap, regcache, regnum, gregs);
+ return;
+ }
+
+ sparc64_supply_gregset (&sparc64obsd_core_gregmap, regcache, regnum, gregs);
+ sparc64_supply_fpregset (&sparc64_bsd_fpregmap, regcache, regnum, fpregs);
+}
- sparc64_supply_gregset (&sparc64obsd_core_gregset, regcache, regnum, regs);
- sparc64_supply_fpregset (regcache, regnum, regs + 288);
+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_fpregmap, regcache, regnum, fpregs);
}
\f
};
static int
-sparc64obsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
+sparc64obsd_pc_in_sigtramp (CORE_ADDR pc, const char *name)
{
CORE_ADDR start_pc = (pc & ~(sparc64obsd_page_size - 1));
unsigned long insn;
CORE_ADDR addr;
if (*this_cache)
- return *this_cache;
+ return (struct sparc_frame_cache *) *this_cache;
cache = sparc_frame_cache (this_frame, this_cache);
gdb_assert (cache == *this_cache);
/* Since we couldn't find the frame's function, the cache was
initialized under the assumption that we're frameless. */
- cache->frameless_p = 0;
+ sparc_record_save_insn (cache);
addr = get_frame_register_unsigned (this_frame, SPARC_FP_REGNUM);
if (addr & 1)
addr += BIAS;
void **this_cache)
{
CORE_ADDR pc = get_frame_pc (this_frame);
- char *name;
+ const char *name;
find_pc_partial_function (pc, &name, NULL, NULL);
if (sparc64obsd_pc_in_sigtramp (pc, name))
static const struct frame_unwind sparc64obsd_frame_unwind =
{
SIGTRAMP_FRAME,
+ default_frame_unwind_stop_reason,
sparc64obsd_frame_this_id,
sparc64obsd_frame_prev_register,
NULL,
int regnum;
if (*this_cache)
- return *this_cache;
+ return (struct sparc_frame_cache *) *this_cache;
cache = sparc_frame_cache (this_frame, this_cache);
gdb_assert (cache == *this_cache);
{
CORE_ADDR pc;
ULONGEST pstate;
- char *name;
+ const char *name;
/* Check whether we are in privileged mode, and bail out if we're not. */
pstate = get_frame_register_unsigned (this_frame, SPARC64_PSTATE_REGNUM);
static const struct frame_unwind sparc64obsd_trapframe_unwind =
{
NORMAL_FRAME,
+ default_frame_unwind_stop_reason,
sparc64obsd_trapframe_this_id,
sparc64obsd_trapframe_prev_register,
NULL,
sparc64obsd_supply_uthread (struct regcache *regcache,
int regnum, CORE_ADDR addr)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
CORE_ADDR fp, fp_addr = addr + SPARC64OBSD_UTHREAD_FP_OFFSET;
gdb_byte buf[8];
gdb_assert (regnum >= -1);
- fp = read_memory_unsigned_integer (fp_addr, 8);
+ fp = read_memory_unsigned_integer (fp_addr, 8, byte_order);
if (regnum == SPARC_SP_REGNUM || regnum == -1)
{
- store_unsigned_integer (buf, 8, fp);
+ store_unsigned_integer (buf, 8, byte_order, fp);
regcache_raw_supply (regcache, SPARC_SP_REGNUM, buf);
if (regnum == SPARC_SP_REGNUM)
{
CORE_ADDR i7, i7_addr = addr + SPARC64OBSD_UTHREAD_PC_OFFSET;
- i7 = read_memory_unsigned_integer (i7_addr, 8);
+ i7 = read_memory_unsigned_integer (i7_addr, 8, byte_order);
if (regnum == SPARC64_PC_REGNUM || regnum == -1)
{
- store_unsigned_integer (buf, 8, i7 + 8);
+ store_unsigned_integer (buf, 8, byte_order, i7 + 8);
regcache_raw_supply (regcache, SPARC64_PC_REGNUM, buf);
}
if (regnum == SPARC64_NPC_REGNUM || regnum == -1)
{
- store_unsigned_integer (buf, 8, i7 + 12);
+ store_unsigned_integer (buf, 8, byte_order, i7 + 12);
regcache_raw_supply (regcache, SPARC64_NPC_REGNUM, buf);
}
sparc64obsd_collect_uthread(const struct regcache *regcache,
int regnum, CORE_ADDR addr)
{
+ struct gdbarch *gdbarch = get_regcache_arch (regcache);
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
CORE_ADDR sp;
gdb_byte buf[8];
CORE_ADDR i7, i7_addr = addr + SPARC64OBSD_UTHREAD_PC_OFFSET;
regcache_raw_collect (regcache, SPARC64_PC_REGNUM, buf);
- i7 = extract_unsigned_integer (buf, 8) - 8;
- write_memory_unsigned_integer (i7_addr, 8, i7);
+ i7 = extract_unsigned_integer (buf, 8, byte_order) - 8;
+ write_memory_unsigned_integer (i7_addr, 8, byte_order, i7);
if (regnum == SPARC64_PC_REGNUM)
return;
}
regcache_raw_collect (regcache, SPARC_SP_REGNUM, buf);
- sp = extract_unsigned_integer (buf, 8);
+ sp = extract_unsigned_integer (buf, 8, byte_order);
sparc_collect_rwindow (regcache, sp, regnum);
}
\f
+static const struct regset sparc64obsd_gregset =
+ {
+ NULL, sparc64obsd_supply_gregset, NULL
+ };
+
+static const struct regset sparc64obsd_fpregset =
+ {
+ NULL, sparc64obsd_supply_fpregset, NULL
+ };
+
static void
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->gregset = &sparc64obsd_gregset;
+ tdep->sizeof_gregset = 288;
+ tdep->fpregset = &sparc64obsd_fpregset;
+ tdep->sizeof_fpregset = 272;
/* Make sure we can single-step "new" syscalls. */
tdep->step_trap = sparcnbsd_step_trap;
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