2004-07-23 Andrew Cagney <cagney@gnu.org>

	Use regcache_raw_collect instead of regcache_collect.
	* regcache.h (regcache_collect): Delete declaration.
	* regcache.c (regcache_colect): Delete function.
	* win32-nat.c (do_child_store_inferior_registers): Update.
	* sol-thread.c (sol_thread_store_registers): Update.
	* shnbsd-tdep.c (shnbsd_fill_reg): Update.
	* rs6000-nat.c (store_register): Update.
	* remote.c (store_register_using_P, remote_store_registers): Update.
	* ppcnbsd-tdep.c (ppcnbsd_fill_reg): Update.
	* ppc-linux-nat.c (store_altivec_register, store_spe_register)
	(fill_vrregset, store_spe_registers, fill_gregset)
	(fill_gregset): Update.
	* nto-procfs.c (procfs_store_registers): Update.
	* mipsnbsd-tdep.c (mipsnbsd_fill_reg): Update.
	* mips-linux-tdep.c (fill_gregset, mips64_fill_gregset): Update.
	* m68klinux-nat.c (store_register, fill_gregset): Update.
	* m68k-tdep.c (fill_gregset): Update.
	* infptrace.c (store_register): Update.
	* i386-nto-tdep.c (i386nto_regset_fill): Update.
	* i386-linux-nat.c (store_register, fill_gregset): Update.
	* hppa-linux-nat.c (fill_gregset): Update.
	* go32-nat.c (store_register): Update.
	* armnbsd-nat.c (store_register, store_regs, store_fp_register)
	(store_fp_regs): Update.
	* arm-linux-nat.c (store_nwfpe_single, store_nwfpe_double)
	(store_nwfpe_extended, store_fpregister, store_fpregs)
	(store_register, store_regs, fill_gregset, fill_fpregset): Update.
	* alpha-tdep.c (alpha_fill_int_regs, alpha_fill_fp_regs): Update.
	* aix-thread.c (fill_gprs64, fill_fprs, fill_sprs64, fill_sprs32)
	(store_regs_user_thread, store_regs_kernel_thread): Update.

1 files changed, 36 insertions, 21 deletions

diff --git a/gdb/armnbsd-nat.c b/gdb/armnbsd-nat.c
index d21fdbfc713..13ba0cb8125 100644
--- a/gdb/armnbsd-nat.c
+++ b/gdb/armnbsd-nat.c
@@ -229,21 +229,25 @@ store_register (int regno)
   switch (regno)
     {
     case ARM_SP_REGNUM:
-      regcache_collect (ARM_SP_REGNUM, (char *) &inferior_registers.r_sp);
+      regcache_raw_collect (current_regcache, ARM_SP_REGNUM,
+			    (char *) &inferior_registers.r_sp);
       break;
 
     case ARM_LR_REGNUM:
-      regcache_collect (ARM_LR_REGNUM, (char *) &inferior_registers.r_lr);
+      regcache_raw_collect (current_regcache, ARM_LR_REGNUM,
+			    (char *) &inferior_registers.r_lr);
       break;
 
     case ARM_PC_REGNUM:
       if (arm_apcs_32)
-	regcache_collect (ARM_PC_REGNUM, (char *) &inferior_registers.r_pc);
+	regcache_raw_collect (current_regcache, ARM_PC_REGNUM,
+			      (char *) &inferior_registers.r_pc);
       else
 	{
 	  unsigned pc_val;
 
-	  regcache_collect (ARM_PC_REGNUM, (char *) &pc_val);
+	  regcache_raw_collect (current_regcache, ARM_PC_REGNUM,
+				(char *) &pc_val);
 	  
 	  pc_val = ADDR_BITS_REMOVE (pc_val);
 	  inferior_registers.r_pc
@@ -254,12 +258,14 @@ store_register (int regno)
 
     case ARM_PS_REGNUM:
       if (arm_apcs_32)
-	regcache_collect (ARM_PS_REGNUM, (char *) &inferior_registers.r_cpsr);
+	regcache_raw_collect (current_regcache, ARM_PS_REGNUM,
+			      (char *) &inferior_registers.r_cpsr);
       else
 	{
 	  unsigned psr_val;
 
-	  regcache_collect (ARM_PS_REGNUM, (char *) &psr_val);
+	  regcache_raw_collect (current_regcache, ARM_PS_REGNUM,
+				(char *) &psr_val);
 
 	  psr_val ^= ADDR_BITS_REMOVE (psr_val);
 	  inferior_registers.r_pc = ADDR_BITS_REMOVE (inferior_registers.r_pc);
@@ -268,7 +274,8 @@ store_register (int regno)
       break;
 
     default:
-      regcache_collect (regno, (char *) &inferior_registers.r[regno]);
+      regcache_raw_collect (current_regcache, regno,
+			    (char *) &inferior_registers.r[regno]);
       break;
     }
 
@@ -288,23 +295,30 @@ store_regs (void)
 
 
   for (regno = ARM_A1_REGNUM; regno < ARM_SP_REGNUM; regno++)
-    regcache_collect (regno, (char *) &inferior_registers.r[regno]);
+    regcache_raw_collect (current_regcache, regno,
+			  (char *) &inferior_registers.r[regno]);
 
-  regcache_collect (ARM_SP_REGNUM, (char *) &inferior_registers.r_sp);
-  regcache_collect (ARM_LR_REGNUM, (char *) &inferior_registers.r_lr);
+  regcache_raw_collect (current_regcache, ARM_SP_REGNUM,
+			(char *) &inferior_registers.r_sp);
+  regcache_raw_collect (current_regcache, ARM_LR_REGNUM,
+			(char *) &inferior_registers.r_lr);
 
   if (arm_apcs_32)
     {
-      regcache_collect (ARM_PC_REGNUM, (char *) &inferior_registers.r_pc);
-      regcache_collect (ARM_PS_REGNUM, (char *) &inferior_registers.r_cpsr);
+      regcache_raw_collect (current_regcache, ARM_PC_REGNUM,
+			    (char *) &inferior_registers.r_pc);
+      regcache_raw_collect (current_regcache, ARM_PS_REGNUM,
+			    (char *) &inferior_registers.r_cpsr);
     }
   else
     {
       unsigned pc_val;
       unsigned psr_val;
 
-      regcache_collect (ARM_PC_REGNUM, (char *) &pc_val);
-      regcache_collect (ARM_PS_REGNUM, (char *) &psr_val);
+      regcache_raw_collect (current_regcache, ARM_PC_REGNUM,
+			    (char *) &pc_val);
+      regcache_raw_collect (current_regcache, ARM_PS_REGNUM,
+			    (char *) &psr_val);
 	  
       pc_val = ADDR_BITS_REMOVE (pc_val);
       psr_val ^= ADDR_BITS_REMOVE (psr_val);
@@ -337,13 +351,13 @@ store_fp_register (int regno)
   switch (regno)
     {
     case ARM_FPS_REGNUM:
-      regcache_collect (ARM_FPS_REGNUM,
-			(char *) &inferior_fp_registers.fpr_fpsr);
+      regcache_raw_collect (current_regcache, ARM_FPS_REGNUM,
+			    (char *) &inferior_fp_registers.fpr_fpsr);
       break;
 
     default:
-      regcache_collect
-	(regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
+      regcache_raw_collect (current_regcache, regno,
+			    (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
       break;
     }
 
@@ -363,10 +377,11 @@ store_fp_regs (void)
 
 
   for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
-    regcache_collect
-      (regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
+    regcache_raw_collect (current_regcache, regno,
+			  (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
 
-  regcache_collect (ARM_FPS_REGNUM, (char *) &inferior_fp_registers.fpr_fpsr);
+  regcache_raw_collect (current_regcache, ARM_FPS_REGNUM,
+			(char *) &inferior_fp_registers.fpr_fpsr);
 
   ret = ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
 		(PTRACE_ARG3_TYPE) &inferior_fp_registers, 0);