*** empty log message ***

[binutils.git] / gdb / procfs.c

diff --git a/gdb/procfs.c b/gdb/procfs.c
index 58e8878633edbf8fc714ba555718251a1511615b..b4b1201175e25ff2f6928d7020d4ad21cafbf70c 100644 (file)
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -1,5 +1,5 @@
 /* Machine independent support for SVR4 /proc (process file system) for GDB.
 /* Machine independent support for SVR4 /proc (process file system) for GDB.

-   Copyright (C) 1991 Free Software Foundation, Inc.
+   Copyright 1991, 1992 Free Software Foundation, Inc.

    Written by Fred Fish at Cygnus Support.
 
 This file is part of GDB.
    Written by Fred Fish at Cygnus Support.
 
 This file is part of GDB.


@@ -40,18 +40,29 @@ regardless of whether or not the actual target has floating point hardware.
 #include <sys/procfs.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <sys/procfs.h>
 #include <fcntl.h>
 #include <errno.h>

+#include <string.h>

 
 #include "inferior.h"
 #include "target.h"
 
 #include "inferior.h"
 #include "target.h"

+#include "command.h"
+
+#define MAX_SYSCALLS   256     /* Maximum number of syscalls for table */

 
 #ifndef PROC_NAME_FMT
 
 #ifndef PROC_NAME_FMT

-#define PROC_NAME_FMT "/proc/%d"
+#define PROC_NAME_FMT "/proc/%05d"

 #endif
 
 #if 1  /* FIXME: Gross and ugly hack to resolve coredep.c global */
 CORE_ADDR kernel_u_addr;
 #endif
 
 #endif
 
 #if 1  /* FIXME: Gross and ugly hack to resolve coredep.c global */
 CORE_ADDR kernel_u_addr;
 #endif
 

+#ifdef BROKEN_SIGINFO_H                /* Workaround broken SGS <sys/siginfo.h> */
+#undef si_pid
+#define si_pid _data._proc.pid
+#undef si_uid
+#define si_uid _data._proc._pdata._kill.uid
+#endif /* BROKEN_SIGINFO_H */
+

 /*  All access to the inferior, either one started by gdb or one that has
     been attached to, is controlled by an instance of a procinfo structure,
     defined below.  Since gdb currently only handles one inferior at a time,
 /*  All access to the inferior, either one started by gdb or one that has
     been attached to, is controlled by an instance of a procinfo structure,
     defined below.  Since gdb currently only handles one inferior at a time,


@@ -67,6 +78,7 @@ struct procinfo {
   int fd;                      /* File descriptor for /proc entry */
   char *pathname;              /* Pathname to /proc entry */
   int was_stopped;             /* Nonzero if was stopped prior to attach */
   int fd;                      /* File descriptor for /proc entry */
   char *pathname;              /* Pathname to /proc entry */
   int was_stopped;             /* Nonzero if was stopped prior to attach */

+  int nopass_next_sigstop;     /* Don't pass a sigstop on next resume */

   prrun_t prrun;               /* Control state when it is run */
   prstatus_t prstatus;         /* Current process status info */
   gregset_t gregset;           /* General register set */
   prrun_t prrun;               /* Control state when it is run */
   prstatus_t prstatus;         /* Current process status info */
   gregset_t gregset;           /* General register set */


@@ -75,17 +87,282 @@ struct procinfo {
   sigset_t trace;              /* Current traced signal set */
   sysset_t exitset;            /* Current traced system call exit set */
   sysset_t entryset;           /* Current traced system call entry set */
   sigset_t trace;              /* Current traced signal set */
   sysset_t exitset;            /* Current traced system call exit set */
   sysset_t entryset;           /* Current traced system call entry set */

+  fltset_t saved_fltset;       /* Saved traced hardware fault set */
+  sigset_t saved_trace;                /* Saved traced signal set */
+  sigset_t saved_sighold;      /* Saved held signal set */
+  sysset_t saved_exitset;      /* Saved traced system call exit set */
+  sysset_t saved_entryset;     /* Saved traced system call entry set */

 };
 
 static struct procinfo pi;     /* Inferior's process information */
 
 };
 
 static struct procinfo pi;     /* Inferior's process information */
 

+/*  Much of the information used in the /proc interface, particularly for
+    printing status information, is kept as tables of structures of the
+    following form.  These tables can be used to map numeric values to
+    their symbolic names and to a string that describes their specific use. */
+
+struct trans {
+  int value;                   /* The numeric value */
+  char *name;                  /* The equivalent symbolic value */
+  char *desc;                  /* Short description of value */
+};
+
+/*  Translate bits in the pr_flags member of the prstatus structure, into the
+    names and desc information. */
+
+static struct trans pr_flag_table[] =
+{
+#if defined (PR_STOPPED)
+  PR_STOPPED, "PR_STOPPED", "Process is stopped",
+#endif
+#if defined (PR_ISTOP)
+  PR_ISTOP, "PR_ISTOP", "Stopped on an event of interest",
+#endif
+#if defined (PR_DSTOP)
+  PR_DSTOP, "PR_DSTOP", "A stop directive is in effect",
+#endif
+#if defined (PR_ASLEEP)
+  PR_ASLEEP, "PR_ASLEEP", "Sleeping in an interruptible system call",
+#endif
+#if defined (PR_FORK)
+  PR_FORK, "PR_FORK", "Inherit-on-fork is in effect",
+#endif
+#if defined (PR_RLC)
+  PR_RLC, "PR_RLC", "Run-on-last-close is in effect",
+#endif
+#if defined (PR_PTRACE)
+  PR_PTRACE, "PR_PTRACE", "Process is being controlled by ptrace",
+#endif
+#if defined (PR_PCINVAL)
+  PR_PCINVAL, "PR_PCINVAL", "PC refers to an invalid virtual address",
+#endif
+#if defined (PR_ISSYS)
+  PR_ISSYS, "PR_ISSYS", "Is a system process",
+#endif
+#if defined (PR_STEP)
+  PR_STEP, "PR_STEP", "Process has single step pending",
+#endif
+#if defined (PR_KLC)
+  PR_KLC, "PR_KLC", "Kill-on-last-close is in effect",
+#endif
+#if defined (PR_ASYNC)
+  PR_ASYNC, "PR_ASYNC", "Asynchronous stop is in effect",
+#endif
+#if defined (PR_PCOMPAT)
+  PR_PCOMPAT, "PR_PCOMPAT", "Ptrace compatibility mode in effect",
+#endif
+ 0, NULL, NULL
+};
+
+/*  Translate values in the pr_why field of the prstatus struct. */
+
+static struct trans pr_why_table[] =
+{
+#if defined (PR_REQUESTED)
+ PR_REQUESTED, "PR_REQUESTED", "Directed to stop via PIOCSTOP/PIOCWSTOP",
+#endif
+#if defined (PR_SIGNALLED)
+ PR_SIGNALLED, "PR_SIGNALLED", "Receipt of a traced signal",
+#endif
+#if defined (PR_FAULTED)
+ PR_FAULTED, "PR_FAULTED", "Incurred a traced hardware fault",
+#endif
+#if defined (PR_SYSENTRY)
+ PR_SYSENTRY, "PR_SYSENTRY", "Entry to a traced system call",
+#endif
+#if defined (PR_SYSEXIT)
+ PR_SYSEXIT, "PR_SYSEXIT", "Exit from a traced system call",
+#endif
+#if defined (PR_JOBCONTROL)
+ PR_JOBCONTROL, "PR_JOBCONTROL", "Default job control stop signal action",
+#endif
+#if defined (PR_SUSPENDED)
+ PR_SUSPENDED, "PR_SUSPENDED", "Process suspended",
+#endif
+ 0, NULL, NULL
+};
+
+/*  Hardware fault translation table. */
+
+static struct trans faults_table[] =
+{
+#if defined (FLTILL)
+ FLTILL, "FLTILL", "Illegal instruction",
+#endif
+#if defined (FLTPRIV)
+ FLTPRIV, "FLTPRIV", "Privileged instruction",
+#endif
+#if defined (FLTBPT)
+ FLTBPT, "FLTBPT", "Breakpoint trap",
+#endif
+#if defined (FLTTRACE)
+ FLTTRACE, "FLTTRACE", "Trace trap",
+#endif
+#if defined (FLTACCESS)
+ FLTACCESS, "FLTACCESS", "Memory access fault",
+#endif
+#if defined (FLTBOUNDS)
+ FLTBOUNDS, "FLTBOUNDS", "Memory bounds violation",
+#endif
+#if defined (FLTIOVF)
+ FLTIOVF, "FLTIOVF", "Integer overflow",
+#endif
+#if defined (FLTIZDIV)
+ FLTIZDIV, "FLTIZDIV", "Integer zero divide",
+#endif
+#if defined (FLTFPE)
+ FLTFPE, "FLTFPE", "Floating-point exception",
+#endif
+#if defined (FLTSTACK)
+ FLTSTACK, "FLTSTACK", "Unrecoverable stack fault",
+#endif
+#if defined (FLTPAGE)
+ FLTPAGE, "FLTPAGE", "Recoverable page fault",
+#endif
+ 0, NULL, NULL
+};
+
+/* Translation table for signal generation information.  See UNIX System
+   V Release 4 Programmer's Reference Manual, siginfo(5).  */
+
+static struct sigcode {
+  int signo;
+  int code;
+  char *codename;
+  char *desc;
+} siginfo_table[] = {
+#if defined (SIGILL) && defined (ILL_ILLOPC)
+  SIGILL, ILL_ILLOPC, "ILL_ILLOPC", "Illegal opcode",
+#endif
+#if defined (SIGILL) && defined (ILL_ILLOPN)
+  SIGILL, ILL_ILLOPN, "ILL_ILLOPN", "Illegal operand",
+#endif
+#if defined (SIGILL) && defined (ILL_ILLADR)
+  SIGILL, ILL_ILLADR, "ILL_ILLADR", "Illegal addressing mode",
+#endif
+#if defined (SIGILL) && defined (ILL_ILLTRP)
+  SIGILL, ILL_ILLTRP, "ILL_ILLTRP", "Illegal trap",
+#endif
+#if defined (SIGILL) && defined (ILL_PRVOPC)
+  SIGILL, ILL_PRVOPC, "ILL_PRVOPC", "Privileged opcode",
+#endif
+#if defined (SIGILL) && defined (ILL_PRVREG)
+  SIGILL, ILL_PRVREG, "ILL_PRVREG", "Privileged register",
+#endif
+#if defined (SIGILL) && defined (ILL_COPROC)
+  SIGILL, ILL_COPROC, "ILL_COPROC", "Coprocessor error",
+#endif
+#if defined (SIGILL) && defined (ILL_BADSTK)
+  SIGILL, ILL_BADSTK, "ILL_BADSTK", "Internal stack error",
+#endif
+#if defined (SIGFPE) && defined (FPE_INTDIV)
+  SIGFPE, FPE_INTDIV, "FPE_INTDIV", "Integer divide by zero",
+#endif
+#if defined (SIGFPE) && defined (FPE_INTOVF)
+  SIGFPE, FPE_INTOVF, "FPE_INTOVF", "Integer overflow",
+#endif
+#if defined (SIGFPE) && defined (FPE_FLTDIV)
+  SIGFPE, FPE_FLTDIV, "FPE_FLTDIV", "Floating point divide by zero",
+#endif
+#if defined (SIGFPE) && defined (FPE_FLTOVF)
+  SIGFPE, FPE_FLTOVF, "FPE_FLTOVF", "Floating point overflow",
+#endif
+#if defined (SIGFPE) && defined (FPE_FLTUND)
+  SIGFPE, FPE_FLTUND, "FPE_FLTUND", "Floating point underflow",
+#endif
+#if defined (SIGFPE) && defined (FPE_FLTRES)
+  SIGFPE, FPE_FLTRES, "FPE_FLTRES", "Floating point inexact result",
+#endif
+#if defined (SIGFPE) && defined (FPE_FLTINV)
+  SIGFPE, FPE_FLTINV, "FPE_FLTINV", "Invalid floating point operation",
+#endif
+#if defined (SIGFPE) && defined (FPE_FLTSUB)
+  SIGFPE, FPE_FLTSUB, "FPE_FLTSUB", "Subscript out of range",
+#endif
+#if defined (SIGSEGV) && defined (SEGV_MAPERR)
+  SIGSEGV, SEGV_MAPERR, "SEGV_MAPERR", "Address not mapped to object",
+#endif
+#if defined (SIGSEGV) && defined (SEGV_ACCERR)
+  SIGSEGV, SEGV_ACCERR, "SEGV_ACCERR", "Invalid permissions for object",
+#endif
+#if defined (SIGBUS) && defined (BUS_ADRALN)
+  SIGBUS, BUS_ADRALN, "BUS_ADRALN", "Invalid address alignment",
+#endif
+#if defined (SIGBUS) && defined (BUS_ADRERR)
+  SIGBUS, BUS_ADRERR, "BUS_ADRERR", "Non-existent physical address",
+#endif
+#if defined (SIGBUS) && defined (BUS_OBJERR)
+  SIGBUS, BUS_OBJERR, "BUS_OBJERR", "Object specific hardware error",
+#endif
+#if defined (SIGTRAP) && defined (TRAP_BRKPT)
+  SIGTRAP, TRAP_BRKPT, "TRAP_BRKPT", "Process breakpoint",
+#endif
+#if defined (SIGTRAP) && defined (TRAP_TRACE)
+  SIGTRAP, TRAP_TRACE, "TRAP_TRACE", "Process trace trap",
+#endif
+#if defined (SIGCLD) && defined (CLD_EXITED)
+  SIGCLD, CLD_EXITED, "CLD_EXITED", "Child has exited",
+#endif
+#if defined (SIGCLD) && defined (CLD_KILLED)
+  SIGCLD, CLD_KILLED, "CLD_KILLED", "Child was killed",
+#endif
+#if defined (SIGCLD) && defined (CLD_DUMPED)
+  SIGCLD, CLD_DUMPED, "CLD_DUMPED", "Child has terminated abnormally",
+#endif
+#if defined (SIGCLD) && defined (CLD_TRAPPED)
+  SIGCLD, CLD_TRAPPED, "CLD_TRAPPED", "Traced child has trapped",
+#endif
+#if defined (SIGCLD) && defined (CLD_STOPPED)
+  SIGCLD, CLD_STOPPED, "CLD_STOPPED", "Child has stopped",
+#endif
+#if defined (SIGCLD) && defined (CLD_CONTINUED)
+  SIGCLD, CLD_CONTINUED, "CLD_CONTINUED", "Stopped child had continued",
+#endif
+#if defined (SIGPOLL) && defined (POLL_IN)
+  SIGPOLL, POLL_IN, "POLL_IN", "Input input available",
+#endif
+#if defined (SIGPOLL) && defined (POLL_OUT)
+  SIGPOLL, POLL_OUT, "POLL_OUT", "Output buffers available",
+#endif
+#if defined (SIGPOLL) && defined (POLL_MSG)
+  SIGPOLL, POLL_MSG, "POLL_MSG", "Input message available",
+#endif
+#if defined (SIGPOLL) && defined (POLL_ERR)
+  SIGPOLL, POLL_ERR, "POLL_ERR", "I/O error",
+#endif
+#if defined (SIGPOLL) && defined (POLL_PRI)
+  SIGPOLL, POLL_PRI, "POLL_PRI", "High priority input available",
+#endif
+#if defined (SIGPOLL) && defined (POLL_HUP)
+  SIGPOLL, POLL_HUP, "POLL_HUP", "Device disconnected",
+#endif
+  0, 0, NULL, NULL
+};
+
+static char *syscall_table[MAX_SYSCALLS];
+

 /* Prototypes for local functions */
 
 /* Prototypes for local functions */
 

+static void
+set_proc_siginfo PARAMS ((struct procinfo *, int));
+
+static void
+init_syscall_table PARAMS ((void));
+
+static char *
+syscallname PARAMS ((int));
+
+static char *
+signalname PARAMS ((int));
+
+static char *
+errnoname PARAMS ((int));
+

 static int
 proc_address_to_fd PARAMS ((CORE_ADDR, int));
 
 static int
 static int
 proc_address_to_fd PARAMS ((CORE_ADDR, int));
 
 static int

-open_proc_file PARAMS ((int, struct procinfo *));
+open_proc_file PARAMS ((int, struct procinfo *, int));

 
 static void
 close_proc_file PARAMS ((struct procinfo *));
 
 static void
 close_proc_file PARAMS ((struct procinfo *));


@@ -97,14 +374,38 @@ static void
 proc_init_failed PARAMS ((char *));
 
 static void
 proc_init_failed PARAMS ((char *));
 
 static void

-proc_info PARAMS ((char *, int));
+info_proc PARAMS ((char *, int));

 
 static void
 
 static void

-proc_info_address_map PARAMS ((struct procinfo *, int));
+info_proc_flags PARAMS ((struct procinfo *, int));
+
+static void
+info_proc_stop PARAMS ((struct procinfo *, int));
+
+static void
+info_proc_siginfo PARAMS ((struct procinfo *, int));
+
+static void
+info_proc_syscalls PARAMS ((struct procinfo *, int));
+
+static void
+info_proc_mappings PARAMS ((struct procinfo *, int));
+
+static void
+info_proc_signals PARAMS ((struct procinfo *, int));
+
+static void
+info_proc_faults PARAMS ((struct procinfo *, int));

 
 static char *
 mappingflags PARAMS ((long));
 
 
 static char *
 mappingflags PARAMS ((long));
 

+static char *
+lookupname PARAMS ((struct trans *, unsigned int, char *));
+
+static char *
+lookupdesc PARAMS ((struct trans *, unsigned int));
+

 /* External function prototypes that can't be easily included in any
    header file because the args are typedefs in system include files. */
 
 /* External function prototypes that can't be easily included in any
    header file because the args are typedefs in system include files. */
 


@@ -120,6 +421,583 @@ supply_fpregset PARAMS ((fpregset_t *));
 extern void
 fill_fpregset PARAMS ((fpregset_t *, int));
 
 extern void
 fill_fpregset PARAMS ((fpregset_t *, int));
 

+/*
+
+LOCAL FUNCTION
+
+       lookupdesc -- translate a value to a summary desc string
+
+SYNOPSIS
+
+       static char *lookupdesc (struct trans *transp, unsigned int val);
+
+DESCRIPTION
+       
+       Given a pointer to a translation table and a value to be translated,
+       lookup the desc string and return it.
+ */
+
+static char *
+lookupdesc (transp, val)
+     struct trans *transp;
+     unsigned int val;
+{
+  char *desc;
+  
+  for (desc = NULL; transp -> name != NULL; transp++)
+    {
+      if (transp -> value == val)
+       {
+         desc = transp -> desc;
+         break;
+       }
+    }
+
+  /* Didn't find a translation for the specified value, set a default one. */
+
+  if (desc == NULL)
+    {
+      desc = "Unknown";
+    }
+  return (desc);
+}
+
+/*
+
+LOCAL FUNCTION
+
+       lookupname -- translate a value to symbolic name
+
+SYNOPSIS
+
+       static char *lookupname (struct trans *transp, unsigned int val,
+                                char *prefix);
+
+DESCRIPTION
+       
+       Given a pointer to a translation table, a value to be translated,
+       and a default prefix to return if the value can't be translated,
+       match the value with one of the translation table entries and
+       return a pointer to the symbolic name.
+
+       If no match is found it just returns the value as a printable string,
+       with the given prefix.  The previous such value, if any, is freed
+       at this time.
+ */
+
+static char *
+lookupname (transp, val, prefix)
+     struct trans *transp;
+     unsigned int val;
+     char *prefix;
+{
+  static char *locbuf;
+  char *name;
+  
+  for (name = NULL; transp -> name != NULL; transp++)
+    {
+      if (transp -> value == val)
+       {
+         name = transp -> name;
+         break;
+       }
+    }
+
+  /* Didn't find a translation for the specified value, build a default
+     one using the specified prefix and return it.  The lifetime of
+     the value is only until the next one is needed. */
+
+  if (name == NULL)
+    {
+      if (locbuf != NULL)
+       {
+         free (locbuf);
+       }
+      locbuf = xmalloc (strlen (prefix) + 16);
+      sprintf (locbuf, "%s %u", prefix, val);
+      name = locbuf;
+    }
+  return (name);
+}
+
+static char *
+sigcodename (sip)
+     siginfo_t *sip;
+{
+  struct sigcode *scp;
+  char *name = NULL;
+  static char locbuf[32];
+  
+  for (scp = siginfo_table; scp -> codename != NULL; scp++)
+    {
+      if ((scp -> signo == sip -> si_signo) &&
+         (scp -> code == sip -> si_code))
+       {
+         name = scp -> codename;
+         break;
+       }
+    }
+  if (name == NULL)
+    {
+      sprintf (locbuf, "sigcode %u", sip -> si_signo);
+      name = locbuf;
+    }
+  return (name);
+}
+
+static char *sigcodedesc (sip)
+     siginfo_t *sip;
+{
+  struct sigcode *scp;
+  char *desc = NULL;
+  
+  for (scp = siginfo_table; scp -> codename != NULL; scp++)
+    {
+      if ((scp -> signo == sip -> si_signo) &&
+         (scp -> code == sip -> si_code))
+       {
+         desc = scp -> desc;
+         break;
+       }
+    }
+  if (desc == NULL)
+    {
+      desc = "Unrecognized signal or trap use";
+    }
+  return (desc);
+}
+
+/*
+
+LOCAL FUNCTION
+
+       syscallname - translate a system call number into a system call name
+
+SYNOPSIS
+
+       char *syscallname (int syscallnum)
+
+DESCRIPTION
+
+       Given a system call number, translate it into the printable name
+       of a system call, or into "syscall <num>" if it is an unknown
+       number.
+ */
+
+static char *
+syscallname (syscallnum)
+     int syscallnum;
+{
+  static char locbuf[32];
+  char *rtnval;
+  
+  if (syscallnum >= 0 && syscallnum < MAX_SYSCALLS)
+    {
+      rtnval = syscall_table[syscallnum];
+    }
+  else
+    {
+      sprintf (locbuf, "syscall %u", syscallnum);
+      rtnval = locbuf;
+    }
+  return (rtnval);
+}
+
+/*
+
+LOCAL FUNCTION
+
+       init_syscall_table - initialize syscall translation table
+
+SYNOPSIS
+
+       void init_syscall_table (void)
+
+DESCRIPTION
+
+       Dynamically initialize the translation table to convert system
+       call numbers into printable system call names.  Done once per
+       gdb run, on initialization.
+
+NOTES
+
+       This is awfully ugly, but preprocessor tricks to make it prettier
+       tend to be nonportable.
+ */
+
+static void
+init_syscall_table ()
+{
+#if defined (SYS_exit)
+  syscall_table[SYS_exit] = "exit";
+#endif
+#if defined (SYS_fork)
+  syscall_table[SYS_fork] = "fork";
+#endif
+#if defined (SYS_read)
+  syscall_table[SYS_read] = "read";
+#endif
+#if defined (SYS_write)
+  syscall_table[SYS_write] = "write";
+#endif
+#if defined (SYS_open)
+  syscall_table[SYS_open] = "open";
+#endif
+#if defined (SYS_close)
+  syscall_table[SYS_close] = "close";
+#endif
+#if defined (SYS_wait)
+  syscall_table[SYS_wait] = "wait";
+#endif
+#if defined (SYS_creat)
+  syscall_table[SYS_creat] = "creat";
+#endif
+#if defined (SYS_link)
+  syscall_table[SYS_link] = "link";
+#endif
+#if defined (SYS_unlink)
+  syscall_table[SYS_unlink] = "unlink";
+#endif
+#if defined (SYS_exec)
+  syscall_table[SYS_exec] = "exec";
+#endif
+#if defined (SYS_execv)
+  syscall_table[SYS_execv] = "execv";
+#endif
+#if defined (SYS_execve)
+  syscall_table[SYS_execve] = "execve";
+#endif
+#if defined (SYS_chdir)
+  syscall_table[SYS_chdir] = "chdir";
+#endif
+#if defined (SYS_time)
+  syscall_table[SYS_time] = "time";
+#endif
+#if defined (SYS_mknod)
+  syscall_table[SYS_mknod] = "mknod";
+#endif
+#if defined (SYS_chmod)
+  syscall_table[SYS_chmod] = "chmod";
+#endif
+#if defined (SYS_chown)
+  syscall_table[SYS_chown] = "chown";
+#endif
+#if defined (SYS_brk)
+  syscall_table[SYS_brk] = "brk";
+#endif
+#if defined (SYS_stat)
+  syscall_table[SYS_stat] = "stat";
+#endif
+#if defined (SYS_lseek)
+  syscall_table[SYS_lseek] = "lseek";
+#endif
+#if defined (SYS_getpid)
+  syscall_table[SYS_getpid] = "getpid";
+#endif
+#if defined (SYS_mount)
+  syscall_table[SYS_mount] = "mount";
+#endif
+#if defined (SYS_umount)
+  syscall_table[SYS_umount] = "umount";
+#endif
+#if defined (SYS_setuid)
+  syscall_table[SYS_setuid] = "setuid";
+#endif
+#if defined (SYS_getuid)
+  syscall_table[SYS_getuid] = "getuid";
+#endif
+#if defined (SYS_stime)
+  syscall_table[SYS_stime] = "stime";
+#endif
+#if defined (SYS_ptrace)
+  syscall_table[SYS_ptrace] = "ptrace";
+#endif
+#if defined (SYS_alarm)
+  syscall_table[SYS_alarm] = "alarm";
+#endif
+#if defined (SYS_fstat)
+  syscall_table[SYS_fstat] = "fstat";
+#endif
+#if defined (SYS_pause)
+  syscall_table[SYS_pause] = "pause";
+#endif
+#if defined (SYS_utime)
+  syscall_table[SYS_utime] = "utime";
+#endif
+#if defined (SYS_stty)
+  syscall_table[SYS_stty] = "stty";
+#endif
+#if defined (SYS_gtty)
+  syscall_table[SYS_gtty] = "gtty";
+#endif
+#if defined (SYS_access)
+  syscall_table[SYS_access] = "access";
+#endif
+#if defined (SYS_nice)
+  syscall_table[SYS_nice] = "nice";
+#endif
+#if defined (SYS_statfs)
+  syscall_table[SYS_statfs] = "statfs";
+#endif
+#if defined (SYS_sync)
+  syscall_table[SYS_sync] = "sync";
+#endif
+#if defined (SYS_kill)
+  syscall_table[SYS_kill] = "kill";
+#endif
+#if defined (SYS_fstatfs)
+  syscall_table[SYS_fstatfs] = "fstatfs";
+#endif
+#if defined (SYS_pgrpsys)
+  syscall_table[SYS_pgrpsys] = "pgrpsys";
+#endif
+#if defined (SYS_xenix)
+  syscall_table[SYS_xenix] = "xenix";
+#endif
+#if defined (SYS_dup)
+  syscall_table[SYS_dup] = "dup";
+#endif
+#if defined (SYS_pipe)
+  syscall_table[SYS_pipe] = "pipe";
+#endif
+#if defined (SYS_times)
+  syscall_table[SYS_times] = "times";
+#endif
+#if defined (SYS_profil)
+  syscall_table[SYS_profil] = "profil";
+#endif
+#if defined (SYS_plock)
+  syscall_table[SYS_plock] = "plock";
+#endif
+#if defined (SYS_setgid)
+  syscall_table[SYS_setgid] = "setgid";
+#endif
+#if defined (SYS_getgid)
+  syscall_table[SYS_getgid] = "getgid";
+#endif
+#if defined (SYS_signal)
+  syscall_table[SYS_signal] = "signal";
+#endif
+#if defined (SYS_msgsys)
+  syscall_table[SYS_msgsys] = "msgsys";
+#endif
+#if defined (SYS_sys3b)
+  syscall_table[SYS_sys3b] = "sys3b";
+#endif
+#if defined (SYS_acct)
+  syscall_table[SYS_acct] = "acct";
+#endif
+#if defined (SYS_shmsys)
+  syscall_table[SYS_shmsys] = "shmsys";
+#endif
+#if defined (SYS_semsys)
+  syscall_table[SYS_semsys] = "semsys";
+#endif
+#if defined (SYS_ioctl)
+  syscall_table[SYS_ioctl] = "ioctl";
+#endif
+#if defined (SYS_uadmin)
+  syscall_table[SYS_uadmin] = "uadmin";
+#endif
+#if defined (SYS_utssys)
+  syscall_table[SYS_utssys] = "utssys";
+#endif
+#if defined (SYS_fsync)
+  syscall_table[SYS_fsync] = "fsync";
+#endif
+#if defined (SYS_umask)
+  syscall_table[SYS_umask] = "umask";
+#endif
+#if defined (SYS_chroot)
+  syscall_table[SYS_chroot] = "chroot";
+#endif
+#if defined (SYS_fcntl)
+  syscall_table[SYS_fcntl] = "fcntl";
+#endif
+#if defined (SYS_ulimit)
+  syscall_table[SYS_ulimit] = "ulimit";
+#endif
+#if defined (SYS_rfsys)
+  syscall_table[SYS_rfsys] = "rfsys";
+#endif
+#if defined (SYS_rmdir)
+  syscall_table[SYS_rmdir] = "rmdir";
+#endif
+#if defined (SYS_mkdir)
+  syscall_table[SYS_mkdir] = "mkdir";
+#endif
+#if defined (SYS_getdents)
+  syscall_table[SYS_getdents] = "getdents";
+#endif
+#if defined (SYS_sysfs)
+  syscall_table[SYS_sysfs] = "sysfs";
+#endif
+#if defined (SYS_getmsg)
+  syscall_table[SYS_getmsg] = "getmsg";
+#endif
+#if defined (SYS_putmsg)
+  syscall_table[SYS_putmsg] = "putmsg";
+#endif
+#if defined (SYS_poll)
+  syscall_table[SYS_poll] = "poll";
+#endif
+#if defined (SYS_lstat)
+  syscall_table[SYS_lstat] = "lstat";
+#endif
+#if defined (SYS_symlink)
+  syscall_table[SYS_symlink] = "symlink";
+#endif
+#if defined (SYS_readlink)
+  syscall_table[SYS_readlink] = "readlink";
+#endif
+#if defined (SYS_setgroups)
+  syscall_table[SYS_setgroups] = "setgroups";
+#endif
+#if defined (SYS_getgroups)
+  syscall_table[SYS_getgroups] = "getgroups";
+#endif
+#if defined (SYS_fchmod)
+  syscall_table[SYS_fchmod] = "fchmod";
+#endif
+#if defined (SYS_fchown)
+  syscall_table[SYS_fchown] = "fchown";
+#endif
+#if defined (SYS_sigprocmask)
+  syscall_table[SYS_sigprocmask] = "sigprocmask";
+#endif
+#if defined (SYS_sigsuspend)
+  syscall_table[SYS_sigsuspend] = "sigsuspend";
+#endif
+#if defined (SYS_sigaltstack)
+  syscall_table[SYS_sigaltstack] = "sigaltstack";
+#endif
+#if defined (SYS_sigaction)
+  syscall_table[SYS_sigaction] = "sigaction";
+#endif
+#if defined (SYS_sigpending)
+  syscall_table[SYS_sigpending] = "sigpending";
+#endif
+#if defined (SYS_context)
+  syscall_table[SYS_context] = "context";
+#endif
+#if defined (SYS_evsys)
+  syscall_table[SYS_evsys] = "evsys";
+#endif
+#if defined (SYS_evtrapret)
+  syscall_table[SYS_evtrapret] = "evtrapret";
+#endif
+#if defined (SYS_statvfs)
+  syscall_table[SYS_statvfs] = "statvfs";
+#endif
+#if defined (SYS_fstatvfs)
+  syscall_table[SYS_fstatvfs] = "fstatvfs";
+#endif
+#if defined (SYS_nfssys)
+  syscall_table[SYS_nfssys] = "nfssys";
+#endif
+#if defined (SYS_waitsys)
+  syscall_table[SYS_waitsys] = "waitsys";
+#endif
+#if defined (SYS_sigsendsys)
+  syscall_table[SYS_sigsendsys] = "sigsendsys";
+#endif
+#if defined (SYS_hrtsys)
+  syscall_table[SYS_hrtsys] = "hrtsys";
+#endif
+#if defined (SYS_acancel)
+  syscall_table[SYS_acancel] = "acancel";
+#endif
+#if defined (SYS_async)
+  syscall_table[SYS_async] = "async";
+#endif
+#if defined (SYS_priocntlsys)
+  syscall_table[SYS_priocntlsys] = "priocntlsys";
+#endif
+#if defined (SYS_pathconf)
+  syscall_table[SYS_pathconf] = "pathconf";
+#endif
+#if defined (SYS_mincore)
+  syscall_table[SYS_mincore] = "mincore";
+#endif
+#if defined (SYS_mmap)
+  syscall_table[SYS_mmap] = "mmap";
+#endif
+#if defined (SYS_mprotect)
+  syscall_table[SYS_mprotect] = "mprotect";
+#endif
+#if defined (SYS_munmap)
+  syscall_table[SYS_munmap] = "munmap";
+#endif
+#if defined (SYS_fpathconf)
+  syscall_table[SYS_fpathconf] = "fpathconf";
+#endif
+#if defined (SYS_vfork)
+  syscall_table[SYS_vfork] = "vfork";
+#endif
+#if defined (SYS_fchdir)
+  syscall_table[SYS_fchdir] = "fchdir";
+#endif
+#if defined (SYS_readv)
+  syscall_table[SYS_readv] = "readv";
+#endif
+#if defined (SYS_writev)
+  syscall_table[SYS_writev] = "writev";
+#endif
+#if defined (SYS_xstat)
+  syscall_table[SYS_xstat] = "xstat";
+#endif
+#if defined (SYS_lxstat)
+  syscall_table[SYS_lxstat] = "lxstat";
+#endif
+#if defined (SYS_fxstat)
+  syscall_table[SYS_fxstat] = "fxstat";
+#endif
+#if defined (SYS_xmknod)
+  syscall_table[SYS_xmknod] = "xmknod";
+#endif
+#if defined (SYS_clocal)
+  syscall_table[SYS_clocal] = "clocal";
+#endif
+#if defined (SYS_setrlimit)
+  syscall_table[SYS_setrlimit] = "setrlimit";
+#endif
+#if defined (SYS_getrlimit)
+  syscall_table[SYS_getrlimit] = "getrlimit";
+#endif
+#if defined (SYS_lchown)
+  syscall_table[SYS_lchown] = "lchown";
+#endif
+#if defined (SYS_memcntl)
+  syscall_table[SYS_memcntl] = "memcntl";
+#endif
+#if defined (SYS_getpmsg)
+  syscall_table[SYS_getpmsg] = "getpmsg";
+#endif
+#if defined (SYS_putpmsg)
+  syscall_table[SYS_putpmsg] = "putpmsg";
+#endif
+#if defined (SYS_rename)
+  syscall_table[SYS_rename] = "rename";
+#endif
+#if defined (SYS_uname)
+  syscall_table[SYS_uname] = "uname";
+#endif
+#if defined (SYS_setegid)
+  syscall_table[SYS_setegid] = "setegid";
+#endif
+#if defined (SYS_sysconfig)
+  syscall_table[SYS_sysconfig] = "sysconfig";
+#endif
+#if defined (SYS_adjtime)
+  syscall_table[SYS_adjtime] = "adjtime";
+#endif
+#if defined (SYS_systeminfo)
+  syscall_table[SYS_systeminfo] = "systeminfo";
+#endif
+#if defined (SYS_seteuid)
+  syscall_table[SYS_seteuid] = "seteuid";
+#endif
+}

 
 /*
 
 
 /*
 


@@ -129,7 +1007,7 @@ GLOBAL FUNCTION
 
 SYNOPSIS
 
 
 SYNOPSIS
 

-       int ptrace (int request, int pid, int arg3, int arg4)
+       int ptrace (int request, int pid, PTRACE_ARG3_TYPE arg3, int arg4)

 
 DESCRIPTION
 
 
 DESCRIPTION
 


@@ -144,7 +1022,7 @@ int
 ptrace (request, pid, arg3, arg4)
      int request;
      int pid;
 ptrace (request, pid, arg3, arg4)
      int request;
      int pid;

-     int arg3;
+     PTRACE_ARG3_TYPE arg3;

      int arg4;
 {
   error ("internal error - there is a call to ptrace() somewhere");
      int arg4;
 {
   error ("internal error - there is a call to ptrace() somewhere");


@@ -245,7 +1123,7 @@ unconditionally_kill_inferior ()
   int signo;
   
   signo = SIGKILL;
   int signo;
   
   signo = SIGKILL;

-  (void) ioctl (pi.fd, PIOCKILL, &signo);
+  ioctl (pi.fd, PIOCKILL, &signo);

   close_proc_file (&pi);
   wait ((int *) 0);
 }
   close_proc_file (&pi);
   wait ((int *) 0);
 }


@@ -350,10 +1228,10 @@ store_inferior_registers (regno)
 {
   if (regno != -1)
     {
 {
   if (regno != -1)
     {

-      (void) ioctl (pi.fd, PIOCGREG, &pi.gregset);
+      ioctl (pi.fd, PIOCGREG, &pi.gregset);

     }
   fill_gregset (&pi.gregset, regno);
     }
   fill_gregset (&pi.gregset, regno);

-  (void) ioctl (pi.fd, PIOCSREG, &pi.gregset);
+  ioctl (pi.fd, PIOCSREG, &pi.gregset);

 
 #if defined (FP0_REGNUM)
 
 
 #if defined (FP0_REGNUM)
 


@@ -363,10 +1241,10 @@ store_inferior_registers (regno)
 
   if (regno != -1)
     {
 
   if (regno != -1)
     {

-      (void) ioctl (pi.fd, PIOCGFPREG, &pi.fpregset);
+      ioctl (pi.fd, PIOCGFPREG, &pi.fpregset);

     }
   fill_fpregset (&pi.fpregset, regno);
     }
   fill_fpregset (&pi.fpregset, regno);

-  (void) ioctl (pi.fd, PIOCSFPREG, &pi.fpregset);
+  ioctl (pi.fd, PIOCSFPREG, &pi.fpregset);

 
 #endif /* FP0_REGNUM */
 
 
 #endif /* FP0_REGNUM */
 


@@ -394,30 +1272,28 @@ NOTES
 
        If proc_init_failed ever gets called, control returns to the command
        processing loop via the standard error handling code.
 
        If proc_init_failed ever gets called, control returns to the command
        processing loop via the standard error handling code.

+

  */
 
 void
 inferior_proc_init (pid)
      int pid;
 {
  */
 
 void
 inferior_proc_init (pid)
      int pid;
 {

-  if (!open_proc_file (pid, &pi))
+  if (!open_proc_file (pid, &pi, O_RDWR))

     {
       proc_init_failed ("can't open process file");
     }
   else
     {
     {
       proc_init_failed ("can't open process file");
     }
   else
     {

-      (void) memset (&pi.prrun, 0, sizeof (pi.prrun));
+      memset ((char *) &pi.prrun, 0, sizeof (pi.prrun));

       prfillset (&pi.prrun.pr_trace);
       prfillset (&pi.prrun.pr_trace);

+      proc_signal_handling_change ();

       prfillset (&pi.prrun.pr_fault);
       prdelset (&pi.prrun.pr_fault, FLTPAGE);
       if (ioctl (pi.fd, PIOCWSTOP, &pi.prstatus) < 0)
        {
          proc_init_failed ("PIOCWSTOP failed");
        }
       prfillset (&pi.prrun.pr_fault);
       prdelset (&pi.prrun.pr_fault, FLTPAGE);
       if (ioctl (pi.fd, PIOCWSTOP, &pi.prstatus) < 0)
        {
          proc_init_failed ("PIOCWSTOP failed");
        }

-      else if (ioctl (pi.fd, PIOCSTRACE, &pi.prrun.pr_trace) < 0)
-       {
-         proc_init_failed ("PIOCSTRACE failed");
-       }

       else if (ioctl (pi.fd, PIOCSFAULT, &pi.prrun.pr_fault) < 0)
        {
          proc_init_failed ("PIOCSFAULT failed");
       else if (ioctl (pi.fd, PIOCSFAULT, &pi.prrun.pr_fault) < 0)
        {
          proc_init_failed ("PIOCSFAULT failed");


@@ -427,6 +1303,58 @@ inferior_proc_init (pid)
 
 /*
 
 
 /*
 

+GLOBAL FUNCTION
+
+       proc_signal_handling_change
+
+SYNOPSIS
+
+       void proc_signal_handling_change (void);
+
+DESCRIPTION
+
+       When the user changes the state of gdb's signal handling via the
+       "handle" command, this function gets called to see if any change
+       in the /proc interface is required.  It is also called internally
+       by other /proc interface functions to initialize the state of
+       the traced signal set.
+
+       One thing it does is that signals for which the state is "nostop",
+       "noprint", and "pass", have their trace bits reset in the pr_trace
+       field, so that they are no longer traced.  This allows them to be
+       delivered directly to the inferior without the debugger ever being
+       involved.
+ */
+
+void
+proc_signal_handling_change ()
+{
+  int signo;
+
+  if (pi.valid)
+    {
+      for (signo = 0; signo < NSIG; signo++)
+       {
+         if (signal_stop_state (signo) == 0 &&
+             signal_print_state (signo) == 0 &&
+             signal_pass_state (signo) == 1)
+           {
+             prdelset (&pi.prrun.pr_trace, signo);
+           }
+         else
+           {
+             praddset (&pi.prrun.pr_trace, signo);
+           }
+       }
+      if (ioctl (pi.fd, PIOCSTRACE, &pi.prrun.pr_trace))
+       {
+         print_sys_errmsg ("PIOCSTRACE failed", errno);
+       }
+    }
+}
+
+/*
+

 GLOBAL FUNCTION
 
        proc_set_exec_trap -- arrange for exec'd child to halt at startup
 GLOBAL FUNCTION
 
        proc_set_exec_trap -- arrange for exec'd child to halt at startup


@@ -450,6 +1378,10 @@ NOTE
        We need to use all local variables since the child may be sharing
        it's data space with the parent, if vfork was used rather than
        fork.
        We need to use all local variables since the child may be sharing
        it's data space with the parent, if vfork was used rather than
        fork.

+
+       Also note that we want to turn off the inherit-on-fork flag in
+       the child process so that any grand-children start with all
+       tracing flags cleared.

  */
 
 void
  */
 
 void


@@ -459,7 +1391,7 @@ proc_set_exec_trap ()
   auto char procname[32];
   int fd;
   
   auto char procname[32];
   int fd;
   

-  (void) sprintf (procname, PROC_NAME_FMT, getpid ());
+  sprintf (procname, PROC_NAME_FMT, getpid ());

   if ((fd = open (procname, O_RDWR)) < 0)
     {
       perror (procname);
   if ((fd = open (procname, O_RDWR)) < 0)
     {
       perror (procname);


@@ -468,12 +1400,11 @@ proc_set_exec_trap ()
     }
   premptyset (&exitset);
 
     }
   premptyset (&exitset);
 

-/*
- * GW: Rationale...
- * Not all systems with /proc have all the exec* syscalls with the same
- * names.  On the SGI, for example, there is no SYS_exec, but there
- * *is* a SYS_execv.  So, we try to account for that.
- */
+  /* GW: Rationale...
+     Not all systems with /proc have all the exec* syscalls with the same
+     names.  On the SGI, for example, there is no SYS_exec, but there
+     *is* a SYS_execv.  So, we try to account for that. */
+

 #ifdef SYS_exec
   praddset (&exitset, SYS_exec);
 #endif
 #ifdef SYS_exec
   praddset (&exitset, SYS_exec);
 #endif


@@ -490,6 +1421,36 @@ proc_set_exec_trap ()
       fflush (stderr);
       _exit (127);
     }
       fflush (stderr);
       _exit (127);
     }

+
+  /* Turn off inherit-on-fork flag so that all grand-children of gdb
+     start with tracing flags cleared. */
+
+#if defined (PIOCRESET)        /* New method */
+  {
+      long pr_flags;
+      pr_flags = PR_FORK;
+      ioctl (fd, PIOCRESET, &pr_flags);
+  }
+#else
+#if defined (PIOCRFORK)        /* Original method */
+  ioctl (fd, PIOCRFORK, NULL);
+#endif
+#endif
+
+  /* Turn on run-on-last-close flag so that this process will not hang
+     if GDB goes away for some reason.  */
+
+#if defined (PIOCSET)  /* New method */
+  {
+      long pr_flags;
+      pr_flags = PR_RLC;
+      (void) ioctl (fd, PIOCSET, &pr_flags);
+  }
+#else
+#if defined (PIOCSRLC) /* Original method */
+  (void) ioctl (fd, PIOCSRLC, 0);
+#endif
+#endif

 }
 
 /*
 }
 
 /*


@@ -520,7 +1481,6 @@ proc_iterate_over_mappings (func)
   int funcstat = 0;
   struct prmap *prmaps;
   struct prmap *prmap;
   int funcstat = 0;
   struct prmap *prmaps;
   struct prmap *prmap;

-  CORE_ADDR baseaddr = 0;

 
   if (pi.valid && (ioctl (pi.fd, PIOCNMAP, &nmap) == 0))
     {
 
   if (pi.valid && (ioctl (pi.fd, PIOCNMAP, &nmap) == 0))
     {


@@ -564,7 +1524,7 @@ DESCRIPTION
 
 CORE_ADDR
 proc_base_address (addr)
 
 CORE_ADDR
 proc_base_address (addr)

-CORE_ADDR addr;
+     CORE_ADDR addr;

 {
   int nmap;
   struct prmap *prmaps;
 {
   int nmap;
   struct prmap *prmaps;


@@ -594,7 +1554,7 @@ CORE_ADDR addr;
 
 /*
 
 
 /*
 

-GLOBAL_FUNCTION
+LOCAL FUNCTION

 
        proc_address_to_fd -- return open fd for file mapped to address
 
 
        proc_address_to_fd -- return open fd for file mapped to address
 


@@ -656,7 +1616,8 @@ NOTES
 
        The option of stopping at attach time is specific to the /proc
        versions of gdb.  Versions using ptrace force the attachee
 
        The option of stopping at attach time is specific to the /proc
        versions of gdb.  Versions using ptrace force the attachee

-       to stop.
+       to stop.  (I have changed this version to do so, too.  All you
+       have to do is "continue" to make it go on. -- [email protected])

 
 */
 
 
 */
 


@@ -664,7 +1625,9 @@ int
 attach (pid)
      int pid;
 {
 attach (pid)
      int pid;
 {

-  if (!open_proc_file (pid, &pi))
+  int result;
+
+  if (!open_proc_file (pid, &pi, O_RDWR))

     {
       perror_with_name (pi.pathname);
       /* NOTREACHED */
     {
       perror_with_name (pi.pathname);
       /* NOTREACHED */


@@ -687,29 +1650,54 @@ attach (pid)
   else
     {
       pi.was_stopped = 0;
   else
     {
       pi.was_stopped = 0;

-      if (query ("Process is currently running, stop it? "))
+      if (1 || query ("Process is currently running, stop it? "))

        {
        {

+         /* Make it run again when we close it.  */
+#if defined (PIOCSET)  /* New method */
+         {
+             long pr_flags;
+             pr_flags = PR_RLC;
+             result = ioctl (pi.fd, PIOCSET, &pr_flags);
+         }
+#else
+#if defined (PIOCSRLC) /* Original method */
+         result = ioctl (pi.fd, PIOCSRLC, 0);
+#endif
+#endif
+         if (result < 0)
+           {
+             print_sys_errmsg (pi.pathname, errno);
+             close_proc_file (&pi);
+             error ("PIOCSRLC or PIOCSET failed");
+           }

          if (ioctl (pi.fd, PIOCSTOP, &pi.prstatus) < 0)
            {
              print_sys_errmsg (pi.pathname, errno);
              close_proc_file (&pi);
              error ("PIOCSTOP failed");
            }
          if (ioctl (pi.fd, PIOCSTOP, &pi.prstatus) < 0)
            {
              print_sys_errmsg (pi.pathname, errno);
              close_proc_file (&pi);
              error ("PIOCSTOP failed");
            }

+         pi.nopass_next_sigstop = 1;
+       }
+      else
+       {
+         printf ("Ok, gdb will wait for process %u to stop.\n", pid);

        }
     }
        }
     }

-  
+

   /*  Remember some things about the inferior that we will, or might, change
       so that we can restore them when we detach. */
   
   /*  Remember some things about the inferior that we will, or might, change
       so that we can restore them when we detach. */
   

-  (void) ioctl (pi.fd, PIOCGTRACE, &pi.trace);
-  (void) ioctl (pi.fd, PIOCGFAULT, &pi.fltset);
-  (void) ioctl (pi.fd, PIOCGENTRY, &pi.entryset);
-  (void) ioctl (pi.fd, PIOCGEXIT, &pi.exitset);
+  ioctl (pi.fd, PIOCGTRACE, &pi.saved_trace);
+  ioctl (pi.fd, PIOCGHOLD, &pi.saved_sighold);
+  ioctl (pi.fd, PIOCGFAULT, &pi.saved_fltset);
+  ioctl (pi.fd, PIOCGENTRY, &pi.saved_entryset);
+  ioctl (pi.fd, PIOCGEXIT, &pi.saved_exitset);

   
   /* Set up trace and fault sets, as gdb expects them. */
   
   
   /* Set up trace and fault sets, as gdb expects them. */
   

-  (void) memset (&pi.prrun, 0, sizeof (pi.prrun));
+  memset (&pi.prrun, 0, sizeof (pi.prrun));

   prfillset (&pi.prrun.pr_trace);
   prfillset (&pi.prrun.pr_trace);

+  proc_signal_handling_change ();

   prfillset (&pi.prrun.pr_fault);
   prdelset (&pi.prrun.pr_fault, FLTPAGE);
   if (ioctl (pi.fd, PIOCSFAULT, &pi.prrun.pr_fault))
   prfillset (&pi.prrun.pr_fault);
   prdelset (&pi.prrun.pr_fault, FLTPAGE);
   if (ioctl (pi.fd, PIOCSFAULT, &pi.prrun.pr_fault))


@@ -757,34 +1745,33 @@ void
 detach (signal)
      int signal;
 {
 detach (signal)
      int signal;
 {

+  int result;
+

   if (signal)
     {
   if (signal)
     {

-      struct siginfo siginfo;
-      siginfo.si_signo = signal;
-      siginfo.si_code = 0;
-      siginfo.si_errno = 0;
-      if (ioctl (pi.fd, PIOCSSIG, &siginfo) < 0)
-       {
-         print_sys_errmsg (pi.pathname, errno);
-         printf ("PIOCSSIG failed.\n");
-       }
+      set_proc_siginfo (&pi, signal);

     }
     }

-  if (ioctl (pi.fd, PIOCSEXIT, &pi.exitset) < 0)
+  if (ioctl (pi.fd, PIOCSEXIT, &pi.saved_exitset) < 0)

     {
       print_sys_errmsg (pi.pathname, errno);
       printf ("PIOCSEXIT failed.\n");
     }
     {
       print_sys_errmsg (pi.pathname, errno);
       printf ("PIOCSEXIT failed.\n");
     }

-  if (ioctl (pi.fd, PIOCSENTRY, &pi.entryset) < 0)
+  if (ioctl (pi.fd, PIOCSENTRY, &pi.saved_entryset) < 0)

     {
       print_sys_errmsg (pi.pathname, errno);
       printf ("PIOCSENTRY failed.\n");
     }
     {
       print_sys_errmsg (pi.pathname, errno);
       printf ("PIOCSENTRY failed.\n");
     }

-  if (ioctl (pi.fd, PIOCSTRACE, &pi.trace) < 0)
+  if (ioctl (pi.fd, PIOCSTRACE, &pi.saved_trace) < 0)

     {
       print_sys_errmsg (pi.pathname, errno);
       printf ("PIOCSTRACE failed.\n");
     }
     {
       print_sys_errmsg (pi.pathname, errno);
       printf ("PIOCSTRACE failed.\n");
     }

-  if (ioctl (pi.fd, PIOCSFAULT, &pi.fltset) < 0)
+  if (ioctl (pi.fd, PIOCSHOLD, &pi.saved_sighold) < 0)
+    {
+      print_sys_errmsg (pi.pathname, errno);
+      printf ("PIOSCHOLD failed.\n");
+    }
+  if (ioctl (pi.fd, PIOCSFAULT, &pi.saved_fltset) < 0)

     {
       print_sys_errmsg (pi.pathname, errno);
       printf ("PIOCSFAULT failed.\n");
     {
       print_sys_errmsg (pi.pathname, errno);
       printf ("PIOCSFAULT failed.\n");


@@ -801,12 +1788,29 @@ detach (signal)
          if (signal || !pi.was_stopped ||
              query ("Was stopped when attached, make it runnable again? "))
            {
          if (signal || !pi.was_stopped ||
              query ("Was stopped when attached, make it runnable again? "))
            {

-             (void) memset (&pi.prrun, 0, sizeof (pi.prrun));
-             pi.prrun.pr_flags = PRCFAULT;
-             if (ioctl (pi.fd, PIOCRUN, &pi.prrun))
+             /* Clear any fault that might have stopped it.  */
+             if (ioctl (pi.fd, PIOCCFAULT, 0))
+               {
+                 print_sys_errmsg (pi.pathname, errno);
+                 printf ("PIOCCFAULT failed.\n");
+               }
+
+             /* Make it run again when we close it.  */
+#if defined (PIOCSET)  /* New method */
+             {
+                 long pr_flags;
+                 pr_flags = PR_RLC;
+                 result = ioctl (pi.fd, PIOCSET, &pr_flags);
+             }
+#else
+#if defined (PIOCSRLC) /* Original method */
+             result = ioctl (pi.fd, PIOCSRLC, 0);
+#endif
+#endif
+             if (result)

                {
                  print_sys_errmsg (pi.pathname, errno);
                {
                  print_sys_errmsg (pi.pathname, errno);

-                 printf ("PIOCRUN failed.\n");
+                 printf ("PIOCSRLC or PIOCSET failed.\n");

                }
            }
        }
                }
            }
        }


@@ -979,13 +1983,83 @@ proc_wait (statloc)
 
 /*
 
 
 /*
 

+LOCAL FUNCTION
+
+       set_proc_siginfo - set a process's current signal info
+
+SYNOPSIS
+
+       void set_proc_siginfo (struct procinfo *pip, int signo);
+
+DESCRIPTION
+
+       Given a pointer to a process info struct in PIP and a signal number
+       in SIGNO, set the process's current signal and its associated signal
+       information.  The signal will be delivered to the process immediately
+       after execution is resumed, even if it is being held.  In addition,
+       this particular delivery will not cause another PR_SIGNALLED stop
+       even if the signal is being traced.
+
+       If we are not delivering the same signal that the prstatus siginfo
+       struct contains information about, then synthesize a siginfo struct
+       to match the signal we are doing to deliver, make it of the type
+       "generated by a user process", and send this synthesized copy.  When
+       used to set the inferior's signal state, this will be required if we
+       are not currently stopped because of a traced signal, or if we decide
+       to continue with a different signal.
+
+       Note that when continuing the inferior from a stop due to receipt
+       of a traced signal, we either have set PRCSIG to clear the existing
+       signal, or we have to call this function to do a PIOCSSIG with either
+       the existing siginfo struct from pr_info, or one we have synthesized
+       appropriately for the signal we want to deliver.  Otherwise if the
+       signal is still being traced, the inferior will immediately stop
+       again.
+
+       See siginfo(5) for more details.
+*/
+
+static void
+set_proc_siginfo (pip, signo)
+     struct procinfo *pip;
+     int signo;
+{
+  struct siginfo newsiginfo;
+  struct siginfo *sip;
+
+  if (pip -> valid)
+    {
+      if (signo == pip -> prstatus.pr_info.si_signo)
+       {
+         sip = &pip -> prstatus.pr_info;
+       }
+      else
+       {
+         memset ((char *) &newsiginfo, 0, sizeof (newsiginfo));
+         sip = &newsiginfo;
+         sip -> si_signo = signo;
+         sip -> si_code = 0;
+         sip -> si_errno = 0;
+         sip -> si_pid = getpid ();
+         sip -> si_uid = getuid ();
+       }
+      if (ioctl (pip -> fd, PIOCSSIG, sip) < 0)
+       {
+         print_sys_errmsg (pip -> pathname, errno);
+         warning ("PIOCSSIG failed");
+       }
+    }
+}
+
+/*
+

 GLOBAL FUNCTION
 
        child_resume -- resume execution of the inferior process
 
 SYNOPSIS
 
 GLOBAL FUNCTION
 
        child_resume -- resume execution of the inferior process
 
 SYNOPSIS
 

-       void child_resume (int step, int signal)
+       void child_resume (int step, int signo)

 
 DESCRIPTION
 
 
 DESCRIPTION
 


@@ -1000,31 +2074,46 @@ NOTE
        to be current.  One case where this might be necessary is if the
        user explicitly changes the PC value that gdb considers to be
        current.  FIXME:  Investigate if this is necessary or not.
        to be current.  One case where this might be necessary is if the
        user explicitly changes the PC value that gdb considers to be
        current.  FIXME:  Investigate if this is necessary or not.

+
+       When attaching to a child process, if we forced it to stop with
+       a PIOCSTOP, then we will have set the nopass_next_sigstop flag.
+       Upon resuming the first time after such a stop, we explicitly
+       inhibit sending it another SIGSTOP, which would be the normal
+       result of default signal handling.  One potential drawback to
+       this is that we will also ignore any attempt to by the user
+       to explicitly continue after the attach with a SIGSTOP.  Ultimately
+       this problem should be dealt with by making the routines that
+       deal with the inferior a little smarter, and possibly even allow
+       an inferior to continue running at the same time as gdb.  (FIXME?)

  */
 
 void
  */
 
 void

-child_resume (step, signal)
+child_resume (step, signo)

      int step;
      int step;

-     int signal;
+     int signo;

 {
   errno = 0;
 {
   errno = 0;

-  pi.prrun.pr_flags = PRSVADDR | PRSTRACE | PRSFAULT | PRCFAULT;
+  pi.prrun.pr_flags = PRSTRACE | PRSFAULT | PRCFAULT;
+
+#ifdef PRSVADDR_BROKEN
+/* Can't do this under Solaris running on a Sparc, as there seems to be no
+   place to put nPC.  In fact, if you use this, nPC seems to be set to some
+   random garbage.  We have to rely on the fact that PC and nPC have been
+   written previously via PIOCSREG during a register flush. */
+

   pi.prrun.pr_vaddr = (caddr_t) *(int *) &registers[REGISTER_BYTE (PC_REGNUM)];
   pi.prrun.pr_vaddr = (caddr_t) *(int *) &registers[REGISTER_BYTE (PC_REGNUM)];

-  if (signal)
+  pi.prrun.pr_flags != PRSVADDR;
+#endif
+
+  if (signo && !(signo == SIGSTOP && pi.nopass_next_sigstop))

     {
     {

-      if (signal != pi.prstatus.pr_cursig)
-       {
-         struct siginfo siginfo;
-         siginfo.si_signo = signal;
-         siginfo.si_code = 0;
-         siginfo.si_errno = 0;
-         (void) ioctl (pi.fd, PIOCSSIG, &siginfo);
-       }
+      set_proc_siginfo (&pi, signo);

     }
   else
     {
       pi.prrun.pr_flags |= PRCSIG;
     }
     }
   else
     {
       pi.prrun.pr_flags |= PRCSIG;
     }

+  pi.nopass_next_sigstop = 0;

   if (step)
     {
       pi.prrun.pr_flags |= PRSTEP;
   if (step)
     {
       pi.prrun.pr_flags |= PRSTEP;


@@ -1096,10 +2185,10 @@ NOTES
 
 void
 fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
 
 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 */
+     char *core_reg_sect;
+     unsigned core_reg_size;
+     int which;
+     unsigned int reg_addr;    /* Unused in this version */

 {
 
   if (which == 0)
 {
 
   if (which == 0)


@@ -1110,8 +2199,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
        }
       else
        {
        }
       else
        {

-         (void) memcpy ((char *) &pi.gregset, core_reg_sect,
-                        sizeof (pi.gregset));
+         memcpy ((char *) &pi.gregset, core_reg_sect, sizeof (pi.gregset));

          supply_gregset (&pi.gregset);
        }
     }
          supply_gregset (&pi.gregset);
        }
     }


@@ -1123,8 +2211,7 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
        }
       else
        {
        }
       else
        {

-         (void) memcpy ((char *) &pi.fpregset, core_reg_sect,
-                        sizeof (pi.fpregset));
+         memcpy ((char *) &pi.fpregset, core_reg_sect, sizeof (pi.fpregset));

 #if defined (FP0_REGNUM)
          supply_fpregset (&pi.fpregset);
 #endif
 #if defined (FP0_REGNUM)
          supply_fpregset (&pi.fpregset);
 #endif


@@ -1155,7 +2242,7 @@ proc_init_failed (why)
      char *why;
 {
   print_sys_errmsg (pi.pathname, errno);
      char *why;
 {
   print_sys_errmsg (pi.pathname, errno);

-  (void) kill (pi.pid, SIGKILL);
+  kill (pi.pid, SIGKILL);

   close_proc_file (&pi);
   error (why);
   /* NOTREACHED */
   close_proc_file (&pi);
   error (why);
   /* NOTREACHED */


@@ -1187,7 +2274,7 @@ close_proc_file (pip)
   pip -> pid = 0;
   if (pip -> valid)
     {
   pip -> pid = 0;
   if (pip -> valid)
     {

-      (void) close (pip -> fd);
+      close (pip -> fd);

     }
   pip -> fd = -1;
   if (pip -> pathname)
     }
   pip -> fd = -1;
   if (pip -> pathname)


@@ -1206,15 +2293,16 @@ LOCAL FUNCTION
 
 SYNOPSIS
 
 
 SYNOPSIS
 

-       static int open_proc_file (pid, struct procinfo *pip)
+       static int open_proc_file (int pid, struct procinfo *pip, int mode)

 
 DESCRIPTION
 
 
 DESCRIPTION
 

-       Given a process id, close the existing open /proc entry (if any)
-       and open one for the new process id.  Once it is open, then
-       mark the local process information structure as valid, which
-       guarantees that the pid, fd, and pathname fields match an open
-       /proc entry.  Returns zero if the open fails, nonzero otherwise.
+       Given a process id and a mode, close the existing open /proc
+       entry (if any) and open one for the new process id, in the
+       specified mode.  Once it is open, then mark the local process
+       information structure as valid, which guarantees that the pid,
+       fd, and pathname fields match an open /proc entry.  Returns
+       zero if the open fails, nonzero otherwise.

 
        Note that the pathname is left intact, even when the open fails,
        so that callers can use it to construct meaningful error messages
 
        Note that the pathname is left intact, even when the open fails,
        so that callers can use it to construct meaningful error messages


@@ -1222,21 +2310,22 @@ DESCRIPTION
  */
 
 static int
  */
 
 static int

-open_proc_file (pid, pip)
+open_proc_file (pid, pip, mode)

      int pid;
      struct procinfo *pip;
      int pid;
      struct procinfo *pip;

+     int mode;

 {
 {

-  pip -> valid = 0;
+  pip -> valid = 0;            /* FIXME, what is this? ?!  */

   if (pip -> valid)
     {
   if (pip -> valid)
     {

-      (void) close (pip -> fd);
+      close (pip -> fd);

     }
   if (pip -> pathname == NULL)
     {
       pip -> pathname = xmalloc (32);
     }
   sprintf (pip -> pathname, PROC_NAME_FMT, pid);
     }
   if (pip -> pathname == NULL)
     {
       pip -> pathname = xmalloc (32);
     }
   sprintf (pip -> pathname, PROC_NAME_FMT, pid);

-  if ((pip -> fd = open (pip -> pathname, O_RDWR)) >= 0)
+  if ((pip -> fd = open (pip -> pathname, mode)) >= 0)

     {
       pip -> valid = 1;
       pip -> pid = pid;
     {
       pip -> valid = 1;
       pip -> pid = pid;


@@ -1248,62 +2337,461 @@ static char *
 mappingflags (flags)
      long flags;
 {
 mappingflags (flags)
      long flags;
 {

-  static char asciiflags[7];
+  static char asciiflags[8];

   
   

-  strcpy (asciiflags, "------");
-  if (flags & MA_STACK)  asciiflags[0] = 's';
-  if (flags & MA_BREAK)  asciiflags[1] = 'b';
-  if (flags & MA_SHARED) asciiflags[2] = 's';
-  if (flags & MA_READ)   asciiflags[3] = 'r';
-  if (flags & MA_WRITE)  asciiflags[4] = 'w';
-  if (flags & MA_EXEC)   asciiflags[5] = 'x';
+  strcpy (asciiflags, "-------");
+#if defined (MA_PHYS)
+  if (flags & MA_PHYS)   asciiflags[0] = 'd';
+#endif
+  if (flags & MA_STACK)  asciiflags[1] = 's';
+  if (flags & MA_BREAK)  asciiflags[2] = 'b';
+  if (flags & MA_SHARED) asciiflags[3] = 's';
+  if (flags & MA_READ)   asciiflags[4] = 'r';
+  if (flags & MA_WRITE)  asciiflags[5] = 'w';
+  if (flags & MA_EXEC)   asciiflags[6] = 'x';

   return (asciiflags);
 }
 
 static void
   return (asciiflags);
 }
 
 static void

-proc_info_address_map (pip, verbose)
+info_proc_flags (pip, summary)
+     struct procinfo *pip;
+     int summary;
+{
+  struct trans *transp;
+
+  printf_filtered ("%-32s", "Process status flags:");
+  if (!summary)
+    {
+      printf_filtered ("\n\n");
+    }
+  for (transp = pr_flag_table; transp -> name != NULL; transp++)
+    {
+      if (pip -> prstatus.pr_flags & transp -> value)
+       {
+         if (summary)
+           {
+             printf_filtered ("%s ", transp -> name);
+           }
+         else
+           {
+             printf_filtered ("\t%-16s %s.\n", transp -> name, transp -> desc);
+           }
+       }
+    }
+  printf_filtered ("\n");
+}
+
+static void
+info_proc_stop (pip, summary)
+     struct procinfo *pip;
+     int summary;
+{
+  struct trans *transp;
+  int why;
+  int what;
+
+  why = pip -> prstatus.pr_why;
+  what = pip -> prstatus.pr_what;
+
+  if (pip -> prstatus.pr_flags & PR_STOPPED)
+    {
+      printf_filtered ("%-32s", "Reason for stopping:");
+      if (!summary)
+       {
+         printf_filtered ("\n\n");
+       }
+      for (transp = pr_why_table; transp -> name != NULL; transp++)
+       {
+         if (why == transp -> value)
+           {
+             if (summary)
+               {
+                 printf_filtered ("%s ", transp -> name);
+               }
+             else
+               {
+                 printf_filtered ("\t%-16s %s.\n",
+                                  transp -> name, transp -> desc);
+               }
+             break;
+           }
+       }
+      
+      /* Use the pr_why field to determine what the pr_what field means, and
+        print more information. */
+      
+      switch (why)
+       {
+         case PR_REQUESTED:
+           /* pr_what is unused for this case */
+           break;
+         case PR_JOBCONTROL:
+         case PR_SIGNALLED:
+           if (summary)
+             {
+               printf_filtered ("%s ", signalname (what));
+             }
+           else
+             {
+               printf_filtered ("\t%-16s %s.\n", signalname (what),
+                                safe_strsignal (what));
+             }
+           break;
+         case PR_SYSENTRY:
+           if (summary)
+             {
+               printf_filtered ("%s ", syscallname (what));
+             }
+           else
+             {
+               printf_filtered ("\t%-16s %s.\n", syscallname (what),
+                                "Entered this system call");
+             }
+           break;
+         case PR_SYSEXIT:
+           if (summary)
+             {
+               printf_filtered ("%s ", syscallname (what));
+             }
+           else
+             {
+               printf_filtered ("\t%-16s %s.\n", syscallname (what),
+                                "Returned from this system call");
+             }
+           break;
+         case PR_FAULTED:
+           if (summary)
+             {
+               printf_filtered ("%s ",
+                                lookupname (faults_table, what, "fault"));
+             }
+           else
+             {
+               printf_filtered ("\t%-16s %s.\n",
+                                lookupname (faults_table, what, "fault"),
+                                lookupdesc (faults_table, what));
+             }
+           break;
+         }
+      printf_filtered ("\n");
+    }
+}
+
+static void
+info_proc_siginfo (pip, summary)
+     struct procinfo *pip;
+     int summary;
+{
+  struct siginfo *sip;
+
+  if ((pip -> prstatus.pr_flags & PR_STOPPED) &&
+      (pip -> prstatus.pr_why == PR_SIGNALLED ||
+       pip -> prstatus.pr_why == PR_FAULTED))
+    {
+      printf_filtered ("%-32s", "Additional signal/fault info:");
+      sip = &pip -> prstatus.pr_info;
+      if (summary)
+       {
+         printf_filtered ("%s ", signalname (sip -> si_signo));
+         if (sip -> si_errno > 0)
+           {
+             printf_filtered ("%s ", errnoname (sip -> si_errno));
+           }
+         if (sip -> si_code <= 0)
+           {
+             printf_filtered ("sent by pid %d, uid %d ", sip -> si_pid,
+                              sip -> si_uid);
+           }
+         else
+           {
+             printf_filtered ("%s ", sigcodename (sip));
+             if ((sip -> si_signo == SIGILL) ||
+                 (sip -> si_signo == SIGFPE) ||
+                 (sip -> si_signo == SIGSEGV) ||
+                 (sip -> si_signo == SIGBUS))
+               {
+                 printf_filtered ("addr=%#x ", sip -> si_addr);
+               }
+             else if ((sip -> si_signo == SIGCHLD))
+               {
+                 printf_filtered ("child pid %u, status %u ",
+                                  sip -> si_pid,
+                                  sip -> si_status);
+               }
+             else if ((sip -> si_signo == SIGPOLL))
+               {
+                 printf_filtered ("band %u ", sip -> si_band);
+               }
+           }
+       }
+      else
+       {
+         printf_filtered ("\n\n");
+         printf_filtered ("\t%-16s %s.\n", signalname (sip -> si_signo),
+                          safe_strsignal (sip -> si_signo));
+         if (sip -> si_errno > 0)
+           {
+             printf_filtered ("\t%-16s %s.\n",
+                              errnoname (sip -> si_errno),
+                              safe_strerror (sip -> si_errno));
+           }
+         if (sip -> si_code <= 0)
+           {
+             printf_filtered ("\t%-16u %s\n", sip -> si_pid,
+                              "PID of process sending signal");
+             printf_filtered ("\t%-16u %s\n", sip -> si_uid,
+                              "UID of process sending signal");
+           }
+         else
+           {
+             printf_filtered ("\t%-16s %s.\n", sigcodename (sip),
+                              sigcodedesc (sip));
+             if ((sip -> si_signo == SIGILL) ||
+                 (sip -> si_signo == SIGFPE))
+               {
+                 printf_filtered ("\t%-16#x %s.\n", sip -> si_addr,
+                                  "Address of faulting instruction");
+               }
+             else if ((sip -> si_signo == SIGSEGV) ||
+                      (sip -> si_signo == SIGBUS))
+               {
+                 printf_filtered ("\t%-16#x %s.\n", sip -> si_addr,
+                                  "Address of faulting memory reference");
+               }
+             else if ((sip -> si_signo == SIGCHLD))
+               {
+                 printf_filtered ("\t%-16u %s.\n", sip -> si_pid,
+                                  "Child process ID");
+                 printf_filtered ("\t%-16u %s.\n", sip -> si_status,
+                                  "Child process exit value or signal");
+               }
+             else if ((sip -> si_signo == SIGPOLL))
+               {
+                 printf_filtered ("\t%-16u %s.\n", sip -> si_band,
+                                  "Band event for POLL_{IN,OUT,MSG}");
+               }
+           }
+       }
+      printf_filtered ("\n");
+    }
+}
+
+static void
+info_proc_syscalls (pip, summary)
+     struct procinfo *pip;
+     int summary;
+{
+  int syscallnum;
+
+  if (!summary)
+    {
+
+#if 0  /* FIXME:  Needs to use gdb-wide configured info about system calls. */
+      if (pip -> prstatus.pr_flags & PR_ASLEEP)
+       {
+         int syscallnum = pip -> prstatus.pr_reg[R_D0];
+         if (summary)
+           {
+             printf_filtered ("%-32s", "Sleeping in system call:");
+             printf_filtered ("%s", syscallname (syscallnum));
+           }
+         else
+           {
+             printf_filtered ("Sleeping in system call '%s'.\n",
+                              syscallname (syscallnum));
+           }
+       }
+#endif
+
+      if (ioctl (pip -> fd, PIOCGENTRY, &pip -> entryset) < 0)
+       {
+         print_sys_errmsg (pip -> pathname, errno);
+         error ("PIOCGENTRY failed");
+       }
+      
+      if (ioctl (pip -> fd, PIOCGEXIT, &pip -> exitset) < 0)
+       {
+         print_sys_errmsg (pip -> pathname, errno);
+         error ("PIOCGEXIT failed");
+       }
+      
+      printf_filtered ("System call tracing information:\n\n");
+      
+      printf_filtered ("\t%-12s %-8s %-8s\n",
+                      "System call",
+                      "Entry",
+                      "Exit");
+      for (syscallnum = 0; syscallnum < MAX_SYSCALLS; syscallnum++)
+       {
+         QUIT;
+         if (syscall_table[syscallnum] != NULL)
+           {
+             printf_filtered ("\t%-12s ", syscall_table[syscallnum]);
+             printf_filtered ("%-8s ",
+                              prismember (&pip -> entryset, syscallnum)
+                              ? "on" : "off");
+             printf_filtered ("%-8s ",
+                              prismember (&pip -> exitset, syscallnum)
+                              ? "on" : "off");
+             printf_filtered ("\n");
+           }
+         }
+      printf_filtered ("\n");
+    }
+}
+
+static char *
+signalname (signo)
+     int signo;
+{
+  char *name;
+  static char locbuf[32];
+
+  name = strsigno (signo);
+  if (name == NULL)
+    {
+      sprintf (locbuf, "Signal %d", signo);
+    }
+  else
+    {
+      sprintf (locbuf, "%s (%d)", name, signo);
+    }
+  return (locbuf);
+}
+
+static char *
+errnoname (errnum)
+     int errnum;
+{
+  char *name;
+  static char locbuf[32];
+
+  name = strerrno (errnum);
+  if (name == NULL)
+    {
+      sprintf (locbuf, "Errno %d", errnum);
+    }
+  else
+    {
+      sprintf (locbuf, "%s (%d)", name, errnum);
+    }
+  return (locbuf);
+}
+
+static void
+info_proc_signals (pip, summary)
+     struct procinfo *pip;
+     int summary;
+{
+  int signo;
+
+  if (!summary)
+    {
+      if (ioctl (pip -> fd, PIOCGTRACE, &pip -> trace) < 0)
+       {
+         print_sys_errmsg (pip -> pathname, errno);
+         error ("PIOCGTRACE failed");
+       }
+      
+      printf_filtered ("Disposition of signals:\n\n");
+      printf_filtered ("\t%-15s %-8s %-8s %-8s  %s\n\n",
+                      "Signal", "Trace", "Hold", "Pending", "Description");
+      for (signo = 0; signo < NSIG; signo++)
+       {
+         QUIT;
+         printf_filtered ("\t%-15s ", signalname (signo));
+         printf_filtered ("%-8s ",
+                          prismember (&pip -> trace, signo)
+                          ? "on" : "off");
+         printf_filtered ("%-8s ",
+                          prismember (&pip -> prstatus.pr_sighold, signo)
+                          ? "on" : "off");
+         printf_filtered ("%-8s ",
+                          prismember (&pip -> prstatus.pr_sigpend, signo)
+                          ? "yes" : "no");
+         printf_filtered (" %s\n", safe_strsignal (signo));
+       }
+      printf_filtered ("\n");
+    }
+}
+
+static void
+info_proc_faults (pip, summary)
+     struct procinfo *pip;
+     int summary;
+{
+  struct trans *transp;
+
+  if (!summary)
+    {
+      if (ioctl (pip -> fd, PIOCGFAULT, &pip -> fltset) < 0)
+       {
+         print_sys_errmsg (pip -> pathname, errno);
+         error ("PIOCGFAULT failed");
+       }
+      
+      printf_filtered ("Current traced hardware fault set:\n\n");
+      printf_filtered ("\t%-12s %-8s\n", "Fault", "Trace");
+
+      for (transp = faults_table; transp -> name != NULL; transp++)
+       {
+         QUIT;
+         printf_filtered ("\t%-12s ", transp -> name);
+         printf_filtered ("%-8s", prismember (&pip -> fltset, transp -> value)
+                          ? "on" : "off");
+         printf_filtered ("\n");
+       }
+      printf_filtered ("\n");
+    }
+}
+
+static void
+info_proc_mappings (pip, summary)

      struct procinfo *pip;
      struct procinfo *pip;

-     int verbose;
+     int summary;

 {
   int nmap;
   struct prmap *prmaps;
   struct prmap *prmap;
 
 {
   int nmap;
   struct prmap *prmaps;
   struct prmap *prmap;
 

-  printf_filtered ("Mapped address spaces:\n\n");
-  printf_filtered ("\t%10s %10s %10s %10s %6s\n",
-                  "Start Addr",
-                  "  End Addr",
-                  "      Size",
-                  "    Offset",
-                  "Flags");
-  if (ioctl (pip -> fd, PIOCNMAP, &nmap) == 0)
+  if (!summary)

     {
     {

-      prmaps = (struct prmap *) alloca ((nmap + 1) * sizeof (*prmaps));
-      if (ioctl (pip -> fd, PIOCMAP, prmaps) == 0)
+      printf_filtered ("Mapped address spaces:\n\n");
+      printf_filtered ("\t%10s %10s %10s %10s %7s\n",
+                      "Start Addr",
+                      "  End Addr",
+                      "      Size",
+                      "    Offset",
+                      "Flags");
+      if (ioctl (pip -> fd, PIOCNMAP, &nmap) == 0)

        {
        {

-         for (prmap = prmaps; prmap -> pr_size; ++prmap)
+         prmaps = (struct prmap *) alloca ((nmap + 1) * sizeof (*prmaps));
+         if (ioctl (pip -> fd, PIOCMAP, prmaps) == 0)

            {
            {

-             printf_filtered ("\t%#10x %#10x %#10x %#10x %6s\n",
-                              prmap -> pr_vaddr,
-                              prmap -> pr_vaddr + prmap -> pr_size - 1,
-                              prmap -> pr_size,
-                              prmap -> pr_off,
-                              mappingflags (prmap -> pr_mflags));
+             for (prmap = prmaps; prmap -> pr_size; ++prmap)
+               {
+                 printf_filtered ("\t%#10x %#10x %#10x %#10x %7s\n",
+                                  prmap -> pr_vaddr,
+                                  prmap -> pr_vaddr + prmap -> pr_size - 1,
+                                  prmap -> pr_size,
+                                  prmap -> pr_off,
+                                  mappingflags (prmap -> pr_mflags));
+               }

            }
        }
            }
        }

+      printf_filtered ("\n");

     }
     }

-  printf_filtered ("\n\n");

 }
 
 /*
 
 LOCAL FUNCTION
 
 }
 
 /*
 
 LOCAL FUNCTION
 

-       proc_info -- implement the "info proc" command
+       info_proc -- implement the "info proc" command

 
 SYNOPSIS
 
 
 SYNOPSIS
 

-       void proc_info (char *args, int from_tty)
+       void info_proc (char *args, int from_tty)

 
 DESCRIPTION
 
 
 DESCRIPTION
 


@@ -1312,24 +2800,38 @@ DESCRIPTION
 
        Examples of the use of "info proc" are:
 
 
        Examples of the use of "info proc" are:
 

-       info proc               Print short info about current inferior.
-       info proc verbose       Print verbose info about current inferior.
-       info proc 123           Print short info about process pid 123.
-       info proc 123 verbose   Print verbose info about process pid 123.
+       info proc               (prints summary info for current inferior)
+       info proc 123           (prints summary info for process with pid 123)
+       info proc mappings      (prints address mappings)
+       info proc times         (prints process/children times)
+       info proc id            (prints pid, ppid, gid, sid, etc)
+       info proc status        (prints general process state info)
+       info proc signals       (prints info about signal handling)
+       info proc all           (prints all info)

 
  */
 
 static void
 
  */
 
 static void

-proc_info (args, from_tty)
+info_proc (args, from_tty)

      char *args;
      int from_tty;
 {
      char *args;
      int from_tty;
 {

-  int verbose = 0;

   int pid;
   struct procinfo pii;
   struct procinfo *pip;
   struct cleanup *old_chain;
   int pid;
   struct procinfo pii;
   struct procinfo *pip;
   struct cleanup *old_chain;

-  char *nexttok;
+  char **argv;
+  int argsize;
+  int summary = 1;
+  int flags = 0;
+  int syscalls = 0;
+  int signals = 0;
+  int faults = 0;
+  int mappings = 0;
+  int times = 0;
+  int id = 0;
+  int status = 0;
+  int all = 0;

 
   old_chain = make_cleanup (null_cleanup, 0);
 
 
   old_chain = make_cleanup (null_cleanup, 0);
 


@@ -1337,31 +2839,79 @@ proc_info (args, from_tty)
 
   pip = &pi;
 
 
   pip = &pi;
 

-  /* Parse the args string, looking for "verbose" (or any abbrev) and
-     for a specific pid.  If a specific pid is found, the process
-     file is opened. */
-  

   if (args != NULL)
     {
   if (args != NULL)
     {

-      while ((nexttok = strtok (args, " \t")) != NULL)
+      if ((argv = buildargv (args)) == NULL)

        {
        {

-         args = NULL;
-         if (strncmp (nexttok, "verbose", strlen (nexttok)) == 0)
+         nomem (0);
+       }
+      make_cleanup (freeargv, (char *) argv);
+
+      while (*argv != NULL)
+       {
+         argsize = strlen (*argv);
+         if (argsize >= 1 && strncmp (*argv, "all", argsize) == 0)
+           {
+             summary = 0;
+             all = 1;
+           }
+         else if (argsize >= 2 && strncmp (*argv, "faults", argsize) == 0)
+           {
+             summary = 0;
+             faults = 1;
+           }
+         else if (argsize >= 2 && strncmp (*argv, "flags", argsize) == 0)
+           {
+             summary = 0;
+             flags = 1;
+           }
+         else if (argsize >= 1 && strncmp (*argv, "id", argsize) == 0)
+           {
+             summary = 0;
+             id = 1;
+           }
+         else if (argsize >= 1 && strncmp (*argv, "mappings", argsize) == 0)
+           {
+             summary = 0;
+             mappings = 1;
+           }
+         else if (argsize >= 2 && strncmp (*argv, "signals", argsize) == 0)
+           {
+             summary = 0;
+             signals = 1;
+           }
+         else if (argsize >= 2 && strncmp (*argv, "status", argsize) == 0)
+           {
+             summary = 0;
+             status = 1;
+           }
+         else if (argsize >= 2 && strncmp (*argv, "syscalls", argsize) == 0)
+           {
+             summary = 0;
+             syscalls = 1;
+           }
+         else if (argsize >= 1 && strncmp (*argv, "times", argsize) == 0)

            {
            {

-             verbose++;
+             summary = 0;
+             times = 1;

            }
            }

-         else if ((pii.pid = atoi (nexttok)) > 0)
+         else if ((pii.pid = atoi (*argv)) > 0)

            {
              pid = pii.pid;
              pip = &pii;
            {
              pid = pii.pid;
              pip = &pii;

-             (void) memset (&pii, 0, sizeof (pii));
-             if (!open_proc_file (pid, pip))
+             memset (&pii, 0, sizeof (pii));
+             if (!open_proc_file (pid, pip, O_RDONLY))

                {
                  perror_with_name (pip -> pathname);
                  /* NOTREACHED */
                }
              make_cleanup (close_proc_file, pip);
            }
                {
                  perror_with_name (pip -> pathname);
                  /* NOTREACHED */
                }
              make_cleanup (close_proc_file, pip);
            }

+         else if (**argv != '\000')
+           {
+             error ("Unrecognized or ambiguous keyword `%s'.", *argv);
+           }
+         argv++;

        }
     }
 
        }
     }
 


@@ -1378,24 +2928,39 @@ proc_info (args, from_tty)
       error ("PIOCSTATUS failed");
     }
 
       error ("PIOCSTATUS failed");
     }
 

-  printf_filtered ("\nStatus information for %s:\n\n", pip -> pathname);
-  proc_info_address_map (pip, verbose);
-#if 0
-  proc_info_flags (pip, verbose);
-  proc_info_why (pip, verbose);
-  proc_info_what (pip, verbose);
-  proc_info_info (pip, verbose);
-  proc_info_cursig (pip, verbose);
-  proc_info_sigpend (pip, verbose);
-  proc_info_sighold (pip, verbose);
-  proc_info_altstack (pip, verbose);
-  proc_info_action (pip, verbose);
-  proc_info_id (pip, verbose);
-  proc_info_times (pip, verbose);
-  proc_info_clname (pip,verbose);
-  proc_info_instr (pip, verbose);
-  proc_info_reg (pip, verbose);
-#endif  
+  /* Print verbose information of the requested type(s), or just a summary
+     of the information for all types. */
+
+  printf_filtered ("\nInformation for %s:\n\n", pip -> pathname);
+  if (summary || all || flags)
+    {
+      info_proc_flags (pip, summary);
+    }
+  if (summary || all)
+    {
+      info_proc_stop (pip, summary);
+    }
+  if (summary || all || signals || faults)
+    {
+      info_proc_siginfo (pip, summary);
+    }
+  if (summary || all || syscalls)
+    {
+      info_proc_syscalls (pip, summary);
+    }
+  if (summary || all || mappings)
+    {
+      info_proc_mappings (pip, summary);
+    }
+  if (summary || all || signals)
+    {
+      info_proc_signals (pip, summary);
+    }
+  if (summary || all || faults)
+    {
+      info_proc_faults (pip, summary);
+    }
+  printf_filtered ("\n");

 
   /* All done, deal with closing any temporary process info structure,
      freeing temporary memory , etc. */
 
   /* All done, deal with closing any temporary process info structure,
      freeing temporary memory , etc. */


@@ -1421,13 +2986,18 @@ DESCRIPTION
 */
 
 static char *proc_desc =
 */
 
 static char *proc_desc =

-"Show current process status information using /proc entry.\n\
-With no arguments, prints short form.  With 'verbose' prints long form.";
+"Show process status information using /proc entry.\n\
+Specify process id or use current inferior by default.\n\
+Specify keywords for detailed information; default is summary.\n\
+Keywords are: `all', `faults', `flags', `id', `mappings', `signals',\n\
+`status', `syscalls', and `times'.\n\
+Unambiguous abbreviations may be used.";

 
 void
 _initialize_proc_fs ()
 {
 
 void
 _initialize_proc_fs ()
 {

-  add_info ("proc", proc_info, proc_desc);
+  add_info ("proc", info_proc, proc_desc);
+  init_syscall_table ();

 }
 
 #endif /* USE_PROC_FS */
 }
 
 #endif /* USE_PROC_FS */