* acinclude.m4: Include ../config/tcl.m4 to pick up

[deliverable/binutils-gdb.git] / gdb / ppcobsd-nat.c

diff --git a/gdb/ppcobsd-nat.c b/gdb/ppcobsd-nat.c
index 1195d764f8977e6bb91778ffeaf1d0df3f98b2c1..6203b50e991e1f50fd528797f9ce030b7e087461 100644 (file)
--- a/gdb/ppcobsd-nat.c
+++ b/gdb/ppcobsd-nat.c
@@ -1,6 +1,6 @@
 /* Native-dependent code for OpenBSD/powerpc.
 
-   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -45,9 +45,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
@@ -59,7 +59,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)
@@ -88,7 +88,8 @@ ppcobsd_fetch_registers (struct regcache *regcache, int regnum)
 #endif
 
 #ifdef PT_GETFPREGS
-  if (regnum == -1 || getfpregs_supplies (regnum))
+  if (regnum == -1
+      || getfpregs_supplies (get_regcache_arch (regcache), regnum))
     {
       struct fpreg fpregs;
 
@@ -126,7 +127,8 @@ ppcobsd_store_registers (struct regcache *regcache, 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;
 
@@ -148,7 +150,8 @@ ppcobsd_store_registers (struct regcache *regcache, 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;
@@ -167,14 +170,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, gdbarch_sp_regnum (current_gdbarch), &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, gdbarch_pc_regnum (current_gdbarch), &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);
 
@@ -198,6 +201,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);
@@ -212,6 +217,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.  */