X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fppcnbsd-nat.c;h=02497973b9137965f6db55cb5caea67995b7d52d;hb=5a95d5a9695da6770d68aa512ee423dc034e4b42;hp=9b7a550406c14e53f72c21f3a3f9d13f664a5a1d;hpb=7bcda025ec2abe0f8a8583a11083ee06e6b46d86;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/ppcnbsd-nat.c b/gdb/ppcnbsd-nat.c index 9b7a550406..02497973b9 100644 --- a/gdb/ppcnbsd-nat.c +++ b/gdb/ppcnbsd-nat.c @@ -1,5 +1,7 @@ -/* Native-dependent code for PowerPC's running NetBSD, for GDB. - Copyright 2002 Free Software Foundation, Inc. +/* Native-dependent code for NetBSD/powerpc. + + Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Contributed by Wasabi Systems, Inc. This file is part of GDB. @@ -16,107 +18,176 @@ 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ #include #include #include +#include +#include #include "defs.h" +#include "gdbcore.h" #include "inferior.h" +#include "regcache.h" + +#include "gdb_assert.h" #include "ppc-tdep.h" #include "ppcnbsd-tdep.h" +#include "bsd-kvm.h" +#include "inf-ptrace.h" /* Returns true if PT_GETREGS fetches this register. */ + static int -getregs_supplies (int regno) +getregs_supplies (int regnum) { struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); - return ((regno >= 0 && regno <= 31) - || regno == tdep->ppc_lr_regnum - || regno == tdep->ppc_cr_regnum - || regno == tdep->ppc_xer_regnum - || regno == tdep->ppc_ctr_regnum - || regno == PC_REGNUM); + return ((regnum >= tdep->ppc_gp0_regnum + && regnum < tdep->ppc_gp0_regnum + ppc_num_gprs) + || regnum == tdep->ppc_lr_regnum + || regnum == tdep->ppc_cr_regnum + || regnum == tdep->ppc_xer_regnum + || regnum == tdep->ppc_ctr_regnum + || regnum == PC_REGNUM); } /* Like above, but for PT_GETFPREGS. */ + static int -getfpregs_supplies (int regno) +getfpregs_supplies (int regnum) { struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); - return ((regno >= tdep->ppc_fp0_regnum - && regno < tdep->ppc_fp0_regnum + ppc_num_fprs) - || regno == tdep->ppc_fpscr_regnum); + /* 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 NetBSD/E500 + combination to the problem. */ + gdb_assert (ppc_floating_point_unit_p (current_gdbarch)); + + return ((regnum >= tdep->ppc_fp0_regnum + && regnum < tdep->ppc_fp0_regnum + ppc_num_fprs) + || regnum == tdep->ppc_fpscr_regnum); } -void -fetch_inferior_registers (int regno) +static void +ppcnbsd_fetch_inferior_registers (int regnum) { - if (regno == -1 || getregs_supplies (regno)) + if (regnum == -1 || getregs_supplies (regnum)) { struct reg regs; if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + (PTRACE_TYPE_ARG3) ®s, 0) == -1) + perror_with_name (_("Couldn't get registers")); - ppcnbsd_supply_reg ((char *) ®s, regno); - if (regno != -1) - return; + ppc_supply_gregset (&ppcnbsd_gregset, current_regcache, + regnum, ®s, sizeof regs); } - if (regno == -1 || getfpregs_supplies (regno)) + if (regnum == -1 || getfpregs_supplies (regnum)) { struct fpreg fpregs; if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get FP registers"); + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name (_("Couldn't get FP registers")); - ppcnbsd_supply_fpreg ((char *) &fpregs, regno); - if (regno != -1) - return; + ppc_supply_fpregset (&ppcnbsd_fpregset, current_regcache, + regnum, &fpregs, sizeof fpregs); } } -void -store_inferior_registers (int regno) +static void +ppcnbsd_store_inferior_registers (int regnum) { - if (regno == -1 || getregs_supplies (regno)) + if (regnum == -1 || getregs_supplies (regnum)) { struct reg regs; if (ptrace (PT_GETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't get registers"); + (PTRACE_TYPE_ARG3) ®s, 0) == -1) + perror_with_name (_("Couldn't get registers")); - ppcnbsd_fill_reg ((char *) ®s, regno); + ppc_collect_gregset (&ppcnbsd_gregset, current_regcache, + regnum, ®s, sizeof regs); if (ptrace (PT_SETREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) ®s, 0) == -1) - perror_with_name ("Couldn't write registers"); - - if (regno != -1) - return; + (PTRACE_TYPE_ARG3) ®s, 0) == -1) + perror_with_name (_("Couldn't write registers")); } - if (regno == -1 || getfpregs_supplies (regno)) + if (regnum == -1 || getfpregs_supplies (regnum)) { struct fpreg fpregs; if (ptrace (PT_GETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't get FP registers"); + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name (_("Couldn't get FP registers")); + + ppc_collect_fpregset (&ppcnbsd_fpregset, current_regcache, + regnum, &fpregs, sizeof fpregs); - ppcnbsd_fill_fpreg ((char *) &fpregs, regno); - if (ptrace (PT_SETFPREGS, PIDGET (inferior_ptid), - (PTRACE_ARG3_TYPE) &fpregs, 0) == -1) - perror_with_name ("Couldn't set FP registers"); + (PTRACE_TYPE_ARG3) &fpregs, 0) == -1) + perror_with_name (_("Couldn't set FP registers")); } } + +static int +ppcnbsd_supply_pcb (struct regcache *regcache, struct pcb *pcb) +{ + struct switchframe sf; + struct callframe cf; + struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); + int i; + + /* The stack pointer shouldn't be zero. */ + if (pcb->pcb_sp == 0) + return 0; + + read_memory (pcb->pcb_sp, (gdb_byte *)&sf, sizeof sf); + regcache_raw_supply (regcache, tdep->ppc_cr_regnum, &sf.cr); + regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 2, &sf.fixreg2); + for (i = 0 ; i < 19 ; i++) + regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 13 + i, + &sf.fixreg[i]); + + read_memory(sf.sp, (gdb_byte *)&cf, sizeof(cf)); + regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 30, &cf.r30); + regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 31, &cf.r31); + regcache_raw_supply (regcache, tdep->ppc_gp0_regnum + 1, &cf.sp); + + read_memory(cf.sp, (gdb_byte *)&cf, sizeof(cf)); + regcache_raw_supply (regcache, tdep->ppc_lr_regnum, &cf.lr); + regcache_raw_supply (regcache, PC_REGNUM, &cf.lr); + + return 1; +} + +/* Provide a prototype to silence -Wmissing-prototypes. */ +void _initialize_ppcnbsd_nat (void); + +void +_initialize_ppcnbsd_nat (void) +{ + struct target_ops *t; + + /* Support debugging kernel virtual memory images. */ + bsd_kvm_add_target (ppcnbsd_supply_pcb); + + /* Add in local overrides. */ + t = inf_ptrace_target (); + t->to_fetch_registers = ppcnbsd_fetch_inferior_registers; + t->to_store_registers = ppcnbsd_store_inferior_registers; + add_target (t); +}