Handle UI's terminal closing

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

diff --git a/gdb/procfs.c b/gdb/procfs.c
index 8204747784c95c7be56de4ad041c58b0561453b3..67b424f5e565587c80f0ce725f6170af0a3055d4 100644 (file)
--- a/gdb/procfs.c
+++ b/gdb/procfs.c
@@ -1,6 +1,6 @@
 /* Machine independent support for SVR4 /proc (process file system) for GDB.
 
 /* Machine independent support for SVR4 /proc (process file system) for GDB.
 

-   Copyright (C) 1999-2014 Free Software Foundation, Inc.
+   Copyright (C) 1999-2016 Free Software Foundation, Inc.

 
    Written by Michael Snyder at Cygnus Solutions.
    Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others.
 
    Written by Michael Snyder at Cygnus Solutions.
    Based on work by Fred Fish, Stu Grossman, Geoff Noer, and others.


@@ -22,6 +22,7 @@
 
 #include "defs.h"
 #include "inferior.h"
 
 #include "defs.h"
 #include "inferior.h"

+#include "infrun.h"

 #include "target.h"
 #include "gdbcore.h"
 #include "elf-bfd.h"           /* for elfcore_write_* */
 #include "target.h"
 #include "gdbcore.h"
 #include "elf-bfd.h"           /* for elfcore_write_* */


@@ -29,6 +30,7 @@
 #include "gdbthread.h"
 #include "regcache.h"
 #include "inf-child.h"
 #include "gdbthread.h"
 #include "regcache.h"
 #include "inf-child.h"

+#include "filestuff.h"

 
 #if defined (NEW_PROC_API)
 #define _STRUCTURED_PROC 1     /* Should be done by configure script.  */
 
 #if defined (NEW_PROC_API)
 #define _STRUCTURED_PROC 1     /* Should be done by configure script.  */


@@ -41,13 +43,10 @@
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif

-#include <sys/errno.h>

 #include "gdb_wait.h"
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_bfd.h"
 #include "gdb_wait.h"
 #include <signal.h>
 #include <ctype.h>
 #include "gdb_bfd.h"

-#include <string.h>
-#include "gdb_assert.h"

 #include "inflow.h"
 #include "auxv.h"
 #include "procfs.h"
 #include "inflow.h"
 #include "auxv.h"
 #include "procfs.h"


@@ -109,11 +108,11 @@
 
 /* This module defines the GDB target vector and its methods.  */
 
 
 /* This module defines the GDB target vector and its methods.  */
 

-static void procfs_attach (struct target_ops *, char *, int);
+static void procfs_attach (struct target_ops *, const char *, int);

 static void procfs_detach (struct target_ops *, const char *, int);
 static void procfs_resume (struct target_ops *,
                           ptid_t, int, enum gdb_signal);
 static void procfs_detach (struct target_ops *, const char *, int);
 static void procfs_resume (struct target_ops *,
                           ptid_t, int, enum gdb_signal);

-static void procfs_stop (struct target_ops *self, ptid_t);
+static void procfs_interrupt (struct target_ops *self, ptid_t);

 static void procfs_files_info (struct target_ops *);
 static void procfs_fetch_registers (struct target_ops *,
                                    struct regcache *, int);
 static void procfs_files_info (struct target_ops *);
 static void procfs_fetch_registers (struct target_ops *,
                                    struct regcache *, int);


@@ -135,7 +134,7 @@ static target_xfer_partial_ftype procfs_xfer_partial;
 
 static int procfs_thread_alive (struct target_ops *ops, ptid_t);
 
 
 static int procfs_thread_alive (struct target_ops *ops, ptid_t);
 

-static void procfs_find_new_threads (struct target_ops *ops);
+static void procfs_update_thread_list (struct target_ops *ops);

 static char *procfs_pid_to_str (struct target_ops *, ptid_t);
 
 static int proc_find_memory_regions (struct target_ops *self,
 static char *procfs_pid_to_str (struct target_ops *, ptid_t);
 
 static int proc_find_memory_regions (struct target_ops *self,


@@ -145,9 +144,9 @@ static char * procfs_make_note_section (struct target_ops *self,
                                        bfd *, int *);
 
 static int procfs_can_use_hw_breakpoint (struct target_ops *self,
                                        bfd *, int *);
 
 static int procfs_can_use_hw_breakpoint (struct target_ops *self,

-                                        int, int, int);
+                                        enum bptype, int, int);

 
 

-static void procfs_info_proc (struct target_ops *, char *,
+static void procfs_info_proc (struct target_ops *, const char *,

                              enum info_proc_what);
 
 #if defined (PR_MODEL_NATIVE) && (PR_MODEL_NATIVE == PR_MODEL_LP64)
                              enum info_proc_what);
 
 #if defined (PR_MODEL_NATIVE) && (PR_MODEL_NATIVE == PR_MODEL_LP64)


@@ -184,10 +183,6 @@ procfs_target (void)
 {
   struct target_ops *t = inf_child_target ();
 
 {
   struct target_ops *t = inf_child_target ();
 

-  t->to_shortname = "procfs";
-  t->to_longname = "Unix /proc child process";
-  t->to_doc =
-    "Unix /proc child process (started by the \"run\" command).";

   t->to_create_inferior = procfs_create_inferior;
   t->to_kill = procfs_kill_inferior;
   t->to_mourn_inferior = procfs_mourn_inferior;
   t->to_create_inferior = procfs_create_inferior;
   t->to_kill = procfs_kill_inferior;
   t->to_mourn_inferior = procfs_mourn_inferior;


@@ -200,9 +195,9 @@ procfs_target (void)
   t->to_xfer_partial = procfs_xfer_partial;
   t->to_pass_signals = procfs_pass_signals;
   t->to_files_info = procfs_files_info;
   t->to_xfer_partial = procfs_xfer_partial;
   t->to_pass_signals = procfs_pass_signals;
   t->to_files_info = procfs_files_info;

-  t->to_stop = procfs_stop;
+  t->to_interrupt = procfs_interrupt;

 
 

-  t->to_find_new_threads = procfs_find_new_threads;
+  t->to_update_thread_list = procfs_update_thread_list;

   t->to_thread_alive = procfs_thread_alive;
   t->to_pid_to_str = procfs_pid_to_str;
 
   t->to_thread_alive = procfs_thread_alive;
   t->to_pid_to_str = procfs_pid_to_str;
 


@@ -695,7 +690,7 @@ create_procinfo (int pid, int tid)
                                                   create it if it
                                                   doesn't exist yet?  */
 
                                                   create it if it
                                                   doesn't exist yet?  */
 

-  pi = (procinfo *) xmalloc (sizeof (procinfo));
+  pi = XNEW (procinfo);

   memset (pi, 0, sizeof (procinfo));
   pi->pid = pid;
   pi->tid = tid;
   memset (pi, 0, sizeof (procinfo));
   pi->pid = pid;
   pi->tid = tid;


@@ -923,7 +918,7 @@ load_syscalls (procinfo *pi)
       maxcall = syscalls[i].pr_number;
 
   pi->num_syscalls = maxcall+1;
       maxcall = syscalls[i].pr_number;
 
   pi->num_syscalls = maxcall+1;

-  pi->syscall_names = xmalloc (pi->num_syscalls * sizeof (char *));
+  pi->syscall_names = XNEWVEC (char *, pi->num_syscalls);

 
   for (i = 0; i < pi->num_syscalls; i++)
     pi->syscall_names[i] = NULL;
 
   for (i = 0; i < pi->num_syscalls; i++)
     pi->syscall_names[i] = NULL;


@@ -2495,7 +2490,7 @@ proc_get_LDT_entry (procinfo *pi, int key)
   /* Allocate space for one LDT entry.
      This alloc must persist, because we return a pointer to it.  */
   if (ldt_entry == NULL)
   /* Allocate space for one LDT entry.
      This alloc must persist, because we return a pointer to it.  */
   if (ldt_entry == NULL)

-    ldt_entry = (struct ssd *) xmalloc (sizeof (struct ssd));
+    ldt_entry = XNEW (struct ssd);

 
   /* Open the file descriptor for the LDT table.  */
   sprintf (pathname, "/proc/%d/ldt", pi->pid);
 
   /* Open the file descriptor for the LDT table.  */
   sprintf (pathname, "/proc/%d/ldt", pi->pid);


@@ -2736,7 +2731,7 @@ proc_update_threads (procinfo *pi)
   if ((nlwp = proc_get_nthreads (pi)) <= 1)
     return 1;  /* Process is not multi-threaded; nothing to do.  */
 
   if ((nlwp = proc_get_nthreads (pi)) <= 1)
     return 1;  /* Process is not multi-threaded; nothing to do.  */
 

-  prstatus = xmalloc (sizeof (gdb_prstatus_t) * (nlwp + 1));
+  prstatus = XNEWVEC (gdb_prstatus_t, nlwp + 1);

 
   old_chain = make_cleanup (xfree, prstatus);
   if (ioctl (pi->ctl_fd, PIOCLSTATUS, prstatus) < 0)
 
   old_chain = make_cleanup (xfree, prstatus);
   if (ioctl (pi->ctl_fd, PIOCLSTATUS, prstatus) < 0)


@@ -2830,7 +2825,7 @@ proc_update_threads (procinfo *pi)
   if (nthreads < 2)
     return 0;          /* Nothing to do for 1 or fewer threads.  */
 
   if (nthreads < 2)
     return 0;          /* Nothing to do for 1 or fewer threads.  */
 

-  threads = xmalloc (nthreads * sizeof (tid_t));
+  threads = XNEWVEC (tid_t, nthreads);

 
   if (ioctl (pi->ctl_fd, PIOCTLIST, threads) < 0)
     proc_error (pi, "procfs: update_threads (PIOCTLIST)", __LINE__);
 
   if (ioctl (pi->ctl_fd, PIOCTLIST, threads) < 0)
     proc_error (pi, "procfs: update_threads (PIOCTLIST)", __LINE__);


@@ -2908,13 +2903,6 @@ static void do_detach (int signo);
 static void proc_trace_syscalls_1 (procinfo *pi, int syscallnum,
                                   int entry_or_exit, int mode, int from_tty);
 
 static void proc_trace_syscalls_1 (procinfo *pi, int syscallnum,
                                   int entry_or_exit, int mode, int from_tty);
 

-/* On mips-irix, we need to insert a breakpoint at __dbx_link during
-   the startup phase.  The following two variables are used to record
-   the address of the breakpoint, and the code that was replaced by
-   a breakpoint.  */
-static int dbx_link_bpt_addr = 0;
-static void *dbx_link_bpt;
-

 /* Sets up the inferior to be debugged.  Registers to trace signals,
    hardware faults, and syscalls.  Note: does not set RLC flag: caller
    may want to customize that.  Returns zero for success (note!
 /* Sets up the inferior to be debugged.  Registers to trace signals,
    hardware faults, and syscalls.  Note: does not set RLC flag: caller
    may want to customize that.  Returns zero for success (note!


@@ -2930,16 +2918,9 @@ procfs_debug_inferior (procinfo *pi)
   sysset_t *traced_syscall_exits;
   int status;
 
   sysset_t *traced_syscall_exits;
   int status;
 

-#ifdef PROCFS_DONT_TRACE_FAULTS
-  /* On some systems (OSF), we don't trace hardware faults.
-     Apparently it's enough that we catch them as signals.
-     Wonder why we don't just do that in general?  */
-  premptyset (&traced_faults);         /* don't trace faults.  */
-#else

   /* Register to trace hardware faults in the child.  */
   prfillset (&traced_faults);          /* trace all faults...  */
   gdb_prdelset  (&traced_faults, FLTPAGE);     /* except page fault.  */
   /* Register to trace hardware faults in the child.  */
   prfillset (&traced_faults);          /* trace all faults...  */
   gdb_prdelset  (&traced_faults, FLTPAGE);     /* except page fault.  */

-#endif

   if (!proc_set_traced_faults  (pi, &traced_faults))
     return __LINE__;
 
   if (!proc_set_traced_faults  (pi, &traced_faults))
     return __LINE__;
 


@@ -3042,7 +3023,7 @@ procfs_debug_inferior (procinfo *pi)
 }
 
 static void
 }
 
 static void

-procfs_attach (struct target_ops *ops, char *args, int from_tty)
+procfs_attach (struct target_ops *ops, const char *args, int from_tty)

 {
   char *exec_file;
   int   pid;
 {
   char *exec_file;
   int   pid;


@@ -3066,7 +3047,8 @@ procfs_attach (struct target_ops *ops, char *args, int from_tty)
       fflush (stdout);
     }
   inferior_ptid = do_attach (pid_to_ptid (pid));
       fflush (stdout);
     }
   inferior_ptid = do_attach (pid_to_ptid (pid));

-  push_target (ops);
+  if (!target_is_pushed (ops))
+    push_target (ops);

 }
 
 static void
 }
 
 static void


@@ -3095,7 +3077,7 @@ procfs_detach (struct target_ops *ops, const char *args, int from_tty)
 
   inferior_ptid = null_ptid;
   detach_inferior (pid);
 
   inferior_ptid = null_ptid;
   detach_inferior (pid);

-  unpush_target (ops);
+  inf_child_maybe_unpush_target (ops);

 }
 
 static ptid_t
 }
 
 static ptid_t


@@ -3385,23 +3367,6 @@ syscall_is_lwp_create (procinfo *pi, int scall)
   return 0;
 }
 
   return 0;
 }
 

-/* Remove the breakpoint that we inserted in __dbx_link().
-   Does nothing if the breakpoint hasn't been inserted or has already
-   been removed.  */
-
-static void
-remove_dbx_link_breakpoint (void)
-{
-  if (dbx_link_bpt_addr == 0)
-    return;
-
-  if (deprecated_remove_raw_breakpoint (target_gdbarch (), dbx_link_bpt) != 0)
-    warning (_("Unable to remove __dbx_link breakpoint."));
-
-  dbx_link_bpt_addr = 0;
-  dbx_link_bpt = NULL;
-}
-

 #ifdef SYS_syssgi
 /* Return the address of the __dbx_link() function in the file
    refernced by ABFD by scanning its symbol table.  Return 0 if
 #ifdef SYS_syssgi
 /* Return the address of the __dbx_link() function in the file
    refernced by ABFD by scanning its symbol table.  Return 0 if


@@ -3466,10 +3431,12 @@ insert_dbx_link_bpt_in_file (int fd, CORE_ADDR ignored)
   sym_addr = dbx_link_addr (abfd);
   if (sym_addr != 0)
     {
   sym_addr = dbx_link_addr (abfd);
   if (sym_addr != 0)
     {

+      struct breakpoint *dbx_link_bpt;
+

       /* Insert the breakpoint.  */
       /* Insert the breakpoint.  */

-      dbx_link_bpt_addr = sym_addr;
-      dbx_link_bpt = deprecated_insert_raw_breakpoint (target_gdbarch (), NULL,
-                                                      sym_addr);
+      dbx_link_bpt
+       = create_and_insert_solib_event_breakpoint (target_gdbarch (),
+                                                   sym_addr);

       if (dbx_link_bpt == NULL)
        {
          warning (_("Failed to insert dbx_link breakpoint."));
       if (dbx_link_bpt == NULL)
        {
          warning (_("Failed to insert dbx_link breakpoint."));


@@ -3899,14 +3866,6 @@ wait_again:
 #if (FLTTRACE != FLTBPT)       /* Avoid "duplicate case" error.  */
                case FLTTRACE:
 #endif
 #if (FLTTRACE != FLTBPT)       /* Avoid "duplicate case" error.  */
                case FLTTRACE:
 #endif

-                 /* If we hit our __dbx_link() internal breakpoint,
-                    then remove it.  See comments in procfs_init_inferior()
-                    for more details.  */
-                 if (dbx_link_bpt_addr != 0
-                     && dbx_link_bpt_addr
-                        == regcache_read_pc (get_current_regcache ()))
-                   remove_dbx_link_breakpoint ();
-

                  wstat = (SIGTRAP << 8) | 0177;
                  break;
                case FLTSTACK:
                  wstat = (SIGTRAP << 8) | 0177;
                  break;
                case FLTSTACK:


@@ -3995,11 +3954,9 @@ procfs_xfer_partial (struct target_ops *ops, enum target_object object,
 #endif
 
     default:
 #endif
 
     default:

-      if (ops->beneath != NULL)
-       return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
-                                             readbuf, writebuf, offset, len,
-                                             xfered_len);
-      return TARGET_XFER_E_IO;
+      return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
+                                           readbuf, writebuf, offset, len,
+                                           xfered_len);

     }
 }
 
     }
 }
 


@@ -4248,7 +4205,7 @@ procfs_files_info (struct target_ops *ignore)
    kill(SIGINT) to the child's process group.  */
 
 static void
    kill(SIGINT) to the child's process group.  */
 
 static void

-procfs_stop (struct target_ops *self, ptid_t ptid)
+procfs_interrupt (struct target_ops *self, ptid_t ptid)

 {
   kill (-inferior_process_group (), SIGINT);
 }
 {
   kill (-inferior_process_group (), SIGINT);
 }


@@ -4264,16 +4221,6 @@ unconditionally_kill_inferior (procinfo *pi)
   int parent_pid;
 
   parent_pid = proc_parent_pid (pi);
   int parent_pid;
 
   parent_pid = proc_parent_pid (pi);

-#ifdef PROCFS_NEED_CLEAR_CURSIG_FOR_KILL
-  /* FIXME: use access functions.  */
-  /* Alpha OSF/1-3.x procfs needs a clear of the current signal
-     before the PIOCKILL, otherwise it might generate a corrupted core
-     file for the inferior.  */
-  if (ioctl (pi->ctl_fd, PIOCSSIG, NULL) < 0)
-    {
-      printf_filtered ("unconditionally_kill: SSIG failed!\n");
-    }
-#endif

 #ifdef PROCFS_NEED_PIOCSSIG_FOR_KILL
   /* Alpha OSF/1-2.x procfs needs a PIOCSSIG call with a SIGKILL signal
      to kill the inferior, otherwise it might remain stopped with a
 #ifdef PROCFS_NEED_PIOCSSIG_FOR_KILL
   /* Alpha OSF/1-2.x procfs needs a PIOCSSIG call with a SIGKILL signal
      to kill the inferior, otherwise it might remain stopped with a


@@ -4344,16 +4291,10 @@ procfs_mourn_inferior (struct target_ops *ops)
       if (pi)
        destroy_procinfo (pi);
     }
       if (pi)
        destroy_procinfo (pi);
     }

-  unpush_target (ops);
-
-  if (dbx_link_bpt != NULL)
-    {
-      deprecated_remove_raw_breakpoint (target_gdbarch (), dbx_link_bpt);
-      dbx_link_bpt_addr = 0;
-      dbx_link_bpt = NULL;
-    }

 
   generic_mourn_inferior ();
 
   generic_mourn_inferior ();

+
+  inf_child_maybe_unpush_target (ops);

 }
 
 /* When GDB forks to create a runnable inferior process, this function
 }
 
 /* When GDB forks to create a runnable inferior process, this function


@@ -4371,7 +4312,8 @@ procfs_init_inferior (struct target_ops *ops, int pid)
 
   /* This routine called on the parent side (GDB side)
      after GDB forks the inferior.  */
 
   /* This routine called on the parent side (GDB side)
      after GDB forks the inferior.  */

-  push_target (ops);
+  if (!target_is_pushed (ops))
+    push_target (ops);

 
   if ((pi = create_procinfo (pid, 0)) == NULL)
     perror (_("procfs: out of memory in 'init_inferior'"));
 
   if ((pi = create_procinfo (pid, 0)) == NULL)
     perror (_("procfs: out of memory in 'init_inferior'"));


@@ -4688,7 +4630,7 @@ procfs_inferior_created (struct target_ops *ops, int from_tty)
 #endif
 }
 
 #endif
 }
 

-/* Callback for find_new_threads.  Calls "add_thread".  */
+/* Callback for update_thread_list.  Calls "add_thread".  */

 
 static int
 procfs_notice_thread (procinfo *pi, procinfo *thread, void *ptr)
 
 static int
 procfs_notice_thread (procinfo *pi, procinfo *thread, void *ptr)


@@ -4705,10 +4647,12 @@ procfs_notice_thread (procinfo *pi, procinfo *thread, void *ptr)
    back to GDB to add to its list.  */
 
 static void
    back to GDB to add to its list.  */
 
 static void

-procfs_find_new_threads (struct target_ops *ops)
+procfs_update_thread_list (struct target_ops *ops)

 {
   procinfo *pi;
 
 {
   procinfo *pi;
 

+  prune_threads ();
+

   /* Find procinfo for main process.  */
   pi = find_procinfo_or_die (ptid_get_pid (inferior_ptid), 0);
   proc_update_threads (pi);
   /* Find procinfo for main process.  */
   pi = find_procinfo_or_die (ptid_get_pid (inferior_ptid), 0);
   proc_update_threads (pi);


@@ -4821,7 +4765,8 @@ procfs_set_watchpoint (ptid_t ptid, CORE_ADDR addr, int len, int rwflag,
 
 static int
 procfs_can_use_hw_breakpoint (struct target_ops *self,
 
 static int
 procfs_can_use_hw_breakpoint (struct target_ops *self,

-                             int type, int cnt, int othertype)
+                             enum bptype type,
+                             int cnt, int othertype)

 {
   /* Due to the way that proc_set_watchpoint() is implemented, host
      and target pointers must be of the same size.  If they are not,
 {
   /* Due to the way that proc_set_watchpoint() is implemented, host
      and target pointers must be of the same size.  If they are not,


@@ -4885,7 +4830,8 @@ procfs_stopped_data_address (struct target_ops *targ, CORE_ADDR *addr)
 
 static int
 procfs_insert_watchpoint (struct target_ops *self,
 
 static int
 procfs_insert_watchpoint (struct target_ops *self,

-                         CORE_ADDR addr, int len, int type,
+                         CORE_ADDR addr, int len,
+                         enum target_hw_bp_type type,

                          struct expression *cond)
 {
   if (!target_have_steppable_watchpoint
                          struct expression *cond)
 {
   if (!target_have_steppable_watchpoint


@@ -4908,7 +4854,8 @@ procfs_insert_watchpoint (struct target_ops *self,
 
 static int
 procfs_remove_watchpoint (struct target_ops *self,
 
 static int
 procfs_remove_watchpoint (struct target_ops *self,

-                         CORE_ADDR addr, int len, int type,
+                         CORE_ADDR addr, int len,
+                         enum target_hw_bp_type type,

                          struct expression *cond)
 {
   return procfs_set_watchpoint (inferior_ptid, addr, 0, 0, 0);
                          struct expression *cond)
 {
   return procfs_set_watchpoint (inferior_ptid, addr, 0, 0, 0);


@@ -5141,7 +5088,7 @@ info_proc_mappings (procinfo *pi, int summary)
 /* Implement the "info proc" command.  */
 
 static void
 /* Implement the "info proc" command.  */
 
 static void

-procfs_info_proc (struct target_ops *ops, char *args,
+procfs_info_proc (struct target_ops *ops, const char *args,

                  enum info_proc_what what)
 {
   struct cleanup *old_chain;
                  enum info_proc_what what)
 {
   struct cleanup *old_chain;


@@ -5376,7 +5323,7 @@ procfs_do_thread_registers (bfd *obfd, ptid_t ptid,
   /* This part is the old method for fetching registers.
      It should be replaced by the newer one using regsets
      once it is implemented in this platform:
   /* This part is the old method for fetching registers.
      It should be replaced by the newer one using regsets
      once it is implemented in this platform:

-     gdbarch_regset_from_core_section() and regset->collect_regset().  */
+     gdbarch_iterate_over_regset_sections().  */

 
   old_chain = save_inferior_ptid ();
   inferior_ptid = ptid;
 
   old_chain = save_inferior_ptid ();
   inferior_ptid = ptid;


@@ -5522,7 +5469,6 @@ procfs_make_note_section (struct target_ops *self, bfd *obfd, int *note_size)
       xfree (auxv);
     }
 
       xfree (auxv);
     }
 

-  make_cleanup (xfree, note_data);

   return note_data;
 }
 #else /* !Solaris */
   return note_data;
 }
 #else /* !Solaris */