Use target_continue{,_no_signal} instead of target_resume

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

diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c
index 6fbd61db5b51b7ff9c4d83c26c13688093faa55f..9c06443e25c387351e4e08fccf8ad6d3ceac662d 100644 (file)
--- a/gdb/gdbserver/server.c
+++ b/gdb/gdbserver/server.c
@@ -258,12 +258,7 @@ start_inferior (char **argv)
 
   if (wrapper_argv != NULL)
     {
-      struct thread_resume resume_info;
-
-      memset (&resume_info, 0, sizeof (resume_info));
-      resume_info.thread = pid_to_ptid (signal_pid);
-      resume_info.kind = resume_continue;
-      resume_info.sig = 0;
+      ptid_t ptid = pid_to_ptid (signal_pid);
 
       last_ptid = mywait (pid_to_ptid (signal_pid), &last_status, 0, 0);
 
@@ -271,7 +266,7 @@ start_inferior (char **argv)
        {
          do
            {
-             (*the_target->resume) (&resume_info, 1);
+             target_continue_no_signal (ptid);
 
              last_ptid = mywait (pid_to_ptid (signal_pid), &last_status, 0, 0);
              if (last_status.kind != TARGET_WAITKIND_STOPPED)
@@ -3929,7 +3924,6 @@ process_serial_event (void)
 
       if ((tracing && disconnected_tracing) || any_persistent_commands ())
        {
-         struct thread_resume resume_info;
          struct process_info *process = find_process_pid (pid);
 
          if (process == NULL)
@@ -3965,10 +3959,7 @@ process_serial_event (void)
          process->gdb_detached = 1;
 
          /* Detaching implicitly resumes all threads.  */
-         resume_info.thread = minus_one_ptid;
-         resume_info.kind = resume_continue;
-         resume_info.sig = 0;
-         (*the_target->resume) (&resume_info, 1);
+         target_continue_no_signal (minus_one_ptid);
 
          write_ok (own_buf);
          break; /* from switch/case */
@@ -4428,7 +4419,7 @@ handle_target_event (int err, gdb_client_data client_data)
              /* A thread stopped with a signal, but gdb isn't
                 connected to handle it.  Pass it down to the
                 inferior, as if it wasn't being traced.  */
-             struct thread_resume resume_info;
+             enum gdb_signal signal;
 
              if (debug_threads)
                debug_printf ("GDB not connected; forwarding event %d for"
@@ -4436,13 +4427,11 @@ handle_target_event (int err, gdb_client_data client_data)
                              (int) last_status.kind,
                              target_pid_to_str (last_ptid));
 
-             resume_info.thread = last_ptid;
-             resume_info.kind = resume_continue;
              if (last_status.kind == TARGET_WAITKIND_STOPPED)
-               resume_info.sig = gdb_signal_to_host (last_status.value.sig);
+               signal = last_status.value.sig;
              else
-               resume_info.sig = 0;
-             (*the_target->resume) (&resume_info, 1);
+               signal = GDB_SIGNAL_0;
+             target_continue (last_ptid, signal);
            }
        }
       else