2010-09-06 Yao Qi <yao@codesourcery.com>

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

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 5daf4b53f2d71d1c3f9797fe714da12590603683..dc6017a2cbcd6165da16cadabfeb54a6ababf6cc 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -28,9 +28,6 @@
 #if HAVE_SYS_WAIT_H
 #include <sys/wait.h>
 #endif
-#if HAVE_MALLOC_H
-#include <malloc.h>
-#endif
 
 ptid_t cont_thread;
 ptid_t general_thread;
@@ -276,13 +273,12 @@ start_inferior (char **argv)
   if (wrapper_argv != NULL)
     {
       struct thread_resume resume_info;
-      ptid_t ptid;
 
       resume_info.thread = pid_to_ptid (signal_pid);
       resume_info.kind = resume_continue;
       resume_info.sig = 0;
 
-      ptid = mywait (pid_to_ptid (signal_pid), &last_status, 0, 0);
+      mywait (pid_to_ptid (signal_pid), &last_status, 0, 0);
 
       if (last_status.kind != TARGET_WAITKIND_STOPPED)
        return signal_pid;
@@ -564,7 +560,7 @@ gdb_read_memory (CORE_ADDR memaddr, unsigned char *myaddr, int len)
   if (ret == 0)
     {
       ret = read_inferior_memory (memaddr, myaddr, len);
-      unprepare_to_access_memory ();
+      done_accessing_memory ();
     }
 
   return ret;
@@ -586,7 +582,7 @@ gdb_write_memory (CORE_ADDR memaddr, const unsigned char *myaddr, int len)
       if (ret == 0)
        {
          ret = write_inferior_memory (memaddr, myaddr, len);
-         unprepare_to_access_memory ();
+         done_accessing_memory ();
        }
       return ret;
     }
@@ -2158,11 +2154,6 @@ queue_stop_reply_callback (struct inferior_list_entry *entry, void *arg)
      manage the thread's last_status field.  */
   if (the_target->thread_stopped == NULL)
     {
-      struct target_waitstatus status;
-
-      status.kind = TARGET_WAITKIND_STOPPED;
-      status.value.sig = TARGET_SIGNAL_TRAP;
-
       /* Pass the last stop reply back to GDB, but don't notify
         yet.  */
       queue_stop_reply (entry->id, &thread->last_status);