Multi-target support

[deliverable/binutils-gdb.git] / gdb / windows-nat.c

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 607b2e8cb97b5cba33a473682e7fb2e68ef4975c..be5955d379fb4efcca6779b0aea1036d40657174 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -1,6 +1,6 @@
 /* Target-vector operations for controlling windows child processes, for GDB.
 
 /* Target-vector operations for controlling windows child processes, for GDB.
 

-   Copyright (C) 1995-2019 Free Software Foundation, Inc.
+   Copyright (C) 1995-2020 Free Software Foundation, Inc.

 
    Contributed by Cygnus Solutions, A Red Hat Company.
 
 
    Contributed by Cygnus Solutions, A Red Hat Company.
 


@@ -68,6 +68,7 @@
 #include "inf-child.h"
 #include "gdbsupport/gdb_tilde_expand.h"
 #include "gdbsupport/pathstuff.h"
 #include "inf-child.h"
 #include "gdbsupport/gdb_tilde_expand.h"
 #include "gdbsupport/pathstuff.h"

+#include "gdbsupport/gdb_wait.h"

 
 #define AdjustTokenPrivileges          dyn_AdjustTokenPrivileges
 #define DebugActiveProcessStop         dyn_DebugActiveProcessStop
 
 #define AdjustTokenPrivileges          dyn_AdjustTokenPrivileges
 #define DebugActiveProcessStop         dyn_DebugActiveProcessStop


@@ -147,7 +148,7 @@ static GetConsoleFontSize_ftype *GetConsoleFontSize;
 static int have_saved_context; /* True if we've saved context from a
                                   cygwin signal.  */
 #ifdef __CYGWIN__
 static int have_saved_context; /* True if we've saved context from a
                                   cygwin signal.  */
 #ifdef __CYGWIN__

-static CONTEXT saved_context;  /* Containes the saved context from a
+static CONTEXT saved_context;  /* Contains the saved context from a

                                   cygwin signal.  */
 #endif
 
                                   cygwin signal.  */
 #endif
 


@@ -349,6 +350,8 @@ struct windows_nat_target final : public x86_nat_target<inf_child_target>
   bool get_tib_address (ptid_t ptid, CORE_ADDR *addr) override;
 
   const char *thread_name (struct thread_info *) override;
   bool get_tib_address (ptid_t ptid, CORE_ADDR *addr) override;
 
   const char *thread_name (struct thread_info *) override;

+
+  int get_windows_debug_event (int pid, struct target_waitstatus *ourstatus);

 };
 
 static windows_nat_target the_windows_nat_target;
 };
 
 static windows_nat_target the_windows_nat_target;


@@ -457,9 +460,9 @@ windows_add_thread (ptid_t ptid, HANDLE h, void *tlb, bool main_thread_p)
      the main thread silently (in reality, this thread is really
      more of a process to the user than a thread).  */
   if (main_thread_p)
      the main thread silently (in reality, this thread is really
      more of a process to the user than a thread).  */
   if (main_thread_p)

-    add_thread_silent (ptid);
+    add_thread_silent (&the_windows_nat_target, ptid);

   else
   else

-    add_thread (ptid);
+    add_thread (&the_windows_nat_target, ptid);

 
   /* Set the debug registers for the new thread if they are used.  */
   if (debug_registers_used)
 
   /* Set the debug registers for the new thread if they are used.  */
   if (debug_registers_used)


@@ -518,7 +521,7 @@ windows_delete_thread (ptid_t ptid, DWORD exit_code, bool main_thread_p)
 
      Note that no notification was printed when the main thread
      was created, and thus, unless in verbose mode, we should be
 
      Note that no notification was printed when the main thread
      was created, and thus, unless in verbose mode, we should be

-     symetrical, and avoid that notification for the main thread
+     symmetrical, and avoid that notification for the main thread

      here as well.  */
 
   if (info_verbose)
      here as well.  */
 
   if (info_verbose)


@@ -528,7 +531,7 @@ windows_delete_thread (ptid_t ptid, DWORD exit_code, bool main_thread_p)
                       target_pid_to_str (ptid).c_str (),
                       (unsigned) exit_code);
 
                       target_pid_to_str (ptid).c_str (),
                       (unsigned) exit_code);
 

-  delete_thread (find_thread_ptid (ptid));
+  delete_thread (find_thread_ptid (&the_windows_nat_target, ptid));

 
   for (th = &thread_head;
        th->next != NULL && th->next->id != id;
 
   for (th = &thread_head;
        th->next != NULL && th->next->id != id;


@@ -590,8 +593,8 @@ windows_fetch_one_register (struct regcache *regcache,
 void
 windows_nat_target::fetch_registers (struct regcache *regcache, int r)
 {
 void
 windows_nat_target::fetch_registers (struct regcache *regcache, int r)
 {

-  DWORD pid = regcache->ptid ().tid ();
-  windows_thread_info *th = thread_rec (pid, TRUE);
+  DWORD tid = regcache->ptid ().tid ();
+  windows_thread_info *th = thread_rec (tid, TRUE);

 
   /* Check if TH exists.  Windows sometimes uses a non-existent
      thread id in its events.  */
 
   /* Check if TH exists.  Windows sometimes uses a non-existent
      thread id in its events.  */


@@ -660,8 +663,8 @@ windows_store_one_register (const struct regcache *regcache,
 void
 windows_nat_target::store_registers (struct regcache *regcache, int r)
 {
 void
 windows_nat_target::store_registers (struct regcache *regcache, int r)
 {

-  DWORD pid = regcache->ptid ().tid ();
-  windows_thread_info *th = thread_rec (pid, TRUE);
+  DWORD tid = regcache->ptid ().tid ();
+  windows_thread_info *th = thread_rec (tid, TRUE);

 
   /* Check if TH exists.  Windows sometimes uses a non-existent
      thread id in its events.  */
 
   /* Check if TH exists.  Windows sometimes uses a non-existent
      thread id in its events.  */


@@ -940,7 +943,14 @@ catch_errors (void (*func) ())
 static void
 windows_clear_solib (void)
 {
 static void
 windows_clear_solib (void)
 {

-  solib_start.next = NULL;
+  struct so_list *so;
+
+  for (so = solib_start.next; so; so = solib_start.next)
+    {
+      solib_start.next = so->next;
+      windows_free_so (so);
+    }
+

   solib_end = &solib_start;
 }
 
   solib_end = &solib_start;
 }
 


@@ -1447,8 +1457,8 @@ windows_nat_target::resume (ptid_t ptid, int step, enum gdb_signal sig)
 
   last_sig = GDB_SIGNAL_0;
 
 
   last_sig = GDB_SIGNAL_0;
 

-  DEBUG_EXEC (("gdb: windows_resume (pid=%d, tid=%ld, step=%d, sig=%d);\n",
-              ptid.pid (), ptid.tid (), step, sig));
+  DEBUG_EXEC (("gdb: windows_resume (pid=%d, tid=0x%x, step=%d, sig=%d);\n",
+              ptid.pid (), (unsigned) ptid.tid (), step, sig));

 
   /* Get context for currently selected thread.  */
   th = thread_rec (inferior_ptid.tid (), FALSE);
 
   /* Get context for currently selected thread.  */
   th = thread_rec (inferior_ptid.tid (), FALSE);


@@ -1516,9 +1526,10 @@ ctrl_c_handler (DWORD event_type)
 
 /* Get the next event from the child.  Returns a non-zero thread id if the event
    requires handling by WFI (or whatever).  */
 
 /* Get the next event from the child.  Returns a non-zero thread id if the event
    requires handling by WFI (or whatever).  */

-static int
-get_windows_debug_event (struct target_ops *ops,
-                        int pid, struct target_waitstatus *ourstatus)
+
+int
+windows_nat_target::get_windows_debug_event (int pid,
+                                            struct target_waitstatus *ourstatus)

 {
   BOOL debug_event;
   DWORD continue_status, event_code;
 {
   BOOL debug_event;
   DWORD continue_status, event_code;


@@ -1548,8 +1559,7 @@ get_windows_debug_event (struct target_ops *ops,
                     "CREATE_THREAD_DEBUG_EVENT"));
       if (saw_create != 1)
        {
                     "CREATE_THREAD_DEBUG_EVENT"));
       if (saw_create != 1)
        {

-         struct inferior *inf;
-         inf = find_inferior_pid (current_event.dwProcessId);
+         inferior *inf = find_inferior_pid (this, current_event.dwProcessId);

          if (!saw_create && inf->attach_flag)
            {
              /* Kludge around a Windows bug where first event is a create
          if (!saw_create && inf->attach_flag)
            {
              /* Kludge around a Windows bug where first event is a create


@@ -1620,8 +1630,23 @@ get_windows_debug_event (struct target_ops *ops,
          windows_delete_thread (ptid_t (current_event.dwProcessId, 0,
                                         current_event.dwThreadId),
                                 0, true /* main_thread_p */);
          windows_delete_thread (ptid_t (current_event.dwProcessId, 0,
                                         current_event.dwThreadId),
                                 0, true /* main_thread_p */);

-         ourstatus->kind = TARGET_WAITKIND_EXITED;
-         ourstatus->value.integer = current_event.u.ExitProcess.dwExitCode;
+         DWORD exit_status = current_event.u.ExitProcess.dwExitCode;
+         /* If the exit status looks like a fatal exception, but we
+            don't recognize the exception's code, make the original
+            exit status value available, to avoid losing
+            information.  */
+         int exit_signal
+           = WIFSIGNALED (exit_status) ? WTERMSIG (exit_status) : -1;
+         if (exit_signal == -1)
+           {
+             ourstatus->kind = TARGET_WAITKIND_EXITED;
+             ourstatus->value.integer = exit_status;
+           }
+         else
+           {
+             ourstatus->kind = TARGET_WAITKIND_SIGNALLED;
+             ourstatus->value.sig = gdb_signal_from_host (exit_signal);
+           }

          thread_id = current_event.dwThreadId;
        }
       break;
          thread_id = current_event.dwThreadId;
        }
       break;


@@ -1756,7 +1781,7 @@ windows_nat_target::wait (ptid_t ptid, struct target_waitstatus *ourstatus,
             the user tries to resume the execution in the inferior.
             This is a classic race that we should try to fix one day.  */
       SetConsoleCtrlHandler (&ctrl_c_handler, TRUE);
             the user tries to resume the execution in the inferior.
             This is a classic race that we should try to fix one day.  */
       SetConsoleCtrlHandler (&ctrl_c_handler, TRUE);

-      retval = get_windows_debug_event (this, pid, ourstatus);
+      retval = get_windows_debug_event (pid, ourstatus);

       SetConsoleCtrlHandler (&ctrl_c_handler, FALSE);
 
       if (retval)
       SetConsoleCtrlHandler (&ctrl_c_handler, FALSE);
 
       if (retval)


@@ -1983,13 +2008,14 @@ windows_nat_target::attach (const char *args, int from_tty)
 #endif
 
   if (!ok)
 #endif
 
   if (!ok)

-    error (_("Can't attach to process."));
+    error (_("Can't attach to process %u (error %u)"),
+          (unsigned) pid, (unsigned) GetLastError ());

 
   DebugSetProcessKillOnExit (FALSE);
 
   if (from_tty)
     {
 
   DebugSetProcessKillOnExit (FALSE);
 
   if (from_tty)
     {

-      char *exec_file = (char *) get_exec_file (0);
+      const char *exec_file = get_exec_file (0);

 
       if (exec_file)
        printf_unfiltered ("Attaching to program `%s', %s\n", exec_file,
 
       if (exec_file)
        printf_unfiltered ("Attaching to program `%s', %s\n", exec_file,


@@ -2709,7 +2735,7 @@ windows_nat_target::create_inferior (const char *exec_file,
        redirect_inferior_handles (allargs, allargs_copy,
                                   &fd_inp, &fd_out, &fd_err);
       if (errno)
        redirect_inferior_handles (allargs, allargs_copy,
                                   &fd_inp, &fd_out, &fd_err);
       if (errno)

-       warning (_("Error in redirection: %s."), strerror (errno));
+       warning (_("Error in redirection: %s."), safe_strerror (errno));

       else
        errno = e;
       allargs_len = strlen (allargs_copy);
       else
        errno = e;
       allargs_len = strlen (allargs_copy);