gdb/

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

diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c
index 066690f9f5db6587f9e3f922fb4cee8b7541cef2..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
+   Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009, 2010
    Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
@@ -8,7 +8,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
-   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,
@@ -17,9 +17,7 @@
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "server.h"
 
@@ -31,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;
@@ -42,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)
@@ -80,7 +75,7 @@ write_inferior_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
   if (buffer != NULL)
     free (buffer);
 
-  buffer = malloc (len);
+  buffer = xmalloc (len);
   memcpy (buffer, myaddr, len);
   check_mem_write (memaddr, buffer, len);
   res = (*the_target->write_memory) (memaddr, buffer, len);
@@ -90,15 +85,24 @@ write_inferior_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
   return res;
 }
 
-unsigned char
-mywait (char *statusp, int connected_wait)
+ptid_t
+mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options,
+       int connected_wait)
 {
-  unsigned char ret;
+  ptid_t ret;
 
   if (connected_wait)
     server_waiting = 1;
 
-  ret = (*the_target->wait) (statusp);
+  ret = (*the_target->wait) (ptid, ourstatus, options);
+
+  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;
@@ -106,9 +110,47 @@ mywait (char *statusp, int connected_wait)
   return ret;
 }
 
+int
+start_non_stop (int nonstop)
+{
+  if (the_target->start_non_stop == NULL)
+    {
+      if (nonstop)
+       return -1;
+      else
+       return 0;
+    }
+
+  return (*the_target->start_non_stop) (nonstop);
+}
+
 void
 set_target_ops (struct target_ops *target)
 {
-  the_target = (struct target_ops *) malloc (sizeof (*the_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;
+}