Replace <sys/dir.h> (and <dirent.h>) with "gdb_dirent.h".

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

diff --git a/gdb/infptrace.c b/gdb/infptrace.c
index 1db7223ea3b5c891eb1e5a3d9e57f92df99c8cc9..0a74b5d63a4892692930dbfaffe06679688f0eb5 100644 (file)
--- a/gdb/infptrace.c
+++ b/gdb/infptrace.c
@@ -2,28 +2,31 @@
    Copyright 1988, 89, 90, 91, 92, 93, 94, 95, 96, 1998 
    Free Software Foundation, Inc.
 
    Copyright 1988, 89, 90, 91, 92, 93, 94, 95, 96, 1998 
    Free Software Foundation, Inc.
 

-This file is part of GDB.
+   This file is part of GDB.

 
 

-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.

 
 

-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.

 
 

-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */

 
 #include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "target.h"
 #include "gdb_string.h"
 
 #include "defs.h"
 #include "frame.h"
 #include "inferior.h"
 #include "target.h"
 #include "gdb_string.h"

-#include "wait.h"
+
+#include "gdb_wait.h"
+

 #include "command.h"
 
 #ifdef USG
 #include "command.h"
 
 #ifdef USG


@@ -31,16 +34,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #endif
 
 #include <sys/param.h>
 #endif
 
 #include <sys/param.h>

-#include <sys/dir.h>
+#include "gdb_dirent.h"

 #include <signal.h>
 #include <sys/ioctl.h>
 
 #ifdef HAVE_PTRACE_H
 #include <signal.h>
 #include <sys/ioctl.h>
 
 #ifdef HAVE_PTRACE_H

-# include <ptrace.h>
+#include <ptrace.h>

 #else
 #else

-# ifdef HAVE_SYS_PTRACE_H
-#  include <sys/ptrace.h>
-# endif
+#ifdef HAVE_SYS_PTRACE_H
+#include <sys/ptrace.h>
+#endif

 #endif
 
 #if !defined (PT_READ_I)
 #endif
 
 #if !defined (PT_READ_I)


@@ -105,10 +108,26 @@ static void fetch_register PARAMS ((int));
 static void store_register PARAMS ((int));
 #endif
 
 static void store_register PARAMS ((int));
 #endif
 

+/*
+ * Some systems (Linux) may have threads implemented as pseudo-processes, 
+ * in which case we may be tracing more than one process at a time.
+ * In that case, inferior_pid will contain the main process ID and the 
+ * individual thread (process) id mashed together.  These macros are 
+ * used to separate them out.  The definitions may be overridden in tm.h
+ *
+ * NOTE: default definitions here are for systems with no threads.
+ * Useful definitions MUST be provided in tm.h
+ */
+
+#if !defined (PIDGET)  /* Default definition for PIDGET/TIDGET.  */
+#define PIDGET(PID)    PID
+#define TIDGET(PID)    0
+#endif
+

 void _initialize_kernel_u_addr PARAMS ((void));
 void _initialize_infptrace PARAMS ((void));
 void _initialize_kernel_u_addr PARAMS ((void));
 void _initialize_infptrace PARAMS ((void));

-

 \f
 \f

+

 /* This function simply calls ptrace with the given arguments.  
    It exists so that all calls to ptrace are isolated in this 
    machine-dependent file. */
 /* This function simply calls ptrace with the given arguments.  
    It exists so that all calls to ptrace are isolated in this 
    machine-dependent file. */


@@ -128,25 +147,26 @@ call_ptrace (request, pid, addr, data)
 #endif
 #if defined(PT_SETTRC)
   /* If the parent can be told to attach to us, try to do it.  */
 #endif
 #if defined(PT_SETTRC)
   /* If the parent can be told to attach to us, try to do it.  */

-  if (request == PT_SETTRC) {
-    errno = 0;
-    pt_status = ptrace (PT_SETTRC, pid, addr, data
-#if defined (FIVE_ARG_PTRACE)
-                       /* Deal with HPUX 8.0 braindamage.  We never use the
-                          calls which require the fifth argument.  */
-                       , 0
+  if (request == PT_SETTRC)
+    {
+      errno = 0;
+#if !defined (FIVE_ARG_PTRACE)
+      pt_status = ptrace (PT_SETTRC, pid, addr, data);
+#else
+      /* Deal with HPUX 8.0 braindamage.  We never use the
+         calls which require the fifth argument.  */
+      pt_status = ptrace (PT_SETTRC, pid, addr, data, 0);

 #endif
 #endif

-                       );
-
-     if (errno) perror_with_name ("ptrace");
+      if (errno)
+       perror_with_name ("ptrace");

 #if 0
 #if 0

-     printf (" = %d\n", pt_status);
+      printf (" = %d\n", pt_status);

 #endif
 #endif

-     if (pt_status < 0)
-         return pt_status;
-     else
-         return parent_attach_all (pid, addr, data);
-  }
+      if (pt_status < 0)
+       return pt_status;
+      else
+       return parent_attach_all (pid, addr, data);
+    }

 #endif
 
 #if defined(PT_CONTIN1)
 #endif
 
 #if defined(PT_CONTIN1)


@@ -167,13 +187,14 @@ call_ptrace (request, pid, addr, data)
   saved_errno = errno;
   errno = 0;
 #endif
   saved_errno = errno;
   errno = 0;
 #endif

-  pt_status = ptrace (request, pid, addr, data
-#if defined (FIVE_ARG_PTRACE)
-                /* Deal with HPUX 8.0 braindamage.  We never use the
-                   calls which require the fifth argument.  */
-                , 0
+#if !defined (FIVE_ARG_PTRACE)
+  pt_status = ptrace (request, pid, addr, data);
+#else
+  /* Deal with HPUX 8.0 braindamage.  We never use the
+     calls which require the fifth argument.  */
+  pt_status = ptrace (request, pid, addr, data, 0);

 #endif
 #endif

-                );
+

 #if 0
   if (errno)
     printf (" [errno = %d]", errno);
 #if 0
   if (errno)
     printf (" [errno = %d]", errno);


@@ -196,8 +217,8 @@ call_ptrace (request, pid, addr, data)
 
 int
 ptrace_wait (pid, status)
 
 int
 ptrace_wait (pid, status)

-    int pid;
-    int *status;
+     int pid;
+     int *status;

 {
   int wstate;
 
 {
   int wstate;
 


@@ -259,9 +280,9 @@ child_resume (pid, step, signal)
   if (step)
     {
       if (SOFTWARE_SINGLE_STEP_P)
   if (step)
     {
       if (SOFTWARE_SINGLE_STEP_P)

-       abort();  /* Make sure this doesn't happen. */
+       abort ();               /* Make sure this doesn't happen. */

       else
       else

-       ptrace (PT_STEP,     pid, (PTRACE_ARG3_TYPE) 1,
+       ptrace (PT_STEP, pid, (PTRACE_ARG3_TYPE) 1,

                target_signal_to_host (signal));
     }
   else
                target_signal_to_host (signal));
     }
   else


@@ -269,11 +290,13 @@ child_resume (pid, step, signal)
            target_signal_to_host (signal));
 
   if (errno)
            target_signal_to_host (signal));
 
   if (errno)

-    perror_with_name ("ptrace");
+    {
+      perror_with_name ("ptrace");
+    }

 }
 #endif /* CHILD_RESUME */
 }
 #endif /* CHILD_RESUME */

-

 \f
 \f

+

 #ifdef ATTACH_DETACH
 /* Start debugging the process whose number is PID.  */
 int
 #ifdef ATTACH_DETACH
 /* Start debugging the process whose number is PID.  */
 int


@@ -327,7 +350,7 @@ _initialize_kernel_u_addr ()
   if (nlist ("/vmunix", names) == 0)
     kernel_u_addr = names[0].n_value;
   else
   if (nlist ("/vmunix", names) == 0)
     kernel_u_addr = names[0].n_value;
   else

-    fatal ("Unable to get kernel u area address.");
+    internal_error ("Unable to get kernel u area address.");

 #endif /* KERNEL_U_ADDR_BSD.  */
 }
 
 #endif /* KERNEL_U_ADDR_BSD.  */
 }
 


@@ -358,10 +381,11 @@ fetch_register (regno)
 {
   /* This isn't really an address.  But ptrace thinks of it as one.  */
   CORE_ADDR regaddr;
 {
   /* This isn't really an address.  But ptrace thinks of it as one.  */
   CORE_ADDR regaddr;

-  char mess[128];                              /* For messages */
+  char mess[128];              /* For messages */

   register int i;
   register int i;

-  unsigned int offset;  /* Offset of registers within the u area.  */
+  unsigned int offset;         /* Offset of registers within the u area.  */

   char buf[MAX_REGISTER_RAW_SIZE];
   char buf[MAX_REGISTER_RAW_SIZE];

+  int tid;

 
   if (CANNOT_FETCH_REGISTER (regno))
     {
 
   if (CANNOT_FETCH_REGISTER (regno))
     {


@@ -370,18 +394,23 @@ fetch_register (regno)
       return;
     }
 
       return;
     }
 

+  /* Overload thread id onto process id */
+  if ((tid = TIDGET (inferior_pid)) == 0)
+    tid = inferior_pid;                /* no thread id, just use process id */
+

   offset = U_REGS_OFFSET;
 
   regaddr = register_addr (regno, offset);
   for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;
   offset = U_REGS_OFFSET;
 
   regaddr = register_addr (regno, offset);
   for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE))
     {
       errno = 0;

-      *(PTRACE_XFER_TYPE *) &buf[i] = ptrace (PT_READ_U, inferior_pid,
-                                             (PTRACE_ARG3_TYPE) regaddr, 0);
+      *(PTRACE_XFER_TYPE *) & buf[i] = ptrace (PT_READ_U, tid,
+                                              (PTRACE_ARG3_TYPE) regaddr, 0);

       regaddr += sizeof (PTRACE_XFER_TYPE);
       if (errno != 0)
        {
       regaddr += sizeof (PTRACE_XFER_TYPE);
       if (errno != 0)
        {

-         sprintf (mess, "reading register %s (#%d)", REGISTER_NAME (regno), regno);
+         sprintf (mess, "reading register %s (#%d)", 
+                  REGISTER_NAME (regno), regno);

          perror_with_name (mess);
        }
     }
          perror_with_name (mess);
        }
     }


@@ -423,27 +452,33 @@ store_register (regno)
 {
   /* This isn't really an address.  But ptrace thinks of it as one.  */
   CORE_ADDR regaddr;
 {
   /* This isn't really an address.  But ptrace thinks of it as one.  */
   CORE_ADDR regaddr;

-  char mess[128];                              /* For messages */
+  char mess[128];              /* For messages */

   register int i;
   register int i;

-  unsigned int offset;  /* Offset of registers within the u area.  */
+  unsigned int offset;         /* Offset of registers within the u area.  */
+  int tid;

 
   if (CANNOT_STORE_REGISTER (regno))
     {
       return;
     }
 
 
   if (CANNOT_STORE_REGISTER (regno))
     {
       return;
     }
 

+  /* Overload thread id onto process id */
+  if ((tid = TIDGET (inferior_pid)) == 0)
+    tid = inferior_pid;                /* no thread id, just use process id */
+

   offset = U_REGS_OFFSET;
 
   regaddr = register_addr (regno, offset);
   offset = U_REGS_OFFSET;
 
   regaddr = register_addr (regno, offset);

-  for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof(PTRACE_XFER_TYPE))
+  for (i = 0; i < REGISTER_RAW_SIZE (regno); i += sizeof (PTRACE_XFER_TYPE))

     {
       errno = 0;
     {
       errno = 0;

-      ptrace (PT_WRITE_U, inferior_pid, (PTRACE_ARG3_TYPE) regaddr,
-             *(PTRACE_XFER_TYPE *) &registers[REGISTER_BYTE (regno) + i]);
+      ptrace (PT_WRITE_U, tid, (PTRACE_ARG3_TYPE) regaddr,
+             *(PTRACE_XFER_TYPE *) & registers[REGISTER_BYTE (regno) + i]);

       regaddr += sizeof (PTRACE_XFER_TYPE);
       if (errno != 0)
        {
       regaddr += sizeof (PTRACE_XFER_TYPE);
       if (errno != 0)
        {

-         sprintf (mess, "writing register %s (#%d)", REGISTER_NAME (regno), regno);
+         sprintf (mess, "writing register %s (#%d)", 
+                  REGISTER_NAME (regno), regno);

          perror_with_name (mess);
        }
     }
          perror_with_name (mess);
        }
     }


@@ -482,7 +517,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.
 /* 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.

-  
+

    Returns the length copied, which is either the LEN argument or zero.
    This xfer function does not do partial moves, since child_ops
    doesn't allow memory operations to cross below us in the target stack
    Returns the length copied, which is either the LEN argument or zero.
    This xfer function does not do partial moves, since child_ops
    doesn't allow memory operations to cross below us in the target stack


@@ -494,33 +529,34 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
      char *myaddr;
      int len;
      int write;
      char *myaddr;
      int len;
      int write;

-     struct target_ops *target;                /* ignored */
+     struct target_ops *target;        /* ignored */

 {
   register int i;
   /* Round starting address down to longword boundary.  */
 {
   register int i;
   /* Round starting address down to longword boundary.  */

-  register CORE_ADDR addr = memaddr & - sizeof (PTRACE_XFER_TYPE);
+  register CORE_ADDR addr = memaddr & -sizeof (PTRACE_XFER_TYPE);

   /* Round ending address up; get number of longwords that makes.  */
   register int count
   /* Round ending address up; get number of longwords that makes.  */
   register int count

-    = (((memaddr + len) - addr) + sizeof (PTRACE_XFER_TYPE) - 1)
-      / sizeof (PTRACE_XFER_TYPE);
+  = (((memaddr + len) - addr) + sizeof (PTRACE_XFER_TYPE) - 1)
+  / sizeof (PTRACE_XFER_TYPE);

   /* Allocate buffer of that many longwords.  */
   register PTRACE_XFER_TYPE *buffer
   /* Allocate buffer of that many longwords.  */
   register PTRACE_XFER_TYPE *buffer

-    = (PTRACE_XFER_TYPE *) alloca (count * sizeof (PTRACE_XFER_TYPE));
+  = (PTRACE_XFER_TYPE *) alloca (count * sizeof (PTRACE_XFER_TYPE));

 
   if (write)
     {
       /* Fill start and end extra bytes of buffer with existing memory data.  */
 
 
   if (write)
     {
       /* Fill start and end extra bytes of buffer with existing memory data.  */
 

-      if (addr != memaddr || len < (int) sizeof (PTRACE_XFER_TYPE)) {
-       /* Need part of initial word -- fetch it.  */
-        buffer[0] = ptrace (PT_READ_I, inferior_pid, (PTRACE_ARG3_TYPE) addr,
-                           0);
-      }
+      if (addr != memaddr || len < (int) sizeof (PTRACE_XFER_TYPE))
+       {
+         /* Need part of initial word -- fetch it.  */
+         buffer[0] = ptrace (PT_READ_I, PIDGET (inferior_pid), 
+                             (PTRACE_ARG3_TYPE) addr, 0);
+       }

 
       if (count > 1)           /* FIXME, avoid if even boundary */
        {
 
       if (count > 1)           /* FIXME, avoid if even boundary */
        {

-         buffer[count - 1]
-           = ptrace (PT_READ_I, inferior_pid,
+         buffer[count - 1] 
+           = ptrace (PT_READ_I, PIDGET (inferior_pid),

                      ((PTRACE_ARG3_TYPE)
                       (addr + (count - 1) * sizeof (PTRACE_XFER_TYPE))),
                      0);
                      ((PTRACE_ARG3_TYPE)
                       (addr + (count - 1) * sizeof (PTRACE_XFER_TYPE))),
                      0);


@@ -537,21 +573,21 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
       for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
        {
          errno = 0;
       for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
        {
          errno = 0;

-         ptrace (PT_WRITE_D, inferior_pid, (PTRACE_ARG3_TYPE) addr,
-                 buffer[i]);
+         ptrace (PT_WRITE_D, PIDGET (inferior_pid), 
+                 (PTRACE_ARG3_TYPE) addr, buffer[i]);

          if (errno)
          if (errno)

-            {
+           {

              /* Using the appropriate one (I or D) is necessary for
              /* Using the appropriate one (I or D) is necessary for

-                Gould NP1, at least.  */
+                Gould NP1, at least.  */

              errno = 0;
              errno = 0;

-             ptrace (PT_WRITE_I, inferior_pid, (PTRACE_ARG3_TYPE) addr,
-                     buffer[i]);
+             ptrace (PT_WRITE_I, PIDGET (inferior_pid), 
+                     (PTRACE_ARG3_TYPE) addr, buffer[i]);

            }
          if (errno)
            return 0;
        }
 #ifdef CLEAR_INSN_CACHE
            }
          if (errno)
            return 0;
        }
 #ifdef CLEAR_INSN_CACHE

-      CLEAR_INSN_CACHE();
+      CLEAR_INSN_CACHE ();

 #endif
     }
   else
 #endif
     }
   else


@@ -560,7 +596,7 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
       for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
        {
          errno = 0;
       for (i = 0; i < count; i++, addr += sizeof (PTRACE_XFER_TYPE))
        {
          errno = 0;

-         buffer[i] = ptrace (PT_READ_I, inferior_pid,
+         buffer[i] = ptrace (PT_READ_I, PIDGET (inferior_pid),

                              (PTRACE_ARG3_TYPE) addr, 0);
          if (errno)
            return 0;
                              (PTRACE_ARG3_TYPE) addr, 0);
          if (errno)
            return 0;


@@ -574,23 +610,23 @@ child_xfer_memory (memaddr, myaddr, len, write, target)
     }
   return len;
 }
     }
   return len;
 }

-

 \f
 \f

+

 static void
 udot_info (dummy1, dummy2)
      char *dummy1;
      int dummy2;
 {
 #if defined (KERNEL_U_SIZE)
 static void
 udot_info (dummy1, dummy2)
      char *dummy1;
      int dummy2;
 {
 #if defined (KERNEL_U_SIZE)

-  int udot_off;                /* Offset into user struct */
-  int udot_val;                /* Value from user struct at udot_off */
-  char mess[128];      /* For messages */
+  int udot_off;                        /* Offset into user struct */
+  int udot_val;                        /* Value from user struct at udot_off */
+  char mess[128];              /* For messages */

 #endif
 
 #endif
 

-   if (!target_has_execution)
-     {
-       error ("The program is not being run.");
-     }
+  if (!target_has_execution)
+    {
+      error ("The program is not being run.");
+    }

 
 #if !defined (KERNEL_U_SIZE)
 
 
 #if !defined (KERNEL_U_SIZE)
 


@@ -626,8 +662,8 @@ udot_info (dummy1, dummy2)
 #endif
 }
 #endif /* !defined (CHILD_XFER_MEMORY).  */
 #endif
 }
 #endif /* !defined (CHILD_XFER_MEMORY).  */

-

 \f
 \f

+

 void
 _initialize_infptrace ()
 {
 void
 _initialize_infptrace ()
 {