Add self to write-after-approval list.

[deliverable/binutils-gdb.git] / gdb / infptrace.c

diff --git a/gdb/infptrace.c b/gdb/infptrace.c
index b189f5077887f0270c8d2db85316ee27f1517b68..e41ca030d5ccaba388d6ddd03a5d881b4b659ba8 100644 (file)
--- a/gdb/infptrace.c
+++ b/gdb/infptrace.c
@@ -1,5 +1,6 @@
 /* Low level Unix child interface to ptrace, for GDB when running under Unix.
-   Copyright 1988, 89, 90, 91, 92, 93, 94, 95, 96, 1998 
+   Copyright 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
+   1999, 2000, 2001
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -24,6 +25,7 @@
 #include "inferior.h"
 #include "target.h"
 #include "gdb_string.h"
+#include "regcache.h"
 
 #include "gdb_wait.h"
 
@@ -271,8 +273,8 @@ child_resume (int pid, int step, enum target_signal signal)
 
   if (step)
     {
-      if (SOFTWARE_SINGLE_STEP_P)
-       abort ();               /* Make sure this doesn't happen. */
+      if (SOFTWARE_SINGLE_STEP_P ())
+       internal_error (__FILE__, __LINE__, "failed internal consistency check");               /* Make sure this doesn't happen. */
       else
        ptrace (PT_STEP, pid, (PTRACE_ARG3_TYPE) 1,
                target_signal_to_host (signal));
@@ -340,7 +342,8 @@ _initialize_kernel_u_addr (void)
   if (nlist ("/vmunix", names) == 0)
     kernel_u_addr = names[0].n_value;
   else
-    internal_error ("Unable to get kernel u area address.");
+    internal_error (__FILE__, __LINE__,
+                   "Unable to get kernel u area address.");
 #endif /* KERNEL_U_ADDR_BSD.  */
 }
 
@@ -420,7 +423,7 @@ fetch_inferior_registers (int regno)
     }
   else
     {
-      for (regno = 0; regno < ARCH_NUM_REGS; regno++)
+      for (regno = 0; regno < NUM_REGS; regno++)
        {
          fetch_register (regno);
        }
@@ -484,7 +487,7 @@ store_inferior_registers (int regno)
     }
   else
     {
-      for (regno = 0; regno < ARCH_NUM_REGS; regno++)
+      for (regno = 0; regno < NUM_REGS; regno++)
        {
          store_register (regno);
        }
@@ -502,7 +505,7 @@ store_inferior_registers (int regno)
 
 /* Copy LEN bytes to or from inferior's memory starting at MEMADDR
    to debugger memory starting at MYADDR.   Copy to inferior if
-   WRITE is nonzero.
+   WRITE is nonzero.  TARGET is ignored.
 
    Returns the length copied, which is either the LEN argument or zero.
    This xfer function does not do partial moves, since child_ops
@@ -510,12 +513,9 @@ store_inferior_registers (int regno)
    anyway.  */
 
 int
-child_xfer_memory (memaddr, myaddr, len, write, target)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-     int write;
-     struct target_ops *target;        /* ignored */
+child_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int write,
+                  struct mem_attrib *attrib ATTRIBUTE_UNUSED,
+                  struct target_ops *target)
 {
   register int i;
   /* Round starting address down to longword boundary.  */