* win32-i386-low.c: Add 64-bit support.

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

diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
index 161ba76e5e1a4fbf61076afb17e7a0403b6f8483..000b20fbf1d06a34deb6fb0597f7a010e99fa7b1 100644 (file)
--- a/gdb/gdbserver/linux-ppc-low.c
+++ b/gdb/gdbserver/linux-ppc-low.c
@@ -169,26 +169,27 @@ ppc_cannot_fetch_register (int regno)
 }
 
 static void
-ppc_collect_ptrace_register (int regno, char *buf)
+ppc_collect_ptrace_register (struct regcache *regcache, int regno, char *buf)
 {
   int size = register_size (regno);
 
   memset (buf, 0, sizeof (long));
 
   if (size < sizeof (long))
-    collect_register (regno, buf + sizeof (long) - size);
+    collect_register (regcache, regno, buf + sizeof (long) - size);
   else
-    collect_register (regno, buf);
+    collect_register (regcache, regno, buf);
 }
 
 static void
-ppc_supply_ptrace_register (int regno, const char *buf)
+ppc_supply_ptrace_register (struct regcache *regcache,
+                           int regno, const char *buf)
 {
   int size = register_size (regno);
   if (size < sizeof (long))
-    supply_register (regno, buf + sizeof (long) - size);
+    supply_register (regcache, regno, buf + sizeof (long) - size);
   else
-    supply_register (regno, buf);
+    supply_register (regcache, regno, buf);
 }
 
 
@@ -199,7 +200,7 @@ ppc_supply_ptrace_register (int regno, const char *buf)
    return to FD and ADDR the file handle and NPC parameter address
    used with the system call.  Return non-zero if successful.  */
 static int
-parse_spufs_run (int *fd, CORE_ADDR *addr)
+parse_spufs_run (struct regcache *regcache, int *fd, CORE_ADDR *addr)
 {
   CORE_ADDR curr_pc;
   int curr_insn;
@@ -208,10 +209,10 @@ parse_spufs_run (int *fd, CORE_ADDR *addr)
   if (register_size (0) == 4)
     {
       unsigned int pc, r0, r3, r4;
-      collect_register_by_name ("pc", &pc);
-      collect_register_by_name ("r0", &r0);
-      collect_register_by_name ("orig_r3", &r3);
-      collect_register_by_name ("r4", &r4);
+      collect_register_by_name (regcache, "pc", &pc);
+      collect_register_by_name (regcache, "r0", &r0);
+      collect_register_by_name (regcache, "orig_r3", &r3);
+      collect_register_by_name (regcache, "r4", &r4);
       curr_pc = (CORE_ADDR) pc;
       curr_r0 = (int) r0;
       *fd = (int) r3;
@@ -220,10 +221,10 @@ parse_spufs_run (int *fd, CORE_ADDR *addr)
   else
     {
       unsigned long pc, r0, r3, r4;
-      collect_register_by_name ("pc", &pc);
-      collect_register_by_name ("r0", &r0);
-      collect_register_by_name ("orig_r3", &r3);
-      collect_register_by_name ("r4", &r4);
+      collect_register_by_name (regcache, "pc", &pc);
+      collect_register_by_name (regcache, "r0", &r0);
+      collect_register_by_name (regcache, "orig_r3", &r3);
+      collect_register_by_name (regcache, "r4", &r4);
       curr_pc = (CORE_ADDR) pc;
       curr_r0 = (int) r0;
       *fd = (int) r3;
@@ -245,12 +246,12 @@ parse_spufs_run (int *fd, CORE_ADDR *addr)
 }
 
 static CORE_ADDR
-ppc_get_pc (void)
+ppc_get_pc (struct regcache *regcache)
 {
   CORE_ADDR addr;
   int fd;
 
-  if (parse_spufs_run (&fd, &addr))
+  if (parse_spufs_run (regcache, &fd, &addr))
     {
       unsigned int pc;
       (*the_target->read_memory) (addr, (unsigned char *) &pc, 4);
@@ -259,24 +260,24 @@ ppc_get_pc (void)
   else if (register_size (0) == 4)
     {
       unsigned int pc;
-      collect_register_by_name ("pc", &pc);
+      collect_register_by_name (regcache, "pc", &pc);
       return (CORE_ADDR) pc;
     }
   else
     {
       unsigned long pc;
-      collect_register_by_name ("pc", &pc);
+      collect_register_by_name (regcache, "pc", &pc);
       return (CORE_ADDR) pc;
     }
 }
 
 static void
-ppc_set_pc (CORE_ADDR pc)
+ppc_set_pc (struct regcache *regcache, CORE_ADDR pc)
 {
   CORE_ADDR addr;
   int fd;
 
-  if (parse_spufs_run (&fd, &addr))
+  if (parse_spufs_run (regcache, &fd, &addr))
     {
       unsigned int newpc = pc;
       (*the_target->write_memory) (addr, (unsigned char *) &newpc, 4);
@@ -284,12 +285,12 @@ ppc_set_pc (CORE_ADDR pc)
   else if (register_size (0) == 4)
     {
       unsigned int newpc = pc;
-      supply_register_by_name ("pc", &newpc);
+      supply_register_by_name (regcache, "pc", &newpc);
     }
   else
     {
       unsigned long newpc = pc;
-      supply_register_by_name ("pc", &newpc);
+      supply_register_by_name (regcache, "pc", &newpc);
     }
 }
 
@@ -334,6 +335,7 @@ ppc_arch_setup (void)
 {
 #ifdef __powerpc64__
   long msr;
+  struct regcache *regcache;
 
   /* On a 64-bit host, assume 64-bit inferior process with no
      AltiVec registers.  Reset ppc_hwcap to ensure that the
@@ -343,7 +345,8 @@ ppc_arch_setup (void)
 
   /* Only if the high bit of the MSR is set, we actually have
      a 64-bit inferior.  */
-  collect_register_by_name ("msr", &msr);
+  regcache = get_thread_regcache (current_inferior, 1);
+  collect_register_by_name (regcache, "msr", &msr);
   if (msr < 0)
     {
       ppc_get_hwcap (&ppc_hwcap);
@@ -449,18 +452,18 @@ ppc_breakpoint_at (CORE_ADDR where)
 /* Provide only a fill function for the general register set.  ps_lgetregs
    will use this for NPTL support.  */
 
-static void ppc_fill_gregset (void *buf)
+static void ppc_fill_gregset (struct regcache *regcache, void *buf)
 {
   int i;
 
   for (i = 0; i < 32; i++)
-    ppc_collect_ptrace_register (i, (char *) buf + ppc_regmap[i]);
+    ppc_collect_ptrace_register (regcache, i, (char *) buf + ppc_regmap[i]);
 
   for (i = 64; i < 70; i++)
-    ppc_collect_ptrace_register (i, (char *) buf + ppc_regmap[i]);
+    ppc_collect_ptrace_register (regcache, i, (char *) buf + ppc_regmap[i]);
 
   for (i = 71; i < 73; i++)
-    ppc_collect_ptrace_register (i, (char *) buf + ppc_regmap[i]);
+    ppc_collect_ptrace_register (regcache, i, (char *) buf + ppc_regmap[i]);
 }
 
 #ifndef PTRACE_GETVSXREGS
@@ -471,7 +474,7 @@ static void ppc_fill_gregset (void *buf)
 #define SIZEOF_VSXREGS 32*8
 
 static void
-ppc_fill_vsxregset (void *buf)
+ppc_fill_vsxregset (struct regcache *regcache, void *buf)
 {
   int i, base;
   char *regset = buf;
@@ -481,11 +484,11 @@ ppc_fill_vsxregset (void *buf)
 
   base = find_regno ("vs0h");
   for (i = 0; i < 32; i++)
-    collect_register (base + i, &regset[i * 8]);
+    collect_register (regcache, base + i, &regset[i * 8]);
 }
 
 static void
-ppc_store_vsxregset (const void *buf)
+ppc_store_vsxregset (struct regcache *regcache, const void *buf)
 {
   int i, base;
   const char *regset = buf;
@@ -495,7 +498,7 @@ ppc_store_vsxregset (const void *buf)
 
   base = find_regno ("vs0h");
   for (i = 0; i < 32; i++)
-    supply_register (base + i, &regset[i * 8]);
+    supply_register (regcache, base + i, &regset[i * 8]);
 }
 
 #ifndef PTRACE_GETVRREGS
@@ -506,7 +509,7 @@ ppc_store_vsxregset (const void *buf)
 #define SIZEOF_VRREGS 33*16+4
 
 static void
-ppc_fill_vrregset (void *buf)
+ppc_fill_vrregset (struct regcache *regcache, void *buf)
 {
   int i, base;
   char *regset = buf;
@@ -516,14 +519,14 @@ ppc_fill_vrregset (void *buf)
 
   base = find_regno ("vr0");
   for (i = 0; i < 32; i++)
-    collect_register (base + i, &regset[i * 16]);
+    collect_register (regcache, base + i, &regset[i * 16]);
 
-  collect_register_by_name ("vscr", &regset[32 * 16 + 12]);
-  collect_register_by_name ("vrsave", &regset[33 * 16]);
+  collect_register_by_name (regcache, "vscr", &regset[32 * 16 + 12]);
+  collect_register_by_name (regcache, "vrsave", &regset[33 * 16]);
 }
 
 static void
-ppc_store_vrregset (const void *buf)
+ppc_store_vrregset (struct regcache *regcache, const void *buf)
 {
   int i, base;
   const char *regset = buf;
@@ -533,10 +536,10 @@ ppc_store_vrregset (const void *buf)
 
   base = find_regno ("vr0");
   for (i = 0; i < 32; i++)
-    supply_register (base + i, &regset[i * 16]);
+    supply_register (regcache, base + i, &regset[i * 16]);
 
-  supply_register_by_name ("vscr", &regset[32 * 16 + 12]);
-  supply_register_by_name ("vrsave", &regset[33 * 16]);
+  supply_register_by_name (regcache, "vscr", &regset[32 * 16 + 12]);
+  supply_register_by_name (regcache, "vrsave", &regset[33 * 16]);
 }
 
 #ifndef PTRACE_GETEVRREGS
@@ -552,7 +555,7 @@ struct gdb_evrregset_t
 };
 
 static void
-ppc_fill_evrregset (void *buf)
+ppc_fill_evrregset (struct regcache *regcache, void *buf)
 {
   int i, ev0;
   struct gdb_evrregset_t *regset = buf;
@@ -562,14 +565,14 @@ ppc_fill_evrregset (void *buf)
 
   ev0 = find_regno ("ev0h");
   for (i = 0; i < 32; i++)
-    collect_register (ev0 + i, &regset->evr[i]);
+    collect_register (regcache, ev0 + i, &regset->evr[i]);
 
-  collect_register_by_name ("acc", &regset->acc);
-  collect_register_by_name ("spefscr", &regset->spefscr);
+  collect_register_by_name (regcache, "acc", &regset->acc);
+  collect_register_by_name (regcache, "spefscr", &regset->spefscr);
 }
 
 static void
-ppc_store_evrregset (const void *buf)
+ppc_store_evrregset (struct regcache *regcache, const void *buf)
 {
   int i, ev0;
   const struct gdb_evrregset_t *regset = buf;
@@ -579,10 +582,10 @@ ppc_store_evrregset (const void *buf)
 
   ev0 = find_regno ("ev0h");
   for (i = 0; i < 32; i++)
-    supply_register (ev0 + i, &regset->evr[i]);
+    supply_register (regcache, ev0 + i, &regset->evr[i]);
 
-  supply_register_by_name ("acc", &regset->acc);
-  supply_register_by_name ("spefscr", &regset->spefscr);
+  supply_register_by_name (regcache, "acc", &regset->acc);
+  supply_register_by_name (regcache, "spefscr", &regset->spefscr);
 }
 
 struct regset_info target_regsets[] = {
@@ -590,14 +593,14 @@ struct regset_info target_regsets[] = {
      fetch them every time, but still fall back to PTRACE_PEEKUSER for the
      general registers.  Some kernels support these, but not the newer
      PPC_PTRACE_GETREGS.  */
-  { PTRACE_GETVSXREGS, PTRACE_SETVSXREGS, SIZEOF_VSXREGS, EXTENDED_REGS,
+  { PTRACE_GETVSXREGS, PTRACE_SETVSXREGS, 0, SIZEOF_VSXREGS, EXTENDED_REGS,
   ppc_fill_vsxregset, ppc_store_vsxregset },
-  { PTRACE_GETVRREGS, PTRACE_SETVRREGS, SIZEOF_VRREGS, EXTENDED_REGS,
+  { PTRACE_GETVRREGS, PTRACE_SETVRREGS, 0, SIZEOF_VRREGS, EXTENDED_REGS,
     ppc_fill_vrregset, ppc_store_vrregset },
-  { PTRACE_GETEVRREGS, PTRACE_SETEVRREGS, 32 * 4 + 8 + 4, EXTENDED_REGS,
+  { PTRACE_GETEVRREGS, PTRACE_SETEVRREGS, 0, 32 * 4 + 8 + 4, EXTENDED_REGS,
     ppc_fill_evrregset, ppc_store_evrregset },
-  { 0, 0, 0, GENERAL_REGS, ppc_fill_gregset, NULL },
-  { 0, 0, -1, -1, NULL, NULL }
+  { 0, 0, 0, 0, GENERAL_REGS, ppc_fill_gregset, NULL },
+  { 0, 0, 0, -1, -1, NULL, NULL }
 };
 
 struct linux_target_ops the_low_target = {