2003-04-08 Elena Zannoni <ezannoni@redhat.com>

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

diff --git a/gdb/ns32knbsd-nat.c b/gdb/ns32knbsd-nat.c
index de2299c37e6d366562fec4b347b18e564b5886fe..97971d2512349abfe9403825668838800ccc8528 100644 (file)
--- a/gdb/ns32knbsd-nat.c
+++ b/gdb/ns32knbsd-nat.c
@@ -1,5 +1,6 @@
 /* Functions specific to running gdb native on an ns32k running NetBSD
-   Copyright 1989, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
+   Copyright 1989, 1992, 1993, 1994, 1996, 1998, 1999, 2000, 2001
+   Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -28,23 +29,23 @@
 #include "inferior.h"
 #include "target.h"
 #include "gdbcore.h"
+#include "regcache.h"
 
 #define RF(dst, src) \
-       memcpy(&registers[REGISTER_BYTE(dst)], &src, sizeof(src))
+       memcpy(&deprecated_registers[REGISTER_BYTE(dst)], &src, sizeof(src))
 
 #define RS(src, dst) \
-       memcpy(&dst, &registers[REGISTER_BYTE(src)], sizeof(dst))
+       memcpy(&dst, &deprecated_registers[REGISTER_BYTE(src)], sizeof(dst))
 
 void
-fetch_inferior_registers (regno)
-     int regno;
+fetch_inferior_registers (int regno)
 {
   struct reg inferior_registers;
   struct fpreg inferior_fpregisters;
 
-  ptrace (PT_GETREGS, inferior_pid,
+  ptrace (PT_GETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_registers, 0);
-  ptrace (PT_GETFPREGS, inferior_pid,
+  ptrace (PT_GETFPREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_fpregisters, 0);
 
   RF (R0_REGNUM + 0, inferior_registers.r_r0);
@@ -70,12 +71,11 @@ fetch_inferior_registers (regno)
   RF (LP0_REGNUM + 3, inferior_fpregisters.r_freg[3]);
   RF (LP0_REGNUM + 5, inferior_fpregisters.r_freg[5]);
   RF (LP0_REGNUM + 7, inferior_fpregisters.r_freg[7]);
-  registers_fetched ();
+  deprecated_registers_fetched ();
 }
 
 void
-store_inferior_registers (regno)
-     int regno;
+store_inferior_registers (int regno)
 {
   struct reg inferior_registers;
   struct fpreg inferior_fpregisters;
@@ -104,9 +104,9 @@ store_inferior_registers (regno)
   RS (LP0_REGNUM + 5, inferior_fpregisters.r_freg[5]);
   RS (LP0_REGNUM + 7, inferior_fpregisters.r_freg[7]);
 
-  ptrace (PT_SETREGS, inferior_pid,
+  ptrace (PT_SETREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_registers, 0);
-  ptrace (PT_SETFPREGS, inferior_pid,
+  ptrace (PT_SETFPREGS, PIDGET (inferior_ptid),
          (PTRACE_ARG3_TYPE) & inferior_fpregisters, 0);
 }
 \f
@@ -118,13 +118,10 @@ struct coreregs
   struct fpreg freg;
 };
 
-/* Get registers from a core file. */
+/* Get registers from a core file.  REG_ADDR is unused.  */
 static void
-fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
-     char *core_reg_sect;
-     unsigned core_reg_size;
-     int which;
-     unsigned int reg_addr;    /* Unused in this version */
+fetch_core_registers (char *core_reg_sect, unsigned core_reg_size, int which,
+                     unsigned int reg_addr)
 {
   struct coreregs *core_reg;
 
@@ -167,7 +164,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
   RF (LP0_REGNUM + 3, core_reg->freg.r_freg[3]);
   RF (LP0_REGNUM + 5, core_reg->freg.r_freg[5]);
   RF (LP0_REGNUM + 7, core_reg->freg.r_freg[7]);
-  registers_fetched ();
+  deprecated_registers_fetched ();
 }
 
 /* Register that we are able to handle ns32knbsd core file formats.
@@ -183,7 +180,7 @@ static struct core_fns nat_core_fns =
 };
 
 void
-_initialize_ns32knbsd_nat ()
+_initialize_ns32knbsd_nat (void)
 {
   add_core_fns (&nat_core_fns);
 }
@@ -200,8 +197,7 @@ _initialize_ns32knbsd_nat ()
  * Called by kcore-nbsd.c:get_kcore_registers().
  */
 void
-fetch_kcore_registers (pcb)
-     struct pcb *pcb;
+fetch_kcore_registers (struct pcb *pcb)
 {
   struct switchframe sf;
   struct reg intreg;
@@ -241,12 +237,12 @@ fetch_kcore_registers (pcb)
   RF (LP0_REGNUM + 3, pcb->pcb_freg[3]);
   RF (LP0_REGNUM + 5, pcb->pcb_freg[5]);
   RF (LP0_REGNUM + 7, pcb->pcb_freg[7]);
-  registers_fetched ();
+  deprecated_registers_fetched ();
 }
 #endif /* FETCH_KCORE_REGISTERS */
 
 void
-clear_regs ()
+clear_regs (void)
 {
   double zero = 0.0;
   int null = 0;
@@ -283,8 +279,7 @@ clear_regs ()
    Can return -1, meaning no way to tell. */
 
 int
-frame_num_args (fi)
-     struct frame_info *fi;
+frame_num_args (struct frame_info *fi)
 {
   CORE_ADDR enter_addr;
   CORE_ADDR argp;
@@ -300,7 +295,7 @@ frame_num_args (fi)
   enter_addr = ns32k_get_enter_addr (fi->pc);
   if (enter_addr = 0)
     return (-1);
-  argp = enter_addr == 1 ? SAVED_PC_AFTER_CALL (fi) : FRAME_SAVED_PC (fi);
+  argp = enter_addr == 1 ? SAVED_PC_AFTER_CALL (fi) : DEPRECATED_FRAME_SAVED_PC (fi);
   for (i = 0; i < 16; i++)
     {
       /*