X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Faarch32-linux-nat.c;h=0c04e395216ff16017027219f55553cf0320ea33;hb=8bbf03947dd594262e672c1fbc3462a81c811b6f;hp=3297d6c343a443351b13d5a5bd349928cc81124e;hpb=73e1c03f93f0294b464dc2b67de1f9aaae84838d;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/aarch32-linux-nat.c b/gdb/aarch32-linux-nat.c
index 3297d6c343..0c04e39521 100644
--- a/gdb/aarch32-linux-nat.c
+++ b/gdb/aarch32-linux-nat.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1999-2018 Free Software Foundation, Inc.
+/* Copyright (C) 1999-2020 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -62,7 +62,7 @@ aarch32_gp_regcache_collect (const struct regcache *regcache, uint32_t *regs,
   for (regno = ARM_A1_REGNUM; regno <= ARM_PC_REGNUM; regno++)
     {
       if (REG_VALID == regcache->get_register_status (regno))
-	regcache_raw_collect (regcache, regno, &regs[regno]);
+	regcache->raw_collect (regno, &regs[regno]);
     }
 
   if (arm_apcs_32
@@ -70,8 +70,7 @@ aarch32_gp_regcache_collect (const struct regcache *regcache, uint32_t *regs,
     {
       uint32_t cpsr = regs[ARM_CPSR_GREGNUM];
 
-      regcache_raw_collect (regcache, ARM_PS_REGNUM,
-			    &regs[ARM_CPSR_GREGNUM]);
+      regcache->raw_collect (ARM_PS_REGNUM, &regs[ARM_CPSR_GREGNUM]);
       /* Keep reserved bits bit 20 to bit 23.  */
       regs[ARM_CPSR_GREGNUM] = ((regs[ARM_CPSR_GREGNUM] & 0xff0fffff)
 				| (cpsr & 0x00f00000));
@@ -103,7 +102,7 @@ aarch32_vfp_regcache_collect (const struct regcache *regcache, gdb_byte *regs,
   int regno;
 
   for (regno = 0; regno < vfp_register_count; regno++)
-    regcache_raw_collect (regcache, regno + ARM_D0_REGNUM, regs + regno * 8);
+    regcache->raw_collect (regno + ARM_D0_REGNUM, regs + regno * 8);
 
-  regcache_raw_collect (regcache, ARM_FPSCR_REGNUM, regs + 32 * 8);
+  regcache->raw_collect (ARM_FPSCR_REGNUM, regs + 32 * 8);
 }