2002-11-14 Andrew Cagney <ac131313@redhat.com>

[deliverable/binutils-gdb.git] / gdb / a68v-nat.c

diff --git a/gdb/a68v-nat.c b/gdb/a68v-nat.c
index 3b4c27160ef31b9146201fb983dbdf530bfbcc46..0bfe8e2e608e20a2a9c092cfb4dc2626da99020b 100644 (file)
--- a/gdb/a68v-nat.c
+++ b/gdb/a68v-nat.c
@@ -1,5 +1,6 @@
 /* Host-dependent code for Apollo-68ks for GDB, the GNU debugger.
-   Copyright 1986, 1987, 1989, 1991 Free Software Foundation, Inc.
+   Copyright 1986, 1987, 1989, 1991, 1992, 1993, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -20,6 +21,7 @@
 
 #include "defs.h"
 #include "inferior.h"
+#include "regcache.h"
 
 #ifndef _ISP__M68K
 #define _ISP__M68K 1
@@ -30,8 +32,7 @@
 extern int errno;
 
 void
-fetch_inferior_registers (ignored)
-     int ignored;
+fetch_inferior_registers (int ignored)
 {
   struct ptrace_$data_regs_m68k inferior_registers;
   struct ptrace_$floating_regs_m68k inferior_fp_registers;
@@ -40,31 +41,34 @@ fetch_inferior_registers (ignored)
   ptrace_$init_control (&inferior_control_registers);
   inferior_fp_registers.size = sizeof (inferior_fp_registers);
 
-  registers_fetched ();
+  deprecated_registers_fetched ();
 
-  ptrace (PTRACE_GETREGS, inferior_pid,
+  ptrace (PTRACE_GETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_registers,
          ptrace_$data_set,
          (PTRACE_ARG3_TYPE) & inferior_registers,
          ptrace_$data_set);
 
-  ptrace (PTRACE_GETREGS, inferior_pid,
+  ptrace (PTRACE_GETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_fp_registers,
          ptrace_$floating_set_m68k,
          (PTRACE_ARG3_TYPE) & inferior_fp_registers,
          ptrace_$floating_set_m68k);
 
-  ptrace (PTRACE_GETREGS, inferior_pid,
+  ptrace (PTRACE_GETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_control_registers,
          ptrace_$control_set_m68k,
          (PTRACE_ARG3_TYPE) & inferior_control_registers,
          ptrace_$control_set_m68k);
 
-  bcopy (&inferior_registers, registers, 16 * 4);
-  bcopy (&inferior_fp_registers, &registers[REGISTER_BYTE (FP0_REGNUM)],
+  bcopy (&inferior_registers, &deprecated_registers[0], 16 * 4);
+  bcopy (&inferior_fp_registers,
+        &deprecated_registers[REGISTER_BYTE (FP0_REGNUM)],
         sizeof inferior_fp_registers.regs);
-  *(int *) &registers[REGISTER_BYTE (PS_REGNUM)] = inferior_control_registers.sr;
-  *(int *) &registers[REGISTER_BYTE (PC_REGNUM)] = inferior_control_registers.pc;
+  *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)]
+    = inferior_control_registers.sr;
+  *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)]
+    = inferior_control_registers.pc;
 }
 
 /* Store our register values back into the inferior.
@@ -72,8 +76,7 @@ fetch_inferior_registers (ignored)
    Otherwise, REGNO specifies which register (so we can save time).  */
 
 void
-store_inferior_registers (regno)
-     int regno;
+store_inferior_registers (int regno)
 {
   struct ptrace_$data_regs_m68k inferior_registers;
   struct ptrace_$floating_regs_m68k inferior_fp_registers;
@@ -82,39 +85,42 @@ store_inferior_registers (regno)
   ptrace_$init_control (&inferior_control_registers);
   inferior_fp_registers.size = sizeof (inferior_fp_registers);
 
-  ptrace (PTRACE_GETREGS, inferior_pid,
+  ptrace (PTRACE_GETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_fp_registers,
          ptrace_$floating_set_m68k,
          (PTRACE_ARG3_TYPE) & inferior_fp_registers,
          ptrace_$floating_set_m68k);
 
-  ptrace (PTRACE_GETREGS, inferior_pid,
+  ptrace (PTRACE_GETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_control_registers,
          ptrace_$control_set_m68k,
          (PTRACE_ARG3_TYPE) & inferior_control_registers,
          ptrace_$control_set_m68k);
 
-  bcopy (registers, &inferior_registers, sizeof (inferior_registers));
+  bcopy (&deprecated_registers[0], &inferior_registers,
+        sizeof (inferior_registers));
 
-  bcopy (&registers[REGISTER_BYTE (FP0_REGNUM)], inferior_fp_registers.regs,
-        sizeof inferior_fp_registers.regs);
+  bcopy (&deprecated_registers[REGISTER_BYTE (FP0_REGNUM)],
+        inferior_fp_registers.regs, sizeof inferior_fp_registers.regs);
 
-  inferior_control_registers.sr = *(int *) &registers[REGISTER_BYTE (PS_REGNUM)];
-  inferior_control_registers.pc = *(int *) &registers[REGISTER_BYTE (PC_REGNUM)];
+  inferior_control_registers.sr
+    = *(int *) &deprecated_registers[REGISTER_BYTE (PS_REGNUM)];
+  inferior_control_registers.pc
+    = *(int *) &deprecated_registers[REGISTER_BYTE (PC_REGNUM)];
 
-  ptrace (PTRACE_SETREGS, inferior_pid,
+  ptrace (PTRACE_SETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_registers,
          ptrace_$data_set_m68k,
          (PTRACE_ARG3_TYPE) & inferior_registers,
          ptrace_$data_set_m68k);
 
-  ptrace (PTRACE_SETREGS, inferior_pid,
+  ptrace (PTRACE_SETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_fp_registers,
          ptrace_$floating_set_m68k,
          (PTRACE_ARG3_TYPE) & inferior_fp_registers,
          ptrace_$floating_set_m68k);
 
-  ptrace (PTRACE_SETREGS, inferior_pid,
+  ptrace (PTRACE_SETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_control_registers,
          ptrace_$control_set_m68k,
          (PTRACE_ARG3_TYPE) & inferior_control_registers,