X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsparcnbsd-tdep.c;h=9afbbcf14e292ee865ede1c19ea28acb7e8adce5;hb=fbd5db48c538738520ee7b9a0699499b56bc9411;hp=6c16a9bb57a2e9c2584b06055d6839d3c827d5c8;hpb=6aba47ca06d9150c6196a374b745c2711b46e045;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/sparcnbsd-tdep.c b/gdb/sparcnbsd-tdep.c index 6c16a9bb57..9afbbcf14e 100644 --- a/gdb/sparcnbsd-tdep.c +++ b/gdb/sparcnbsd-tdep.c @@ -1,13 +1,13 @@ /* Target-dependent code for NetBSD/sparc. - Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2002-2004, 2006-2012 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 - 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,15 +16,13 @@ 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 "floatformat.h" #include "frame.h" #include "frame-unwind.h" #include "gdbcore.h" +#include "gdbtypes.h" #include "osabi.h" #include "regcache.h" #include "regset.h" @@ -89,7 +87,7 @@ static const CORE_ADDR sparc32nbsd_sigtramp_start = 0xeffffef0; 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; @@ -98,18 +96,19 @@ sparc32nbsd_pc_in_sigtramp (CORE_ADDR pc, char *name) } 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 @@ -141,21 +140,21 @@ 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; - 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); } } @@ -166,12 +165,12 @@ sparc32nbsd_sigcontext_saved_regs (struct frame_info *next_frame) #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) @@ -182,7 +181,7 @@ sparc32nbsd_sigcontext_saved_regs (struct frame_info *next_frame) } 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; @@ -191,7 +190,7 @@ sparc32nbsd_sigcontext_frame_cache (struct frame_info *next_frame, 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 @@ -202,84 +201,81 @@ 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; - 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; + 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 +}; /* 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. */ - 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) - return sparc_address_from_register (SPARC_G2_REGNUM); + return get_frame_register_unsigned (frame, SPARC_G2_REGNUM); if (number & 0x800) - return sparc_address_from_register (SPARC_G7_REGNUM); + return get_frame_register_unsigned (frame, SPARC_G7_REGNUM); } return 0; @@ -293,7 +289,7 @@ sparc32nbsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) /* NetBSD doesn't support the 128-bit `long double' from the psABI. */ set_gdbarch_long_double_bit (gdbarch, 64); - set_gdbarch_long_double_format (gdbarch, &floatformat_ieee_double_big); + set_gdbarch_long_double_format (gdbarch, floatformats_ieee_double); tdep->gregset = regset_alloc (gdbarch, sparc32nbsd_supply_gregset, NULL); tdep->sizeof_gregset = 20 * 4; @@ -304,7 +300,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; - frame_unwind_append_sniffer (gdbarch, sparc32nbsd_sigtramp_frame_sniffer); + frame_unwind_append_unwinder (gdbarch, &sparc32nbsd_sigcontext_frame_unwind); } static void @@ -358,7 +354,7 @@ sparcnbsd_core_osabi_sniffer (bfd *abfd) 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);