2011-10-31 Pedro Alves <pedro@codesourcery.com>

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

diff --git a/gdb/gdbserver/target.c b/gdb/gdbserver/target.c
index 78630b0abfc06b4cc66ef1ff56d893290c3277c4..873ee68e10752ae4f069c30f972733bc435d0034 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, 2010
+   Copyright (C) 2002, 2004, 2005, 2007, 2008, 2009, 2010, 2011
    Free Software Foundation, Inc.
 
    Contributed by MontaVista Software.
@@ -31,21 +31,7 @@ set_desired_inferior (int use_general)
   if (use_general == 1)
     found = find_thread_ptid (general_thread);
   else
-    {
-      found = NULL;
-
-      /* 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 ((!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 = find_thread_ptid (cont_thread);
-    }
+    found = find_thread_ptid (cont_thread);
 
   if (found == NULL)
     current_inferior = (struct thread_info *) all_threads.head;
@@ -77,7 +63,7 @@ write_inferior_memory (CORE_ADDR memaddr, const unsigned char *myaddr,
 
   buffer = xmalloc (len);
   memcpy (buffer, myaddr, len);
-  check_mem_write (memaddr, buffer, len);
+  check_mem_write (memaddr, buffer, myaddr, len);
   res = (*the_target->write_memory) (memaddr, buffer, len);
   free (buffer);
   buffer = NULL;