gdb/

[deliverable/binutils-gdb.git] / gdb / gdbserver / target.c

diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c
index b570b6c688635813f260c9346ee2e727e4ec6c0b..f50bc02c3da388d42819a06b4d2b3480e4ad6770 100644 (file)
--- a/gdb/gdbserver/target.c
+++ b/gdb/gdbserver/target.c
@@ -1,5 +1,5 @@
 /* Target operations for the remote server for GDB.
-   Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009
+   Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
@@ -29,10 +29,7 @@ set_desired_inferior (int use_general)
   struct thread_info *found;
 
   if (use_general == 1)
-    {
-      found = (struct thread_info *) find_inferior_id (&all_threads,
-                                                      general_thread);
-    }
+    found = find_thread_ptid (general_thread);
   else
     {
       found = NULL;
@@ -40,14 +37,14 @@ set_desired_inferior (int use_general)
       /* If we are continuing any (all) thread(s), use step_thread
         to decide which thread to step and/or send the specified
         signal to.  */
-      if ((step_thread != 0 && step_thread != -1)
-         && (cont_thread == 0 || cont_thread == -1))
-       found = (struct thread_info *) find_inferior_id (&all_threads,
-                                                        step_thread);
+      if ((!ptid_equal (step_thread, null_ptid)
+          && !ptid_equal (step_thread, minus_one_ptid))
+         && (ptid_equal (cont_thread, null_ptid)
+             || ptid_equal (cont_thread, minus_one_ptid)))
+       found = find_thread_ptid (step_thread);
 
       if (found == NULL)
-       found = (struct thread_info *) find_inferior_id (&all_threads,
-                                                        cont_thread);
+       found = find_thread_ptid (cont_thread);
     }
 
   if (found == NULL)
@@ -88,28 +85,24 @@ write_inferior_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
   return res;
 }
 
-unsigned long
-mywait (struct target_waitstatus *ourstatus, int options,
+ptid_t
+mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options,
        int connected_wait)
 {
-  unsigned long ret;
+  ptid_t ret;
 
   if (connected_wait)
     server_waiting = 1;
 
-  ret = (*the_target->wait) (ourstatus, options);
+  ret = (*the_target->wait) (ptid, ourstatus, options);
 
-  if (ourstatus->kind == TARGET_WAITKIND_EXITED
-      || ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
-    {
-      if (ourstatus->kind == TARGET_WAITKIND_EXITED)
-       fprintf (stderr,
-                "\nChild exited with status %d\n", ourstatus->value.sig);
-      if (ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
-       fprintf (stderr, "\nChild terminated with signal = 0x%x (%s)\n",
-                target_signal_to_host (ourstatus->value.sig),
-                target_signal_to_name (ourstatus->value.sig));
-    }
+  if (ourstatus->kind == TARGET_WAITKIND_EXITED)
+    fprintf (stderr,
+            "\nChild exited with status %d\n", ourstatus->value.sig);
+  else if (ourstatus->kind == TARGET_WAITKIND_SIGNALLED)
+    fprintf (stderr, "\nChild terminated with signal = 0x%x (%s)\n",
+            target_signal_to_host (ourstatus->value.sig),
+            target_signal_to_name (ourstatus->value.sig));
 
   if (connected_wait)
     server_waiting = 0;
@@ -137,3 +130,27 @@ set_target_ops (struct target_ops *target)
   the_target = (struct target_ops *) xmalloc (sizeof (*the_target));
   memcpy (the_target, target, sizeof (*the_target));
 }
+
+/* Convert pid to printable format.  */
+
+const char *
+target_pid_to_str (ptid_t ptid)
+{
+  static char buf[80];
+
+  if (ptid_equal (ptid, minus_one_ptid))
+    snprintf (buf, sizeof (buf), "<all threads>");
+  else if (ptid_equal (ptid, null_ptid))
+    snprintf (buf, sizeof (buf), "<null thread>");
+  else if (ptid_get_tid (ptid) != 0)
+    snprintf (buf, sizeof (buf), "Thread %d.0x%lx",
+             ptid_get_pid (ptid), ptid_get_tid (ptid));
+  else if (ptid_get_lwp (ptid) != 0)
+    snprintf (buf, sizeof (buf), "LWP %d.%ld",
+             ptid_get_pid (ptid), ptid_get_lwp (ptid));
+  else
+    snprintf (buf, sizeof (buf), "Process %d",
+             ptid_get_pid (ptid));
+
+  return buf;
+}