X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fgdbserver%2Ftarget.c;h=998d6c1f230d2a21f8a83eadee1564ad2c043bb7;hb=b09846a918b74f0371149f730f8b391548b11a8d;hp=53a4c1ef55a4c4c35c5fcb805c90e166b012f662;hpb=611cb4a54268cbb8f25175dd4900fff87eae161b;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c
index 53a4c1ef55..998d6c1f23 100644
--- a/gdb/gdbserver/target.c
+++ b/gdb/gdbserver/target.c
@@ -1,6 +1,6 @@
 /* Target operations for the remote server for GDB.
-   Copyright 2002
-   Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004-2005, 2007-2012 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,31 +17,168 @@
    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 "server.h"
 
 struct target_ops *the_target;
 
 void
-read_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len)
+set_desired_inferior (int use_general)
 {
-  (*the_target->read_memory) (memaddr, myaddr, len);
+  struct thread_info *found;
+
+  if (use_general == 1)
+    found = find_thread_ptid (general_thread);
+  else
+    found = find_thread_ptid (cont_thread);
+
+  if (found == NULL)
+    current_inferior = (struct thread_info *) all_threads.head;
+  else
+    current_inferior = found;
+}
+
+int
+read_inferior_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len)
+{
+  int res;
+  res = (*the_target->read_memory) (memaddr, myaddr, len);
   check_mem_read (memaddr, myaddr, len);
+  return res;
+}
+
+int
+write_inferior_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
+		       int len)
+{
+  /* Lacking cleanups, there is some potential for a memory leak if the
+     write fails and we go through error().  Make sure that no more than
+     one buffer is ever pending by making BUFFER static.  */
+  static unsigned char *buffer = 0;
+  int res;
+
+  if (buffer != NULL)
+    free (buffer);
+
+  buffer = xmalloc (len);
+  memcpy (buffer, myaddr, len);
+  check_mem_write (memaddr, buffer, myaddr, len);
+  res = (*the_target->write_memory) (memaddr, buffer, len);
+  free (buffer);
+  buffer = NULL;
+
+  return res;
+}
+
+ptid_t
+mywait (ptid_t ptid, struct target_waitstatus *ourstatus, int options,
+	int connected_wait)
+{
+  ptid_t ret;
+
+  if (connected_wait)
+    server_waiting = 1;
+
+  ret = (*the_target->wait) (ptid, ourstatus, options);
+
+  if (ourstatus->kind == TARGET_WAITKIND_EXITED)
+    fprintf (stderr,
+	     "\nChild exited with status %d\n", ourstatus->value.integer);
+  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;
+
+  return ret;
 }
 
 int
-write_inferior_memory (CORE_ADDR memaddr, char *myaddr, int len)
+start_non_stop (int nonstop)
 {
-  check_mem_write (memaddr, myaddr, len);
-  return (*the_target->write_memory) (memaddr, myaddr, len);
+  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))
+    xsnprintf (buf, sizeof (buf), "<all threads>");
+  else if (ptid_equal (ptid, null_ptid))
+    xsnprintf (buf, sizeof (buf), "<null thread>");
+  else if (ptid_get_tid (ptid) != 0)
+    xsnprintf (buf, sizeof (buf), "Thread %d.0x%lx",
+	       ptid_get_pid (ptid), ptid_get_tid (ptid));
+  else if (ptid_get_lwp (ptid) != 0)
+    xsnprintf (buf, sizeof (buf), "LWP %d.%ld",
+	       ptid_get_pid (ptid), ptid_get_lwp (ptid));
+  else
+    xsnprintf (buf, sizeof (buf), "Process %d",
+	       ptid_get_pid (ptid));
+
+  return buf;
+}
+
+/* Return a pretty printed form of target_waitstatus.  */
+
+const char *
+target_waitstatus_to_string (const struct target_waitstatus *ws)
+{
+  static char buf[200];
+  const char *kind_str = "status->kind = ";
+
+  switch (ws->kind)
+    {
+    case TARGET_WAITKIND_EXITED:
+      sprintf (buf, "%sexited, status = %d",
+	       kind_str, ws->value.integer);
+      break;
+    case TARGET_WAITKIND_STOPPED:
+      sprintf (buf, "%sstopped, signal = %s",
+	       kind_str, target_signal_to_name (ws->value.sig));
+      break;
+    case TARGET_WAITKIND_SIGNALLED:
+      sprintf (buf, "%ssignalled, signal = %s",
+	       kind_str, target_signal_to_name (ws->value.sig));
+      break;
+    case TARGET_WAITKIND_LOADED:
+      sprintf (buf, "%sloaded", kind_str);
+      break;
+    case TARGET_WAITKIND_EXECD:
+      sprintf (buf, "%sexecd", kind_str);
+      break;
+    case TARGET_WAITKIND_SPURIOUS:
+      sprintf (buf, "%sspurious", kind_str);
+      break;
+    case TARGET_WAITKIND_IGNORE:
+      sprintf (buf, "%signore", kind_str);
+      break;
+    default:
+      sprintf (buf, "%sunknown???", kind_str);
+      break;
+    }
+
+  return buf;
+}