CVS commit: src/external/gpl3/gdb/dist/gdb

[Christos Zoulas]

Module Name:    src
Committed By:   christos
Date:           Wed May 29 22:10:38 UTC 2019

Modified Files:
        src/external/gpl3/gdb/dist/gdb: aarch64-nbsd-nat.c arm-nbsd-nat.c

Log Message:
Some more mechanical c++ificiation.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c:1.2 src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c:1.3
--- src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c:1.2	Thu Dec 27 04:55:27 2018
+++ src/external/gpl3/gdb/dist/gdb/aarch64-nbsd-nat.c	Wed May 29 18:10:38 2019
@@ -61,7 +61,7 @@ aarch64_nbsd_fetch_inferior_registers (s
   pid_t pid = ptid_get_pid (ptid);
   int tid = ptid_get_lwp (ptid);
 
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch *gdbarch = regcache->arch ();
   if (regnum == -1 || getregs_supplies (gdbarch, regnum))
     {
       struct reg regs;
@@ -96,7 +96,7 @@ aarch64_nbsd_store_inferior_registers (s
   pid_t pid = ptid_get_pid (ptid);
   int tid = ptid_get_lwp (ptid);
 
-  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch *gdbarch = regcache->arch ();
   if (regnum == -1 || getregs_supplies (gdbarch, regnum))
     {
       struct reg regs;
@@ -159,13 +159,13 @@ aarch64_nbsd_supply_pcb (struct regcache
 
   for (i = 0; i <= 30; i++)
     {
-      regcache_raw_supply (regcache, AARCH64_X0_REGNUM + i, &tf.tf_reg[i]);
+      regcache->raw_supply (AARCH64_X0_REGNUM + i, &tf.tf_reg[i]);
     }
-  regcache_raw_supply (regcache, AARCH64_SP_REGNUM, &tf.tf_sp);
-  regcache_raw_supply (regcache, AARCH64_PC_REGNUM, &tf.tf_pc);
+  regcache->raw_supply (AARCH64_SP_REGNUM, &tf.tf_sp);
+  regcache->raw_supply (AARCH64_PC_REGNUM, &tf.tf_pc);
 
-  regcache_raw_supply (regcache, AARCH64_FPCR_REGNUM, &pcb->pcb_fpregs.fpcr);
-  regcache_raw_supply (regcache, AARCH64_FPSR_REGNUM, &pcb->pcb_fpregs.fpsr);
+  regcache->raw_supply (AARCH64_FPCR_REGNUM, &pcb->pcb_fpregs.fpcr);
+  regcache->raw_supply (AARCH64_FPSR_REGNUM, &pcb->pcb_fpregs.fpsr);
 
   return 1;
 }

Index: src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.8 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.9
--- src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.8	Tue May 28 11:30:39 2019
+++ src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c	Wed May 29 18:10:38 2019
@@ -93,17 +93,17 @@ armnbsd_supply_pcb (struct regcache *reg
 
   read_memory (pcb->pcb_sp, (gdb_byte *) &sf, sizeof sf);
 
-  regcache_raw_supply (regcache, ARM_PC_REGNUM, &sf.sf_pc);
-  regcache_raw_supply (regcache, ARM_SP_REGNUM, &pcb->pcb_sp);
-  regcache_raw_supply (regcache, 12, &pcb->pcb_r12);
-  regcache_raw_supply (regcache, 11, &pcb->pcb_r11);
-  regcache_raw_supply (regcache, 10, &pcb->pcb_r10);
-  regcache_raw_supply (regcache, 9, &pcb->pcb_r9);
-  regcache_raw_supply (regcache, 8, &pcb->pcb_r8);
-  regcache_raw_supply (regcache, 7, &sf.sf_r7);
-  regcache_raw_supply (regcache, 6, &sf.sf_r6);
-  regcache_raw_supply (regcache, 5, &sf.sf_r5);
-  regcache_raw_supply (regcache, 4, &sf.sf_r4);
+  regcache->raw_supply (ARM_PC_REGNUM, &sf.sf_pc);
+  regcache->raw_supply (ARM_SP_REGNUM, &pcb->pcb_sp);
+  regcache->raw_supply (12, &pcb->pcb_r12);
+  regcache->raw_supply (11, &pcb->pcb_r11);
+  regcache->raw_supply (10, &pcb->pcb_r10);
+  regcache->raw_supply (9, &pcb->pcb_r9);
+  regcache->raw_supply (8, &pcb->pcb_r8);
+  regcache->raw_supply (7, &sf.sf_r7);
+  regcache->raw_supply (6, &sf.sf_r6);
+  regcache->raw_supply (5, &sf.sf_r5);
+  regcache->raw_supply (4, &sf.sf_r4);
 
   return 1;
 }