/* Target-dependent code for NetBSD/sparc.
- Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008
- Free Software Foundation, Inc.
+ Copyright (C) 2002-2016 Free Software Foundation, Inc.
Contributed by Wasabi Systems, Inc.
This file is part of GDB.
#include "symtab.h"
#include "trad-frame.h"
-#include "gdb_assert.h"
-#include "gdb_string.h"
-
#include "sparc-tdep.h"
#include "nbsd-tdep.h"
#define X_RS2(i) ((i) & 0x1f)
#define X_I(i) (((i) >> 13) & 1)
-const struct sparc_gregset sparc32nbsd_gregset =
+const struct sparc_gregmap sparc32nbsd_gregmap =
{
0 * 4, /* %psr */
1 * 4, /* %pc */
struct regcache *regcache,
int regnum, const void *gregs, size_t len)
{
- sparc32_supply_gregset (&sparc32nbsd_gregset, regcache, regnum, gregs);
+ sparc32_supply_gregset (&sparc32nbsd_gregmap, regcache, regnum, gregs);
/* Traditional NetBSD core files don't use multiple register sets.
Instead, the general-purpose and floating-point registers are
lumped together in a single section. */
if (len >= 212)
- sparc32_supply_fpregset (regcache, regnum, (const char *) gregs + 80);
+ sparc32_supply_fpregset (&sparc32_bsd_fpregmap, regcache, regnum,
+ (const char *) gregs + 80);
}
static void
struct regcache *regcache,
int regnum, const void *fpregs, size_t len)
{
- sparc32_supply_fpregset (regcache, regnum, fpregs);
+ sparc32_supply_fpregset (&sparc32_bsd_fpregmap, regcache, regnum, fpregs);
}
\f
static const CORE_ADDR sparc32nbsd_sigtramp_end = 0xeffffff0;
static int
-sparc32nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
+sparc32nbsd_pc_in_sigtramp (CORE_ADDR pc, const char *name)
{
if (pc >= sparc32nbsd_sigtramp_start && pc < sparc32nbsd_sigtramp_end)
return 1;
}
struct trad_frame_saved_reg *
-sparc32nbsd_sigcontext_saved_regs (struct frame_info *next_frame)
+sparc32nbsd_sigcontext_saved_regs (struct frame_info *this_frame)
{
+ struct gdbarch *gdbarch = get_frame_arch (this_frame);
struct trad_frame_saved_reg *saved_regs;
CORE_ADDR addr, sigcontext_addr;
int regnum, delta;
ULONGEST psr;
- saved_regs = trad_frame_alloc_saved_regs (next_frame);
+ saved_regs = trad_frame_alloc_saved_regs (this_frame);
/* We find the appropriate instance of `struct sigcontext' at a
fixed offset in the signal frame. */
- addr = frame_unwind_register_unsigned (next_frame, SPARC_FP_REGNUM);
+ addr = get_frame_register_unsigned (this_frame, SPARC_FP_REGNUM);
sigcontext_addr = addr + 64 + 16;
/* The registers are saved in bits and pieces scattered all over the
/* The `local' and `in' registers have been saved in the register
save area. */
addr = saved_regs[SPARC_SP_REGNUM].addr;
- addr = get_frame_memory_unsigned (next_frame, addr, 4);
+ addr = get_frame_memory_unsigned (this_frame, addr, 4);
for (regnum = SPARC_L0_REGNUM;
regnum <= SPARC_I7_REGNUM; regnum++, addr += 4)
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, 4);
+ i7 = get_frame_memory_unsigned (this_frame, addr, 4);
trad_frame_set_value (saved_regs, SPARC_I7_REGNUM, i7 ^ wcookie);
}
}
#define PSR_EF 0x00001000
addr = saved_regs[SPARC32_PSR_REGNUM].addr;
- psr = get_frame_memory_unsigned (next_frame, addr, 4);
+ psr = get_frame_memory_unsigned (this_frame, addr, 4);
if (psr & PSR_EF)
{
CORE_ADDR sp;
- sp = frame_unwind_register_unsigned (next_frame, SPARC_SP_REGNUM);
+ sp = get_frame_register_unsigned (this_frame, SPARC_SP_REGNUM);
saved_regs[SPARC32_FSR_REGNUM].addr = sp + 96;
for (regnum = SPARC_F0_REGNUM, addr = sp + 96 + 8;
regnum <= SPARC_F31_REGNUM; regnum++, addr += 4)
}
static struct sparc_frame_cache *
-sparc32nbsd_sigcontext_frame_cache (struct frame_info *next_frame,
+sparc32nbsd_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
/* 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);
cache->base = addr;
}
- cache->saved_regs = sparc32nbsd_sigcontext_saved_regs (next_frame);
+ cache->saved_regs = sparc32nbsd_sigcontext_saved_regs (this_frame);
return cache;
}
static void
-sparc32nbsd_sigcontext_frame_this_id (struct frame_info *next_frame,
+sparc32nbsd_sigcontext_frame_this_id (struct frame_info *this_frame,
void **this_cache,
struct frame_id *this_id)
{
struct sparc_frame_cache *cache =
- sparc32nbsd_sigcontext_frame_cache (next_frame, this_cache);
+ sparc32nbsd_sigcontext_frame_cache (this_frame, this_cache);
(*this_id) = frame_id_build (cache->base, cache->pc);
}
-static void
-sparc32nbsd_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 *
+sparc32nbsd_sigcontext_frame_prev_register (struct frame_info *this_frame,
+ void **this_cache, int regnum)
{
struct sparc_frame_cache *cache =
- sparc32nbsd_sigcontext_frame_cache (next_frame, this_cache);
+ sparc32nbsd_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 sparc32nbsd_sigcontext_frame_unwind =
-{
- SIGTRAMP_FRAME,
- sparc32nbsd_sigcontext_frame_this_id,
- sparc32nbsd_sigcontext_frame_prev_register
-};
-
-static const struct frame_unwind *
-sparc32nbsd_sigtramp_frame_sniffer (struct frame_info *next_frame)
+static int
+sparc32nbsd_sigcontext_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 (sparc32nbsd_pc_in_sigtramp (pc, name))
{
- if (name == NULL || strncmp (name, "__sigtramp_sigcontext", 21))
- return &sparc32nbsd_sigcontext_frame_unwind;
+ if (name == NULL || !startswith (name, "__sigtramp_sigcontext"))
+ return 1;
}
- return NULL;
+ return 0;
}
+
+static const struct frame_unwind sparc32nbsd_sigcontext_frame_unwind =
+{
+ SIGTRAMP_FRAME,
+ default_frame_unwind_stop_reason,
+ sparc32nbsd_sigcontext_frame_this_id,
+ sparc32nbsd_sigcontext_frame_prev_register,
+ NULL,
+ sparc32nbsd_sigcontext_frame_sniffer
+};
\f
/* Return the address of a system call's alternative return
address. */
}
\f
+static const struct regset sparc32nbsd_gregset =
+ {
+ NULL, sparc32nbsd_supply_gregset, NULL
+ };
+
+static const struct regset sparc32nbsd_fpregset =
+ {
+ NULL, sparc32nbsd_supply_fpregset, NULL
+ };
+
static void
sparc32nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
{
set_gdbarch_long_double_bit (gdbarch, 64);
set_gdbarch_long_double_format (gdbarch, floatformats_ieee_double);
- tdep->gregset = regset_alloc (gdbarch, sparc32nbsd_supply_gregset, NULL);
+ tdep->gregset = &sparc32nbsd_gregset;
tdep->sizeof_gregset = 20 * 4;
- tdep->fpregset = regset_alloc (gdbarch, sparc32nbsd_supply_fpregset, NULL);
+ tdep->fpregset = &sparc32nbsd_fpregset;
tdep->sizeof_fpregset = 33 * 4;
/* Make sure we can single-step "new" syscalls. */
tdep->step_trap = sparcnbsd_step_trap;
- frame_unwind_append_sniffer (gdbarch, sparc32nbsd_sigtramp_frame_sniffer);
+ frame_unwind_append_unwinder (gdbarch, &sparc32nbsd_sigcontext_frame_unwind);
}
static void
void _initialize_sparcnbsd_tdep (void);
void
-_initialize_sparnbsd_tdep (void)
+_initialize_sparcnbsd_tdep (void)
{
gdbarch_register_osabi_sniffer (bfd_arch_sparc, bfd_target_aout_flavour,
sparcnbsd_aout_osabi_sniffer);
projects / deliverable / binutils-gdb.git / blobdiff