Remove regcache_raw_collect

[deliverable/binutils-gdb.git] / gdb / arm-nbsd-nat.c

diff --git a/gdb/arm-nbsd-nat.c b/gdb/arm-nbsd-nat.c
index a641ccbb3c066fbdb65fa58c74473eb7001e47ae..2a298eea0a24fcdebc4c1b79512a5be11052819d 100644 (file)
--- a/gdb/arm-nbsd-nat.c
+++ b/gdb/arm-nbsd-nat.c
@@ -228,25 +228,22 @@ store_register (const struct regcache *regcache, int regno)
   switch (regno)
     {
     case ARM_SP_REGNUM:
-      regcache_raw_collect (regcache, ARM_SP_REGNUM,
-                           (char *) &inferior_registers.r_sp);
+      regcache->raw_collect (ARM_SP_REGNUM, (char *) &inferior_registers.r_sp);
       break;
 
     case ARM_LR_REGNUM:
-      regcache_raw_collect (regcache, ARM_LR_REGNUM,
-                           (char *) &inferior_registers.r_lr);
+      regcache->raw_collect (ARM_LR_REGNUM, (char *) &inferior_registers.r_lr);
       break;
 
     case ARM_PC_REGNUM:
       if (arm_apcs_32)
-       regcache_raw_collect (regcache, ARM_PC_REGNUM,
-                             (char *) &inferior_registers.r_pc);
+       regcache->raw_collect (ARM_PC_REGNUM,
+                              (char *) &inferior_registers.r_pc);
       else
        {
          unsigned pc_val;
 
-         regcache_raw_collect (regcache, ARM_PC_REGNUM,
-                               (char *) &pc_val);
+         regcache->raw_collect (ARM_PC_REGNUM, (char *) &pc_val);
          
          pc_val = gdbarch_addr_bits_remove (gdbarch, pc_val);
          inferior_registers.r_pc ^= gdbarch_addr_bits_remove
@@ -257,14 +254,13 @@ store_register (const struct regcache *regcache, int regno)
 
     case ARM_PS_REGNUM:
       if (arm_apcs_32)
-       regcache_raw_collect (regcache, ARM_PS_REGNUM,
-                             (char *) &inferior_registers.r_cpsr);
+       regcache->raw_collect (ARM_PS_REGNUM,
+                              (char *) &inferior_registers.r_cpsr);
       else
        {
          unsigned psr_val;
 
-         regcache_raw_collect (regcache, ARM_PS_REGNUM,
-                               (char *) &psr_val);
+         regcache->raw_collect (ARM_PS_REGNUM, (char *) &psr_val);
 
          psr_val ^= gdbarch_addr_bits_remove (gdbarch, psr_val);
          inferior_registers.r_pc = gdbarch_addr_bits_remove
@@ -274,8 +270,7 @@ store_register (const struct regcache *regcache, int regno)
       break;
 
     default:
-      regcache_raw_collect (regcache, regno,
-                           (char *) &inferior_registers.r[regno]);
+      regcache->raw_collect (regno, (char *) &inferior_registers.r[regno]);
       break;
     }
 
@@ -296,30 +291,24 @@ store_regs (const struct regcache *regcache)
 
 
   for (regno = ARM_A1_REGNUM; regno < ARM_SP_REGNUM; regno++)
-    regcache_raw_collect (regcache, regno,
-                         (char *) &inferior_registers.r[regno]);
+    regcache->raw_collect (regno, (char *) &inferior_registers.r[regno]);
 
-  regcache_raw_collect (regcache, ARM_SP_REGNUM,
-                       (char *) &inferior_registers.r_sp);
-  regcache_raw_collect (regcache, ARM_LR_REGNUM,
-                       (char *) &inferior_registers.r_lr);
+  regcache->raw_collect (ARM_SP_REGNUM, (char *) &inferior_registers.r_sp);
+  regcache->raw_collect (ARM_LR_REGNUM, (char *) &inferior_registers.r_lr);
 
   if (arm_apcs_32)
     {
-      regcache_raw_collect (regcache, ARM_PC_REGNUM,
-                           (char *) &inferior_registers.r_pc);
-      regcache_raw_collect (regcache, ARM_PS_REGNUM,
-                           (char *) &inferior_registers.r_cpsr);
+      regcache->raw_collect (ARM_PC_REGNUM, (char *) &inferior_registers.r_pc);
+      regcache->raw_collect (ARM_PS_REGNUM,
+                            (char *) &inferior_registers.r_cpsr);
     }
   else
     {
       unsigned pc_val;
       unsigned psr_val;
 
-      regcache_raw_collect (regcache, ARM_PC_REGNUM,
-                           (char *) &pc_val);
-      regcache_raw_collect (regcache, ARM_PS_REGNUM,
-                           (char *) &psr_val);
+      regcache->raw_collect (ARM_PC_REGNUM, (char *) &pc_val);
+      regcache->raw_collect (ARM_PS_REGNUM, (char *) &psr_val);
          
       pc_val = gdbarch_addr_bits_remove (gdbarch, pc_val);
       psr_val ^= gdbarch_addr_bits_remove (gdbarch, psr_val);
@@ -352,13 +341,13 @@ store_fp_register (const struct regcache *regcache, int regno)
   switch (regno)
     {
     case ARM_FPS_REGNUM:
-      regcache_raw_collect (regcache, ARM_FPS_REGNUM,
-                           (char *) &inferior_fp_registers.fpr_fpsr);
+      regcache->raw_collect (ARM_FPS_REGNUM,
+                            (char *) &inferior_fp_registers.fpr_fpsr);
       break;
 
     default:
-      regcache_raw_collect (regcache, regno,
-                           (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
+      regcache->raw_collect
+       (regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
       break;
     }
 
@@ -378,11 +367,11 @@ store_fp_regs (const struct regcache *regcache)
 
 
   for (regno = ARM_F0_REGNUM; regno <= ARM_F7_REGNUM; regno++)
-    regcache_raw_collect (regcache, regno,
-                         (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
+    regcache->raw_collect
+      (regno, (char *) &inferior_fp_registers.fpr[regno - ARM_F0_REGNUM]);
 
-  regcache_raw_collect (regcache, ARM_FPS_REGNUM,
-                       (char *) &inferior_fp_registers.fpr_fpsr);
+  regcache->raw_collect (ARM_FPS_REGNUM,
+                        (char *) &inferior_fp_registers.fpr_fpsr);
 
   ret = ptrace (PT_SETFPREGS, ptid_get_pid (regcache->ptid ()),
                (PTRACE_TYPE_ARG3) &inferior_fp_registers, 0);