X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Finfptrace.c;h=e4637ee28f11a39f4700f93930259fc4854911fa;hb=e1e9e218c189882084a89fdee655a0a523efbaf8;hp=52ff7a3eadefef360c11bdaec2f74a0e9d951c32;hpb=a14ed312fd86dd2c862847230931451da2e49942;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/infptrace.c b/gdb/infptrace.c
index 52ff7a3ead..e4637ee28f 100644
--- a/gdb/infptrace.c
+++ b/gdb/infptrace.c
@@ -1,5 +1,5 @@
 /* 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, 89, 90, 91, 92, 93, 94, 95, 96, 1998, 2001 
    Free Software Foundation, Inc.
 
    This file is part of GDB.
@@ -132,10 +132,7 @@ void _initialize_infptrace (void);
    It exists so that all calls to ptrace are isolated in this 
    machine-dependent file. */
 int
-call_ptrace (request, pid, addr, data)
-     int request, pid;
-     PTRACE_ARG3_TYPE addr;
-     int data;
+call_ptrace (int request, int pid, PTRACE_ARG3_TYPE addr, int data)
 {
   int pt_status = 0;
 
@@ -216,9 +213,7 @@ call_ptrace (request, pid, addr, data)
    hook before returning.  */
 
 int
-ptrace_wait (pid, status)
-     int pid;
-     int *status;
+ptrace_wait (int pid, int *status)
 {
   int wstate;
 
@@ -228,7 +223,7 @@ ptrace_wait (pid, status)
 }
 
 void
-kill_inferior ()
+kill_inferior (void)
 {
   int status;
 
@@ -255,10 +250,7 @@ kill_inferior ()
    If SIGNAL is nonzero, give it that signal.  */
 
 void
-child_resume (pid, step, signal)
-     int pid;
-     int step;
-     enum target_signal signal;
+child_resume (int pid, int step, enum target_signal signal)
 {
   errno = 0;
 
@@ -280,7 +272,7 @@ child_resume (pid, step, signal)
   if (step)
     {
       if (SOFTWARE_SINGLE_STEP_P)
-	abort ();		/* Make sure this doesn't happen. */
+	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));
@@ -300,8 +292,7 @@ child_resume (pid, step, signal)
 #ifdef ATTACH_DETACH
 /* Start debugging the process whose number is PID.  */
 int
-attach (pid)
-     int pid;
+attach (int pid)
 {
   errno = 0;
   ptrace (PT_ATTACH, pid, (PTRACE_ARG3_TYPE) 0, 0);
@@ -316,8 +307,7 @@ attach (pid)
    SIGNAL = 0 means just continue it.  */
 
 void
-detach (signal)
-     int signal;
+detach (int signal)
 {
   errno = 0;
   ptrace (PT_DETACH, inferior_pid, (PTRACE_ARG3_TYPE) 1, signal);
@@ -340,7 +330,7 @@ CORE_ADDR kernel_u_addr;
 #endif /* KERNEL_U_ADDR_BSD.  */
 
 void
-_initialize_kernel_u_addr ()
+_initialize_kernel_u_addr (void)
 {
 #if defined (KERNEL_U_ADDR_BSD) && !defined (FETCH_INFERIOR_REGISTERS)
   struct nlist names[2];
@@ -350,7 +340,8 @@ _initialize_kernel_u_addr ()
   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.  */
 }
 
@@ -376,8 +367,7 @@ _initialize_kernel_u_addr ()
 /* Fetch one register.  */
 
 static void
-fetch_register (regno)
-     int regno;
+fetch_register (int regno)
 {
   /* This isn't really an address.  But ptrace thinks of it as one.  */
   CORE_ADDR regaddr;
@@ -423,8 +413,7 @@ fetch_register (regno)
    Otherwise, REGNO specifies which register (so we can save time). */
 
 void
-fetch_inferior_registers (regno)
-     int regno;
+fetch_inferior_registers (int regno)
 {
   if (regno >= 0)
     {
@@ -447,8 +436,7 @@ fetch_inferior_registers (regno)
 /* Store one register. */
 
 static void
-store_register (regno)
-     int regno;
+store_register (int regno)
 {
   /* This isn't really an address.  But ptrace thinks of it as one.  */
   CORE_ADDR regaddr;
@@ -489,8 +477,7 @@ store_register (regno)
    Otherwise, REGNO specifies which register (so we can save time).  */
 
 void
-store_inferior_registers (regno)
-     int regno;
+store_inferior_registers (int regno)
 {
   if (regno >= 0)
     {
@@ -516,7 +503,7 @@ store_inferior_registers (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
@@ -524,12 +511,9 @@ store_inferior_registers (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.  */
@@ -613,9 +597,7 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
 
 
 static void
-udot_info (dummy1, dummy2)
-     char *dummy1;
-     int dummy2;
+udot_info (char *dummy1, int dummy2)
 {
 #if defined (KERNEL_U_SIZE)
   int udot_off;			/* Offset into user struct */
@@ -665,7 +647,7 @@ udot_info (dummy1, dummy2)
 
 
 void
-_initialize_infptrace ()
+_initialize_infptrace (void)
 {
 #if !defined (CHILD_XFER_MEMORY)
   add_info ("udot", udot_info,