aboutsummaryrefslogtreecommitdiff
path: root/gdb/sparc64obsd-tdep.c
diff options
context:
space:
mode:
Diffstat (limited to 'gdb/sparc64obsd-tdep.c')
-rw-r--r--gdb/sparc64obsd-tdep.c118
1 files changed, 59 insertions, 59 deletions
diff --git a/gdb/sparc64obsd-tdep.c b/gdb/sparc64obsd-tdep.c
index 55f0d49..9f8a84a 100644
--- a/gdb/sparc64obsd-tdep.c
+++ b/gdb/sparc64obsd-tdep.c
@@ -121,7 +121,7 @@ sparc64obsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
}
static struct sparc_frame_cache *
-sparc64obsd_frame_cache (struct frame_info *next_frame, void **this_cache)
+sparc64obsd_frame_cache (struct frame_info *this_frame, void **this_cache)
{
struct sparc_frame_cache *cache;
CORE_ADDR addr;
@@ -129,20 +129,20 @@ sparc64obsd_frame_cache (struct frame_info *next_frame, void **this_cache)
if (*this_cache)
return *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
with an on-stack signal trampoline. */
if (cache->pc == 0)
{
- cache->pc = frame_pc_unwind (next_frame);
+ cache->pc = get_frame_pc (this_frame);
cache->pc &= ~(sparc64obsd_page_size - 1);
/* 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);
+ addr = get_frame_register_unsigned (this_frame, SPARC_FP_REGNUM);
if (addr & 1)
addr += BIAS;
cache->base = addr;
@@ -151,59 +151,59 @@ sparc64obsd_frame_cache (struct frame_info *next_frame, void **this_cache)
/* We find the appropriate instance of `struct sigcontext' at a
fixed offset in the signal frame. */
addr = cache->base + 128 + 16;
- cache->saved_regs = sparc64nbsd_sigcontext_saved_regs (addr, next_frame);
+ cache->saved_regs = sparc64nbsd_sigcontext_saved_regs (addr, this_frame);
return cache;
}
static void
-sparc64obsd_frame_this_id (struct frame_info *next_frame, void **this_cache,
+sparc64obsd_frame_this_id (struct frame_info *this_frame, void **this_cache,
struct frame_id *this_id)
{
struct sparc_frame_cache *cache =
- sparc64obsd_frame_cache (next_frame, this_cache);
+ sparc64obsd_frame_cache (this_frame, this_cache);
(*this_id) = frame_id_build (cache->base, cache->pc);
}
-static void
-sparc64obsd_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 *
+sparc64obsd_frame_prev_register (struct frame_info *this_frame,
+ void **this_cache, int regnum)
{
struct sparc_frame_cache *cache =
- sparc64obsd_frame_cache (next_frame, this_cache);
+ sparc64obsd_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 sparc64obsd_frame_unwind =
-{
- SIGTRAMP_FRAME,
- sparc64obsd_frame_this_id,
- sparc64obsd_frame_prev_register
-};
-
-static const struct frame_unwind *
-sparc64obsd_sigtramp_frame_sniffer (struct frame_info *next_frame)
+static int
+sparc64obsd_sigtramp_frame_sniffer (const struct frame_unwind *self,
+ struct frame_info *this_frame,
+ void **this_cache)
{
- CORE_ADDR pc = frame_pc_unwind (next_frame);
+ CORE_ADDR pc = get_frame_pc (this_frame);
char *name;
find_pc_partial_function (pc, &name, NULL, NULL);
if (sparc64obsd_pc_in_sigtramp (pc, name))
- return &sparc64obsd_frame_unwind;
+ return 1;
- return NULL;
+ return 0;
}
+
+static const struct frame_unwind sparc64obsd_frame_unwind =
+{
+ SIGTRAMP_FRAME,
+ sparc64obsd_frame_this_id,
+ sparc64obsd_frame_prev_register,
+ NULL,
+ sparc64obsd_sigtramp_frame_sniffer
+};
/* Kernel debugging support. */
static struct sparc_frame_cache *
-sparc64obsd_trapframe_cache (struct frame_info *next_frame, void **this_cache)
+sparc64obsd_trapframe_cache (struct frame_info *this_frame, void **this_cache)
{
struct sparc_frame_cache *cache;
CORE_ADDR sp, trapframe_addr;
@@ -212,13 +212,13 @@ sparc64obsd_trapframe_cache (struct frame_info *next_frame, void **this_cache)
if (*this_cache)
return *this_cache;
- cache = sparc_frame_cache (next_frame, this_cache);
+ cache = sparc_frame_cache (this_frame, this_cache);
gdb_assert (cache == *this_cache);
- sp = frame_unwind_register_unsigned (next_frame, SPARC_SP_REGNUM);
+ sp = get_frame_register_unsigned (this_frame, SPARC_SP_REGNUM);
trapframe_addr = sp + BIAS + 176;
- cache->saved_regs = trad_frame_alloc_saved_regs (next_frame);
+ cache->saved_regs = trad_frame_alloc_saved_regs (this_frame);
cache->saved_regs[SPARC64_STATE_REGNUM].addr = trapframe_addr;
cache->saved_regs[SPARC64_PC_REGNUM].addr = trapframe_addr + 8;
@@ -232,55 +232,55 @@ sparc64obsd_trapframe_cache (struct frame_info *next_frame, void **this_cache)
}
static void
-sparc64obsd_trapframe_this_id (struct frame_info *next_frame,
+sparc64obsd_trapframe_this_id (struct frame_info *this_frame,
void **this_cache, struct frame_id *this_id)
{
struct sparc_frame_cache *cache =
- sparc64obsd_trapframe_cache (next_frame, this_cache);
+ sparc64obsd_trapframe_cache (this_frame, this_cache);
(*this_id) = frame_id_build (cache->base, cache->pc);
}
-static void
-sparc64obsd_trapframe_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 *
+sparc64obsd_trapframe_prev_register (struct frame_info *this_frame,
+ void **this_cache, int regnum)
{
struct sparc_frame_cache *cache =
- sparc64obsd_trapframe_cache (next_frame, this_cache);
+ sparc64obsd_trapframe_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 sparc64obsd_trapframe_unwind =
-{
- NORMAL_FRAME,
- sparc64obsd_trapframe_this_id,
- sparc64obsd_trapframe_prev_register
-};
-
-static const struct frame_unwind *
-sparc64obsd_trapframe_sniffer (struct frame_info *next_frame)
+static int
+sparc64obsd_trapframe_sniffer (const struct frame_unwind *self,
+ struct frame_info *this_frame,
+ void **this_cache)
{
CORE_ADDR pc;
ULONGEST pstate;
char *name;
/* Check whether we are in privileged mode, and bail out if we're not. */
- pstate = frame_unwind_register_unsigned (next_frame, SPARC64_PSTATE_REGNUM);
+ pstate = get_frame_register_unsigned (this_frame, SPARC64_PSTATE_REGNUM);
if ((pstate & SPARC64_PSTATE_PRIV) == 0)
- return NULL;
+ return 0;
- pc = frame_unwind_address_in_block (next_frame, NORMAL_FRAME);
+ pc = get_frame_address_in_block (this_frame);
find_pc_partial_function (pc, &name, NULL, NULL);
if (name && strcmp (name, "Lslowtrap_reenter") == 0)
- return &sparc64obsd_trapframe_unwind;
+ return 1;
- return NULL;
+ return 0;
}
+
+static const struct frame_unwind sparc64obsd_trapframe_unwind =
+{
+ NORMAL_FRAME,
+ sparc64obsd_trapframe_this_id,
+ sparc64obsd_trapframe_prev_register,
+ NULL,
+ sparc64obsd_trapframe_sniffer
+};
/* Threads support. */
@@ -378,8 +378,8 @@ sparc64obsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
/* Make sure we can single-step "new" syscalls. */
tdep->step_trap = sparcnbsd_step_trap;
- frame_unwind_append_sniffer (gdbarch, sparc64obsd_sigtramp_frame_sniffer);
- frame_unwind_append_sniffer (gdbarch, sparc64obsd_trapframe_sniffer);
+ frame_unwind_append_unwinder (gdbarch, &sparc64obsd_frame_unwind);
+ frame_unwind_append_unwinder (gdbarch, &sparc64obsd_trapframe_unwind);
sparc64_init_abi (info, gdbarch);