Remove the attach_flag global, and make it per-inferior.

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

diff --git a/gdb/nto-procfs.c b/gdb/nto-procfs.c
index 227d4e39f5e8824c76275388ac7943921fd4c03c..671423902f34b06664aff7d79de5f473749a5a45 100644 (file)
--- a/gdb/nto-procfs.c
+++ b/gdb/nto-procfs.c
@@ -1,7 +1,7 @@
 /* Machine independent support for QNX Neutrino /proc (process file system)
    for GDB.  Written by Colin Burgess at QNX Software Systems Limited. 
 
 /* Machine independent support for QNX Neutrino /proc (process file system)
    for GDB.  Written by Colin Burgess at QNX Software Systems Limited. 
 

-   Copyright 2003 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2006, 2007, 2008 Free Software Foundation, Inc.

 
    Contributed by QNX Software Systems Ltd.
 
 
    Contributed by QNX Software Systems Ltd.
 


@@ -9,7 +9,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by

-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or

    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,


@@ -18,9 +18,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License

-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 #include "defs.h"
 
 
 #include "defs.h"
 


@@ -33,6 +31,7 @@
 #include "gdb_dirent.h"
 #include <sys/netmgr.h>
 
 #include "gdb_dirent.h"
 #include <sys/netmgr.h>
 

+#include "exceptions.h"

 #include "gdb_string.h"
 #include "gdbcore.h"
 #include "inferior.h"
 #include "gdb_string.h"
 #include "gdbcore.h"
 #include "inferior.h"


@@ -42,6 +41,7 @@
 #include "nto-tdep.h"
 #include "command.h"
 #include "regcache.h"
 #include "nto-tdep.h"
 #include "command.h"
 #include "regcache.h"

+#include "solib.h"

 
 #define NULL_PID               0
 #define _DEBUG_FLAG_TRACE      (_DEBUG_FLAG_TRACE_EXEC|_DEBUG_FLAG_TRACE_RD|\
 
 #define NULL_PID               0
 #define _DEBUG_FLAG_TRACE      (_DEBUG_FLAG_TRACE_EXEC|_DEBUG_FLAG_TRACE_RD|\


@@ -61,11 +61,11 @@ static int procfs_can_run (void);
 
 static ptid_t procfs_wait (ptid_t, struct target_waitstatus *);
 
 
 static ptid_t procfs_wait (ptid_t, struct target_waitstatus *);
 

-static int procfs_xfer_memory (CORE_ADDR, char *, int, int,
+static int procfs_xfer_memory (CORE_ADDR, gdb_byte *, int, int,

                               struct mem_attrib *attrib,
                               struct target_ops *);
 
                               struct mem_attrib *attrib,
                               struct target_ops *);
 

-static void procfs_fetch_registers (int);
+static void procfs_fetch_registers (struct regcache *, int);

 
 static void notice_signals (void);
 
 
 static void notice_signals (void);
 


@@ -75,10 +75,6 @@ static ptid_t do_attach (ptid_t ptid);
 
 static int procfs_can_use_hw_breakpoint (int, int, int);
 
 
 static int procfs_can_use_hw_breakpoint (int, int, int);
 

-static int procfs_insert_hw_breakpoint (CORE_ADDR, char *);
-
-static int procfs_remove_hw_breakpoint (CORE_ADDR addr, char *);
-

 static int procfs_insert_hw_watchpoint (CORE_ADDR addr, int len, int type);
 
 static int procfs_remove_hw_watchpoint (CORE_ADDR addr, int len, int type);
 static int procfs_insert_hw_watchpoint (CORE_ADDR addr, int len, int type);
 
 static int procfs_remove_hw_watchpoint (CORE_ADDR addr, int len, int type);


@@ -97,20 +93,26 @@ static unsigned nto_procfs_node = ND_LOCAL_NODE;
    is required is because QNX node descriptors are transient so
    we have to re-acquire them every time.  */
 static unsigned
    is required is because QNX node descriptors are transient so
    we have to re-acquire them every time.  */
 static unsigned

-nto_node(void)
+nto_node (void)

 {
   unsigned node;
 
 {
   unsigned node;
 

-  if (ND_NODE_CMP(nto_procfs_node, ND_LOCAL_NODE) == 0)
+  if (ND_NODE_CMP (nto_procfs_node, ND_LOCAL_NODE) == 0)

     return ND_LOCAL_NODE;
 
     return ND_LOCAL_NODE;
 

-  node = netmgr_strtond(nto_procfs_path,0);
+  node = netmgr_strtond (nto_procfs_path, 0);

   if (node == -1)
   if (node == -1)

-      error ("Lost the QNX node.  Debug session probably over.");
+    error (_("Lost the QNX node.  Debug session probably over."));

 
   return (node);
 }
 
 
   return (node);
 }
 

+static enum gdb_osabi
+procfs_is_nto_target (bfd *abfd)
+{
+  return GDB_OSABI_QNXNTO;
+}
+

 /* This is called when we call 'target procfs <arg>' from the (gdb) prompt.
    For QNX6 (nto), the only valid arg will be a QNX node string, 
    eg: "/net/some_node".  If arg is not a valid QNX node, we will
 /* This is called when we call 'target procfs <arg>' from the (gdb) prompt.
    For QNX6 (nto), the only valid arg will be a QNX node string, 
    eg: "/net/some_node".  If arg is not a valid QNX node, we will


@@ -124,6 +126,8 @@ procfs_open (char *arg, int from_tty)
   int fd, total_size;
   procfs_sysinfo *sysinfo;
 
   int fd, total_size;
   procfs_sysinfo *sysinfo;
 

+  nto_is_nto_target = procfs_is_nto_target;
+

   /* Set the default node used for spawning to this one,
      and only override it if there is a valid arg.  */
 
   /* Set the default node used for spawning to this one,
      and only override it if there is a valid arg.  */
 


@@ -153,7 +157,8 @@ procfs_open (char *arg, int from_tty)
            *endstr = 0;
        }
     }
            *endstr = 0;
        }
     }

-  snprintf (nto_procfs_path, PATH_MAX - 1, "%s%s", nodestr ? nodestr : "", "/proc");
+  snprintf (nto_procfs_path, PATH_MAX - 1, "%s%s", nodestr ? nodestr : "",
+           "/proc");

   if (nodestr)
     xfree (nodestr);
 
   if (nodestr)
     xfree (nodestr);
 


@@ -162,7 +167,7 @@ procfs_open (char *arg, int from_tty)
     {
       printf_filtered ("Error opening %s : %d (%s)\n", nto_procfs_path, errno,
                       safe_strerror (errno));
     {
       printf_filtered ("Error opening %s : %d (%s)\n", nto_procfs_path, errno,
                       safe_strerror (errno));

-      error ("Invalid procfs arg");
+      error (_("Invalid procfs arg"));

     }
 
   sysinfo = (void *) buffer;
     }
 
   sysinfo = (void *) buffer;


@@ -171,7 +176,7 @@ procfs_open (char *arg, int from_tty)
       printf_filtered ("Error getting size: %d (%s)\n", errno,
                       safe_strerror (errno));
       close (fd);
       printf_filtered ("Error getting size: %d (%s)\n", errno,
                       safe_strerror (errno));
       close (fd);

-      error ("Devctl failed.");
+      error (_("Devctl failed."));

     }
   else
     {
     }
   else
     {


@@ -182,7 +187,7 @@ procfs_open (char *arg, int from_tty)
          printf_filtered ("Memory error: %d (%s)\n", errno,
                           safe_strerror (errno));
          close (fd);
          printf_filtered ("Memory error: %d (%s)\n", errno,
                           safe_strerror (errno));
          close (fd);

-         error ("alloca failed.");
+         error (_("alloca failed."));

        }
       else
        {
        }
       else
        {


@@ -191,15 +196,16 @@ procfs_open (char *arg, int from_tty)
              printf_filtered ("Error getting sysinfo: %d (%s)\n", errno,
                               safe_strerror (errno));
              close (fd);
              printf_filtered ("Error getting sysinfo: %d (%s)\n", errno,
                               safe_strerror (errno));
              close (fd);

-             error ("Devctl failed.");
+             error (_("Devctl failed."));

            }
          else
            {
              if (sysinfo->type !=
            }
          else
            {
              if (sysinfo->type !=

-                 nto_map_arch_to_cputype (TARGET_ARCHITECTURE->arch_name))
+                 nto_map_arch_to_cputype (gdbarch_bfd_arch_info
+                                          (current_gdbarch)->arch_name))

                {
                  close (fd);
                {
                  close (fd);

-                 error ("Invalid target CPU.");
+                 error (_("Invalid target CPU."));

                }
            }
        }
                }
            }
        }


@@ -271,7 +277,7 @@ procfs_pidlist (char *args, int from_tty)
   if (dp == NULL)
     {
       fprintf_unfiltered (gdb_stderr, "failed to opendir \"%s\" - %d (%s)",
   if (dp == NULL)
     {
       fprintf_unfiltered (gdb_stderr, "failed to opendir \"%s\" - %d (%s)",

-             nto_procfs_path, errno, safe_strerror (errno));
+                         nto_procfs_path, errno, safe_strerror (errno));

       return;
     }
 
       return;
     }
 


@@ -299,7 +305,7 @@ procfs_pidlist (char *args, int from_tty)
       if (fd == -1)
        {
          fprintf_unfiltered (gdb_stderr, "failed to open %s - %d (%s)\n",
       if (fd == -1)
        {
          fprintf_unfiltered (gdb_stderr, "failed to open %s - %d (%s)\n",

-                 buf, errno, safe_strerror (errno));
+                             buf, errno, safe_strerror (errno));

          closedir (dp);
          return;
        }
          closedir (dp);
          return;
        }


@@ -308,8 +314,8 @@ procfs_pidlist (char *args, int from_tty)
       if (devctl (fd, DCMD_PROC_INFO, pidinfo, sizeof (buf), 0) != EOK)
        {
          fprintf_unfiltered (gdb_stderr,
       if (devctl (fd, DCMD_PROC_INFO, pidinfo, sizeof (buf), 0) != EOK)
        {
          fprintf_unfiltered (gdb_stderr,

-                 "devctl DCMD_PROC_INFO failed - %d (%s)\n", errno,
-                 safe_strerror (errno));
+                             "devctl DCMD_PROC_INFO failed - %d (%s)\n",
+                             errno, safe_strerror (errno));

          break;
        }
       num_threads = pidinfo->num_threads;
          break;
        }
       num_threads = pidinfo->num_threads;


@@ -375,7 +381,8 @@ procfs_meminfo (char *args, int from_tty)
   err = devctl (ctl_fd, DCMD_PROC_MAPINFO, NULL, 0, &num);
   if (err != EOK)
     {
   err = devctl (ctl_fd, DCMD_PROC_MAPINFO, NULL, 0, &num);
   if (err != EOK)
     {

-      printf ("failed devctl num mapinfos - %d (%s)\n", err, safe_strerror (err));
+      printf ("failed devctl num mapinfos - %d (%s)\n", err,
+             safe_strerror (err));

       return;
     }
 
       return;
     }
 


@@ -487,8 +494,10 @@ procfs_meminfo (char *args, int from_tty)
 static void
 procfs_files_info (struct target_ops *ignore)
 {
 static void
 procfs_files_info (struct target_ops *ignore)
 {

+  struct inferior *inf = current_inferior ();
+

   printf_unfiltered ("\tUsing the running image of %s %s via %s.\n",
   printf_unfiltered ("\tUsing the running image of %s %s via %s.\n",

-                    attach_flag ? "attached" : "child",
+                    pi->attach_flag ? "attached" : "child",

                     target_pid_to_str (inferior_ptid), nto_procfs_path);
 }
 
                     target_pid_to_str (inferior_ptid), nto_procfs_path);
 }
 


@@ -505,14 +514,15 @@ procfs_attach (char *args, int from_tty)
 {
   char *exec_file;
   int pid;
 {
   char *exec_file;
   int pid;

+  struct inferior *inf;

 
   if (!args)
 
   if (!args)

-    error_no_arg ("process-id to attach");
+    error_no_arg (_("process-id to attach"));

 
   pid = atoi (args);
 
   if (pid == getpid ())
 
   pid = atoi (args);
 
   if (pid == getpid ())

-    error ("Attaching GDB to itself is not a good idea...");
+    error (_("Attaching GDB to itself is not a good idea..."));

 
   if (from_tty)
     {
 
   if (from_tty)
     {


@@ -528,16 +538,19 @@ procfs_attach (char *args, int from_tty)
       gdb_flush (gdb_stdout);
     }
   inferior_ptid = do_attach (pid_to_ptid (pid));
       gdb_flush (gdb_stdout);
     }
   inferior_ptid = do_attach (pid_to_ptid (pid));

+  inf = add_inferior (pid);
+  inf->attach_flag = 1;
+

   push_target (&procfs_ops);
   push_target (&procfs_ops);

+
+  procfs_find_new_threads ();

 }
 
 static void
 procfs_post_attach (pid_t pid)
 {
 }
 
 static void
 procfs_post_attach (pid_t pid)
 {

-#ifdef SOLIB_CREATE_INFERIOR_HOOK

   if (exec_bfd)
   if (exec_bfd)

-    SOLIB_CREATE_INFERIOR_HOOK (pid);
-#endif
+    solib_create_inferior_hook ();

 }
 
 static ptid_t
 }
 
 static ptid_t


@@ -550,10 +563,10 @@ do_attach (ptid_t ptid)
   snprintf (path, PATH_MAX - 1, "%s/%d/as", nto_procfs_path, PIDGET (ptid));
   ctl_fd = open (path, O_RDWR);
   if (ctl_fd == -1)
   snprintf (path, PATH_MAX - 1, "%s/%d/as", nto_procfs_path, PIDGET (ptid));
   ctl_fd = open (path, O_RDWR);
   if (ctl_fd == -1)

-    error ("Couldn't open proc file %s, error %d (%s)", path, errno,
+    error (_("Couldn't open proc file %s, error %d (%s)"), path, errno,

           safe_strerror (errno));
   if (devctl (ctl_fd, DCMD_PROC_STOP, &status, sizeof (status), 0) != EOK)
           safe_strerror (errno));
   if (devctl (ctl_fd, DCMD_PROC_STOP, &status, sizeof (status), 0) != EOK)

-    error ("Couldn't stop process");
+    error (_("Couldn't stop process"));

 
   /* Define a sigevent for process stopped notification.  */
   event.sigev_notify = SIGEV_SIGNAL_THREAD;
 
   /* Define a sigevent for process stopped notification.  */
   event.sigev_notify = SIGEV_SIGNAL_THREAD;


@@ -565,8 +578,7 @@ do_attach (ptid_t ptid)
 
   if (devctl (ctl_fd, DCMD_PROC_STATUS, &status, sizeof (status), 0) == EOK
       && status.flags & _DEBUG_FLAG_STOPPED)
 
   if (devctl (ctl_fd, DCMD_PROC_STATUS, &status, sizeof (status), 0) == EOK
       && status.flags & _DEBUG_FLAG_STOPPED)

-    SignalKill (nto_node(), PIDGET (ptid), 0, SIGCONT, 0, 0);
-  attach_flag = 1;
+    SignalKill (nto_node (), PIDGET (ptid), 0, SIGCONT, 0, 0);

   nto_init_solib_absolute_prefix ();
   return ptid;
 }
   nto_init_solib_absolute_prefix ();
   return ptid;
 }


@@ -581,7 +593,7 @@ interrupt_query (void)
 Give up (and stop debugging it)? "))
     {
       target_mourn_inferior ();
 Give up (and stop debugging it)? "))
     {
       target_mourn_inferior ();

-      throw_exception (RETURN_QUIT);
+      deprecated_throw_reason (RETURN_QUIT);

     }
 
   target_terminal_inferior ();
     }
 
   target_terminal_inferior ();


@@ -602,7 +614,7 @@ nto_interrupt (int signo)
   /* If this doesn't work, try more severe steps.  */
   signal (signo, nto_interrupt_twice);
 
   /* If this doesn't work, try more severe steps.  */
   signal (signo, nto_interrupt_twice);
 

-  target_stop ();
+  target_stop (inferior_ptid);

 }
 
 static ptid_t
 }
 
 static ptid_t


@@ -701,14 +713,14 @@ procfs_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
        }
     }
 
        }
     }
 

-  return inferior_ptid;
+  return ptid_build (status.pid, 0, status.tid);

 }
 
 /* Read the current values of the inferior's registers, both the
    general register set and floating point registers (if supported)
    and update gdb's idea of their current values.  */
 static void
 }
 
 /* Read the current values of the inferior's registers, both the
    general register set and floating point registers (if supported)
    and update gdb's idea of their current values.  */
 static void

-procfs_fetch_registers (int regno)
+procfs_fetch_registers (struct regcache *regcache, int regno)

 {
   union
   {
 {
   union
   {


@@ -721,13 +733,13 @@ procfs_fetch_registers (int regno)
 
   procfs_set_thread (inferior_ptid);
   if (devctl (ctl_fd, DCMD_PROC_GETGREG, &reg, sizeof (reg), &regsize) == EOK)
 
   procfs_set_thread (inferior_ptid);
   if (devctl (ctl_fd, DCMD_PROC_GETGREG, &reg, sizeof (reg), &regsize) == EOK)

-    nto_supply_gregset ((char *) &reg.greg);
+    nto_supply_gregset (regcache, (char *) &reg.greg);

   if (devctl (ctl_fd, DCMD_PROC_GETFPREG, &reg, sizeof (reg), &regsize)
       == EOK)
   if (devctl (ctl_fd, DCMD_PROC_GETFPREG, &reg, sizeof (reg), &regsize)
       == EOK)

-    nto_supply_fpregset ((char *) &reg.fpreg);
+    nto_supply_fpregset (regcache, (char *) &reg.fpreg);

   if (devctl (ctl_fd, DCMD_PROC_GETALTREG, &reg, sizeof (reg), &regsize)
       == EOK)
   if (devctl (ctl_fd, DCMD_PROC_GETALTREG, &reg, sizeof (reg), &regsize)
       == EOK)

-    nto_supply_altregset ((char *) &reg.altreg);
+    nto_supply_altregset (regcache, (char *) &reg.altreg);

 }
 
 /* Copy LEN bytes to/from inferior's memory starting at MEMADDR
 }
 
 /* Copy LEN bytes to/from inferior's memory starting at MEMADDR


@@ -739,7 +751,7 @@ procfs_fetch_registers (int regno)
    doesn't allow memory operations to cross below us in the target stack
    anyway.  */
 static int
    doesn't allow memory operations to cross below us in the target stack
    anyway.  */
 static int

-procfs_xfer_memory (CORE_ADDR memaddr, char *myaddr, int len, int dowrite,
+procfs_xfer_memory (CORE_ADDR memaddr, gdb_byte *myaddr, int len, int dowrite,

                    struct mem_attrib *attrib, struct target_ops *target)
 {
   int nbytes = 0;
                    struct mem_attrib *attrib, struct target_ops *target)
 {
   int nbytes = 0;


@@ -764,6 +776,7 @@ static void
 procfs_detach (char *args, int from_tty)
 {
   int siggnal = 0;
 procfs_detach (char *args, int from_tty)
 {
   int siggnal = 0;

+  int pid;

 
   if (from_tty)
     {
 
   if (from_tty)
     {


@@ -778,13 +791,15 @@ procfs_detach (char *args, int from_tty)
     siggnal = atoi (args);
 
   if (siggnal)
     siggnal = atoi (args);
 
   if (siggnal)

-    SignalKill (nto_node(), PIDGET (inferior_ptid), 0, siggnal, 0, 0);
+    SignalKill (nto_node (), PIDGET (inferior_ptid), 0, siggnal, 0, 0);

 
   close (ctl_fd);
   ctl_fd = -1;
 
   close (ctl_fd);
   ctl_fd = -1;

-  init_thread_list ();
+
+  pid = ptid_get_pid (inferior_ptid);

   inferior_ptid = null_ptid;
   inferior_ptid = null_ptid;

-  attach_flag = 0;
+  detach_inferior (pid);
+  init_thread_list ();

   unpush_target (&procfs_ops); /* Pop out of handling an inferior.  */
 }
 
   unpush_target (&procfs_ops); /* Pop out of handling an inferior.  */
 }
 


@@ -803,27 +818,29 @@ procfs_breakpoint (CORE_ADDR addr, int type, int size)
 }
 
 static int
 }
 
 static int

-procfs_insert_breakpoint (CORE_ADDR addr, char *contents_cache)
+procfs_insert_breakpoint (struct bp_target_info *bp_tgt)

 {
 {

-  return procfs_breakpoint (addr, _DEBUG_BREAK_EXEC, 0);
+  return procfs_breakpoint (bp_tgt->placed_address, _DEBUG_BREAK_EXEC, 0);

 }
 
 static int
 }
 
 static int

-procfs_remove_breakpoint (CORE_ADDR addr, char *contents_cache)
+procfs_remove_breakpoint (struct bp_target_info *bp_tgt)

 {
 {

-  return procfs_breakpoint (addr, _DEBUG_BREAK_EXEC, -1);
+  return procfs_breakpoint (bp_tgt->placed_address, _DEBUG_BREAK_EXEC, -1);

 }
 
 static int
 }
 
 static int

-procfs_insert_hw_breakpoint (CORE_ADDR addr, char *contents_cache)
+procfs_insert_hw_breakpoint (struct bp_target_info *bp_tgt)

 {
 {

-  return procfs_breakpoint (addr, _DEBUG_BREAK_EXEC | _DEBUG_BREAK_HW, 0);
+  return procfs_breakpoint (bp_tgt->placed_address,
+                           _DEBUG_BREAK_EXEC | _DEBUG_BREAK_HW, 0);

 }
 
 static int
 }
 
 static int

-procfs_remove_hw_breakpoint (CORE_ADDR addr, char *contents_cache)
+procfs_remove_hw_breakpoint (struct bp_target_info *bp_tgt)

 {
 {

-  return procfs_breakpoint (addr, _DEBUG_BREAK_EXEC | _DEBUG_BREAK_HW, -1);
+  return procfs_breakpoint (bp_tgt->placed_address,
+                           _DEBUG_BREAK_EXEC | _DEBUG_BREAK_HW, -1);

 }
 
 static void
 }
 
 static void


@@ -831,6 +848,7 @@ procfs_resume (ptid_t ptid, int step, enum target_signal signo)
 {
   int signal_to_pass;
   procfs_status status;
 {
   int signal_to_pass;
   procfs_status status;

+  sigset_t *run_fault = (sigset_t *) (void *) &run.fault;

 
   if (ptid_equal (inferior_ptid, null_ptid))
     return;
 
   if (ptid_equal (inferior_ptid, null_ptid))
     return;


@@ -842,17 +860,17 @@ procfs_resume (ptid_t ptid, int step, enum target_signal signo)
   if (step)
     run.flags |= _DEBUG_RUN_STEP;
 
   if (step)
     run.flags |= _DEBUG_RUN_STEP;
 

-  sigemptyset ((sigset_t *) &run.fault);
-  sigaddset ((sigset_t *) &run.fault, FLTBPT);
-  sigaddset ((sigset_t *) &run.fault, FLTTRACE);
-  sigaddset ((sigset_t *) &run.fault, FLTILL);
-  sigaddset ((sigset_t *) &run.fault, FLTPRIV);
-  sigaddset ((sigset_t *) &run.fault, FLTBOUNDS);
-  sigaddset ((sigset_t *) &run.fault, FLTIOVF);
-  sigaddset ((sigset_t *) &run.fault, FLTIZDIV);
-  sigaddset ((sigset_t *) &run.fault, FLTFPE);
+  sigemptyset (run_fault);
+  sigaddset (run_fault, FLTBPT);
+  sigaddset (run_fault, FLTTRACE);
+  sigaddset (run_fault, FLTILL);
+  sigaddset (run_fault, FLTPRIV);
+  sigaddset (run_fault, FLTBOUNDS);
+  sigaddset (run_fault, FLTIOVF);
+  sigaddset (run_fault, FLTIZDIV);
+  sigaddset (run_fault, FLTFPE);

   /* Peter V will be changing this at some point.  */
   /* Peter V will be changing this at some point.  */

-  sigaddset ((sigset_t *) &run.fault, FLTPAGE);
+  sigaddset (run_fault, FLTPAGE);

 
   run.flags |= _DEBUG_RUN_ARM;
 
 
   run.flags |= _DEBUG_RUN_ARM;
 


@@ -868,8 +886,8 @@ procfs_resume (ptid_t ptid, int step, enum target_signal signo)
        {
          if (signal_to_pass != status.info.si_signo)
            {
        {
          if (signal_to_pass != status.info.si_signo)
            {

-             SignalKill (nto_node(), PIDGET (inferior_ptid), 0, signal_to_pass,
-                         0, 0);
+             SignalKill (nto_node (), PIDGET (inferior_ptid), 0,
+                         signal_to_pass, 0, 0);

              run.flags |= _DEBUG_RUN_CLRFLT | _DEBUG_RUN_CLRSIG;
            }
          else                  /* Let it kill the program without telling us.  */
              run.flags |= _DEBUG_RUN_CLRFLT | _DEBUG_RUN_CLRSIG;
            }
          else                  /* Let it kill the program without telling us.  */


@@ -892,14 +910,13 @@ procfs_mourn_inferior (void)
 {
   if (!ptid_equal (inferior_ptid, null_ptid))
     {
 {
   if (!ptid_equal (inferior_ptid, null_ptid))
     {

-      SignalKill (nto_node(), PIDGET (inferior_ptid), 0, SIGKILL, 0, 0);
+      SignalKill (nto_node (), PIDGET (inferior_ptid), 0, SIGKILL, 0, 0);

       close (ctl_fd);
     }
   inferior_ptid = null_ptid;
   init_thread_list ();
   unpush_target (&procfs_ops);
   generic_mourn_inferior ();
       close (ctl_fd);
     }
   inferior_ptid = null_ptid;
   init_thread_list ();
   unpush_target (&procfs_ops);
   generic_mourn_inferior ();

-  attach_flag = 0;

 }
 
 /* This function breaks up an argument string into an argument
 }
 
 /* This function breaks up an argument string into an argument


@@ -970,9 +987,10 @@ procfs_create_inferior (char *exec_file, char *allargs, char **env,
   pid_t pid;
   int flags, errn;
   char **argv, *args;
   pid_t pid;
   int flags, errn;
   char **argv, *args;

-  char *in = "", *out = "", *err = "";
+  const char *in = "", *out = "", *err = "";

   int fd, fds[3];
   sigset_t set;
   int fd, fds[3];
   sigset_t set;

+  const char *inferior_io_terminal = get_inferior_io_terminal ();

 
   argv = xmalloc (((strlen (allargs) + 1) / (unsigned) 2 + 2) *
                  sizeof (*argv));
 
   argv = xmalloc (((strlen (allargs) + 1) / (unsigned) 2 + 2) *
                  sizeof (*argv));


@@ -1042,7 +1060,7 @@ procfs_create_inferior (char *exec_file, char *allargs, char **env,
 
   if (ND_NODE_CMP (nto_procfs_node, ND_LOCAL_NODE) != 0)
     {
 
   if (ND_NODE_CMP (nto_procfs_node, ND_LOCAL_NODE) != 0)
     {

-      inherit.nd = nto_node();
+      inherit.nd = nto_node ();

       inherit.flags |= SPAWN_SETND;
       inherit.flags &= ~SPAWN_EXEC;
     }
       inherit.flags |= SPAWN_SETND;
       inherit.flags &= ~SPAWN_EXEC;
     }


@@ -1055,7 +1073,8 @@ procfs_create_inferior (char *exec_file, char *allargs, char **env,
   sigprocmask (SIG_BLOCK, &set, NULL);
 
   if (pid == -1)
   sigprocmask (SIG_BLOCK, &set, NULL);
 
   if (pid == -1)

-    error ("Error spawning %s: %d (%s)", argv[0], errno, safe_strerror (errno));
+    error (_("Error spawning %s: %d (%s)"), argv[0], errno,
+          safe_strerror (errno));

 
   if (fds[0] != STDIN_FILENO)
     close (fds[0]);
 
   if (fds[0] != STDIN_FILENO)
     close (fds[0]);


@@ -1066,7 +1085,9 @@ procfs_create_inferior (char *exec_file, char *allargs, char **env,
 
   inferior_ptid = do_attach (pid_to_ptid (pid));
 
 
   inferior_ptid = do_attach (pid_to_ptid (pid));
 

+  add_inferior (pid);

   attach_flag = 0;
   attach_flag = 0;

+

   flags = _DEBUG_FLAG_KLC;     /* Kill-on-Last-Close flag.  */
   errn = devctl (ctl_fd, DCMD_PROC_SET_FLAG, &flags, sizeof (flags), 0);
   if (errn != EOK)
   flags = _DEBUG_FLAG_KLC;     /* Kill-on-Last-Close flag.  */
   errn = devctl (ctl_fd, DCMD_PROC_SET_FLAG, &flags, sizeof (flags), 0);
   if (errn != EOK)


@@ -1078,15 +1099,13 @@ procfs_create_inferior (char *exec_file, char *allargs, char **env,
   push_target (&procfs_ops);
   target_terminal_init ();
 
   push_target (&procfs_ops);
   target_terminal_init ();
 

-#ifdef SOLIB_CREATE_INFERIOR_HOOK

   if (exec_bfd != NULL
       || (symfile_objfile != NULL && symfile_objfile->obfd != NULL))
   if (exec_bfd != NULL
       || (symfile_objfile != NULL && symfile_objfile->obfd != NULL))

-    SOLIB_CREATE_INFERIOR_HOOK (pid);
-#endif
+    solib_create_inferior_hook ();

 }
 
 static void
 }
 
 static void

-procfs_stop (void)
+procfs_stop (ptid_t ptid)

 {
   devctl (ctl_fd, DCMD_PROC_STOP, NULL, 0, 0);
 }
 {
   devctl (ctl_fd, DCMD_PROC_STOP, NULL, 0, 0);
 }


@@ -1100,7 +1119,7 @@ procfs_kill_inferior (void)
 /* Store register REGNO, or all registers if REGNO == -1, from the contents
    of REGISTERS.  */
 static void
 /* Store register REGNO, or all registers if REGNO == -1, from the contents
    of REGISTERS.  */
 static void

-procfs_prepare_to_store (void)
+procfs_prepare_to_store (struct regcache *regcache)

 {
 }
 
 {
 }
 


@@ -1138,7 +1157,7 @@ get_regset (int regset, char *buf, int bufsize, int *regsize)
 }
 
 void
 }
 
 void

-procfs_store_registers (int regno)
+procfs_store_registers (struct regcache *regcache, int regno)

 {
   union
   {
 {
   union
   {


@@ -1164,7 +1183,7 @@ procfs_store_registers (int regno)
          if (dev_set == -1)
            continue;
 
          if (dev_set == -1)
            continue;
 

-         if (nto_regset_fill (regset, (char *) &reg) == -1)
+         if (nto_regset_fill (regcache, regset, (char *) &reg) == -1)

            continue;
 
          err = devctl (ctl_fd, dev_set, &reg, regsize, 0);
            continue;
 
          err = devctl (ctl_fd, dev_set, &reg, regsize, 0);


@@ -1184,12 +1203,13 @@ procfs_store_registers (int regno)
       if (dev_set == -1)
        return;
 
       if (dev_set == -1)
        return;
 

-      len = nto_register_area (regno, regset, &off);
+      len = nto_register_area (get_regcache_arch (regcache),
+                              regno, regset, &off);

 
       if (len < 1)
        return;
 
 
       if (len < 1)
        return;
 

-      regcache_raw_collect (current_regcache, regno, (char *) &reg + off);
+      regcache_raw_collect (regcache, regno, (char *) &reg + off);

 
       err = devctl (ctl_fd, dev_set, &reg, regsize, 0);
       if (err != EOK)
 
       err = devctl (ctl_fd, dev_set, &reg, regsize, 0);
       if (err != EOK)


@@ -1324,14 +1344,15 @@ _initialize_procfs (void)
 
   /* Set up trace and fault sets, as gdb expects them.  */
   sigemptyset (&run.trace);
 
   /* Set up trace and fault sets, as gdb expects them.  */
   sigemptyset (&run.trace);

-  notice_signals ();

 
   /* Stuff some information.  */
   nto_cpuinfo_flags = SYSPAGE_ENTRY (cpuinfo)->flags;
   nto_cpuinfo_valid = 1;
 
 
   /* Stuff some information.  */
   nto_cpuinfo_flags = SYSPAGE_ENTRY (cpuinfo)->flags;
   nto_cpuinfo_valid = 1;
 

-  add_info ("pidlist", procfs_pidlist, "pidlist");
-  add_info ("meminfo", procfs_meminfo, "memory information");
+  add_info ("pidlist", procfs_pidlist, _("pidlist"));
+  add_info ("meminfo", procfs_meminfo, _("memory information"));
+
+  nto_is_nto_target = procfs_is_nto_target;

 }
 
 
 }