X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fppcobsd-tdep.c;h=8b9096c329148e1718e3b8ea9ace22651779cd79;hb=466f643cd93347116a8f462f6d4b2000a677a6de;hp=b826fba145c460177692b755722d544e7d9b2828;hpb=e6bb342af78253e9aa06b777db3aafa8273a0150;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ppcobsd-tdep.c b/gdb/ppcobsd-tdep.c index b826fba145..8b9096c329 100644 --- a/gdb/ppcobsd-tdep.c +++ b/gdb/ppcobsd-tdep.c @@ -1,12 +1,13 @@ /* Target-dependent code for OpenBSD/powerpc. - Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, 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, @@ -15,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 "arch-utils.h" @@ -53,18 +52,6 @@ ppcobsd_supply_gregset (const struct regset *regset, struct regcache *regcache, int regnum, const void *gregs, size_t len) { - /* FIXME: jimb/2004-05-05: Some PPC variants don't have floating - point registers. Traditionally, GDB's register set has still - listed the floating point registers for such machines, so this - code is harmless. However, the new E500 port actually omits the - floating point registers entirely from the register set --- they - don't even have register numbers assigned to them. - - It's not clear to me how best to update this code, so this assert - will alert the first person to encounter the OpenBSD/E500 - combination to the problem. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - ppc_supply_gregset (regset, regcache, regnum, gregs, len); ppc_supply_fpregset (regset, regcache, regnum, gregs, len); } @@ -79,18 +66,6 @@ ppcobsd_collect_gregset (const struct regset *regset, const struct regcache *regcache, int regnum, void *gregs, size_t len) { - /* FIXME: jimb/2004-05-05: Some PPC variants don't have floating - point registers. Traditionally, GDB's register set has still - listed the floating point registers for such machines, so this - code is harmless. However, the new E500 port actually omits the - floating point registers entirely from the register set --- they - don't even have register numbers assigned to them. - - It's not clear to me how best to update this code, so this assert - will alert the first person to encounter the OpenBSD/E500 - combination to the problem. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); - ppc_collect_gregset (regset, regcache, regnum, gregs, len); ppc_collect_fpregset (regset, regcache, regnum, gregs, len); } @@ -147,9 +122,13 @@ static const int ppcobsd_sigreturn_offset[] = { }; static int -ppcobsd_sigtramp_p (struct frame_info *next_frame) +ppcobsd_sigtramp_frame_sniffer (const struct frame_unwind *self, + struct frame_info *this_frame, + void **this_cache) { - CORE_ADDR pc = frame_pc_unwind (next_frame); + struct gdbarch *gdbarch = get_frame_arch (this_frame); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); + CORE_ADDR pc = get_frame_pc (this_frame); CORE_ADDR start_pc = (pc & ~(ppcobsd_page_size - 1)); const int *offset; char *name; @@ -163,17 +142,18 @@ ppcobsd_sigtramp_p (struct frame_info *next_frame) gdb_byte buf[2 * PPC_INSN_SIZE]; unsigned long insn; - if (!safe_frame_unwind_memory (next_frame, start_pc + *offset, + if (!safe_frame_unwind_memory (this_frame, start_pc + *offset, buf, sizeof buf)) continue; /* Check for "li r0,SYS_sigreturn". */ - insn = extract_unsigned_integer (buf, PPC_INSN_SIZE); + insn = extract_unsigned_integer (buf, PPC_INSN_SIZE, byte_order); if (insn != 0x38000067) continue; /* Check for "sc". */ - insn = extract_unsigned_integer (buf + PPC_INSN_SIZE, PPC_INSN_SIZE); + insn = extract_unsigned_integer (buf + PPC_INSN_SIZE, + PPC_INSN_SIZE, byte_order); if (insn != 0x44000002) continue; @@ -184,10 +164,11 @@ ppcobsd_sigtramp_p (struct frame_info *next_frame) } static struct trad_frame_cache * -ppcobsd_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache) +ppcobsd_sigtramp_frame_cache (struct frame_info *this_frame, void **this_cache) { - struct gdbarch *gdbarch = get_frame_arch (next_frame); + struct gdbarch *gdbarch = get_frame_arch (this_frame); struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); + enum bfd_endian byte_order = gdbarch_byte_order (gdbarch); struct trad_frame_cache *cache; CORE_ADDR addr, base, func; gdb_byte buf[PPC_INSN_SIZE]; @@ -197,21 +178,21 @@ ppcobsd_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache) if (*this_cache) return *this_cache; - cache = trad_frame_cache_zalloc (next_frame); + cache = trad_frame_cache_zalloc (this_frame); *this_cache = cache; - func = frame_pc_unwind (next_frame); + func = get_frame_pc (this_frame); func &= ~(ppcobsd_page_size - 1); - if (!safe_frame_unwind_memory (next_frame, func, buf, sizeof buf)) + if (!safe_frame_unwind_memory (this_frame, func, buf, sizeof buf)) return cache; /* Calculate the offset where we can find `struct sigcontext'. We base our calculation on the amount of stack space reserved by the first instruction of the signal trampoline. */ - insn = extract_unsigned_integer (buf, PPC_INSN_SIZE); + insn = extract_unsigned_integer (buf, PPC_INSN_SIZE, byte_order); sigcontext_offset = (0x10000 - (insn & 0x0000ffff)) + 8; - base = frame_unwind_register_unsigned (next_frame, SP_REGNUM); + base = get_frame_register_unsigned (this_frame, gdbarch_sp_regnum (gdbarch)); addr = base + sigcontext_offset + 2 * tdep->wordsize; for (i = 0; i < ppc_num_gprs; i++, addr += tdep->wordsize) { @@ -226,7 +207,8 @@ ppcobsd_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache) addr += tdep->wordsize; trad_frame_set_reg_addr (cache, tdep->ppc_ctr_regnum, addr); addr += tdep->wordsize; - trad_frame_set_reg_addr (cache, PC_REGNUM, addr); /* SRR0? */ + trad_frame_set_reg_addr (cache, gdbarch_pc_regnum (gdbarch), addr); + /* SRR0? */ addr += tdep->wordsize; /* Construct the frame ID using the function start. */ @@ -236,43 +218,32 @@ ppcobsd_sigtramp_frame_cache (struct frame_info *next_frame, void **this_cache) } static void -ppcobsd_sigtramp_frame_this_id (struct frame_info *next_frame, +ppcobsd_sigtramp_frame_this_id (struct frame_info *this_frame, void **this_cache, struct frame_id *this_id) { struct trad_frame_cache *cache = - ppcobsd_sigtramp_frame_cache (next_frame, this_cache); + ppcobsd_sigtramp_frame_cache (this_frame, this_cache); trad_frame_get_id (cache, this_id); } -static void -ppcobsd_sigtramp_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 * +ppcobsd_sigtramp_frame_prev_register (struct frame_info *this_frame, + void **this_cache, int regnum) { struct trad_frame_cache *cache = - ppcobsd_sigtramp_frame_cache (next_frame, this_cache); + ppcobsd_sigtramp_frame_cache (this_frame, this_cache); - trad_frame_get_register (cache, next_frame, regnum, - optimizedp, lvalp, addrp, realnump, valuep); + return trad_frame_get_register (cache, this_frame, regnum); } static const struct frame_unwind ppcobsd_sigtramp_frame_unwind = { SIGTRAMP_FRAME, ppcobsd_sigtramp_frame_this_id, - ppcobsd_sigtramp_frame_prev_register + ppcobsd_sigtramp_frame_prev_register, + NULL, + ppcobsd_sigtramp_frame_sniffer }; - -static const struct frame_unwind * -ppcobsd_sigtramp_frame_sniffer (struct frame_info *next_frame) -{ - if (ppcobsd_sigtramp_p (next_frame)) - return &ppcobsd_sigtramp_frame_unwind; - - return NULL; -} static void @@ -292,7 +263,7 @@ ppcobsd_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) set_gdbarch_regset_from_core_section (gdbarch, ppcobsd_regset_from_core_section); - frame_unwind_append_sniffer (gdbarch, ppcobsd_sigtramp_frame_sniffer); + frame_unwind_append_unwinder (gdbarch, &ppcobsd_sigtramp_frame_unwind); } @@ -331,6 +302,8 @@ _initialize_ppcobsd_tdep (void) { /* General-purpose registers. */ ppcobsd_reg_offsets.r0_offset = 0; + ppcobsd_reg_offsets.gpr_size = 4; + ppcobsd_reg_offsets.xr_size = 4; ppcobsd_reg_offsets.pc_offset = 384; ppcobsd_reg_offsets.ps_offset = 388; ppcobsd_reg_offsets.cr_offset = 392; @@ -354,5 +327,6 @@ _initialize_ppcobsd_tdep (void) /* Floating-point registers. */ ppcobsd_reg_offsets.f0_offset = 0; ppcobsd_reg_offsets.fpscr_offset = 256; + ppcobsd_reg_offsets.fpscr_size = 4; } }