X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fppcobsd-nat.c;h=44e607d725c986db438f74c80f1d6b9bfe7b007f;hb=58b61394cfd1f96444c1debd9ba9e0ea69d439f2;hp=bdca4cafe4cfeacafb3c90489a2ef80fee417467;hpb=8599da2d51649d4e39103345404d6eee11872929;p=binutils-gdb.git diff --git a/gdb/ppcobsd-nat.c b/gdb/ppcobsd-nat.c index bdca4cafe4c..44e607d725c 100644 --- a/gdb/ppcobsd-nat.c +++ b/gdb/ppcobsd-nat.c @@ -1,12 +1,13 @@ /* Native-dependent code for OpenBSD/powerpc. - Copyright (C) 2004, 2005, 2006 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 "gdbcore.h" @@ -47,9 +46,9 @@ /* Returns true if PT_GETFPREGS fetches this register. */ static int -getfpregs_supplies (int regnum) +getfpregs_supplies (struct gdbarch *gdbarch, int regnum) { - struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); /* FIXME: jimb/2004-05-05: Some PPC variants don't have floating point registers. Traditionally, GDB's register set has still @@ -61,7 +60,7 @@ getfpregs_supplies (int regnum) It's not clear to me how best to update this code, so this assert will alert the first person to encounter the NetBSD/E500 combination to the problem. */ - gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); + gdb_assert (ppc_floating_point_unit_p (gdbarch)); return ((regnum >= tdep->ppc_fp0_regnum && regnum < tdep->ppc_fp0_regnum + ppc_num_fprs) @@ -74,7 +73,8 @@ getfpregs_supplies (int regnum) for all registers. */ static void -ppcobsd_fetch_registers (int regnum) +ppcobsd_fetch_registers (struct target_ops *ops, + struct regcache *regcache, int regnum) { struct reg regs; @@ -82,15 +82,16 @@ ppcobsd_fetch_registers (int regnum) (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't get registers")); - ppc_supply_gregset (&ppcobsd_gregset, current_regcache, -1, + ppc_supply_gregset (&ppcobsd_gregset, regcache, -1, ®s, sizeof regs); #ifndef PT_GETFPREGS - ppc_supply_fpregset (&ppcobsd_gregset, current_regcache, -1, + ppc_supply_fpregset (&ppcobsd_gregset, regcache, -1, ®s, sizeof regs); #endif #ifdef PT_GETFPREGS - if (regnum == -1 || getfpregs_supplies (regnum)) + if (regnum == -1 + || getfpregs_supplies (get_regcache_arch (regcache), regnum)) { struct fpreg fpregs; @@ -98,7 +99,7 @@ ppcobsd_fetch_registers (int regnum) (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) perror_with_name (_("Couldn't get floating point status")); - ppc_supply_fpregset (&ppcobsd_fpregset, current_regcache, -1, + ppc_supply_fpregset (&ppcobsd_fpregset, regcache, -1, &fpregs, sizeof fpregs); } #endif @@ -108,7 +109,8 @@ ppcobsd_fetch_registers (int regnum) this for all registers. */ static void -ppcobsd_store_registers (int regnum) +ppcobsd_store_registers (struct target_ops *ops, + struct regcache *regcache, int regnum) { struct reg regs; @@ -116,10 +118,10 @@ ppcobsd_store_registers (int regnum) (PTRACE_TYPE_ARG3) ®s, 0) == -1) perror_with_name (_("Couldn't get registers")); - ppc_collect_gregset (&ppcobsd_gregset, current_regcache, + ppc_collect_gregset (&ppcobsd_gregset, regcache, regnum, ®s, sizeof regs); #ifndef PT_GETFPREGS - ppc_collect_fpregset (&ppcobsd_gregset, current_regcache, + ppc_collect_fpregset (&ppcobsd_gregset, regcache, regnum, ®s, sizeof regs); #endif @@ -128,7 +130,8 @@ ppcobsd_store_registers (int regnum) perror_with_name (_("Couldn't write registers")); #ifdef PT_GETFPREGS - if (regnum == -1 || getfpregs_supplies (regnum)) + if (regnum == -1 + || getfpregs_supplies (get_regcache_arch (regcache), regnum)) { struct fpreg fpregs; @@ -136,7 +139,7 @@ ppcobsd_store_registers (int regnum) (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) perror_with_name (_("Couldn't get floating point status")); - ppc_collect_fpregset (&ppcobsd_fpregset, current_regcache, + ppc_collect_fpregset (&ppcobsd_fpregset, regcache, regnum, &fpregs, sizeof fpregs); if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), @@ -150,7 +153,8 @@ ppcobsd_store_registers (int regnum) static int ppcobsd_supply_pcb (struct regcache *regcache, struct pcb *pcb) { - struct gdbarch_tdep *tdep = gdbarch_tdep (get_regcache_arch (regcache)); + struct gdbarch *gdbarch = get_regcache_arch (regcache); + struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); struct switchframe sf; struct callframe cf; int i, regnum; @@ -169,14 +173,14 @@ ppcobsd_supply_pcb (struct regcache *regcache, struct pcb *pcb) return 0; read_memory (pcb->pcb_sp, (gdb_byte *)&sf, sizeof sf); - regcache_raw_supply (regcache, SP_REGNUM, &sf.sp); + regcache_raw_supply (regcache, gdbarch_sp_regnum (gdbarch), &sf.sp); regcache_raw_supply (regcache, tdep->ppc_cr_regnum, &sf.cr); regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 2, &sf.fixreg2); for (i = 0, regnum = tdep->ppc_gp0_regnum + 13; i < 19; i++, regnum++) regcache_raw_supply (regcache, regnum, &sf.fixreg[i]); read_memory (sf.sp, (gdb_byte *)&cf, sizeof cf); - regcache_raw_supply (regcache, PC_REGNUM, &cf.lr); + regcache_raw_supply (regcache, gdbarch_pc_regnum (gdbarch), &cf.lr); regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 30, &cf.r30); regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 31, &cf.r31); @@ -200,6 +204,8 @@ _initialize_ppcobsd_nat (void) /* General-purpose registers. */ ppcobsd_reg_offsets.r0_offset = offsetof (struct reg, gpr); + ppcobsd_reg_offsets.gpr_size = 4; + ppcobsd_reg_offsets.xr_size = 4; ppcobsd_reg_offsets.pc_offset = offsetof (struct reg, pc); ppcobsd_reg_offsets.ps_offset = offsetof (struct reg, ps); ppcobsd_reg_offsets.cr_offset = offsetof (struct reg, cnd); @@ -214,6 +220,7 @@ _initialize_ppcobsd_nat (void) #ifdef PT_GETFPREGS ppcobsd_fpreg_offsets.f0_offset = offsetof (struct fpreg, fpr); ppcobsd_fpreg_offsets.fpscr_offset = offsetof (struct fpreg, fpscr); + ppcobsd_fpreg_offsets.fpscr_size = 4; #endif /* AltiVec registers. */