* regcache.h (struct thread_info): Forward declare.

	(struct regcache): New.
	(new_register_cache): Adjust prototype.
	(get_thread_regcache): Declare.
	(free_register_cache): Adjust prototype.
	(registers_to_string, registers_from_string): Ditto.
	(supply_register, supply_register_by_name, collect_register)
	(collect_register_as_string, collect_register_by_name): Ditto.
	* regcache.c (struct inferior_regcache_data): Delete.
	(get_regcache): Rename to ...
	(get_thread_regcache): ... this.  Adjust.  Switch inferior before
	fetching registers.
	(regcache_invalidate_one): Adjust.
	(regcache_invalidate): Fix prototype.
	(new_register_cache): Return the new register cache.
	(free_register_cache): Change prototype.
	(realloc_register_cache): Adjust.
	(registers_to_string): Change prototype to take a regcache.  Adjust.
	(registers_from_string): Ditto.
	(register_data): Ditto.
	(supply_register): Ditto.
	(supply_register_by_name): Ditto.
	(collect_register): Ditto.
	(collect_register_as_string): Ditto.
	(collect_register_by_name): Ditto.
	* server.c (process_serial_event): Adjust.
	* linux-low.h (regset_fill_func, regset_store_func): Change
	prototype.
	(get_pc, set_pc, collect_ptrace_register, supply_ptrace_register):
	Change prototype.
	* linux-low.c (get_stop_pc): Adjust.
	(check_removed_breakpoint): Adjust.
	(linux_wait_for_event): Adjust.
	(linux_resume_one_lwp): Adjust.
	(fetch_register): Add regcache parameter.  Adjust.
	(usr_store_inferior_registers): Ditto.
	(regsets_fetch_inferior_registers): Ditto.
	(regsets_store_inferior_registers): Ditto.
	(linux_fetch_registers, linux_store_registers): Ditto.
	* i387-fp.c (i387_cache_to_fsave): Change prototype to take a
	regcache.  Adjust.
	(i387_fsave_to_cache, i387_cache_to_fxsave, i387_fxsave_to_cache): Ditto.
	* i387-fp.h (i387_cache_to_fsave, i387_fsave_to_cache): Change
	prototype to take a regcache.
	(i387_cache_to_fxsave, i387_fxsave_to_cache): Ditto.
	* remote-utils.c (convert_ascii_to_int, outreg)
	(prepare_resume_reply): Change prototype to take a regcache.
	Adjust.
	* target.h (struct target_ops) <fetch_registers, store_registers>:
	Change prototype to take a regcache.
	(fetch_inferior_registers, store_inferior_registers): Change
	prototype to take a regcache.  Adjust.
	* proc-service.c (ps_lgetregs): Adjust.
	* linux-x86-low.c (x86_fill_gregset, x86_store_gregset)
	(x86_fill_fpregset, x86_store_fpregset, x86_fill_fpxregset)
	(x86_store_fpxregset, x86_get_pc, x86_set_pc): Change prototype to
	take a regcache.  Adjust.
	* linux-arm-low.c (arm_fill_gregset, arm_store_gregset)
	(arm_fill_wmmxregset, arm_store_wmmxregset, arm_fill_vfpregset)
	(arm_store_vfpregset, arm_get_pc, arm_set_pc):
	(arm_breakpoint_at): Change prototype to take a regcache.  Adjust.
	* linux-cris-low.c (cris_get_pc, cris_set_pc)
	(cris_cannot_fetch_register):
	(cris_breakpoint_at): Change prototype to take a regcache.
	Adjust.
	* linux-crisv32-low.c (cris_get_pc, cris_set_pc,
	cris_reinsert_addr, cris_write_data_breakpoint): Change prototype
	to take a regcache.  Adjust.
	(cris_breakpoint_at, cris_insert_point, cris_remove_point):
	Adjust.
	* linux-m32r-low.c (m32r_get_pc, m32r_set_pc): Change prototype to
	take a regcache.  Adjust.
	* linux-m68k-low.c (m68k_fill_gregset, m68k_store_gregset)
	(m68k_fill_fpregset, m68k_store_fpregset, m68k_get_pc,
	(m68k_set_pc): Change prototype to take a regcache.  Adjust.
	* linux-mips-low.c (mips_get_pc):
	(mips_set_pc): Change prototype to take a regcache.  Adjust.
	(mips_reinsert_addr): Adjust.
	(mips_collect_register): Change prototype to take a regcache.
	Adjust.
	(mips_supply_register):
	(mips_collect_register_32bit, mips_supply_register_32bit)
	(mips_fill_gregset, mips_store_gregset, mips_fill_fpregset)
	(mips_store_fpregset): Ditto.
	* linux-ppc-low.c (ppc_supply_ptrace_register, ppc_supply_ptrace_register):
	Ditto.
	(parse_spufs_run): Adjust.
	(ppc_get_pc, ppc_set_pc, ppc_fill_gregset, ppc_fill_vsxregset)
	(ppc_store_vsxregset, ppc_fill_vrregset, ppc_store_vrregset)
	(ppc_fill_evrregset, ppc_store_evrregset): Change prototype to
	take a regcache.  Adjust.
	* linux-s390-low.c (s390_collect_ptrace_register)
	(s390_supply_ptrace_register, s390_fill_gregset, s390_get_pc)
	(s390_set_pc): Change prototype to take a regcache.  Adjust.
	(s390_arch_setup): Adjust.
	* linux-sh-low.c (sh_get_pc, sh_breakpoint_at)
	(sh_fill_gregset): Change prototype to take a regcache.  Adjust.
	* linux-sparc-low.c (sparc_fill_gregset_to_stack)
	(sparc_fill_gregset, sparc_store_gregset_from_stack)
	(sparc_store_gregset, sparc_get_pc): Change prototype to take a
	regcache.  Adjust.
	(sparc_breakpoint_at): Adjust.
	* linux-xtensa-low.c (xtensa_fill_gregset):
	(xtensa_store_gregset):
	(xtensa_fill_xtregset, xtensa_store_xtregset, xtensa_get_pc)
	(xtensa_set_pc): Change prototype to take a regcache.  Adjust.
	* nto-low.c (nto_fetch_registers, nto_store_registers): Change
	prototype to take a regcache.  Adjust.
	* win32-arm-low.c (arm_fetch_inferior_register)
	(arm_store_inferior_register): Change prototype to take a
	regcache.  Adjust.
	* win32-i386-low.c (i386_fetch_inferior_register)
	(i386_store_inferior_register): Change prototype to take a
	regcache.  Adjust.
	* win32-low.c (child_fetch_inferior_registers)
	(child_store_inferior_registers): Change prototype to take a
	regcache.  Adjust.
	(win32_wait): Adjust.
	(win32_fetch_inferior_registers): Change prototype to take a
	regcache.  Adjust.
	(win32_store_inferior_registers): Adjust.
	* win32-low.h (struct win32_target_ops) <fetch_inferior_register,
	store_inferior_register>: Change prototype to take a regcache.

1 files changed, 48 insertions, 47 deletions

diff --git a/gdb/gdbserver/linux-ppc-low.c b/gdb/gdbserver/linux-ppc-low.c
index 161ba76e5e1..5832dc7ade7 100644
--- 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);
     }
 }
 
@@ -449,18 +450,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 +472,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 +482,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 +496,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 +507,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 +517,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 +534,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 +553,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 +563,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 +580,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[] = {