*** empty log message ***

[deliverable/binutils-gdb.git] / gdb / remote-vx68.c

diff --git a/gdb/remote-vx68.c b/gdb/remote-vx68.c
index 8dd97f2a1651b1a6ca0f5ed826e3d843620d954e..e7f138d1d355c6544062962d4844870c1ba4a910 100644 (file)
--- a/gdb/remote-vx68.c
+++ b/gdb/remote-vx68.c
@@ -30,7 +30,8 @@
 #include "gdbcore.h"
 #include "command.h"
 #include "symtab.h"
-#include "symfile.h"           /* for struct complaint */
+#include "symfile.h"
+#include "regcache.h"
 
 #include "gdb_string.h"
 #include <errno.h>
@@ -84,10 +85,13 @@ vx_read_register (int regno)
 
   net_read_registers (mc68k_greg_packet, MC68K_GREG_PLEN, PTRACE_GETREGS);
 
-  bcopy (&mc68k_greg_packet[MC68K_R_D0], registers, 16 * MC68K_GREG_SIZE);
-  bcopy (&mc68k_greg_packet[MC68K_R_SR], &registers[REGISTER_BYTE (PS_REGNUM)],
+  bcopy (&mc68k_greg_packet[MC68K_R_D0], deprecated_registers,
+        16 * MC68K_GREG_SIZE);
+  bcopy (&mc68k_greg_packet[MC68K_R_SR],
+        &deprecated_registers[REGISTER_BYTE (PS_REGNUM)],
         MC68K_GREG_SIZE);
-  bcopy (&mc68k_greg_packet[MC68K_R_PC], &registers[REGISTER_BYTE (PC_REGNUM)],
+  bcopy (&mc68k_greg_packet[MC68K_R_PC],
+        &deprecated_registers[REGISTER_BYTE (PC_REGNUM)],
         MC68K_GREG_SIZE);
 
   /* Get floating-point registers, if the target system has them.
@@ -99,23 +103,23 @@ vx_read_register (int regno)
                          PTRACE_GETFPREGS);
 
       bcopy (&mc68k_fpreg_packet[MC68K_R_FP0],
-            &registers[REGISTER_BYTE (FP0_REGNUM)],
+            &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)],
             MC68K_FPREG_SIZE * 8);
       bcopy (&mc68k_fpreg_packet[MC68K_R_FPCR],
-            &registers[REGISTER_BYTE (FPC_REGNUM)],
+            &deprecated_registers[REGISTER_BYTE (FPC_REGNUM)],
             MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8));
     }
   else
     {
-      bzero (&registers[REGISTER_BYTE (FP0_REGNUM)],
+      bzero (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)],
             MC68K_FPREG_SIZE * 8);
-      bzero (&registers[REGISTER_BYTE (FPC_REGNUM)],
+      bzero (&deprecated_registers[REGISTER_BYTE (FPC_REGNUM)],
             MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8));
     }
 
   /* Mark the register cache valid.  */
 
-  registers_fetched ();
+  deprecated_registers_fetched ();
 }
 
 /* Store a register or registers into the VxWorks target.
@@ -130,10 +134,11 @@ vx_write_register (int regno)
 
   /* Store general-purpose registers.  */
 
-  bcopy (registers, &mc68k_greg_packet[MC68K_R_D0], 16 * MC68K_GREG_SIZE);
-  bcopy (&registers[REGISTER_BYTE (PS_REGNUM)],
+  bcopy (deprecated_registers, &mc68k_greg_packet[MC68K_R_D0],
+        16 * MC68K_GREG_SIZE);
+  bcopy (&deprecated_registers[REGISTER_BYTE (PS_REGNUM)],
         &mc68k_greg_packet[MC68K_R_SR], MC68K_GREG_SIZE);
-  bcopy (&registers[REGISTER_BYTE (PC_REGNUM)],
+  bcopy (&deprecated_registers[REGISTER_BYTE (PC_REGNUM)],
         &mc68k_greg_packet[MC68K_R_PC], MC68K_GREG_SIZE);
 
   net_write_registers (mc68k_greg_packet, MC68K_GREG_PLEN, PTRACE_SETREGS);
@@ -142,10 +147,10 @@ vx_write_register (int regno)
 
   if (target_has_fp)
     {
-      bcopy (&registers[REGISTER_BYTE (FP0_REGNUM)],
+      bcopy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)],
             &mc68k_fpreg_packet[MC68K_R_FP0],
             MC68K_FPREG_SIZE * 8);
-      bcopy (&registers[REGISTER_BYTE (FPC_REGNUM)],
+      bcopy (&deprecated_registers[REGISTER_BYTE (FPC_REGNUM)],
             &mc68k_fpreg_packet[MC68K_R_FPCR],
             MC68K_FPREG_PLEN - (MC68K_FPREG_SIZE * 8));