* configure.ac: Check for memmem declaration.

[deliverable/binutils-gdb.git] / gdb / ppc-linux-nat.c

diff --git a/gdb/ppc-linux-nat.c b/gdb/ppc-linux-nat.c
index 9df3e3d126fb66054743090fa5da84b5fd1b35ff..f9ea83896140e5c93017ed62d037cbbf2dbb9abc 100644 (file)
--- a/gdb/ppc-linux-nat.c
+++ b/gdb/ppc-linux-nat.c
@@ -1,13 +1,13 @@
 /* PPC GNU/Linux native support.
 
 /* PPC GNU/Linux native support.
 

-   Copyright 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002,
-   2003 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1989, 1991, 1992, 1994, 1996, 2000, 2001, 2002, 2003,
+   2004, 2005, 2006, 2007, 2008 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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -16,9 +16,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    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., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 #include "gdb_string.h"
 
 #include "defs.h"
 #include "gdb_string.h"


@@ -27,7 +25,10 @@
 #include "gdbcore.h"
 #include "regcache.h"
 #include "gdb_assert.h"
 #include "gdbcore.h"
 #include "regcache.h"
 #include "gdb_assert.h"

+#include "target.h"
+#include "linux-nat.h"

 
 

+#include <stdint.h>

 #include <sys/types.h>
 #include <sys/param.h>
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/param.h>
 #include <signal.h>


@@ -41,17 +42,14 @@
 /* Prototypes for supply_gregset etc. */
 #include "gregset.h"
 #include "ppc-tdep.h"
 /* Prototypes for supply_gregset etc. */
 #include "gregset.h"
 #include "ppc-tdep.h"

+#include "ppc-linux-tdep.h"

 
 

-#ifndef PT_READ_U
-#define PT_READ_U PTRACE_PEEKUSR
+/* This sometimes isn't defined.  */
+#ifndef PT_ORIG_R3
+#define PT_ORIG_R3 34

 #endif
 #endif

-#ifndef PT_WRITE_U
-#define PT_WRITE_U PTRACE_POKEUSR
-#endif
-
-/* Default the type of the ptrace transfer to int.  */
-#ifndef PTRACE_XFER_TYPE
-#define PTRACE_XFER_TYPE int
+#ifndef PT_TRAP
+#define PT_TRAP 40

 #endif
 
 /* Glibc's headers don't define PTRACE_GETVRREGS so we cannot use a
 #endif
 
 /* Glibc's headers don't define PTRACE_GETVRREGS so we cannot use a


@@ -79,6 +77,16 @@
 #define PTRACE_SETEVRREGS 21
 #endif
 
 #define PTRACE_SETEVRREGS 21
 #endif
 

+/* Similarly for the hardware watchpoint support.  */
+#ifndef PTRACE_GET_DEBUGREG
+#define PTRACE_GET_DEBUGREG    25
+#endif
+#ifndef PTRACE_SET_DEBUGREG
+#define PTRACE_SET_DEBUGREG    26
+#endif
+#ifndef PTRACE_GETSIGINFO
+#define PTRACE_GETSIGINFO    0x4202
+#endif

 
 /* This oddity is because the Linux kernel defines elf_vrregset_t as
    an array of 33 16 bytes long elements.  I.e. it leaves out vrsave.
 
 /* This oddity is because the Linux kernel defines elf_vrregset_t as
    an array of 33 16 bytes long elements.  I.e. it leaves out vrsave.


@@ -114,13 +122,12 @@ typedef char gdb_vrregset_t[SIZEOF_VRREGS];
 
 /* On PPC processors that support the the Signal Processing Extension
    (SPE) APU, the general-purpose registers are 64 bits long.
 
 /* On PPC processors that support the the Signal Processing Extension
    (SPE) APU, the general-purpose registers are 64 bits long.

-   However, the ordinary Linux kernel PTRACE_PEEKUSR / PTRACE_POKEUSR
-   / PT_READ_U / PT_WRITE_U ptrace calls only access the lower half of
-   each register, to allow them to behave the same way they do on
-   non-SPE systems.  There's a separate pair of calls,
-   PTRACE_GETEVRREGS / PTRACE_SETEVRREGS, that read and write the top
-   halves of all the general-purpose registers at once, along with
-   some SPE-specific registers.
+   However, the ordinary Linux kernel PTRACE_PEEKUSER / PTRACE_POKEUSER
+   ptrace calls only access the lower half of each register, to allow
+   them to behave the same way they do on non-SPE systems.  There's a
+   separate pair of calls, PTRACE_GETEVRREGS / PTRACE_SETEVRREGS, that
+   read and write the top halves of all the general-purpose registers
+   at once, along with some SPE-specific registers.

 
    GDB itself continues to claim the general-purpose registers are 32
    bits long.  It has unnamed raw registers that hold the upper halves
 
    GDB itself continues to claim the general-purpose registers are 32
    bits long.  It has unnamed raw registers that hold the upper halves


@@ -144,20 +151,12 @@ struct gdb_evrregset_t
    error.  */
 int have_ptrace_getvrregs = 1;
 
    error.  */
 int have_ptrace_getvrregs = 1;
 

-

 /* Non-zero if our kernel may support the PTRACE_GETEVRREGS and
    PTRACE_SETEVRREGS requests, for reading and writing the SPE
    registers.  Zero if we've tried one of them and gotten an
    error.  */
 int have_ptrace_getsetevrregs = 1;
 
 /* Non-zero if our kernel may support the PTRACE_GETEVRREGS and
    PTRACE_SETEVRREGS requests, for reading and writing the SPE
    registers.  Zero if we've tried one of them and gotten an
    error.  */
 int have_ptrace_getsetevrregs = 1;
 

-
-int
-kernel_u_size (void)
-{
-  return (sizeof (struct user));
-}
-

 /* *INDENT-OFF* */
 /* registers layout, as presented by the ptrace interface:
 PT_R0, PT_R1, PT_R2, PT_R3, PT_R4, PT_R5, PT_R6, PT_R7,
 /* *INDENT-OFF* */
 /* registers layout, as presented by the ptrace interface:
 PT_R0, PT_R1, PT_R2, PT_R3, PT_R4, PT_R5, PT_R6, PT_R7,


@@ -172,13 +171,13 @@ PT_NIP, PT_MSR, PT_CCR, PT_LNK, PT_CTR, PT_XER, PT_MQ */
 /* *INDENT_ON * */
 
 static int
 /* *INDENT_ON * */
 
 static int

-ppc_register_u_addr (int regno)
+ppc_register_u_addr (struct gdbarch *gdbarch, int regno)

 {
   int u_addr = -1;
 {
   int u_addr = -1;

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   /* NOTE: cagney/2003-11-25: This is the word size used by the ptrace
      interface, and not the wordsize of the program's ABI.  */
   /* NOTE: cagney/2003-11-25: This is the word size used by the ptrace
      interface, and not the wordsize of the program's ABI.  */

-  int wordsize = sizeof (PTRACE_XFER_TYPE);
+  int wordsize = sizeof (long);

 
   /* General purpose registers occupy 1 slot each in the buffer */
   if (regno >= tdep->ppc_gp0_regnum 
 
   /* General purpose registers occupy 1 slot each in the buffer */
   if (regno >= tdep->ppc_gp0_regnum 


@@ -194,7 +193,7 @@ ppc_register_u_addr (int regno)
     u_addr = (PT_FPR0 * wordsize) + ((regno - tdep->ppc_fp0_regnum) * 8);
 
   /* UISA special purpose registers: 1 slot each */
     u_addr = (PT_FPR0 * wordsize) + ((regno - tdep->ppc_fp0_regnum) * 8);
 
   /* UISA special purpose registers: 1 slot each */

-  if (regno == PC_REGNUM)
+  if (regno == gdbarch_pc_regnum (gdbarch))

     u_addr = PT_NIP * wordsize;
   if (regno == tdep->ppc_lr_regnum)
     u_addr = PT_LNK * wordsize;
     u_addr = PT_NIP * wordsize;
   if (regno == tdep->ppc_lr_regnum)
     u_addr = PT_LNK * wordsize;


@@ -210,6 +209,10 @@ ppc_register_u_addr (int regno)
 #endif
   if (regno == tdep->ppc_ps_regnum)
     u_addr = PT_MSR * wordsize;
 #endif
   if (regno == tdep->ppc_ps_regnum)
     u_addr = PT_MSR * wordsize;

+  if (regno == PPC_ORIG_R3_REGNUM)
+    u_addr = PT_ORIG_R3 * wordsize;
+  if (regno == PPC_TRAP_REGNUM)
+    u_addr = PT_TRAP * wordsize;

   if (tdep->ppc_fpscr_regnum >= 0
       && regno == tdep->ppc_fpscr_regnum)
     {
   if (tdep->ppc_fpscr_regnum >= 0
       && regno == tdep->ppc_fpscr_regnum)
     {


@@ -232,13 +235,14 @@ ppc_register_u_addr (int regno)
    registers set mechanism, as opposed to the interface for all the
    other registers, that stores/fetches each register individually.  */
 static void
    registers set mechanism, as opposed to the interface for all the
    other registers, that stores/fetches each register individually.  */
 static void

-fetch_altivec_register (int tid, int regno)
+fetch_altivec_register (struct regcache *regcache, int tid, int regno)

 {
   int ret;
   int offset = 0;
   gdb_vrregset_t regs;
 {
   int ret;
   int offset = 0;
   gdb_vrregset_t regs;

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
-  int vrregsize = register_size (current_gdbarch, tdep->ppc_vr0_regnum);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+  int vrregsize = register_size (gdbarch, tdep->ppc_vr0_regnum);

 
   ret = ptrace (PTRACE_GETVRREGS, tid, 0, &regs);
   if (ret < 0)
 
   ret = ptrace (PTRACE_GETVRREGS, tid, 0, &regs);
   if (ret < 0)


@@ -248,7 +252,7 @@ fetch_altivec_register (int tid, int regno)
           have_ptrace_getvrregs = 0;
           return;
         }
           have_ptrace_getvrregs = 0;
           return;
         }

-      perror_with_name ("Unable to fetch AltiVec register");
+      perror_with_name (_("Unable to fetch AltiVec register"));

     }
  
   /* VSCR is fetched as a 16 bytes quantity, but it is really 4 bytes
     }
  
   /* VSCR is fetched as a 16 bytes quantity, but it is really 4 bytes


@@ -256,9 +260,9 @@ fetch_altivec_register (int tid, int regno)
      vector.  VRSAVE is at the end of the array in a 4 bytes slot, so
      there is no need to define an offset for it.  */
   if (regno == (tdep->ppc_vrsave_regnum - 1))
      vector.  VRSAVE is at the end of the array in a 4 bytes slot, so
      there is no need to define an offset for it.  */
   if (regno == (tdep->ppc_vrsave_regnum - 1))

-    offset = vrregsize - register_size (current_gdbarch, tdep->ppc_vrsave_regnum);
+    offset = vrregsize - register_size (gdbarch, tdep->ppc_vrsave_regnum);

   
   

-  regcache_raw_supply (current_regcache, regno,
+  regcache_raw_supply (regcache, regno,

                       regs + (regno - tdep->ppc_vr0_regnum) * vrregsize + offset);
 }
 
                       regs + (regno - tdep->ppc_vr0_regnum) * vrregsize + offset);
 }
 


@@ -285,7 +289,7 @@ get_spe_registers (int tid, struct gdb_evrregset_t *evrregset)
             have_ptrace_getsetevrregs = 0;
           else
             /* Anything else needs to be reported.  */
             have_ptrace_getsetevrregs = 0;
           else
             /* Anything else needs to be reported.  */

-            perror_with_name ("Unable to fetch SPE registers");
+            perror_with_name (_("Unable to fetch SPE registers"));

         }
     }
 
         }
     }
 


@@ -297,17 +301,18 @@ get_spe_registers (int tid, struct gdb_evrregset_t *evrregset)
    be the number of an upper half register, acc, spefscr, or -1 to
    supply the values of all registers.  */
 static void
    be the number of an upper half register, acc, spefscr, or -1 to
    supply the values of all registers.  */
 static void

-fetch_spe_register (int tid, int regno)
+fetch_spe_register (struct regcache *regcache, int tid, int regno)

 {
 {

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   struct gdb_evrregset_t evrregs;
 
   gdb_assert (sizeof (evrregs.evr[0])
   struct gdb_evrregset_t evrregs;
 
   gdb_assert (sizeof (evrregs.evr[0])

-              == register_size (current_gdbarch, tdep->ppc_ev0_upper_regnum));
+              == register_size (gdbarch, tdep->ppc_ev0_upper_regnum));

   gdb_assert (sizeof (evrregs.acc)
   gdb_assert (sizeof (evrregs.acc)

-              == register_size (current_gdbarch, tdep->ppc_acc_regnum));
+              == register_size (gdbarch, tdep->ppc_acc_regnum));

   gdb_assert (sizeof (evrregs.spefscr)
   gdb_assert (sizeof (evrregs.spefscr)

-              == register_size (current_gdbarch, tdep->ppc_spefscr_regnum));
+              == register_size (gdbarch, tdep->ppc_spefscr_regnum));

 
   get_spe_registers (tid, &evrregs);
 
 
   get_spe_registers (tid, &evrregs);
 


@@ -316,35 +321,36 @@ fetch_spe_register (int tid, int regno)
       int i;
 
       for (i = 0; i < ppc_num_gprs; i++)
       int i;
 
       for (i = 0; i < ppc_num_gprs; i++)

-        regcache_raw_supply (current_regcache, tdep->ppc_ev0_upper_regnum + i,
+        regcache_raw_supply (regcache, tdep->ppc_ev0_upper_regnum + i,

                              &evrregs.evr[i]);
     }
   else if (tdep->ppc_ev0_upper_regnum <= regno
            && regno < tdep->ppc_ev0_upper_regnum + ppc_num_gprs)
                              &evrregs.evr[i]);
     }
   else if (tdep->ppc_ev0_upper_regnum <= regno
            && regno < tdep->ppc_ev0_upper_regnum + ppc_num_gprs)

-    regcache_raw_supply (current_regcache, regno,
+    regcache_raw_supply (regcache, regno,

                          &evrregs.evr[regno - tdep->ppc_ev0_upper_regnum]);
 
   if (regno == -1
       || regno == tdep->ppc_acc_regnum)
                          &evrregs.evr[regno - tdep->ppc_ev0_upper_regnum]);
 
   if (regno == -1
       || regno == tdep->ppc_acc_regnum)

-    regcache_raw_supply (current_regcache, tdep->ppc_acc_regnum, &evrregs.acc);
+    regcache_raw_supply (regcache, tdep->ppc_acc_regnum, &evrregs.acc);

 
   if (regno == -1
       || regno == tdep->ppc_spefscr_regnum)
 
   if (regno == -1
       || regno == tdep->ppc_spefscr_regnum)

-    regcache_raw_supply (current_regcache, tdep->ppc_spefscr_regnum,
+    regcache_raw_supply (regcache, tdep->ppc_spefscr_regnum,

                          &evrregs.spefscr);
 }
 
 static void
                          &evrregs.spefscr);
 }
 
 static void

-fetch_register (int tid, int regno)
+fetch_register (struct regcache *regcache, int tid, int regno)

 {
 {

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   /* This isn't really an address.  But ptrace thinks of it as one.  */
   /* This isn't really an address.  But ptrace thinks of it as one.  */

-  CORE_ADDR regaddr = ppc_register_u_addr (regno);
+  CORE_ADDR regaddr = ppc_register_u_addr (gdbarch, regno);

   int bytes_transferred;
   unsigned int offset;         /* Offset of registers within the u area. */
   char buf[MAX_REGISTER_SIZE];
 
   int bytes_transferred;
   unsigned int offset;         /* Offset of registers within the u area. */
   char buf[MAX_REGISTER_SIZE];
 

-  if (altivec_register_p (regno))
+  if (altivec_register_p (gdbarch, regno))

     {
       /* If this is the first time through, or if it is not the first
          time through, and we have comfirmed that there is kernel
     {
       /* If this is the first time through, or if it is not the first
          time through, and we have comfirmed that there is kernel


@@ -352,77 +358,77 @@ fetch_register (int tid, int regno)
          register.  */
       if (have_ptrace_getvrregs)
        {
          register.  */
       if (have_ptrace_getvrregs)
        {

-         fetch_altivec_register (tid, regno);
+         fetch_altivec_register (regcache, tid, regno);

          return;
        }
      /* If we have discovered that there is no ptrace support for
         AltiVec registers, fall through and return zeroes, because
         regaddr will be -1 in this case.  */
     }
          return;
        }
      /* If we have discovered that there is no ptrace support for
         AltiVec registers, fall through and return zeroes, because
         regaddr will be -1 in this case.  */
     }

-  else if (spe_register_p (regno))
+  else if (spe_register_p (gdbarch, regno))

     {
     {

-      fetch_spe_register (tid, regno);
+      fetch_spe_register (regcache, tid, regno);

       return;
     }
 
   if (regaddr == -1)
     {
       return;
     }
 
   if (regaddr == -1)
     {

-      memset (buf, '\0', register_size (current_gdbarch, regno));   /* Supply zeroes */
-      regcache_raw_supply (current_regcache, regno, buf);
+      memset (buf, '\0', register_size (gdbarch, regno));   /* Supply zeroes */
+      regcache_raw_supply (regcache, regno, buf);

       return;
     }
 
       return;
     }
 

-  /* Read the raw register using PTRACE_XFER_TYPE sized chunks.  On a
+  /* Read the raw register using sizeof(long) sized chunks.  On a

      32-bit platform, 64-bit floating-point registers will require two
      transfers.  */
   for (bytes_transferred = 0;
      32-bit platform, 64-bit floating-point registers will require two
      transfers.  */
   for (bytes_transferred = 0;

-       bytes_transferred < register_size (current_gdbarch, regno);
-       bytes_transferred += sizeof (PTRACE_XFER_TYPE))
+       bytes_transferred < register_size (gdbarch, regno);
+       bytes_transferred += sizeof (long))

     {
       errno = 0;
     {
       errno = 0;

-      *(PTRACE_XFER_TYPE *) & buf[bytes_transferred]
-        = ptrace (PT_READ_U, tid, (PTRACE_ARG3_TYPE) regaddr, 0);
-      regaddr += sizeof (PTRACE_XFER_TYPE);
+      *(long *) &buf[bytes_transferred]
+        = ptrace (PTRACE_PEEKUSER, tid, (PTRACE_TYPE_ARG3) regaddr, 0);
+      regaddr += sizeof (long);

       if (errno != 0)
        {
           char message[128];
          sprintf (message, "reading register %s (#%d)", 
       if (errno != 0)
        {
           char message[128];
          sprintf (message, "reading register %s (#%d)", 

-                  REGISTER_NAME (regno), regno);
+                  gdbarch_register_name (gdbarch, regno), regno);

          perror_with_name (message);
        }
     }
 
   /* Now supply the register.  Keep in mind that the regcache's idea
      of the register's size may not be a multiple of sizeof
          perror_with_name (message);
        }
     }
 
   /* Now supply the register.  Keep in mind that the regcache's idea
      of the register's size may not be a multiple of sizeof

-     (PTRACE_XFER_TYPE).  */
-  if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_LITTLE)
+     (long).  */
+  if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)

     {
       /* Little-endian values are always found at the left end of the
          bytes transferred.  */
     {
       /* Little-endian values are always found at the left end of the
          bytes transferred.  */

-      regcache_raw_supply (current_regcache, regno, buf);
+      regcache_raw_supply (regcache, regno, buf);

     }
     }

-  else if (gdbarch_byte_order (current_gdbarch) == BFD_ENDIAN_BIG)
+  else if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)

     {
       /* Big-endian values are found at the right end of the bytes
          transferred.  */
     {
       /* Big-endian values are found at the right end of the bytes
          transferred.  */

-      size_t padding = (bytes_transferred
-                        - register_size (current_gdbarch, regno));
-      regcache_raw_supply (current_regcache, regno, buf + padding);
+      size_t padding = (bytes_transferred - register_size (gdbarch, regno));
+      regcache_raw_supply (regcache, regno, buf + padding);

     }
   else 
     internal_error (__FILE__, __LINE__,
     }
   else 
     internal_error (__FILE__, __LINE__,

-                    "fetch_register: unexpected byte order: %d",
-                    gdbarch_byte_order (current_gdbarch));
+                    _("fetch_register: unexpected byte order: %d"),
+                    gdbarch_byte_order (gdbarch));

 }
 
 static void
 }
 
 static void

-supply_vrregset (gdb_vrregset_t *vrregsetp)
+supply_vrregset (struct regcache *regcache, gdb_vrregset_t *vrregsetp)

 {
   int i;
 {
   int i;

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   int num_of_vrregs = tdep->ppc_vrsave_regnum - tdep->ppc_vr0_regnum + 1;
   int num_of_vrregs = tdep->ppc_vrsave_regnum - tdep->ppc_vr0_regnum + 1;

-  int vrregsize = register_size (current_gdbarch, tdep->ppc_vr0_regnum);
-  int offset = vrregsize - register_size (current_gdbarch, tdep->ppc_vrsave_regnum);
+  int vrregsize = register_size (gdbarch, tdep->ppc_vr0_regnum);
+  int offset = vrregsize - register_size (gdbarch, tdep->ppc_vrsave_regnum);

 
   for (i = 0; i < num_of_vrregs; i++)
     {
 
   for (i = 0; i < num_of_vrregs; i++)
     {


@@ -431,16 +437,16 @@ supply_vrregset (gdb_vrregset_t *vrregsetp)
          occupies a whole vector, while VRSAVE occupies a full 4 bytes
          slot.  */
       if (i == (num_of_vrregs - 2))
          occupies a whole vector, while VRSAVE occupies a full 4 bytes
          slot.  */
       if (i == (num_of_vrregs - 2))

-        regcache_raw_supply (current_regcache, tdep->ppc_vr0_regnum + i,
+        regcache_raw_supply (regcache, tdep->ppc_vr0_regnum + i,

                             *vrregsetp + i * vrregsize + offset);
       else
                             *vrregsetp + i * vrregsize + offset);
       else

-        regcache_raw_supply (current_regcache, tdep->ppc_vr0_regnum + i,
+        regcache_raw_supply (regcache, tdep->ppc_vr0_regnum + i,

                             *vrregsetp + i * vrregsize);
     }
 }
 
 static void
                             *vrregsetp + i * vrregsize);
     }
 }
 
 static void

-fetch_altivec_registers (int tid)
+fetch_altivec_registers (struct regcache *regcache, int tid)

 {
   int ret;
   gdb_vrregset_t regs;
 {
   int ret;
   gdb_vrregset_t regs;


@@ -453,49 +459,55 @@ fetch_altivec_registers (int tid)
           have_ptrace_getvrregs = 0;
          return;
        }
           have_ptrace_getvrregs = 0;
          return;
        }

-      perror_with_name ("Unable to fetch AltiVec registers");
+      perror_with_name (_("Unable to fetch AltiVec registers"));

     }
     }

-  supply_vrregset (&regs);
+  supply_vrregset (regcache, &regs);

 }
 
 static void 
 }
 
 static void 

-fetch_ppc_registers (int tid)
+fetch_ppc_registers (struct regcache *regcache, int tid)

 {
   int i;
 {
   int i;

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

 
   for (i = 0; i < ppc_num_gprs; i++)
 
   for (i = 0; i < ppc_num_gprs; i++)

-    fetch_register (tid, tdep->ppc_gp0_regnum + i);
+    fetch_register (regcache, tid, tdep->ppc_gp0_regnum + i);

   if (tdep->ppc_fp0_regnum >= 0)
     for (i = 0; i < ppc_num_fprs; i++)
   if (tdep->ppc_fp0_regnum >= 0)
     for (i = 0; i < ppc_num_fprs; i++)

-      fetch_register (tid, tdep->ppc_fp0_regnum + i);
-  fetch_register (tid, PC_REGNUM);
+      fetch_register (regcache, tid, tdep->ppc_fp0_regnum + i);
+  fetch_register (regcache, tid, gdbarch_pc_regnum (gdbarch));

   if (tdep->ppc_ps_regnum != -1)
   if (tdep->ppc_ps_regnum != -1)

-    fetch_register (tid, tdep->ppc_ps_regnum);
+    fetch_register (regcache, tid, tdep->ppc_ps_regnum);

   if (tdep->ppc_cr_regnum != -1)
   if (tdep->ppc_cr_regnum != -1)

-    fetch_register (tid, tdep->ppc_cr_regnum);
+    fetch_register (regcache, tid, tdep->ppc_cr_regnum);

   if (tdep->ppc_lr_regnum != -1)
   if (tdep->ppc_lr_regnum != -1)

-    fetch_register (tid, tdep->ppc_lr_regnum);
+    fetch_register (regcache, tid, tdep->ppc_lr_regnum);

   if (tdep->ppc_ctr_regnum != -1)
   if (tdep->ppc_ctr_regnum != -1)

-    fetch_register (tid, tdep->ppc_ctr_regnum);
+    fetch_register (regcache, tid, tdep->ppc_ctr_regnum);

   if (tdep->ppc_xer_regnum != -1)
   if (tdep->ppc_xer_regnum != -1)

-    fetch_register (tid, tdep->ppc_xer_regnum);
+    fetch_register (regcache, tid, tdep->ppc_xer_regnum);

   if (tdep->ppc_mq_regnum != -1)
   if (tdep->ppc_mq_regnum != -1)

-    fetch_register (tid, tdep->ppc_mq_regnum);
+    fetch_register (regcache, tid, tdep->ppc_mq_regnum);
+  if (ppc_linux_trap_reg_p (gdbarch))
+    {
+      fetch_register (regcache, tid, PPC_ORIG_R3_REGNUM);
+      fetch_register (regcache, tid, PPC_TRAP_REGNUM);
+    }

   if (tdep->ppc_fpscr_regnum != -1)
   if (tdep->ppc_fpscr_regnum != -1)

-    fetch_register (tid, tdep->ppc_fpscr_regnum);
+    fetch_register (regcache, tid, tdep->ppc_fpscr_regnum);

   if (have_ptrace_getvrregs)
     if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)
   if (have_ptrace_getvrregs)
     if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)

-      fetch_altivec_registers (tid);
+      fetch_altivec_registers (regcache, tid);

   if (tdep->ppc_ev0_upper_regnum >= 0)
   if (tdep->ppc_ev0_upper_regnum >= 0)

-    fetch_spe_register (tid, -1);
+    fetch_spe_register (regcache, tid, -1);

 }
 
 /* Fetch registers from the child process.  Fetch all registers if
    regno == -1, otherwise fetch all general registers or all floating
    point registers depending upon the value of regno.  */
 }
 
 /* Fetch registers from the child process.  Fetch all registers if
    regno == -1, otherwise fetch all general registers or all floating
    point registers depending upon the value of regno.  */

-void
-fetch_inferior_registers (int regno)
+static void
+ppc_linux_fetch_inferior_registers (struct regcache *regcache, int regno)

 {
   /* Overload thread id onto process id */
   int tid = TIDGET (inferior_ptid);
 {
   /* Overload thread id onto process id */
   int tid = TIDGET (inferior_ptid);


@@ -505,20 +517,21 @@ fetch_inferior_registers (int regno)
     tid = PIDGET (inferior_ptid);
 
   if (regno == -1)
     tid = PIDGET (inferior_ptid);
 
   if (regno == -1)

-    fetch_ppc_registers (tid);
+    fetch_ppc_registers (regcache, tid);

   else 
   else 

-    fetch_register (tid, regno);
+    fetch_register (regcache, tid, regno);

 }
 
 /* Store one register. */
 static void
 }
 
 /* Store one register. */
 static void

-store_altivec_register (int tid, int regno)
+store_altivec_register (const struct regcache *regcache, int tid, int regno)

 {
   int ret;
   int offset = 0;
   gdb_vrregset_t regs;
 {
   int ret;
   int offset = 0;
   gdb_vrregset_t regs;

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
-  int vrregsize = register_size (current_gdbarch, tdep->ppc_vr0_regnum);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);
+  int vrregsize = register_size (gdbarch, tdep->ppc_vr0_regnum);

 
   ret = ptrace (PTRACE_GETVRREGS, tid, 0, &regs);
   if (ret < 0)
 
   ret = ptrace (PTRACE_GETVRREGS, tid, 0, &regs);
   if (ret < 0)


@@ -528,20 +541,20 @@ store_altivec_register (int tid, int regno)
           have_ptrace_getvrregs = 0;
           return;
         }
           have_ptrace_getvrregs = 0;
           return;
         }

-      perror_with_name ("Unable to fetch AltiVec register");
+      perror_with_name (_("Unable to fetch AltiVec register"));

     }
 
   /* VSCR is fetched as a 16 bytes quantity, but it is really 4 bytes
      long on the hardware.  */
   if (regno == (tdep->ppc_vrsave_regnum - 1))
     }
 
   /* VSCR is fetched as a 16 bytes quantity, but it is really 4 bytes
      long on the hardware.  */
   if (regno == (tdep->ppc_vrsave_regnum - 1))

-    offset = vrregsize - register_size (current_gdbarch, tdep->ppc_vrsave_regnum);
+    offset = vrregsize - register_size (gdbarch, tdep->ppc_vrsave_regnum);

 
 

-  regcache_raw_collect (current_regcache, regno,
+  regcache_raw_collect (regcache, regno,

                        regs + (regno - tdep->ppc_vr0_regnum) * vrregsize + offset);
 
   ret = ptrace (PTRACE_SETVRREGS, tid, 0, &regs);
   if (ret < 0)
                        regs + (regno - tdep->ppc_vr0_regnum) * vrregsize + offset);
 
   ret = ptrace (PTRACE_SETVRREGS, tid, 0, &regs);
   if (ret < 0)

-    perror_with_name ("Unable to store AltiVec register");
+    perror_with_name (_("Unable to store AltiVec register"));

 }
 
 /* Assuming TID referrs to an SPE process, set the top halves of TID's
 }
 
 /* Assuming TID referrs to an SPE process, set the top halves of TID's


@@ -568,7 +581,7 @@ set_spe_registers (int tid, struct gdb_evrregset_t *evrregset)
             have_ptrace_getsetevrregs = 0;
           else
             /* Anything else needs to be reported.  */
             have_ptrace_getsetevrregs = 0;
           else
             /* Anything else needs to be reported.  */

-            perror_with_name ("Unable to set SPE registers");
+            perror_with_name (_("Unable to set SPE registers"));

         }
     }
 }
         }
     }
 }


@@ -577,17 +590,18 @@ set_spe_registers (int tid, struct gdb_evrregset_t *evrregset)
    If REGNO is -1, write the values of all the SPE-specific
    registers.  */
 static void
    If REGNO is -1, write the values of all the SPE-specific
    registers.  */
 static void

-store_spe_register (int tid, int regno)
+store_spe_register (const struct regcache *regcache, int tid, int regno)

 {
 {

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   struct gdb_evrregset_t evrregs;
 
   gdb_assert (sizeof (evrregs.evr[0])
   struct gdb_evrregset_t evrregs;
 
   gdb_assert (sizeof (evrregs.evr[0])

-              == register_size (current_gdbarch, tdep->ppc_ev0_upper_regnum));
+              == register_size (gdbarch, tdep->ppc_ev0_upper_regnum));

   gdb_assert (sizeof (evrregs.acc)
   gdb_assert (sizeof (evrregs.acc)

-              == register_size (current_gdbarch, tdep->ppc_acc_regnum));
+              == register_size (gdbarch, tdep->ppc_acc_regnum));

   gdb_assert (sizeof (evrregs.spefscr)
   gdb_assert (sizeof (evrregs.spefscr)

-              == register_size (current_gdbarch, tdep->ppc_spefscr_regnum));
+              == register_size (gdbarch, tdep->ppc_spefscr_regnum));

 
   if (regno == -1)
     /* Since we're going to write out every register, the code below
 
   if (regno == -1)
     /* Since we're going to write out every register, the code below


@@ -605,24 +619,24 @@ store_spe_register (int tid, int regno)
       int i;
 
       for (i = 0; i < ppc_num_gprs; i++)
       int i;
 
       for (i = 0; i < ppc_num_gprs; i++)

-        regcache_raw_collect (current_regcache,
+        regcache_raw_collect (regcache,

                               tdep->ppc_ev0_upper_regnum + i,
                               &evrregs.evr[i]);
     }
   else if (tdep->ppc_ev0_upper_regnum <= regno
            && regno < tdep->ppc_ev0_upper_regnum + ppc_num_gprs)
                               tdep->ppc_ev0_upper_regnum + i,
                               &evrregs.evr[i]);
     }
   else if (tdep->ppc_ev0_upper_regnum <= regno
            && regno < tdep->ppc_ev0_upper_regnum + ppc_num_gprs)

-    regcache_raw_collect (current_regcache, regno,
+    regcache_raw_collect (regcache, regno,

                           &evrregs.evr[regno - tdep->ppc_ev0_upper_regnum]);
 
   if (regno == -1
       || regno == tdep->ppc_acc_regnum)
                           &evrregs.evr[regno - tdep->ppc_ev0_upper_regnum]);
 
   if (regno == -1
       || regno == tdep->ppc_acc_regnum)

-    regcache_raw_collect (current_regcache,
+    regcache_raw_collect (regcache,

                           tdep->ppc_acc_regnum,
                           &evrregs.acc);
 
   if (regno == -1
       || regno == tdep->ppc_spefscr_regnum)
                           tdep->ppc_acc_regnum,
                           &evrregs.acc);
 
   if (regno == -1
       || regno == tdep->ppc_spefscr_regnum)

-    regcache_raw_collect (current_regcache,
+    regcache_raw_collect (regcache,

                           tdep->ppc_spefscr_regnum,
                           &evrregs.spefscr);
 
                           tdep->ppc_spefscr_regnum,
                           &evrregs.spefscr);
 


@@ -631,23 +645,24 @@ store_spe_register (int tid, int regno)
 }
 
 static void
 }
 
 static void

-store_register (int tid, int regno)
+store_register (const struct regcache *regcache, int tid, int regno)

 {
 {

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   /* This isn't really an address.  But ptrace thinks of it as one.  */
   /* This isn't really an address.  But ptrace thinks of it as one.  */

-  CORE_ADDR regaddr = ppc_register_u_addr (regno);
+  CORE_ADDR regaddr = ppc_register_u_addr (gdbarch, regno);

   int i;
   size_t bytes_to_transfer;
   char buf[MAX_REGISTER_SIZE];
 
   int i;
   size_t bytes_to_transfer;
   char buf[MAX_REGISTER_SIZE];
 

-  if (altivec_register_p (regno))
+  if (altivec_register_p (gdbarch, regno))

     {
     {

-      store_altivec_register (tid, regno);
+      store_altivec_register (regcache, tid, regno);

       return;
     }
       return;
     }

-  else if (spe_register_p (regno))
+  else if (spe_register_p (gdbarch, regno))

     {
     {

-      store_spe_register (tid, regno);
+      store_spe_register (regcache, tid, regno);

       return;
     }
 
       return;
     }
 


@@ -656,34 +671,35 @@ store_register (int tid, int regno)
 
   /* First collect the register.  Keep in mind that the regcache's
      idea of the register's size may not be a multiple of sizeof
 
   /* First collect the register.  Keep in mind that the regcache's
      idea of the register's size may not be a multiple of sizeof

-     (PTRACE_XFER_TYPE).  */
+     (long).  */

   memset (buf, 0, sizeof buf);
   memset (buf, 0, sizeof buf);

-  bytes_to_transfer = align_up (register_size (current_gdbarch, regno),
-                                sizeof (PTRACE_XFER_TYPE));
-  if (TARGET_BYTE_ORDER == BFD_ENDIAN_LITTLE)
+  bytes_to_transfer = align_up (register_size (gdbarch, regno), sizeof (long));
+  if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_LITTLE)

     {
       /* Little-endian values always sit at the left end of the buffer.  */
     {
       /* Little-endian values always sit at the left end of the buffer.  */

-      regcache_raw_collect (current_regcache, regno, buf);
+      regcache_raw_collect (regcache, regno, buf);

     }
     }

-  else if (TARGET_BYTE_ORDER == BFD_ENDIAN_BIG)
+  else if (gdbarch_byte_order (gdbarch) == BFD_ENDIAN_BIG)

     {
       /* Big-endian values sit at the right end of the buffer.  */
     {
       /* Big-endian values sit at the right end of the buffer.  */

-      size_t padding = (bytes_to_transfer
-                        - register_size (current_gdbarch, regno));
-      regcache_raw_collect (current_regcache, regno, buf + padding);
+      size_t padding = (bytes_to_transfer - register_size (gdbarch, regno));
+      regcache_raw_collect (regcache, regno, buf + padding);

     }
 
     }
 

-  for (i = 0; i < bytes_to_transfer; i += sizeof (PTRACE_XFER_TYPE))
+  for (i = 0; i < bytes_to_transfer; i += sizeof (long))

     {
       errno = 0;
     {
       errno = 0;

-      ptrace (PT_WRITE_U, tid, (PTRACE_ARG3_TYPE) regaddr,
-             *(PTRACE_XFER_TYPE *) & buf[i]);
-      regaddr += sizeof (PTRACE_XFER_TYPE);
+      ptrace (PTRACE_POKEUSER, tid, (PTRACE_TYPE_ARG3) regaddr,
+             *(long *) &buf[i]);
+      regaddr += sizeof (long);

 
       if (errno == EIO 
 
       if (errno == EIO 

-          && regno == tdep->ppc_fpscr_regnum)
+          && (regno == tdep->ppc_fpscr_regnum
+             || regno == PPC_ORIG_R3_REGNUM
+             || regno == PPC_TRAP_REGNUM))

        {
        {

-         /* Some older kernel versions don't allow fpscr to be written.  */
+         /* Some older kernel versions don't allow fpscr, orig_r3
+            or trap to be written.  */

          continue;
        }
 
          continue;
        }
 


@@ -691,36 +707,37 @@ store_register (int tid, int regno)
        {
           char message[128];
          sprintf (message, "writing register %s (#%d)", 
        {
           char message[128];
          sprintf (message, "writing register %s (#%d)", 

-                  REGISTER_NAME (regno), regno);
+                  gdbarch_register_name (gdbarch, regno), regno);

          perror_with_name (message);
        }
     }
 }
 
 static void
          perror_with_name (message);
        }
     }
 }
 
 static void

-fill_vrregset (gdb_vrregset_t *vrregsetp)
+fill_vrregset (const struct regcache *regcache, gdb_vrregset_t *vrregsetp)

 {
   int i;
 {
   int i;

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   int num_of_vrregs = tdep->ppc_vrsave_regnum - tdep->ppc_vr0_regnum + 1;
   int num_of_vrregs = tdep->ppc_vrsave_regnum - tdep->ppc_vr0_regnum + 1;

-  int vrregsize = register_size (current_gdbarch, tdep->ppc_vr0_regnum);
-  int offset = vrregsize - register_size (current_gdbarch, tdep->ppc_vrsave_regnum);
+  int vrregsize = register_size (gdbarch, tdep->ppc_vr0_regnum);
+  int offset = vrregsize - register_size (gdbarch, tdep->ppc_vrsave_regnum);

 
   for (i = 0; i < num_of_vrregs; i++)
     {
       /* The last 2 registers of this set are only 32 bit long, not
          128, but only VSCR is fetched as a 16 bytes quantity.  */
       if (i == (num_of_vrregs - 2))
 
   for (i = 0; i < num_of_vrregs; i++)
     {
       /* The last 2 registers of this set are only 32 bit long, not
          128, but only VSCR is fetched as a 16 bytes quantity.  */
       if (i == (num_of_vrregs - 2))

-        regcache_raw_collect (current_regcache, tdep->ppc_vr0_regnum + i,
+        regcache_raw_collect (regcache, tdep->ppc_vr0_regnum + i,

                              *vrregsetp + i * vrregsize + offset);
       else
                              *vrregsetp + i * vrregsize + offset);
       else

-        regcache_raw_collect (current_regcache, tdep->ppc_vr0_regnum + i,
+        regcache_raw_collect (regcache, tdep->ppc_vr0_regnum + i,

                              *vrregsetp + i * vrregsize);
     }
 }
 
 static void
                              *vrregsetp + i * vrregsize);
     }
 }
 
 static void

-store_altivec_registers (int tid)
+store_altivec_registers (const struct regcache *regcache, int tid)

 {
   int ret;
   gdb_vrregset_t regs;
 {
   int ret;
   gdb_vrregset_t regs;


@@ -733,50 +750,183 @@ store_altivec_registers (int tid)
           have_ptrace_getvrregs = 0;
           return;
         }
           have_ptrace_getvrregs = 0;
           return;
         }

-      perror_with_name ("Couldn't get AltiVec registers");
+      perror_with_name (_("Couldn't get AltiVec registers"));

     }
 
     }
 

-  fill_vrregset (&regs);
+  fill_vrregset (regcache, &regs);

   
   if (ptrace (PTRACE_SETVRREGS, tid, 0, &regs) < 0)
   
   if (ptrace (PTRACE_SETVRREGS, tid, 0, &regs) < 0)

-    perror_with_name ("Couldn't write AltiVec registers");
+    perror_with_name (_("Couldn't write AltiVec registers"));

 }
 
 static void
 }
 
 static void

-store_ppc_registers (int tid)
+store_ppc_registers (const struct regcache *regcache, int tid)

 {
   int i;
 {
   int i;

-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch);
+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   
   for (i = 0; i < ppc_num_gprs; i++)
   
   for (i = 0; i < ppc_num_gprs; i++)

-    store_register (tid, tdep->ppc_gp0_regnum + i);
+    store_register (regcache, tid, tdep->ppc_gp0_regnum + i);

   if (tdep->ppc_fp0_regnum >= 0)
     for (i = 0; i < ppc_num_fprs; i++)
   if (tdep->ppc_fp0_regnum >= 0)
     for (i = 0; i < ppc_num_fprs; i++)

-      store_register (tid, tdep->ppc_fp0_regnum + i);
-  store_register (tid, PC_REGNUM);
+      store_register (regcache, tid, tdep->ppc_fp0_regnum + i);
+  store_register (regcache, tid, gdbarch_pc_regnum (gdbarch));

   if (tdep->ppc_ps_regnum != -1)
   if (tdep->ppc_ps_regnum != -1)

-    store_register (tid, tdep->ppc_ps_regnum);
+    store_register (regcache, tid, tdep->ppc_ps_regnum);

   if (tdep->ppc_cr_regnum != -1)
   if (tdep->ppc_cr_regnum != -1)

-    store_register (tid, tdep->ppc_cr_regnum);
+    store_register (regcache, tid, tdep->ppc_cr_regnum);

   if (tdep->ppc_lr_regnum != -1)
   if (tdep->ppc_lr_regnum != -1)

-    store_register (tid, tdep->ppc_lr_regnum);
+    store_register (regcache, tid, tdep->ppc_lr_regnum);

   if (tdep->ppc_ctr_regnum != -1)
   if (tdep->ppc_ctr_regnum != -1)

-    store_register (tid, tdep->ppc_ctr_regnum);
+    store_register (regcache, tid, tdep->ppc_ctr_regnum);

   if (tdep->ppc_xer_regnum != -1)
   if (tdep->ppc_xer_regnum != -1)

-    store_register (tid, tdep->ppc_xer_regnum);
+    store_register (regcache, tid, tdep->ppc_xer_regnum);

   if (tdep->ppc_mq_regnum != -1)
   if (tdep->ppc_mq_regnum != -1)

-    store_register (tid, tdep->ppc_mq_regnum);
+    store_register (regcache, tid, tdep->ppc_mq_regnum);

   if (tdep->ppc_fpscr_regnum != -1)
   if (tdep->ppc_fpscr_regnum != -1)

-    store_register (tid, tdep->ppc_fpscr_regnum);
+    store_register (regcache, tid, tdep->ppc_fpscr_regnum);
+  if (ppc_linux_trap_reg_p (gdbarch))
+    {
+      store_register (regcache, tid, PPC_ORIG_R3_REGNUM);
+      store_register (regcache, tid, PPC_TRAP_REGNUM);
+    }

   if (have_ptrace_getvrregs)
     if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)
   if (have_ptrace_getvrregs)
     if (tdep->ppc_vr0_regnum != -1 && tdep->ppc_vrsave_regnum != -1)

-      store_altivec_registers (tid);
+      store_altivec_registers (regcache, tid);

   if (tdep->ppc_ev0_upper_regnum >= 0)
   if (tdep->ppc_ev0_upper_regnum >= 0)

-    store_spe_register (tid, -1);
+    store_spe_register (regcache, tid, -1);

 }
 
 }
 

-void
-store_inferior_registers (int regno)
+static int
+ppc_linux_check_watch_resources (int type, int cnt, int ot)
+{
+  int tid;
+  ptid_t ptid = inferior_ptid;
+
+  /* DABR (data address breakpoint register) is optional for PPC variants.
+     Some variants have one DABR, others have none.  So CNT can't be larger
+     than 1.  */
+  if (cnt > 1)
+    return 0;
+
+  /* We need to know whether ptrace supports PTRACE_SET_DEBUGREG and whether
+     the target has DABR.  If either answer is no, the ptrace call will
+     return -1.  Fail in that case.  */
+  tid = TIDGET (ptid);
+  if (tid == 0)
+    tid = PIDGET (ptid);
+
+  if (ptrace (PTRACE_SET_DEBUGREG, tid, 0, 0) == -1)
+    return 0;
+  return 1;
+}
+
+static int
+ppc_linux_region_ok_for_hw_watchpoint (CORE_ADDR addr, int len)
+{
+  /* Handle sub-8-byte quantities.  */
+  if (len <= 0)
+    return 0;
+
+  /* addr+len must fall in the 8 byte watchable region.  */
+  if ((addr + len) > (addr & ~7) + 8)
+    return 0;
+
+  return 1;
+}
+
+/* The cached DABR value, to install in new threads.  */
+static long saved_dabr_value;
+
+/* Set a watchpoint of type TYPE at address ADDR.  */
+static int
+ppc_linux_insert_watchpoint (CORE_ADDR addr, int len, int rw)
+{
+  struct lwp_info *lp;
+  ptid_t ptid;
+  long dabr_value;
+
+  dabr_value = addr & ~7;
+  switch (rw)
+    {
+    case hw_read:
+      /* Set read and translate bits.  */
+      dabr_value |= 5;
+      break;
+    case hw_write:
+      /* Set write and translate bits.  */
+      dabr_value |= 6;
+      break;
+    case hw_access:
+      /* Set read, write and translate bits.  */
+      dabr_value |= 7;
+      break;
+    }
+
+  saved_dabr_value = dabr_value;
+
+  ALL_LWPS (lp, ptid)
+    if (ptrace (PTRACE_SET_DEBUGREG, TIDGET (ptid), 0, saved_dabr_value) < 0)
+      return -1;
+
+  return 0;
+}
+
+static int
+ppc_linux_remove_watchpoint (CORE_ADDR addr, int len, int rw)
+{
+  struct lwp_info *lp;
+  ptid_t ptid;
+  long dabr_value = 0;
+
+  saved_dabr_value = 0;
+  ALL_LWPS (lp, ptid)
+    if (ptrace (PTRACE_SET_DEBUGREG, TIDGET (ptid), 0, saved_dabr_value) < 0)
+      return -1;
+  return 0;
+}
+
+static void
+ppc_linux_new_thread (ptid_t ptid)
+{
+  ptrace (PTRACE_SET_DEBUGREG, TIDGET (ptid), 0, saved_dabr_value);
+}
+
+static int
+ppc_linux_stopped_data_address (struct target_ops *target, CORE_ADDR *addr_p)
+{
+  struct siginfo *siginfo_p;
+
+  siginfo_p = linux_nat_get_siginfo (inferior_ptid);
+
+  if (siginfo_p->si_signo != SIGTRAP
+      || (siginfo_p->si_code & 0xffff) != 0x0004 /* TRAP_HWBKPT */)
+    return 0;
+
+  *addr_p = (CORE_ADDR) (uintptr_t) siginfo_p->si_addr;
+  return 1;
+}
+
+static int
+ppc_linux_stopped_by_watchpoint (void)
+{
+  CORE_ADDR addr;
+  return ppc_linux_stopped_data_address (&current_target, &addr);
+}
+
+static int
+ppc_linux_watchpoint_addr_within_range (struct target_ops *target,
+                                       CORE_ADDR addr,
+                                       CORE_ADDR start, int length)
+{
+  addr &= ~7;
+  /* Check whether [start, start+length-1] intersects [addr, addr+7]. */
+  return start <= addr + 7 && start + length - 1 >= addr;
+}
+
+static void
+ppc_linux_store_inferior_registers (struct regcache *regcache, int regno)

 {
   /* Overload thread id onto process id */
   int tid = TIDGET (inferior_ptid);
 {
   /* Overload thread id onto process id */
   int tid = TIDGET (inferior_ptid);


@@ -786,100 +936,131 @@ store_inferior_registers (int regno)
     tid = PIDGET (inferior_ptid);
 
   if (regno >= 0)
     tid = PIDGET (inferior_ptid);
 
   if (regno >= 0)

-    store_register (tid, regno);
+    store_register (regcache, tid, regno);

   else
   else

-    store_ppc_registers (tid);
+    store_ppc_registers (regcache, tid);

 }
 
 }
 

+/* Functions for transferring registers between a gregset_t or fpregset_t
+   (see sys/ucontext.h) and gdb's regcache.  The word size is that used
+   by the ptrace interface, not the current program's ABI.  eg. If a
+   powerpc64-linux gdb is being used to debug a powerpc32-linux app, we
+   read or write 64-bit gregsets.  This is to suit the host libthread_db.  */
+

 void
 void

-supply_gregset (gdb_gregset_t *gregsetp)
+supply_gregset (struct regcache *regcache, const gdb_gregset_t *gregsetp)

 {
 {

-  /* NOTE: cagney/2003-11-25: This is the word size used by the ptrace
-     interface, and not the wordsize of the program's ABI.  */
-  int wordsize = sizeof (PTRACE_XFER_TYPE);
-  ppc_linux_supply_gregset (current_regcache, -1, gregsetp,
-                           sizeof (gdb_gregset_t), wordsize);
+  const struct regset *regset = ppc_linux_gregset (sizeof (long));
+
+  ppc_supply_gregset (regset, regcache, -1, gregsetp, sizeof (*gregsetp));

 }
 
 }
 

-static void
-right_fill_reg (int regnum, void *reg)
+void
+fill_gregset (const struct regcache *regcache,
+             gdb_gregset_t *gregsetp, int regno)

 {
 {

-  /* NOTE: cagney/2003-11-25: This is the word size used by the ptrace
-     interface, and not the wordsize of the program's ABI.  */
-  int wordsize = sizeof (PTRACE_XFER_TYPE);
-  /* Right fill the register.  */
-  regcache_raw_collect (current_regcache, regnum,
-                       ((bfd_byte *) reg
-                        + wordsize
-                        - register_size (current_gdbarch, regnum)));
+  const struct regset *regset = ppc_linux_gregset (sizeof (long));
+
+  if (regno == -1)
+    memset (gregsetp, 0, sizeof (*gregsetp));
+  ppc_collect_gregset (regset, regcache, regno, gregsetp, sizeof (*gregsetp));

 }
 
 void
 }
 
 void

-fill_gregset (gdb_gregset_t *gregsetp, int regno)
+supply_fpregset (struct regcache *regcache, const gdb_fpregset_t * fpregsetp)
+{
+  const struct regset *regset = ppc_linux_fpregset ();
+
+  ppc_supply_fpregset (regset, regcache, -1,
+                      fpregsetp, sizeof (*fpregsetp));
+}
+
+void
+fill_fpregset (const struct regcache *regcache,
+              gdb_fpregset_t *fpregsetp, int regno)
+{
+  const struct regset *regset = ppc_linux_fpregset ();
+
+  ppc_collect_fpregset (regset, regcache, regno,
+                       fpregsetp, sizeof (*fpregsetp));
+}
+
+static const struct target_desc *
+ppc_linux_read_description (struct target_ops *ops)

 {
 {

-  int regi;
-  elf_greg_t *regp = (elf_greg_t *) gregsetp;
-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); 
-  const int elf_ngreg = 48;
+  int altivec = 0;
+
+  int tid = TIDGET (inferior_ptid);
+  if (tid == 0)
+    tid = PIDGET (inferior_ptid);
+
+  if (have_ptrace_getsetevrregs)
+    {
+      struct gdb_evrregset_t evrregset;

 
 

+      if (ptrace (PTRACE_GETEVRREGS, tid, 0, &evrregset) >= 0)
+        return tdesc_powerpc_e500l;

 
 

-  /* Start with zeros.  */
-  memset (regp, 0, elf_ngreg * sizeof (*regp));
+      /* EIO means that the PTRACE_GETEVRREGS request isn't supported.
+        Anything else needs to be reported.  */
+      else if (errno != EIO)
+       perror_with_name (_("Unable to fetch SPE registers"));
+    }

 
 

-  for (regi = 0; regi < ppc_num_gprs; regi++)
+  if (have_ptrace_getvrregs)

     {
     {

-      if ((regno == -1) || regno == tdep->ppc_gp0_regnum + regi)
-       right_fill_reg (tdep->ppc_gp0_regnum + regi, (regp + PT_R0 + regi));
+      gdb_vrregset_t vrregset;
+
+      if (ptrace (PTRACE_GETVRREGS, tid, 0, &vrregset) >= 0)
+        altivec = 1;
+
+      /* EIO means that the PTRACE_GETVRREGS request isn't supported.
+        Anything else needs to be reported.  */
+      else if (errno != EIO)
+       perror_with_name (_("Unable to fetch AltiVec registers"));

     }
 
     }
 

-  if ((regno == -1) || regno == PC_REGNUM)
-    right_fill_reg (PC_REGNUM, regp + PT_NIP);
-  if ((regno == -1) || regno == tdep->ppc_lr_regnum)
-    right_fill_reg (tdep->ppc_lr_regnum, regp + PT_LNK);
-  if ((regno == -1) || regno == tdep->ppc_cr_regnum)
-    regcache_raw_collect (current_regcache, tdep->ppc_cr_regnum,
-                         regp + PT_CCR);
-  if ((regno == -1) || regno == tdep->ppc_xer_regnum)
-    regcache_raw_collect (current_regcache, tdep->ppc_xer_regnum,
-                         regp + PT_XER);
-  if ((regno == -1) || regno == tdep->ppc_ctr_regnum)
-    right_fill_reg (tdep->ppc_ctr_regnum, regp + PT_CTR);
-#ifdef PT_MQ
-  if (((regno == -1) || regno == tdep->ppc_mq_regnum)
-      && (tdep->ppc_mq_regnum != -1))
-    right_fill_reg (tdep->ppc_mq_regnum, regp + PT_MQ);
+  /* Check for 64-bit inferior process.  This is the case when the host is
+     64-bit, and in addition the top bit of the MSR register is set.  */
+#ifdef __powerpc64__
+  {
+    long msr;
+    errno = 0;
+    msr = (long) ptrace (PTRACE_PEEKUSER, tid, PT_MSR * 8, 0);
+    if (errno == 0 && msr < 0)
+      return altivec? tdesc_powerpc_altivec64l : tdesc_powerpc_64l;
+  }

 #endif
 #endif

-  if ((regno == -1) || regno == tdep->ppc_ps_regnum)
-    right_fill_reg (tdep->ppc_ps_regnum, regp + PT_MSR);
-}

 
 

-void
-supply_fpregset (gdb_fpregset_t * fpregsetp)
-{
-  ppc_linux_supply_fpregset (NULL, current_regcache, -1, fpregsetp,
-                            sizeof (gdb_fpregset_t));
+  return altivec? tdesc_powerpc_altivec32l : tdesc_powerpc_32l;

 }
 
 }
 

-/* Given a pointer to a floating point register set in /proc format
-   (fpregset_t *), update the register specified by REGNO from gdb's
-   idea of the current floating point register set.  If REGNO is -1,
-   update them all.  */
+void _initialize_ppc_linux_nat (void);
+

 void
 void

-fill_fpregset (gdb_fpregset_t *fpregsetp, int regno)
+_initialize_ppc_linux_nat (void)

 {
 {

-  int regi;
-  struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); 
-  bfd_byte *fpp = (void *) fpregsetp;
-  
-  if (ppc_floating_point_unit_p (current_gdbarch))
-    {
-      for (regi = 0; regi < ppc_num_fprs; regi++)
-        {
-          if ((regno == -1) || (regno == tdep->ppc_fp0_regnum + regi))
-            regcache_raw_collect (current_regcache, tdep->ppc_fp0_regnum + regi,
-                                 fpp + 8 * regi);
-        }
-      if (regno == -1 || regno == tdep->ppc_fpscr_regnum)
-        right_fill_reg (tdep->ppc_fpscr_regnum, (fpp + 8 * 32));
-    }
+  struct target_ops *t;
+
+  /* Fill in the generic GNU/Linux methods.  */
+  t = linux_target ();
+
+  /* Add our register access methods.  */
+  t->to_fetch_registers = ppc_linux_fetch_inferior_registers;
+  t->to_store_registers = ppc_linux_store_inferior_registers;
+
+  /* Add our watchpoint methods.  */
+  t->to_can_use_hw_breakpoint = ppc_linux_check_watch_resources;
+  t->to_region_ok_for_hw_watchpoint = ppc_linux_region_ok_for_hw_watchpoint;
+  t->to_insert_watchpoint = ppc_linux_insert_watchpoint;
+  t->to_remove_watchpoint = ppc_linux_remove_watchpoint;
+  t->to_stopped_by_watchpoint = ppc_linux_stopped_by_watchpoint;
+  t->to_stopped_data_address = ppc_linux_stopped_data_address;
+  t->to_watchpoint_addr_within_range = ppc_linux_watchpoint_addr_within_range;
+
+  t->to_read_description = ppc_linux_read_description;
+
+  /* Register the target.  */
+  linux_nat_add_target (t);
+  linux_nat_set_new_thread (t, ppc_linux_new_thread);

 }
 }