X-Git-Url: http://drtracing.org/?a=blobdiff_plain;ds=sidebyside;f=gdb%2Fsparc64nbsd-tdep.c;h=1abb721e2e01110bdf507ab3b02e3d8e9738db44;hb=b8162e5ac9e052b2a88912b729081600972e854c;hp=5c7ef16844942784b5675f25b2915d15c43ee435;hpb=c893be758be8844753c7e545525d76b7cb789f52;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/sparc64nbsd-tdep.c b/gdb/sparc64nbsd-tdep.c
index 5c7ef16844..1abb721e2e 100644
--- a/gdb/sparc64nbsd-tdep.c
+++ b/gdb/sparc64nbsd-tdep.c
@@ -1,13 +1,13 @@
/* Target-dependent code for NetBSD/sparc64.
- Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2002-2016 Free Software Foundation, Inc.
Based on code 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
+ 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,
@@ -16,9 +16,7 @@
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 "frame.h"
@@ -32,14 +30,11 @@
#include "solib-svr4.h"
#include "trad-frame.h"
-#include "gdb_assert.h"
-#include "gdb_string.h"
-
#include "sparc64-tdep.h"
#include "nbsd-tdep.h"
/* From . */
-const struct sparc_gregset sparc64nbsd_gregset =
+const struct sparc_gregmap sparc64nbsd_gregmap =
{
0 * 8, /* "tstate" */
1 * 8, /* %pc */
@@ -58,7 +53,7 @@ sparc64nbsd_supply_gregset (const struct regset *regset,
struct regcache *regcache,
int regnum, const void *gregs, size_t len)
{
- sparc64_supply_gregset (&sparc64nbsd_gregset, regcache, regnum, gregs);
+ sparc64_supply_gregset (&sparc64nbsd_gregmap, regcache, regnum, gregs);
}
static void
@@ -66,7 +61,7 @@ sparc64nbsd_supply_fpregset (const struct regset *regset,
struct regcache *regcache,
int regnum, const void *fpregs, size_t len)
{
- sparc64_supply_fpregset (regcache, regnum, fpregs);
+ sparc64_supply_fpregset (&sparc64_bsd_fpregmap, regcache, regnum, fpregs);
}
@@ -81,7 +76,7 @@ static const CORE_ADDR sparc64nbsd_sigtramp_start = 0xffffffffffffdee4ULL;
static const CORE_ADDR sparc64nbsd_sigtramp_end = 0xffffffffffffe000ULL;
static int
-sparc64nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
+sparc64nbsd_pc_in_sigtramp (CORE_ADDR pc, const char *name)
{
if (pc >= sparc64nbsd_sigtramp_start && pc < sparc64nbsd_sigtramp_end)
return 1;
@@ -91,13 +86,14 @@ sparc64nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
struct trad_frame_saved_reg *
sparc64nbsd_sigcontext_saved_regs (CORE_ADDR sigcontext_addr,
- struct frame_info *next_frame)
+ struct frame_info *this_frame)
{
+ struct gdbarch *gdbarch = get_frame_arch (this_frame);
struct trad_frame_saved_reg *saved_regs;
CORE_ADDR addr, sp;
int regnum, delta;
- saved_regs = trad_frame_alloc_saved_regs (next_frame);
+ saved_regs = trad_frame_alloc_saved_regs (this_frame);
/* The registers are saved in bits and pieces scattered all over the
place. The code below records their location on the assumption
@@ -128,21 +124,21 @@ sparc64nbsd_sigcontext_saved_regs (CORE_ADDR sigcontext_addr,
/* The `local' and `in' registers have been saved in the register
save area. */
addr = saved_regs[SPARC_SP_REGNUM].addr;
- sp = get_frame_memory_unsigned (next_frame, addr, 8);
+ sp = get_frame_memory_unsigned (this_frame, addr, 8);
for (regnum = SPARC_L0_REGNUM, addr = sp + BIAS;
regnum <= SPARC_I7_REGNUM; regnum++, addr += 8)
saved_regs[regnum].addr = addr;
/* Handle StackGhost. */
{
- ULONGEST wcookie = sparc_fetch_wcookie ();
+ ULONGEST wcookie = sparc_fetch_wcookie (gdbarch);
if (wcookie != 0)
{
ULONGEST i7;
addr = saved_regs[SPARC_I7_REGNUM].addr;
- i7 = get_frame_memory_unsigned (next_frame, addr, 8);
+ i7 = get_frame_memory_unsigned (this_frame, addr, 8);
trad_frame_set_value (saved_regs, SPARC_I7_REGNUM, i7 ^ wcookie);
}
}
@@ -153,16 +149,16 @@ sparc64nbsd_sigcontext_saved_regs (CORE_ADDR sigcontext_addr,
}
static struct sparc_frame_cache *
-sparc64nbsd_sigcontext_frame_cache (struct frame_info *next_frame,
+sparc64nbsd_sigcontext_frame_cache (struct frame_info *this_frame,
void **this_cache)
{
struct sparc_frame_cache *cache;
CORE_ADDR addr;
if (*this_cache)
- return *this_cache;
+ return (struct sparc_frame_cache *) *this_cache;
- cache = sparc_frame_cache (next_frame, this_cache);
+ cache = sparc_frame_cache (this_frame, this_cache);
gdb_assert (cache == *this_cache);
/* If we couldn't find the frame's function, we're probably dealing
@@ -173,8 +169,8 @@ sparc64nbsd_sigcontext_frame_cache (struct frame_info *next_frame,
/* Since we couldn't find the frame's function, the cache was
initialized under the assumption that we're frameless. */
- cache->frameless_p = 0;
- addr = frame_unwind_register_unsigned (next_frame, SPARC_FP_REGNUM);
+ sparc_record_save_insn (cache);
+ addr = get_frame_register_unsigned (this_frame, SPARC_FP_REGNUM);
if (addr & 1)
addr += BIAS;
cache->base = addr;
@@ -183,76 +179,86 @@ sparc64nbsd_sigcontext_frame_cache (struct frame_info *next_frame,
/* We find the appropriate instance of `struct sigcontext' at a
fixed offset in the signal frame. */
addr = cache->base + 128 + 8;
- cache->saved_regs = sparc64nbsd_sigcontext_saved_regs (addr, next_frame);
+ cache->saved_regs = sparc64nbsd_sigcontext_saved_regs (addr, this_frame);
return cache;
}
static void
-sparc64nbsd_sigcontext_frame_this_id (struct frame_info *next_frame,
+sparc64nbsd_sigcontext_frame_this_id (struct frame_info *this_frame,
void **this_cache,
struct frame_id *this_id)
{
struct sparc_frame_cache *cache =
- sparc64nbsd_sigcontext_frame_cache (next_frame, this_cache);
+ sparc64nbsd_sigcontext_frame_cache (this_frame, this_cache);
(*this_id) = frame_id_build (cache->base, cache->pc);
}
-static void
-sparc64nbsd_sigcontext_frame_prev_register (struct frame_info *next_frame,
- void **this_cache,
- int regnum, int *optimizedp,
- enum lval_type *lvalp,
- CORE_ADDR *addrp,
- int *realnump, gdb_byte *valuep)
+static struct value *
+sparc64nbsd_sigcontext_frame_prev_register (struct frame_info *this_frame,
+ void **this_cache, int regnum)
{
struct sparc_frame_cache *cache =
- sparc64nbsd_sigcontext_frame_cache (next_frame, this_cache);
+ sparc64nbsd_sigcontext_frame_cache (this_frame, this_cache);
- trad_frame_get_prev_register (next_frame, cache->saved_regs, regnum,
- optimizedp, lvalp, addrp, realnump, valuep);
+ return trad_frame_get_prev_register (this_frame, cache->saved_regs, regnum);
}
-static const struct frame_unwind sparc64nbsd_sigcontext_frame_unwind =
-{
- SIGTRAMP_FRAME,
- sparc64nbsd_sigcontext_frame_this_id,
- sparc64nbsd_sigcontext_frame_prev_register
-};
-
-static const struct frame_unwind *
-sparc64nbsd_sigtramp_frame_sniffer (struct frame_info *next_frame)
+static int
+sparc64nbsd_sigtramp_frame_sniffer (const struct frame_unwind *self,
+ struct frame_info *this_frame,
+ void **this_cache)
{
- CORE_ADDR pc = frame_pc_unwind (next_frame);
- char *name;
+ CORE_ADDR pc = get_frame_pc (this_frame);
+ const char *name;
find_pc_partial_function (pc, &name, NULL, NULL);
if (sparc64nbsd_pc_in_sigtramp (pc, name))
{
- if (name == NULL || strncmp (name, "__sigtramp_sigcontext", 21))
- return &sparc64nbsd_sigcontext_frame_unwind;
+ if (name == NULL || !startswith (name, "__sigtramp_sigcontext"))
+ return 1;
}
- return NULL;
+ return 0;
}
+
+static const struct frame_unwind sparc64nbsd_sigcontext_frame_unwind =
+{
+ SIGTRAMP_FRAME,
+ default_frame_unwind_stop_reason,
+ sparc64nbsd_sigcontext_frame_this_id,
+ sparc64nbsd_sigcontext_frame_prev_register,
+ NULL,
+ sparc64nbsd_sigtramp_frame_sniffer
+};
+static const struct regset sparc64nbsd_gregset =
+ {
+ NULL, sparc64nbsd_supply_gregset, NULL
+ };
+
+static const struct regset sparc64nbsd_fpregset =
+ {
+ NULL, sparc64nbsd_supply_fpregset, NULL
+ };
+
static void
sparc64nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
- tdep->gregset = regset_alloc (gdbarch, sparc64nbsd_supply_gregset, NULL);
+ tdep->gregset = &sparc64nbsd_gregset;
tdep->sizeof_gregset = 160;
- tdep->fpregset = regset_alloc (gdbarch, sparc64nbsd_supply_fpregset, NULL);
+ tdep->fpregset = &sparc64nbsd_fpregset;
tdep->sizeof_fpregset = 272;
/* Make sure we can single-step "new" syscalls. */
tdep->step_trap = sparcnbsd_step_trap;
- frame_unwind_append_sniffer (gdbarch, sparc64nbsd_sigtramp_frame_sniffer);
+ frame_unwind_append_unwinder (gdbarch, &sparc64nbsd_sigcontext_frame_unwind);
sparc64_init_abi (info, gdbarch);