projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include/elf/
[deliverable/binutils-gdb.git]
/
gdb
/
sparcnbsd-tdep.c
diff --git
a/gdb/sparcnbsd-tdep.c
b/gdb/sparcnbsd-tdep.c
index b8673b0c7193f977d5a5ef2c8c15298cdbdaa6ee..3af3102c411b795770a4865fcba2c4f24fbf7986 100644
(file)
--- a/
gdb/sparcnbsd-tdep.c
+++ b/
gdb/sparcnbsd-tdep.c
@@
-1,13
+1,14
@@
/* Target-dependent code for NetBSD/sparc.
/* Target-dependent code for NetBSD/sparc.
- Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
+ Copyright (C) 2002, 2003, 2004, 2006, 2007, 2008, 2009
+ Free Software Foundation, Inc.
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
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,
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@
-16,9
+17,7
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 <http://www.gnu.org/licenses/>. */
#include "defs.h"
#include "frame.h"
#include "defs.h"
#include "frame.h"
@@
-98,18
+97,18
@@
sparc32nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name)
}
struct trad_frame_saved_reg *
}
struct trad_frame_saved_reg *
-sparc32nbsd_sigcontext_saved_regs (struct frame_info *
next
_frame)
+sparc32nbsd_sigcontext_saved_regs (struct frame_info *
this
_frame)
{
struct trad_frame_saved_reg *saved_regs;
CORE_ADDR addr, sigcontext_addr;
int regnum, delta;
ULONGEST psr;
{
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. */
/* 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
sigcontext_addr = addr + 64 + 16;
/* The registers are saved in bits and pieces scattered all over the
@@
-141,7
+140,7
@@
sparc32nbsd_sigcontext_saved_regs (struct frame_info *next_frame)
/* The `local' and `in' registers have been saved in the register
save area. */
addr = saved_regs[SPARC_SP_REGNUM].addr;
/* 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;
for (regnum = SPARC_L0_REGNUM;
regnum <= SPARC_I7_REGNUM; regnum++, addr += 4)
saved_regs[regnum].addr = addr;
@@
-155,7
+154,7
@@
sparc32nbsd_sigcontext_saved_regs (struct frame_info *next_frame)
ULONGEST i7;
addr = saved_regs[SPARC_I7_REGNUM].addr;
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);
}
}
trad_frame_set_value (saved_regs, SPARC_I7_REGNUM, i7 ^ wcookie);
}
}
@@
-166,12
+165,12
@@
sparc32nbsd_sigcontext_saved_regs (struct frame_info *next_frame)
#define PSR_EF 0x00001000
addr = saved_regs[SPARC32_PSR_REGNUM].addr;
#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;
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)
saved_regs[SPARC32_FSR_REGNUM].addr = sp + 96;
for (regnum = SPARC_F0_REGNUM, addr = sp + 96 + 8;
regnum <= SPARC_F31_REGNUM; regnum++, addr += 4)
@@
-182,7
+181,7
@@
sparc32nbsd_sigcontext_saved_regs (struct frame_info *next_frame)
}
static struct sparc_frame_cache *
}
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;
void **this_cache)
{
struct sparc_frame_cache *cache;
@@
-191,7
+190,7
@@
sparc32nbsd_sigcontext_frame_cache (struct frame_info *next_frame,
if (*this_cache)
return *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
gdb_assert (cache == *this_cache);
/* If we couldn't find the frame's function, we're probably dealing
@@
-203,83
+202,79
@@
sparc32nbsd_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;
/* 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);
cache->base = addr;
}
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
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 =
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);
}
(*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 =
{
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);
+ CORE_ADDR pc =
get_frame_pc (this
_frame);
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))
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
;
+ return
1
;
}
}
- return
NULL
;
+ return
0
;
}
}
+
+static const struct frame_unwind sparc32nbsd_sigcontext_frame_unwind =
+{
+ SIGTRAMP_FRAME,
+ 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. */
CORE_ADDR
\f
/* Return the address of a system call's alternative return
address. */
CORE_ADDR
-sparcnbsd_step_trap (unsigned long insn)
+sparcnbsd_step_trap (
struct frame_info *frame,
unsigned long insn)
{
if ((X_I (insn) == 0 && X_RS1 (insn) == 0 && X_RS2 (insn) == 0)
|| (X_I (insn) == 1 && X_RS1 (insn) == 0 && (insn & 0x7f) == 0))
{
/* "New" system call. */
{
if ((X_I (insn) == 0 && X_RS1 (insn) == 0 && X_RS2 (insn) == 0)
|| (X_I (insn) == 1 && X_RS1 (insn) == 0 && (insn & 0x7f) == 0))
{
/* "New" system call. */
- ULONGEST number;
-
- regcache_cooked_read_unsigned (current_regcache,
- SPARC_G1_REGNUM, &number);
+ ULONGEST number = get_frame_register_unsigned (frame, SPARC_G1_REGNUM);
if (number & 0x400)
if (number & 0x400)
- return
sparc_address_from_register (
SPARC_G2_REGNUM);
+ return
get_frame_register_unsigned (frame,
SPARC_G2_REGNUM);
if (number & 0x800)
if (number & 0x800)
- return
sparc_address_from_register (
SPARC_G7_REGNUM);
+ return
get_frame_register_unsigned (frame,
SPARC_G7_REGNUM);
}
return 0;
}
return 0;
@@
-304,7
+299,7
@@
sparc32nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch)
/* Make sure we can single-step "new" syscalls. */
tdep->step_trap = sparcnbsd_step_trap;
/* 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
}
static void
@@
-358,7
+353,7
@@
sparcnbsd_core_osabi_sniffer (bfd *abfd)
void _initialize_sparcnbsd_tdep (void);
void
void _initialize_sparcnbsd_tdep (void);
void
-_initialize_sparnbsd_tdep (void)
+_initialize_spar
c
nbsd_tdep (void)
{
gdbarch_register_osabi_sniffer (bfd_arch_sparc, bfd_target_aout_flavour,
sparcnbsd_aout_osabi_sniffer);
{
gdbarch_register_osabi_sniffer (bfd_arch_sparc, bfd_target_aout_flavour,
sparcnbsd_aout_osabi_sniffer);
This page took
0.028687 seconds
and
4
git commands to generate.