* config/i386/nm-cygwin.h (ATTACH_NO_WAIT): Delete.

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

diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 7d6aab09e5aca3c1ae035f5b0de7165dc7305881..eb15c97142291a09347859ca601d4426ccbd9a2b 100644 (file)
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -1,7 +1,7 @@
 /* Target-vector operations for controlling win32 child processes, for GDB.
 
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 /* Target-vector operations for controlling win32 child processes, for GDB.
 
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

-   2005, 2006, 2007 Free Software Foundation, Inc.
+   2005, 2006, 2007, 2008 Free Software Foundation, Inc.

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


@@ -9,23 +9,19 @@
 
    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
 
    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,
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,

-   but WITHOUT ANY WARRANTY; without eve nthe implied warranty of
+   but WITHOUT ANY WARRANTY; without even the implied warranty of

    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    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., 51 Franklin Street, Fifth Floor,
-   Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 
 /* Originally by Steve Chamberlain, sac@cygnus.com */
 
 
 /* Originally by Steve Chamberlain, sac@cygnus.com */
 

-/* We assume we're being built with and will be used for cygwin.  */
-

 #include "defs.h"
 #include "frame.h"             /* required by inferior.h */
 #include "inferior.h"
 #include "defs.h"
 #include "frame.h"             /* required by inferior.h */
 #include "inferior.h"


@@ -42,12 +38,15 @@
 #include <stdlib.h>
 #include <windows.h>
 #include <imagehlp.h>
 #include <stdlib.h>
 #include <windows.h>
 #include <imagehlp.h>

+#ifdef __CYGWIN__

 #include <sys/cygwin.h>
 #include <sys/cygwin.h>

+#endif

 #include <signal.h>
 
 #include "buildsym.h"
 #include "symfile.h"
 #include "objfiles.h"
 #include <signal.h>
 
 #include "buildsym.h"
 #include "symfile.h"
 #include "objfiles.h"

+#include "gdb_obstack.h"

 #include "gdb_string.h"
 #include "gdbthread.h"
 #include "gdbcmd.h"
 #include "gdb_string.h"
 #include "gdbthread.h"
 #include "gdbcmd.h"


@@ -56,16 +55,20 @@
 #include "exec.h"
 #include "solist.h"
 #include "solib.h"
 #include "exec.h"
 #include "solist.h"
 #include "solib.h"

+#include "xml-support.h"

 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 
 
 #include "i386-tdep.h"
 #include "i387-tdep.h"
 

+#include "i386-cygwin-tdep.h"
+

 static struct target_ops win32_ops;
 static struct target_ops win32_ops;

-static struct target_so_ops win32_so_ops;

 
 

+#ifdef __CYGWIN__

 /* The starting and ending address of the cygwin1.dll text segment. */
 static bfd_vma cygwin_load_start;
 static bfd_vma cygwin_load_end;
 /* The starting and ending address of the cygwin1.dll text segment. */
 static bfd_vma cygwin_load_start;
 static bfd_vma cygwin_load_end;

+#endif

 
 static int have_saved_context; /* True if we've saved context from a cygwin signal. */
 static CONTEXT saved_context;  /* Containes the saved context from a cygwin signal. */
 
 static int have_saved_context; /* True if we've saved context from a cygwin signal. */
 static CONTEXT saved_context;  /* Containes the saved context from a cygwin signal. */


@@ -80,7 +83,6 @@ enum
     CONTEXT_DEBUGGER = (CONTEXT_FULL | CONTEXT_FLOATING_POINT)
   };
 #endif
     CONTEXT_DEBUGGER = (CONTEXT_FULL | CONTEXT_FLOATING_POINT)
   };
 #endif

-#include <sys/procfs.h>

 #include <psapi.h>
 
 #define CONTEXT_DEBUGGER_DR CONTEXT_DEBUGGER | CONTEXT_DEBUG_REGISTERS \
 #include <psapi.h>
 
 #define CONTEXT_DEBUGGER_DR CONTEXT_DEBUGGER | CONTEXT_DEBUG_REGISTERS \


@@ -89,6 +91,7 @@ enum
 static unsigned dr[8];
 static int debug_registers_changed;
 static int debug_registers_used;
 static unsigned dr[8];
 static int debug_registers_changed;
 static int debug_registers_used;

+#define DR6_CLEAR_VALUE 0xffff0ff0

 
 /* The string sent by cygwin when it processes a signal.
    FIXME: This should be in a cygwin include file. */
 
 /* The string sent by cygwin when it processes a signal.
    FIXME: This should be in a cygwin include file. */


@@ -110,14 +113,14 @@ static enum target_signal last_sig = TARGET_SIGNAL_0;
 /* Set if a signal was received from the debugged process */
 
 /* Thread information structure used to track information that is
 /* Set if a signal was received from the debugged process */
 
 /* Thread information structure used to track information that is

-   not available in gdb's thread structure. */
+   not available in gdb's thread structure.  */

 typedef struct thread_info_struct
   {
     struct thread_info_struct *next;
     DWORD id;
     HANDLE h;
     char *name;
 typedef struct thread_info_struct
   {
     struct thread_info_struct *next;
     DWORD id;
     HANDLE h;
     char *name;

-    int suspend_count;
+    int suspended;

     int reload_context;
     CONTEXT context;
     STACKFRAME sf;
     int reload_context;
     CONTEXT context;
     STACKFRAME sf;


@@ -138,10 +141,13 @@ static DWORD main_thread_id;              /* Thread ID of the main thread */
 static int exception_count = 0;
 static int event_count = 0;
 static int saw_create;
 static int exception_count = 0;
 static int event_count = 0;
 static int saw_create;

+static int open_process_used = 0;

 
 /* User options. */
 static int new_console = 0;
 
 /* User options. */
 static int new_console = 0;

+#ifdef __CYGWIN__

 static int cygwin_exceptions = 0;
 static int cygwin_exceptions = 0;

+#endif

 static int new_group = 1;
 static int debug_exec = 0;             /* show execution */
 static int debug_events = 0;           /* show events from kernel */
 static int new_group = 1;
 static int debug_exec = 0;             /* show execution */
 static int debug_events = 0;           /* show events from kernel */


@@ -240,9 +246,9 @@ check (BOOL ok, const char *file, int line)
                     GetLastError ());
 }
 
                     GetLastError ());
 }
 

-/* Find a thread record given a thread id.
-   If get_context then also retrieve the context for this
-   thread. */
+/* Find a thread record given a thread id.  If GET_CONTEXT is not 0,
+   then also retrieve the context for this thread.  If GET_CONTEXT is
+   negative, then don't suspend the thread.  */

 static thread_info *
 thread_rec (DWORD id, int get_context)
 {
 static thread_info *
 thread_rec (DWORD id, int get_context)
 {


@@ -251,12 +257,21 @@ thread_rec (DWORD id, int get_context)
   for (th = &thread_head; (th = th->next) != NULL;)
     if (th->id == id)
       {
   for (th = &thread_head; (th = th->next) != NULL;)
     if (th->id == id)
       {

-       if (!th->suspend_count && get_context)
+       if (!th->suspended && get_context)

          {
            if (get_context > 0 && id != current_event.dwThreadId)
          {
            if (get_context > 0 && id != current_event.dwThreadId)

-             th->suspend_count = SuspendThread (th->h) + 1;
+             {
+               if (SuspendThread (th->h) == (DWORD) -1)
+                 {
+                   DWORD err = GetLastError ();
+                   warning (_("SuspendThread failed. (winerr %d)"),
+                            (int) err);
+                   return NULL;
+                 }
+               th->suspended = 1;
+             }

            else if (get_context < 0)
            else if (get_context < 0)

-             th->suspend_count = -1;
+             th->suspended = -1;

            th->reload_context = 1;
          }
        return th;
            th->reload_context = 1;
          }
        return th;


@@ -290,8 +305,7 @@ win32_add_thread (DWORD id, HANDLE h)
       th->context.Dr1 = dr[1];
       th->context.Dr2 = dr[2];
       th->context.Dr3 = dr[3];
       th->context.Dr1 = dr[1];
       th->context.Dr2 = dr[2];
       th->context.Dr3 = dr[3];

-      /* th->context.Dr6 = dr[6];
-      FIXME: should we set dr6 also ?? */
+      th->context.Dr6 = DR6_CLEAR_VALUE;

       th->context.Dr7 = dr[7];
       CHECK (SetThreadContext (th->h, &th->context));
       th->context.ContextFlags = 0;
       th->context.Dr7 = dr[7];
       CHECK (SetThreadContext (th->h, &th->context));
       th->context.ContextFlags = 0;


@@ -312,7 +326,6 @@ win32_init_thread_list (void)
     {
       thread_info *here = th->next;
       th->next = here->next;
     {
       thread_info *here = th->next;
       th->next = here->next;

-      (void) CloseHandle (here->h);

       xfree (here);
     }
   thread_head.next = NULL;
       xfree (here);
     }
   thread_head.next = NULL;


@@ -337,15 +350,16 @@ win32_delete_thread (DWORD id)
     {
       thread_info *here = th->next;
       th->next = here->next;
     {
       thread_info *here = th->next;
       th->next = here->next;

-      CloseHandle (here->h);

       xfree (here);
     }
 }
 
 static void
       xfree (here);
     }
 }
 
 static void

-do_win32_fetch_inferior_registers (int r)
+do_win32_fetch_inferior_registers (struct regcache *regcache, int r)

 {
   char *context_offset = ((char *) &current_thread->context) + mappings[r];
 {
   char *context_offset = ((char *) &current_thread->context) + mappings[r];

+  struct gdbarch *gdbarch = get_regcache_arch (regcache);
+  struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch);

   long l;
 
   if (!current_thread)
   long l;
 
   if (!current_thread)


@@ -369,159 +383,149 @@ do_win32_fetch_inferior_registers (int r)
          thread_info *th = current_thread;
          th->context.ContextFlags = CONTEXT_DEBUGGER_DR;
          GetThreadContext (th->h, &th->context);
          thread_info *th = current_thread;
          th->context.ContextFlags = CONTEXT_DEBUGGER_DR;
          GetThreadContext (th->h, &th->context);

-         /* Copy dr values from that thread.  */
-         dr[0] = th->context.Dr0;
-         dr[1] = th->context.Dr1;
-         dr[2] = th->context.Dr2;
-         dr[3] = th->context.Dr3;
-         dr[6] = th->context.Dr6;
-         dr[7] = th->context.Dr7;
+         /* Copy dr values from that thread. 
+            But only if there were not modified since last stop. PR gdb/2388 */
+         if (!debug_registers_changed)
+           {
+             dr[0] = th->context.Dr0;
+             dr[1] = th->context.Dr1;
+             dr[2] = th->context.Dr2;
+             dr[3] = th->context.Dr3;
+             dr[6] = th->context.Dr6;
+             dr[7] = th->context.Dr7;
+           }

        }
       current_thread->reload_context = 0;
     }
 
        }
       current_thread->reload_context = 0;
     }
 

-#define I387_ST0_REGNUM I386_ST0_REGNUM
-
-  if (r == I387_FISEG_REGNUM)
+  if (r == I387_FISEG_REGNUM (tdep))

     {
       l = *((long *) context_offset) & 0xffff;
     {
       l = *((long *) context_offset) & 0xffff;

-      regcache_raw_supply (current_regcache, r, (char *) &l);
+      regcache_raw_supply (regcache, r, (char *) &l);

     }
     }

-  else if (r == I387_FOP_REGNUM)
+  else if (r == I387_FOP_REGNUM (tdep))

     {
       l = (*((long *) context_offset) >> 16) & ((1 << 11) - 1);
     {
       l = (*((long *) context_offset) >> 16) & ((1 << 11) - 1);

-      regcache_raw_supply (current_regcache, r, (char *) &l);
+      regcache_raw_supply (regcache, r, (char *) &l);

     }
   else if (r >= 0)
     }
   else if (r >= 0)

-    regcache_raw_supply (current_regcache, r, context_offset);
+    regcache_raw_supply (regcache, r, context_offset);

   else
     {
   else
     {

-      for (r = 0; r < NUM_REGS; r++)
-       do_win32_fetch_inferior_registers (r);
+      for (r = 0; r < gdbarch_num_regs (gdbarch); r++)
+       do_win32_fetch_inferior_registers (regcache, r);

     }
     }

-
-#undef I387_ST0_REGNUM

 }
 
 static void
 }
 
 static void

-win32_fetch_inferior_registers (int r)
+win32_fetch_inferior_registers (struct regcache *regcache, int r)

 {
   current_thread = thread_rec (PIDGET (inferior_ptid), TRUE);
   /* Check if current_thread exists.  Windows sometimes uses a non-existent
      thread id in its events */
   if (current_thread)
 {
   current_thread = thread_rec (PIDGET (inferior_ptid), TRUE);
   /* Check if current_thread exists.  Windows sometimes uses a non-existent
      thread id in its events */
   if (current_thread)

-    do_win32_fetch_inferior_registers (r);
+    do_win32_fetch_inferior_registers (regcache, r);

 }
 
 static void
 }
 
 static void

-do_win32_store_inferior_registers (int r)
+do_win32_store_inferior_registers (const struct regcache *regcache, int r)

 {
   if (!current_thread)
     /* Windows sometimes uses a non-existent thread id in its events */;
   else if (r >= 0)
 {
   if (!current_thread)
     /* Windows sometimes uses a non-existent thread id in its events */;
   else if (r >= 0)

-    regcache_raw_collect (current_regcache, r,
+    regcache_raw_collect (regcache, r,

                          ((char *) &current_thread->context) + mappings[r]);
   else
     {
                          ((char *) &current_thread->context) + mappings[r]);
   else
     {

-      for (r = 0; r < NUM_REGS; r++)
-       do_win32_store_inferior_registers (r);
+      for (r = 0; r < gdbarch_num_regs (get_regcache_arch (regcache)); r++)
+       do_win32_store_inferior_registers (regcache, r);

     }
 }
 
 /* Store a new register value into the current thread context */
 static void
     }
 }
 
 /* Store a new register value into the current thread context */
 static void

-win32_store_inferior_registers (int r)
+win32_store_inferior_registers (struct regcache *regcache, int r)

 {
   current_thread = thread_rec (PIDGET (inferior_ptid), TRUE);
   /* Check if current_thread exists.  Windows sometimes uses a non-existent
      thread id in its events */
   if (current_thread)
 {
   current_thread = thread_rec (PIDGET (inferior_ptid), TRUE);
   /* Check if current_thread exists.  Windows sometimes uses a non-existent
      thread id in its events */
   if (current_thread)

-    do_win32_store_inferior_registers (r);
+    do_win32_store_inferior_registers (regcache, r);

 }
 
 static int psapi_loaded = 0;
 }
 
 static int psapi_loaded = 0;

-static HMODULE psapi_module_handle = NULL;
-static BOOL WINAPI (*psapi_EnumProcessModules) (HANDLE, HMODULE *, DWORD, LPDWORD) = NULL;
-static BOOL WINAPI (*psapi_GetModuleInformation) (HANDLE, HMODULE, LPMODULEINFO, DWORD) = NULL;
-static DWORD WINAPI (*psapi_GetModuleFileNameExA) (HANDLE, HMODULE, LPSTR, DWORD) = NULL;
-
+static BOOL WINAPI (*psapi_EnumProcessModules) (HANDLE, HMODULE *, DWORD,
+                                               LPDWORD);
+static BOOL WINAPI (*psapi_GetModuleInformation) (HANDLE, HMODULE, LPMODULEINFO,
+                                                 DWORD);
+static DWORD WINAPI (*psapi_GetModuleFileNameExA) (HANDLE, HMODULE, LPSTR,
+                                                  DWORD);
+
+/* Get the name of a given module at at given base address.  If base_address
+   is zero return the first loaded module (which is always the name of the
+   executable).  */

 static int
 static int

-psapi_get_dll_name (DWORD BaseAddress, char *dll_name_ret)
+get_module_name (DWORD base_address, char *dll_name_ret)

 {
   DWORD len;
   MODULEINFO mi;
   int i;
   HMODULE dh_buf[1];
 {
   DWORD len;
   MODULEINFO mi;
   int i;
   HMODULE dh_buf[1];

-  HMODULE *DllHandle = dh_buf;
+  HMODULE *DllHandle = dh_buf; /* Set to temporary storage for initial query */

   DWORD cbNeeded;
   DWORD cbNeeded;

-  BOOL ok;
+#ifdef __CYGWIN__
+  char pathbuf[PATH_MAX + 1];  /* Temporary storage prior to converting to
+                                  posix form */
+#else
+  char *pathbuf = dll_name_ret;        /* Just copy directly to passed-in arg */
+#endif

 
 

-  if (!psapi_loaded ||
-      psapi_EnumProcessModules == NULL ||
-      psapi_GetModuleInformation == NULL ||
-      psapi_GetModuleFileNameExA == NULL)
-    {
-      if (psapi_loaded)
-       goto failed;
-      psapi_loaded = 1;
-      psapi_module_handle = LoadLibrary ("psapi.dll");
-      if (!psapi_module_handle)
-       {
-         /* printf_unfiltered ("error loading psapi.dll: %u", GetLastError ()); */
-         goto failed;
-       }
-      psapi_EnumProcessModules = GetProcAddress (psapi_module_handle, "EnumProcessModules");
-      psapi_GetModuleInformation = GetProcAddress (psapi_module_handle, "GetModuleInformation");
-      psapi_GetModuleFileNameExA = (void *) GetProcAddress (psapi_module_handle,
-                                                   "GetModuleFileNameExA");
-      if (psapi_EnumProcessModules == NULL ||
-         psapi_GetModuleInformation == NULL ||
-         psapi_GetModuleFileNameExA == NULL)
-       goto failed;
-    }
+  /* If psapi_loaded < 0 either psapi.dll is not available or it does not contain
+     the needed functions. */
+  if (psapi_loaded <= 0)
+    goto failed;

 
   cbNeeded = 0;
 
   cbNeeded = 0;

-  ok = (*psapi_EnumProcessModules) (current_process_handle,
-                                   DllHandle,
-                                   sizeof (HMODULE),
-                                   &cbNeeded);
-
-  if (!ok || !cbNeeded)
+  /* Find size of buffer needed to handle list of modules loaded in inferior */
+  if (!psapi_EnumProcessModules (current_process_handle, DllHandle,
+                                sizeof (HMODULE), &cbNeeded) || !cbNeeded)

     goto failed;
 
     goto failed;
 

+  /* Allocate correct amount of space for module list */

   DllHandle = (HMODULE *) alloca (cbNeeded);
   if (!DllHandle)
     goto failed;
 
   DllHandle = (HMODULE *) alloca (cbNeeded);
   if (!DllHandle)
     goto failed;
 

-  ok = (*psapi_EnumProcessModules) (current_process_handle,
-                                   DllHandle,
-                                   cbNeeded,
-                                   &cbNeeded);
-  if (!ok)
+  /* Get the list of modules */
+  if (!psapi_EnumProcessModules (current_process_handle, DllHandle, cbNeeded,
+                                &cbNeeded))

     goto failed;
 
   for (i = 0; i < (int) (cbNeeded / sizeof (HMODULE)); i++)
     {
     goto failed;
 
   for (i = 0; i < (int) (cbNeeded / sizeof (HMODULE)); i++)
     {

-      if (!(*psapi_GetModuleInformation) (current_process_handle,
-                                         DllHandle[i],
-                                         &mi,
-                                         sizeof (mi)))
+      /* Get information on this module */
+      if (!psapi_GetModuleInformation (current_process_handle, DllHandle[i],
+                                      &mi, sizeof (mi)))

        error (_("Can't get module info"));
 
        error (_("Can't get module info"));
 

-      len = (*psapi_GetModuleFileNameExA) (current_process_handle,
-                                          DllHandle[i],
-                                          dll_name_ret,
-                                          MAX_PATH);
-      if (len == 0)
-       error (_("Error getting dll name: %u."), (unsigned) GetLastError ());
-
-      if ((DWORD) (mi.lpBaseOfDll) == BaseAddress)
-       return 1;
+      if (!base_address || (DWORD) (mi.lpBaseOfDll) == base_address)
+       {
+         /* Try to find the name of the given module */
+         len = psapi_GetModuleFileNameExA (current_process_handle,
+                                           DllHandle[i], pathbuf, MAX_PATH);
+         if (len == 0)
+           error (_("Error getting dll name: %u."), (unsigned) GetLastError ());
+#ifdef __CYGWIN__
+         /* Cygwin prefers that the path be in /x/y/z format */
+         cygwin_conv_to_full_posix_path (pathbuf, dll_name_ret);
+#endif
+         return 1;     /* success */
+       }

     }
 
 failed:
   dll_name_ret[0] = '\0';
     }
 
 failed:
   dll_name_ret[0] = '\0';

-  return 0;
+  return 0;            /* failure */

 }
 
 /* Encapsulate the information required in a call to
 }
 
 /* Encapsulate the information required in a call to


@@ -551,8 +555,6 @@ static int
 safe_symbol_file_add_stub (void *argv)
 {
 #define p ((struct safe_symbol_file_add_args *) argv)
 safe_symbol_file_add_stub (void *argv)
 {
 #define p ((struct safe_symbol_file_add_args *) argv)

-  struct so_list *so = &solib_start;
-

   p->ret = symbol_file_add (p->name, p->from_tty, p->addrs, p->mainline, p->flags);
   return !!p->ret;
 #undef p
   p->ret = symbol_file_add (p->name, p->from_tty, p->addrs, p->mainline, p->flags);
   return !!p->ret;
 #undef p


@@ -600,123 +602,8 @@ safe_symbol_file_add (char *name, int from_tty,
   return p.ret;
 }
 
   return p.ret;
 }
 

-/* Get the loaded address of all sections, given that .text was loaded
-   at text_load. Assumes that all sections are subject to the same
-   relocation offset. Returns NULL if problems occur or if the
-   sections were not relocated. */
-
-static struct section_addr_info *
-get_relocated_section_addrs (bfd *abfd, CORE_ADDR text_load)
-{
-  struct section_addr_info *result = NULL;
-  int section_count = bfd_count_sections (abfd);
-  asection *text_section = bfd_get_section_by_name (abfd, ".text");
-  CORE_ADDR text_vma;
-
-  if (!text_section)
-    {
-      /* Couldn't get the .text section. Weird. */
-    }
-  else if (text_load == (text_vma = bfd_get_section_vma (abfd, text_section)))
-    {
-      /* DLL wasn't relocated. */
-    }
-  else
-    {
-      /* Figure out all sections' loaded addresses. The offset here is
-        such that taking a bfd_get_section_vma() result and adding
-        offset will give the real load address of the section. */
-
-      CORE_ADDR offset = text_load - text_vma;
-
-      struct section_table *table_start = NULL;
-      struct section_table *table_end = NULL;
-      struct section_table *iter = NULL;
-
-      build_section_table (abfd, &table_start, &table_end);
-
-      for (iter = table_start; iter < table_end; ++iter)
-       {
-         /* Relocated addresses. */
-         iter->addr += offset;
-         iter->endaddr += offset;
-       }
-
-      result = build_section_addr_info_from_section_table (table_start,
-                                                          table_end);
-
-      xfree (table_start);
-    }
-
-  return result;
-}
-
-/* Add DLL symbol information. */
-static void
-solib_symbols_add (struct so_list *so, CORE_ADDR load_addr)
-{
-  struct section_addr_info *addrs = NULL;
-  static struct objfile *result = NULL;
-  char *name = so->so_name;
-  bfd *abfd = NULL;
-  char *p;
-
-  /* The symbols in a dll are offset by 0x1000, which is the
-     the offset from 0 of the first byte in an image - because
-     of the file header and the section alignment. */
-
-  if (!name || !name[0])
-    return;
-
-  abfd = bfd_openr (name, "pei-i386");
-
-  if (!abfd)
-    {
-      /* pei failed - try pe */
-      abfd = bfd_openr (name, "pe-i386");
-    }
-
-  if (abfd)
-    {
-      if (bfd_check_format (abfd, bfd_object))
-       addrs = get_relocated_section_addrs (abfd, load_addr);
-    }
-
-  if (addrs)
-    {
-      result = safe_symbol_file_add (name, 0, addrs, 0, OBJF_SHARED);
-      free_section_addr_info (addrs);
-    }
-  else
-    {
-      /* Fallback on handling just the .text section. */
-      struct cleanup *my_cleanups;
-
-      addrs = alloc_section_addr_info (1);
-      my_cleanups = make_cleanup (xfree, addrs);
-      addrs->other[0].name = ".text";
-      addrs->other[0].addr = load_addr;
-
-      result = safe_symbol_file_add (name, 0, addrs, 0, OBJF_SHARED);
-      do_cleanups (my_cleanups);
-    }
-
-  p = strchr (so->so_name, '\0') - (sizeof ("/cygwin1.dll") - 1);
-  if (p >= so->so_name && strcasecmp (p, "/cygwin1.dll") == 0)
-    {
-      asection *text = bfd_get_section_by_name (abfd, ".text");
-      cygwin_load_start = bfd_section_vma (abfd, text);
-      cygwin_load_end = cygwin_load_start + bfd_section_size (abfd, text);
-    }
-
-  bfd_close (abfd);
-
-  so->symbols_loaded = !!result;
-  return;
-}
-
-static char *
-register_loaded_dll (const char *name, DWORD load_addr, int readsyms)
+static struct so_list *
+win32_make_so (const char *name, DWORD load_addr)

 {
   struct so_list *so;
   char buf[MAX_PATH + 1];
 {
   struct so_list *so;
   char buf[MAX_PATH + 1];


@@ -725,7 +612,6 @@ register_loaded_dll (const char *name, DWORD load_addr, int readsyms)
   WIN32_FIND_DATA w32_fd;
   HANDLE h = FindFirstFile(name, &w32_fd);
   MEMORY_BASIC_INFORMATION m;
   WIN32_FIND_DATA w32_fd;
   HANDLE h = FindFirstFile(name, &w32_fd);
   MEMORY_BASIC_INFORMATION m;

-  size_t len;

 
   if (h == INVALID_HANDLE_VALUE)
     strcpy (buf, name);
 
   if (h == INVALID_HANDLE_VALUE)
     strcpy (buf, name);


@@ -752,16 +638,44 @@ register_loaded_dll (const char *name, DWORD load_addr, int readsyms)
   so = XZALLOC (struct so_list);
   so->lm_info = (struct lm_info *) xmalloc (sizeof (struct lm_info));
   so->lm_info->load_addr = load_addr;
   so = XZALLOC (struct so_list);
   so->lm_info = (struct lm_info *) xmalloc (sizeof (struct lm_info));
   so->lm_info->load_addr = load_addr;

+  strcpy (so->so_original_name, name);
+#ifndef __CYGWIN__
+  strcpy (so->so_name, buf);
+#else

   cygwin_conv_to_posix_path (buf, so->so_name);
   cygwin_conv_to_posix_path (buf, so->so_name);

-  strcpy (so->so_original_name, so->so_name);
+  /* Record cygwin1.dll .text start/end.  */
+  p = strchr (so->so_name, '\0') - (sizeof ("/cygwin1.dll") - 1);
+  if (p >= so->so_name && strcasecmp (p, "/cygwin1.dll") == 0)
+    {
+      bfd *abfd;
+      asection *text = NULL;
+      CORE_ADDR text_vma;
+
+      abfd = bfd_openr (so->so_name, "pei-i386");
+
+      if (!abfd)
+       return so;
+
+      if (bfd_check_format (abfd, bfd_object))
+       text = bfd_get_section_by_name (abfd, ".text");

 
 

-  solib_end->next = so;
-  solib_end = so;
-  len = strlen (so->so_name);
-  if (readsyms)
-    solib_symbols_add (so, (CORE_ADDR) load_addr);
+      if (!text)
+       {
+         bfd_close (abfd);
+         return so;
+       }
+
+      /* The symbols in a dll are offset by 0x1000, which is the the
+        offset from 0 of the first byte in an image - because of the
+        file header and the section alignment. */
+      cygwin_load_start = load_addr + 0x1000;
+      cygwin_load_end = cygwin_load_start + bfd_section_size (abfd, text);

 
 

-  return so->so_name;
+      bfd_close (abfd);
+    }
+#endif
+
+  return so;

 }
 
 static char *
 }
 
 static char *


@@ -816,17 +730,22 @@ handle_load_dll (void *dummy)
 
   dll_buf[0] = dll_buf[sizeof (dll_buf) - 1] = '\0';
 
 
   dll_buf[0] = dll_buf[sizeof (dll_buf) - 1] = '\0';
 

-  if (!psapi_get_dll_name ((DWORD) (event->lpBaseOfDll), dll_buf))
+  if (!get_module_name ((DWORD) event->lpBaseOfDll, dll_buf))

     dll_buf[0] = dll_buf[sizeof (dll_buf) - 1] = '\0';
 
   dll_name = dll_buf;
 
   if (*dll_name == '\0')
     dll_buf[0] = dll_buf[sizeof (dll_buf) - 1] = '\0';
 
   dll_name = dll_buf;
 
   if (*dll_name == '\0')

-    dll_name = get_image_name (current_process_handle, event->lpImageName, event->fUnicode);
+    dll_name = get_image_name (current_process_handle,
+                              event->lpImageName, event->fUnicode);

   if (!dll_name)
     return 1;
 
   if (!dll_name)
     return 1;
 

-  register_loaded_dll (dll_name, (DWORD) event->lpBaseOfDll + 0x1000, auto_solib_add);
+  solib_end->next = win32_make_so (dll_name, (DWORD) event->lpBaseOfDll);
+  solib_end = solib_end->next;
+
+  DEBUG_EVENTS (("gdb: Loading dll \"%s\" at 0x%lx.\n", solib_end->so_name,
+                (DWORD) solib_end->lm_info->load_addr));

 
   return 1;
 }
 
   return 1;
 }


@@ -836,27 +755,13 @@ win32_free_so (struct so_list *so)
 {
   if (so->lm_info)
     xfree (so->lm_info);
 {
   if (so->lm_info)
     xfree (so->lm_info);

-}
-
-static void
-win32_relocate_section_addresses (struct so_list *so,
-                                 struct section_table *sec)
-{
-  /* FIXME */
-  return;
-}
-
-static void
-win32_solib_create_inferior_hook (void)
-{
-  solib_add (NULL, 0, NULL, auto_solib_add);
-  return;
+  xfree (so);

 }
 
 static int
 handle_unload_dll (void *dummy)
 {
 }
 
 static int
 handle_unload_dll (void *dummy)
 {

-  DWORD lpBaseOfDll = (DWORD) current_event.u.UnloadDll.lpBaseOfDll + 0x1000;
+  DWORD lpBaseOfDll = (DWORD) current_event.u.UnloadDll.lpBaseOfDll;

   struct so_list *so;
 
   for (so = &solib_start; so->next != NULL; so = so->next)
   struct so_list *so;
 
   for (so = &solib_start; so->next != NULL; so = so->next)


@@ -866,7 +771,9 @@ handle_unload_dll (void *dummy)
        so->next = sodel->next;
        if (!so->next)
          solib_end = so;
        so->next = sodel->next;
        if (!so->next)
          solib_end = so;

-       free_so (sodel);
+       DEBUG_EVENTS (("gdb: Unloading dll \"%s\".\n", sodel->so_name));
+
+       win32_free_so (sodel);

        solib_add (NULL, 0, NULL, auto_solib_add);
        return 1;
       }
        solib_add (NULL, 0, NULL, auto_solib_add);
        return 1;
       }


@@ -884,12 +791,6 @@ win32_clear_solib (void)
   solib_end = &solib_start;
 }
 
   solib_end = &solib_start;
 }
 

-static void
-win32_special_symbol_handling (void)
-{
-  return;
-}
-

 /* Load DLL symbol info. */
 void
 dll_symbol_command (char *args, int from_tty)
 /* Load DLL symbol info. */
 void
 dll_symbol_command (char *args, int from_tty)


@@ -922,12 +823,15 @@ handle_output_debug_string (struct target_waitstatus *ourstatus)
   int retval = 0;
 
   if (!target_read_string
   int retval = 0;
 
   if (!target_read_string

-    ((CORE_ADDR) current_event.u.DebugString.lpDebugStringData, &s, 1024, 0)
+       ((CORE_ADDR) (uintptr_t) current_event.u.DebugString.lpDebugStringData,
+       &s, 1024, 0)

       || !s || !*s)
     /* nothing to do */;
   else if (strncmp (s, _CYGWIN_SIGNAL_STRING, sizeof (_CYGWIN_SIGNAL_STRING) - 1) != 0)
     {
       || !s || !*s)
     /* nothing to do */;
   else if (strncmp (s, _CYGWIN_SIGNAL_STRING, sizeof (_CYGWIN_SIGNAL_STRING) - 1) != 0)
     {

+#ifdef __CYGWIN__

       if (strncmp (s, "cYg", 3) != 0)
       if (strncmp (s, "cYg", 3) != 0)

+#endif

        warning (("%s"), s);
     }
 #ifdef __COPY_CONTEXT_SIZE
        warning (("%s"), s);
     }
 #ifdef __COPY_CONTEXT_SIZE


@@ -1105,6 +1009,7 @@ handle_exception (struct target_waitstatus *ourstatus)
     case EXCEPTION_ACCESS_VIOLATION:
       DEBUG_EXCEPTION_SIMPLE ("EXCEPTION_ACCESS_VIOLATION");
       ourstatus->value.sig = TARGET_SIGNAL_SEGV;
     case EXCEPTION_ACCESS_VIOLATION:
       DEBUG_EXCEPTION_SIMPLE ("EXCEPTION_ACCESS_VIOLATION");
       ourstatus->value.sig = TARGET_SIGNAL_SEGV;

+#ifdef __CYGWIN__

       {
        /* See if the access violation happened within the cygwin DLL itself.  Cygwin uses
           a kind of exception handling to deal with passed-in invalid addresses. gdb
       {
        /* See if the access violation happened within the cygwin DLL itself.  Cygwin uses
           a kind of exception handling to deal with passed-in invalid addresses. gdb


@@ -1113,12 +1018,14 @@ handle_exception (struct target_waitstatus *ourstatus)
           and will be sent as a cygwin-specific-signal.  So, ignore SEGVs if they show up
           within the text segment of the DLL itself. */
        char *fn;
           and will be sent as a cygwin-specific-signal.  So, ignore SEGVs if they show up
           within the text segment of the DLL itself. */
        char *fn;

-       bfd_vma addr = (bfd_vma) current_event.u.Exception.ExceptionRecord.ExceptionAddress;
+       bfd_vma addr = (bfd_vma) (uintptr_t) current_event.u.Exception.
+                                            ExceptionRecord.ExceptionAddress;

        if ((!cygwin_exceptions && (addr >= cygwin_load_start && addr < cygwin_load_end))
            || (find_pc_partial_function (addr, &fn, NULL, NULL)
                && strncmp (fn, "KERNEL32!IsBad", strlen ("KERNEL32!IsBad")) == 0))
          return 0;
       }
        if ((!cygwin_exceptions && (addr >= cygwin_load_start && addr < cygwin_load_end))
            || (find_pc_partial_function (addr, &fn, NULL, NULL)
                && strncmp (fn, "KERNEL32!IsBad", strlen ("KERNEL32!IsBad")) == 0))
          return 0;
       }

+#endif

       break;
     case STATUS_STACK_OVERFLOW:
       DEBUG_EXCEPTION_SIMPLE ("STATUS_STACK_OVERFLOW");
       break;
     case STATUS_STACK_OVERFLOW:
       DEBUG_EXCEPTION_SIMPLE ("STATUS_STACK_OVERFLOW");


@@ -1220,32 +1127,34 @@ win32_continue (DWORD continue_status, int id)
                  current_event.dwProcessId, current_event.dwThreadId,
                  continue_status == DBG_CONTINUE ?
                  "DBG_CONTINUE" : "DBG_EXCEPTION_NOT_HANDLED"));
                  current_event.dwProcessId, current_event.dwThreadId,
                  continue_status == DBG_CONTINUE ?
                  "DBG_CONTINUE" : "DBG_EXCEPTION_NOT_HANDLED"));

+
+  for (th = &thread_head; (th = th->next) != NULL;)
+    if ((id == -1 || id == (int) th->id)
+       && th->suspended)
+      {
+       if (debug_registers_changed)
+         {
+           th->context.ContextFlags |= CONTEXT_DEBUG_REGISTERS;
+           th->context.Dr0 = dr[0];
+           th->context.Dr1 = dr[1];
+           th->context.Dr2 = dr[2];
+           th->context.Dr3 = dr[3];
+           th->context.Dr6 = DR6_CLEAR_VALUE;
+           th->context.Dr7 = dr[7];
+         }
+       if (th->context.ContextFlags)
+         {
+           CHECK (SetThreadContext (th->h, &th->context));
+           th->context.ContextFlags = 0;
+         }
+       if (th->suspended > 0)
+         (void) ResumeThread (th->h);
+       th->suspended = 0;
+      }
+

   res = ContinueDebugEvent (current_event.dwProcessId,
                            current_event.dwThreadId,
                            continue_status);
   res = ContinueDebugEvent (current_event.dwProcessId,
                            current_event.dwThreadId,
                            continue_status);

-  if (res)
-    for (th = &thread_head; (th = th->next) != NULL;)
-      if (((id == -1) || (id == (int) th->id)) && th->suspend_count)
-       {
-
-         for (i = 0; i < th->suspend_count; i++)
-           (void) ResumeThread (th->h);
-         th->suspend_count = 0;
-         if (debug_registers_changed)
-           {
-             /* Only change the value of the debug registers */
-             th->context.ContextFlags = CONTEXT_DEBUG_REGISTERS;
-             th->context.Dr0 = dr[0];
-             th->context.Dr1 = dr[1];
-             th->context.Dr2 = dr[2];
-             th->context.Dr3 = dr[3];
-             /* th->context.Dr6 = dr[6];
-                FIXME: should we set dr6 also ?? */
-             th->context.Dr7 = dr[7];
-             CHECK (SetThreadContext (th->h, &th->context));
-             th->context.ContextFlags = 0;
-           }
-       }

 
   debug_registers_changed = 0;
   return res;
 
   debug_registers_changed = 0;
   return res;


@@ -1258,6 +1167,14 @@ fake_create_process (void)
 {
   current_process_handle = OpenProcess (PROCESS_ALL_ACCESS, FALSE,
                                        current_event.dwProcessId);
 {
   current_process_handle = OpenProcess (PROCESS_ALL_ACCESS, FALSE,
                                        current_event.dwProcessId);

+  if (current_process_handle != NULL)
+    open_process_used = 1;
+  else
+    {
+      error (_("OpenProcess call failed, GetLastError = %lud\n"),
+       GetLastError ());
+      /*  We can not debug anything in that case.  */
+    }

   main_thread_id = current_event.dwThreadId;
   current_thread = win32_add_thread (main_thread_id,
                                     current_event.u.CreateThread.hThread);
   main_thread_id = current_event.dwThreadId;
   current_thread = win32_add_thread (main_thread_id,
                                     current_event.u.CreateThread.hThread);


@@ -1312,13 +1229,14 @@ win32_resume (ptid_t ptid, int step, enum target_signal sig)
               pid, step, sig));
 
   /* Get context for currently selected thread */
               pid, step, sig));
 
   /* Get context for currently selected thread */

-  th = thread_rec (current_event.dwThreadId, FALSE);
+  th = thread_rec (PIDGET (inferior_ptid), FALSE);

   if (th)
     {
       if (step)
        {
          /* Single step by setting t bit */
   if (th)
     {
       if (step)
        {
          /* Single step by setting t bit */

-         win32_fetch_inferior_registers (PS_REGNUM);
+         win32_fetch_inferior_registers (get_current_regcache (),
+                                         gdbarch_ps_regnum (current_gdbarch));

          th->context.EFlags |= FLAG_TRACE_BIT;
        }
 
          th->context.EFlags |= FLAG_TRACE_BIT;
        }
 


@@ -1330,8 +1248,7 @@ win32_resume (ptid_t ptid, int step, enum target_signal sig)
              th->context.Dr1 = dr[1];
              th->context.Dr2 = dr[2];
              th->context.Dr3 = dr[3];
              th->context.Dr1 = dr[1];
              th->context.Dr2 = dr[2];
              th->context.Dr3 = dr[3];

-             /* th->context.Dr6 = dr[6];
-              FIXME: should we set dr6 also ?? */
+             th->context.Dr6 = DR6_CLEAR_VALUE;

              th->context.Dr7 = dr[7];
            }
          CHECK (SetThreadContext (th->h, &th->context));
              th->context.Dr7 = dr[7];
            }
          CHECK (SetThreadContext (th->h, &th->context));


@@ -1386,17 +1303,14 @@ get_win32_debug_event (int pid, struct target_waitstatus *ourstatus)
                 thread event.  Caused when attached process does not have
                 a main thread. */
              retval = ourstatus->value.related_pid = fake_create_process ();
                 thread event.  Caused when attached process does not have
                 a main thread. */
              retval = ourstatus->value.related_pid = fake_create_process ();

-             saw_create++;
+            if (retval)
+              saw_create++;

            }
          break;
        }
       /* Record the existence of this thread */
       th = win32_add_thread (current_event.dwThreadId,
                             current_event.u.CreateThread.hThread);
            }
          break;
        }
       /* Record the existence of this thread */
       th = win32_add_thread (current_event.dwThreadId,
                             current_event.u.CreateThread.hThread);

-      if (info_verbose)
-       printf_unfiltered ("[New %s]\n",
-                          target_pid_to_str (
-                            pid_to_ptid (current_event.dwThreadId)));

       retval = current_event.dwThreadId;
       break;
 
       retval = current_event.dwThreadId;
       break;
 


@@ -1419,10 +1333,7 @@ get_win32_debug_event (int pid, struct target_waitstatus *ourstatus)
                     "CREATE_PROCESS_DEBUG_EVENT"));
       CloseHandle (current_event.u.CreateProcessInfo.hFile);
       if (++saw_create != 1)
                     "CREATE_PROCESS_DEBUG_EVENT"));
       CloseHandle (current_event.u.CreateProcessInfo.hFile);
       if (++saw_create != 1)

-       {
-         CloseHandle (current_event.u.CreateProcessInfo.hProcess);
-         break;
-       }
+       break;

 
       current_process_handle = current_event.u.CreateProcessInfo.hProcess;
       if (main_thread_id)
 
       current_process_handle = current_event.u.CreateProcessInfo.hProcess;
       if (main_thread_id)


@@ -1443,7 +1354,6 @@ get_win32_debug_event (int pid, struct target_waitstatus *ourstatus)
        break;
       ourstatus->kind = TARGET_WAITKIND_EXITED;
       ourstatus->value.integer = current_event.u.ExitProcess.dwExitCode;
        break;
       ourstatus->kind = TARGET_WAITKIND_EXITED;
       ourstatus->value.integer = current_event.u.ExitProcess.dwExitCode;

-      CloseHandle (current_process_handle);

       retval = main_thread_id;
       break;
 
       retval = main_thread_id;
       break;
 


@@ -1456,11 +1366,9 @@ get_win32_debug_event (int pid, struct target_waitstatus *ourstatus)
       if (saw_create != 1)
        break;
       catch_errors (handle_load_dll, NULL, (char *) "", RETURN_MASK_ALL);
       if (saw_create != 1)
        break;
       catch_errors (handle_load_dll, NULL, (char *) "", RETURN_MASK_ALL);

-      registers_changed ();    /* mark all regs invalid */

       ourstatus->kind = TARGET_WAITKIND_LOADED;
       ourstatus->value.integer = 0;
       retval = main_thread_id;
       ourstatus->kind = TARGET_WAITKIND_LOADED;
       ourstatus->value.integer = 0;
       retval = main_thread_id;

-      re_enable_breakpoints_in_shlibs ();

       break;
 
     case UNLOAD_DLL_DEBUG_EVENT:
       break;
 
     case UNLOAD_DLL_DEBUG_EVENT:


@@ -1471,9 +1379,9 @@ get_win32_debug_event (int pid, struct target_waitstatus *ourstatus)
       if (saw_create != 1)
        break;
       catch_errors (handle_unload_dll, NULL, (char *) "", RETURN_MASK_ALL);
       if (saw_create != 1)
        break;
       catch_errors (handle_unload_dll, NULL, (char *) "", RETURN_MASK_ALL);

-      registers_changed ();    /* mark all regs invalid */
-      /* ourstatus->kind = TARGET_WAITKIND_UNLOADED;
-        does not exist yet. */
+      ourstatus->kind = TARGET_WAITKIND_LOADED;
+      ourstatus->value.integer = 0;
+      retval = main_thread_id;

       break;
 
     case EXCEPTION_DEBUG_EVENT:
       break;
 
     case EXCEPTION_DEBUG_EVENT:


@@ -1552,7 +1460,25 @@ win32_wait (ptid_t ptid, struct target_waitstatus *ourstatus)
 
   while (1)
     {
 
   while (1)
     {

-      int retval = get_win32_debug_event (pid, ourstatus);
+      int retval;
+      
+      /* Ignore CTRL+C signals while waiting for a debug event.
+         FIXME: brobecker/2008-05-20: When the user presses CTRL+C while
+         the inferior is running, both the inferior and GDB receive the
+         associated signal.  If the inferior receives the signal first
+         and the delay until GDB receives that signal is sufficiently long,
+         GDB can sometimes receive the SIGINT after we have unblocked
+         the CTRL+C handler.  This would lead to the debugger to stop
+         prematurely while handling the new-thread event that comes
+         with the handling of the SIGINT inside the inferior, and then
+         stop again immediately when the user tries to resume the execution
+         in the inferior.  This is a classic race, and it would be nice
+         to find a better solution to that problem.  But in the meantime,
+         the current approach already greatly mitigate this issue.  */
+      SetConsoleCtrlHandler (NULL, TRUE);
+      retval = get_win32_debug_event (pid, ourstatus);
+      SetConsoleCtrlHandler (NULL, FALSE);
+

       if (retval)
        return pid_to_ptid (retval);
       else
       if (retval)
        return pid_to_ptid (retval);
       else


@@ -1577,14 +1503,18 @@ do_initial_win32_stuff (DWORD pid)
   last_sig = TARGET_SIGNAL_0;
   event_count = 0;
   exception_count = 0;
   last_sig = TARGET_SIGNAL_0;
   event_count = 0;
   exception_count = 0;

+  open_process_used = 0;

   debug_registers_changed = 0;
   debug_registers_used = 0;
   for (i = 0; i < sizeof (dr) / sizeof (dr[0]); i++)
     dr[i] = 0;
   debug_registers_changed = 0;
   debug_registers_used = 0;
   for (i = 0; i < sizeof (dr) / sizeof (dr[0]); i++)
     dr[i] = 0;

+#ifdef __CYGWIN__
+  cygwin_load_start = cygwin_load_end = 0;
+#endif

   current_event.dwProcessId = pid;
   memset (&current_event, 0, sizeof (current_event));
   push_target (&win32_ops);
   current_event.dwProcessId = pid;
   memset (&current_event, 0, sizeof (current_event));
   push_target (&win32_ops);

-  disable_breakpoints_in_shlibs (1);
+  disable_breakpoints_in_shlibs ();

   win32_clear_solib ();
   clear_proceed_status ();
   init_wait_for_inferior ();
   win32_clear_solib ();
   clear_proceed_status ();
   init_wait_for_inferior ();


@@ -1592,15 +1522,18 @@ do_initial_win32_stuff (DWORD pid)
   terminal_init_inferior_with_pgrp (pid);
   target_terminal_inferior ();
 
   terminal_init_inferior_with_pgrp (pid);
   target_terminal_inferior ();
 

+  stop_soon = STOP_QUIETLY;

   while (1)
     {
       stop_after_trap = 1;
   while (1)
     {
       stop_after_trap = 1;

-      wait_for_inferior ();
+      wait_for_inferior (0);

       if (stop_signal != TARGET_SIGNAL_TRAP)
        resume (0, stop_signal);
       else
        break;
     }
       if (stop_signal != TARGET_SIGNAL_TRAP)
        resume (0, stop_signal);
       else
        break;
     }

+
+  stop_soon = NO_STOP_QUIETLY;

   stop_after_trap = 0;
   return;
 }
   stop_after_trap = 0;
   return;
 }


@@ -1733,6 +1666,7 @@ win32_attach (char *args, int from_tty)
   ok = DebugActiveProcess (pid);
   saw_create = 0;
 
   ok = DebugActiveProcess (pid);
   saw_create = 0;
 

+#ifdef __CYGWIN__

   if (!ok)
     {
       /* Try fall back to Cygwin pid */
   if (!ok)
     {
       /* Try fall back to Cygwin pid */


@@ -1740,10 +1674,11 @@ win32_attach (char *args, int from_tty)
 
       if (pid > 0)
        ok = DebugActiveProcess (pid);
 
       if (pid > 0)
        ok = DebugActiveProcess (pid);

+  }
+#endif

 
 

-      if (!ok)
-       error (_("Can't attach to process."));
-    }
+  if (!ok)
+    error (_("Can't attach to process."));

 
   if (has_detach_ability ())
     DebugSetProcessKillOnExit (FALSE);
 
   if (has_detach_ability ())
     DebugSetProcessKillOnExit (FALSE);


@@ -1802,31 +1737,27 @@ win32_detach (char *args, int from_tty)
 static char *
 win32_pid_to_exec_file (int pid)
 {
 static char *
 win32_pid_to_exec_file (int pid)
 {

-  /* Try to find the process path using the Cygwin internal process list
-     pid isn't a valid pid, unfortunately.  Use current_event.dwProcessId
-     instead.  */
-  /* TODO: Also find native Windows processes using CW_GETPINFO_FULL.  */
-

   static char path[MAX_PATH + 1];
   static char path[MAX_PATH + 1];

-  char *path_ptr = NULL;
-  int cpid;
-  struct external_pinfo *pinfo;
-
-  cygwin_internal (CW_LOCK_PINFO, 1000);
-  for (cpid = 0;
-       (pinfo = (struct external_pinfo *)
-       cygwin_internal (CW_GETPINFO, cpid | CW_NEXTPID));
-       cpid = pinfo->pid)
+
+#ifdef __CYGWIN__
+  /* Try to find exe name as symlink target of /proc/<pid>/exe */
+  int nchars;
+  char procexe[sizeof ("/proc/4294967295/exe")];
+  sprintf (procexe, "/proc/%lu/exe", current_event.dwProcessId);
+  nchars = readlink (procexe, path, sizeof(path));
+  if (nchars > 0 && nchars < sizeof (path))

     {
     {

-      if (pinfo->dwProcessId == current_event.dwProcessId) /* Got it */
-       {
-        cygwin_conv_to_full_posix_path (pinfo->progname, path);
-        path_ptr = path;
-        break;
-       }
+      path[nchars] = '\0';     /* Got it */
+      return path;

     }
     }

-  cygwin_internal (CW_UNLOCK_PINFO);
-  return path_ptr;
+#endif
+
+  /* If we get here then either Cygwin is hosed, this isn't a Cygwin version
+     of gdb, or we're trying to debug a non-Cygwin windows executable. */
+  if (!get_module_name (0, path))
+    path[0] = '\0';
+
+  return path;

 }
 
 /* Print status information about what we're accessing.  */
 }
 
 /* Print status information about what we're accessing.  */


@@ -1872,6 +1803,7 @@ win32_create_inferior (char *exec_file, char *allargs, char **in_env,
   memset (&si, 0, sizeof (si));
   si.cb = sizeof (si);
 
   memset (&si, 0, sizeof (si));
   si.cb = sizeof (si);
 

+#ifdef __CYGWIN__

   if (!useshell)
     {
       flags = DEBUG_ONLY_THIS_PROCESS;
   if (!useshell)
     {
       flags = DEBUG_ONLY_THIS_PROCESS;


@@ -1892,6 +1824,10 @@ win32_create_inferior (char *exec_file, char *allargs, char **in_env,
       toexec = shell;
       flags = DEBUG_PROCESS;
     }
       toexec = shell;
       flags = DEBUG_PROCESS;
     }

+#else
+  toexec = exec_file;
+  flags = DEBUG_ONLY_THIS_PROCESS;
+#endif

 
   if (new_group)
     flags |= CREATE_NEW_PROCESS_GROUP;
 
   if (new_group)
     flags |= CREATE_NEW_PROCESS_GROUP;


@@ -1906,6 +1842,7 @@ win32_create_inferior (char *exec_file, char *allargs, char **in_env,
   strcat (args, " ");
   strcat (args, allargs);
 
   strcat (args, " ");
   strcat (args, allargs);
 

+#ifdef __CYGWIN__

   /* Prepare the environment vars for CreateProcess.  */
   cygwin_internal (CW_SYNC_WINENV);
 
   /* Prepare the environment vars for CreateProcess.  */
   cygwin_internal (CW_SYNC_WINENV);
 


@@ -1929,6 +1866,7 @@ win32_create_inferior (char *exec_file, char *allargs, char **in_env,
          dup2 (tty, 2);
        }
     }
          dup2 (tty, 2);
        }
     }

+#endif

 
   win32_init_thread_list ();
   ret = CreateProcess (0,
 
   win32_init_thread_list ();
   ret = CreateProcess (0,


@@ -1941,6 +1879,8 @@ win32_create_inferior (char *exec_file, char *allargs, char **in_env,
                       NULL,    /* current directory */
                       &si,
                       &pi);
                       NULL,    /* current directory */
                       &si,
                       &pi);

+
+#ifdef __CYGWIN__

   if (tty >= 0)
     {
       close (tty);
   if (tty >= 0)
     {
       close (tty);


@@ -1951,6 +1891,7 @@ win32_create_inferior (char *exec_file, char *allargs, char **in_env,
       close (ostdout);
       close (ostderr);
     }
       close (ostdout);
       close (ostderr);
     }

+#endif

 
   if (!ret)
     error (_("Error creating process %s, (error %d)."),
 
   if (!ret)
     error (_("Error creating process %s, (error %d)."),


@@ -1974,6 +1915,11 @@ win32_mourn_inferior (void)
 {
   (void) win32_continue (DBG_CONTINUE, -1);
   i386_cleanup_dregs();
 {
   (void) win32_continue (DBG_CONTINUE, -1);
   i386_cleanup_dregs();

+  if (open_process_used)
+    {
+      CHECK (CloseHandle (current_process_handle));
+      open_process_used = 0;
+    }

   unpush_target (&win32_ops);
   generic_mourn_inferior ();
 }
   unpush_target (&win32_ops);
   generic_mourn_inferior ();
 }


@@ -1998,17 +1944,20 @@ win32_xfer_memory (CORE_ADDR memaddr, gdb_byte *our, int len,
   if (write)
     {
       DEBUG_MEM (("gdb: write target memory, %d bytes at 0x%08lx\n",
   if (write)
     {
       DEBUG_MEM (("gdb: write target memory, %d bytes at 0x%08lx\n",

-                 len, (DWORD) memaddr));
-      if (!WriteProcessMemory (current_process_handle, (LPVOID) memaddr, our,
+                 len, (DWORD) (uintptr_t) memaddr));
+      if (!WriteProcessMemory (current_process_handle, 
+                              (LPVOID) (uintptr_t) memaddr, our,

                               len, &done))
        done = 0;
                               len, &done))
        done = 0;

-      FlushInstructionCache (current_process_handle, (LPCVOID) memaddr, len);
+      FlushInstructionCache (current_process_handle, 
+                            (LPCVOID) (uintptr_t) memaddr, len);

     }
   else
     {
       DEBUG_MEM (("gdb: read target memory, %d bytes at 0x%08lx\n",
     }
   else
     {
       DEBUG_MEM (("gdb: read target memory, %d bytes at 0x%08lx\n",

-                 len, (DWORD) memaddr));
-      if (!ReadProcessMemory (current_process_handle, (LPCVOID) memaddr, our,
+                 len, (DWORD) (uintptr_t) memaddr));
+      if (!ReadProcessMemory (current_process_handle, 
+                             (LPCVOID) (uintptr_t) memaddr, our,

                              len, &done))
        done = 0;
     }
                              len, &done))
        done = 0;
     }


@@ -2030,16 +1979,11 @@ win32_kill_inferior (void)
        break;
     }
 
        break;
     }
 

-  CHECK (CloseHandle (current_process_handle));
-
-  /* this may fail in an attached process so don't check. */
-  if (current_thread && current_thread->h)
-    (void) CloseHandle (current_thread->h);

   target_mourn_inferior ();    /* or just win32_mourn_inferior? */
 }
 
 static void
   target_mourn_inferior ();    /* or just win32_mourn_inferior? */
 }
 
 static void

-win32_prepare_to_store (void)
+win32_prepare_to_store (struct regcache *regcache)

 {
   /* Do nothing, since we can store individual regs */
 }
 {
   /* Do nothing, since we can store individual regs */
 }


@@ -2059,7 +2003,7 @@ win32_close (int x)
 
 /* Convert pid to printable format. */
 static char *
 
 /* Convert pid to printable format. */
 static char *

-cygwin_pid_to_str (ptid_t ptid)
+win32_pid_to_str (ptid_t ptid)

 {
   static char buf[80];
   int pid = PIDGET (ptid);
 {
   static char buf[80];
   int pid = PIDGET (ptid);


@@ -2067,209 +2011,69 @@ cygwin_pid_to_str (ptid_t ptid)
   if ((DWORD) pid == current_event.dwProcessId)
     sprintf (buf, "process %d", pid);
   else
   if ((DWORD) pid == current_event.dwProcessId)
     sprintf (buf, "process %d", pid);
   else

-    sprintf (buf, "thread %ld.0x%x", current_event.dwProcessId, pid);
+    sprintf (buf, "Thread %ld.0x%x", current_event.dwProcessId, pid);

   return buf;
 }
 
   return buf;
 }
 

-typedef struct
-{
-  struct target_ops *target;
-  bfd_vma addr;
-} map_code_section_args;
-
-static void
-map_single_dll_code_section (bfd *abfd, asection *sect, void *obj)
-{
-  int old;
-  int update_coreops;
-  struct section_table *new_target_sect_ptr;
-
-  map_code_section_args *args = (map_code_section_args *) obj;
-  struct target_ops *target = args->target;
-  if (sect->flags & SEC_CODE)
-    {
-      update_coreops = core_ops.to_sections == target->to_sections;
-
-      if (target->to_sections)
-       {
-         old = target->to_sections_end - target->to_sections;
-         target->to_sections = (struct section_table *)
-           xrealloc ((char *) target->to_sections,
-                     (sizeof (struct section_table)) * (1 + old));
-       }
-      else
-       {
-         old = 0;
-         target->to_sections = (struct section_table *)
-           xmalloc ((sizeof (struct section_table)));
-       }
-      target->to_sections_end = target->to_sections + (1 + old);
-
-      /* Update the to_sections field in the core_ops structure
-        if needed.  */
-      if (update_coreops)
-       {
-         core_ops.to_sections = target->to_sections;
-         core_ops.to_sections_end = target->to_sections_end;
-       }
-      new_target_sect_ptr = target->to_sections + old;
-      new_target_sect_ptr->addr = args->addr + bfd_section_vma (abfd, sect);
-      new_target_sect_ptr->endaddr = args->addr + bfd_section_vma (abfd, sect) +
-       bfd_section_size (abfd, sect);;
-      new_target_sect_ptr->the_bfd_section = sect;
-      new_target_sect_ptr->bfd = abfd;
-    }
-}
-
-static int
-dll_code_sections_add (const char *dll_name, int base_addr, struct target_ops *target)
-{
-  bfd *dll_bfd;
-  map_code_section_args map_args;
-  asection *lowest_sect;
-  char *name;
-  if (dll_name == NULL || target == NULL)
-    return 0;
-  name = xstrdup (dll_name);
-  dll_bfd = bfd_openr (name, "pei-i386");
-  if (dll_bfd == NULL)
-    return 0;
-
-  if (bfd_check_format (dll_bfd, bfd_object))
-    {
-      lowest_sect = bfd_get_section_by_name (dll_bfd, ".text");
-      if (lowest_sect == NULL)
-       return 0;
-      map_args.target = target;
-      map_args.addr = base_addr - bfd_section_vma (dll_bfd, lowest_sect);
-
-      bfd_map_over_sections (dll_bfd, &map_single_dll_code_section, (void *) (&map_args));
-    }
-
-  return 1;
-}
-
-static void
-core_section_load_dll_symbols (bfd *abfd, asection *sect, void *obj)
+static LONGEST
+win32_xfer_shared_libraries (struct target_ops *ops,
+                            enum target_object object, const char *annex,
+                            gdb_byte *readbuf, const gdb_byte *writebuf,
+                            ULONGEST offset, LONGEST len)

 {
 {

-  struct target_ops *target = (struct target_ops *) obj;
-
-  DWORD base_addr;
-
-  int dll_name_size;
-  struct win32_pstatus *pstatus;
+  struct obstack obstack;
+  const char *buf;
+  LONGEST len_avail;

   struct so_list *so;
   struct so_list *so;

-  char *dll_name;
-  char *buf = NULL;
-  char *p;
-  struct objfile *objfile;
-  const char *dll_basename;
-
-  if (strncmp (sect->name, ".module", 7) != 0)
-    return;
-
-  buf = (char *) xmalloc (bfd_get_section_size (sect) + 1);
-  if (!buf)
-    {
-      printf_unfiltered ("memory allocation failed for %s\n", sect->name);
-      goto out;
-    }
-  if (!bfd_get_section_contents (abfd, sect, buf, 0, bfd_get_section_size (sect)))
-    goto out;

 
 

-  pstatus = (struct win32_pstatus *) buf;
+  if (writebuf)
+    return -1;

 
 

-  memmove (&base_addr, &(pstatus->data.module_info.base_address), sizeof (base_addr));
-  dll_name_size = pstatus->data.module_info.module_name_size;
-  if (offsetof (struct win32_pstatus, data.module_info.module_name) + dll_name_size > bfd_get_section_size (sect))
-      goto out;
+  obstack_init (&obstack);
+  obstack_grow_str (&obstack, "<library-list>\n");
+  for (so = solib_start.next; so; so = so->next)
+    win32_xfer_shared_library (so->so_name, so->lm_info->load_addr, &obstack);
+  obstack_grow_str0 (&obstack, "</library-list>\n");

 
 

-  dll_name = pstatus->data.module_info.module_name;
-
-  if (!(dll_basename = strrchr (dll_name, '/')))
-    dll_basename = dll_name;
-  else
-    dll_basename++;
-
-  ALL_OBJFILES (objfile)
-  {
-    char *objfile_basename = strrchr (objfile->name, '/');
-
-    if (objfile_basename &&
-       strcasecmp (dll_basename, objfile_basename + 1) == 0)
-      goto out;
-  }
-
-  base_addr += 0x1000;
-  dll_name = register_loaded_dll (dll_name, base_addr, 1);
+  buf = obstack_finish (&obstack);
+  len_avail = strlen (buf);
+  if (offset >= len_avail)
+    return 0;

 
 

-  if (!dll_code_sections_add (dll_name, (DWORD) base_addr, target))
-    printf_unfiltered ("%s: Failed to map dll code sections.\n", dll_name);
+  if (len > len_avail - offset)
+    len = len_avail - offset;
+  memcpy (readbuf, buf + offset, len);

 
 

-out:
-  if (buf)
-    xfree (buf);
-  return;
+  obstack_free (&obstack, NULL);
+  return len;

 }
 
 }
 

-static struct so_list *
-win32_current_sos (void)
+static LONGEST
+win32_xfer_partial (struct target_ops *ops, enum target_object object,
+                   const char *annex, gdb_byte *readbuf,
+                   const gdb_byte *writebuf, ULONGEST offset, LONGEST len)

 {
 {

-  struct so_list *sop;
-  struct so_list *start = NULL;
-  struct so_list *last = NULL;
-
-  if (!solib_start.next && core_bfd)
+  switch (object)

     {
     {

-      win32_clear_solib ();
-      bfd_map_over_sections (core_bfd, &core_section_load_dll_symbols,
-                            &win32_ops);
-    }
-
-  for (sop = solib_start.next; sop; sop = sop->next)
-    {
-      struct so_list *new = XZALLOC (struct so_list);
-      strcpy (new->so_name, sop->so_name);
-      strcpy (new->so_original_name, sop->so_original_name);
-      if (!start)
-       last = start = new;
-      else
-       {
-         last->next = new;
-         last = new;
-       }
-    }
-
-  return start;
-}
+    case TARGET_OBJECT_MEMORY:
+      if (readbuf)
+       return (*ops->deprecated_xfer_memory) (offset, readbuf,
+                                              len, 0/*read*/, NULL, ops);
+      if (writebuf)
+       return (*ops->deprecated_xfer_memory) (offset, (gdb_byte *) writebuf,
+                                              len, 1/*write*/, NULL, ops);
+      return -1;
+
+    case TARGET_OBJECT_LIBRARIES:
+      return win32_xfer_shared_libraries (ops, object, annex, readbuf,
+                                         writebuf, offset, len);

 
 

-static void
-fetch_elf_core_registers (struct regcache *regcache,
-                         char *core_reg_sect,
-                         unsigned core_reg_size,
-                         int which,
-                         CORE_ADDR reg_addr)
-{
-  int r;
-  if (core_reg_size < sizeof (CONTEXT))
-    {
-      error (_("Core file register section too small (%u bytes)."), core_reg_size);
-      return;
+    default:
+      if (ops->beneath != NULL)
+       return ops->beneath->to_xfer_partial (ops->beneath, object, annex,
+                                             readbuf, writebuf, offset, len);
+      return -1;

     }
     }

-  for (r = 0; r < NUM_REGS; r++)
-    regcache_raw_supply (regcache, r, core_reg_sect + mappings[r]);
-}
-
-static int
-open_symbol_file_object (void *from_ttyp)
-{
-  return 0;
-}
-
-static int
-in_dynsym_resolve_code (CORE_ADDR pc)
-{
-  return 0;

 }
 
 static void
 }
 
 static void


@@ -2281,6 +2085,7 @@ init_win32_ops (void)
   win32_ops.to_open = win32_open;
   win32_ops.to_close = win32_close;
   win32_ops.to_attach = win32_attach;
   win32_ops.to_open = win32_open;
   win32_ops.to_close = win32_close;
   win32_ops.to_attach = win32_attach;

+  win32_ops.to_attach_no_wait = 1;

   win32_ops.to_detach = win32_detach;
   win32_ops.to_resume = win32_resume;
   win32_ops.to_wait = win32_wait;
   win32_ops.to_detach = win32_detach;
   win32_ops.to_resume = win32_resume;
   win32_ops.to_wait = win32_wait;


@@ -2288,6 +2093,7 @@ init_win32_ops (void)
   win32_ops.to_store_registers = win32_store_inferior_registers;
   win32_ops.to_prepare_to_store = win32_prepare_to_store;
   win32_ops.deprecated_xfer_memory = win32_xfer_memory;
   win32_ops.to_store_registers = win32_store_inferior_registers;
   win32_ops.to_prepare_to_store = win32_prepare_to_store;
   win32_ops.deprecated_xfer_memory = win32_xfer_memory;

+  win32_ops.to_xfer_partial = win32_xfer_partial;

   win32_ops.to_files_info = win32_files_info;
   win32_ops.to_insert_breakpoint = memory_insert_breakpoint;
   win32_ops.to_remove_breakpoint = memory_remove_breakpoint;
   win32_ops.to_files_info = win32_files_info;
   win32_ops.to_insert_breakpoint = memory_insert_breakpoint;
   win32_ops.to_remove_breakpoint = memory_remove_breakpoint;


@@ -2302,7 +2108,7 @@ init_win32_ops (void)
   win32_ops.to_mourn_inferior = win32_mourn_inferior;
   win32_ops.to_can_run = win32_can_run;
   win32_ops.to_thread_alive = win32_win32_thread_alive;
   win32_ops.to_mourn_inferior = win32_mourn_inferior;
   win32_ops.to_can_run = win32_can_run;
   win32_ops.to_thread_alive = win32_win32_thread_alive;

-  win32_ops.to_pid_to_str = cygwin_pid_to_str;
+  win32_ops.to_pid_to_str = win32_pid_to_str;

   win32_ops.to_stop = win32_stop;
   win32_ops.to_stratum = process_stratum;
   win32_ops.to_has_all_memory = 1;
   win32_ops.to_stop = win32_stop;
   win32_ops.to_stratum = process_stratum;
   win32_ops.to_has_all_memory = 1;


@@ -2312,18 +2118,6 @@ init_win32_ops (void)
   win32_ops.to_has_execution = 1;
   win32_ops.to_magic = OPS_MAGIC;
   win32_ops.to_pid_to_exec_file = win32_pid_to_exec_file;
   win32_ops.to_has_execution = 1;
   win32_ops.to_magic = OPS_MAGIC;
   win32_ops.to_pid_to_exec_file = win32_pid_to_exec_file;

-
-  win32_so_ops.relocate_section_addresses = win32_relocate_section_addresses;
-  win32_so_ops.free_so = win32_free_so;
-  win32_so_ops.clear_solib = win32_clear_solib;
-  win32_so_ops.solib_create_inferior_hook = win32_solib_create_inferior_hook;
-  win32_so_ops.special_symbol_handling = win32_special_symbol_handling;
-  win32_so_ops.current_sos = win32_current_sos;
-  win32_so_ops.open_symbol_file_object = open_symbol_file_object;
-  win32_so_ops.in_dynsym_resolve_code = in_dynsym_resolve_code;
-
-  /* FIXME: Don't do this here.  *_gdbarch_init() should set so_ops. */
-  current_target_so_ops = &win32_so_ops;

 }
 
 static void
 }
 
 static void


@@ -2345,6 +2139,7 @@ _initialize_win32_nat (void)
 
   add_com_alias ("sharedlibrary", "dll-symbols", class_alias, 1);
 
 
   add_com_alias ("sharedlibrary", "dll-symbols", class_alias, 1);
 

+#ifdef __CYGWIN__

   add_setshow_boolean_cmd ("shell", class_support, &useshell, _("\
 Set use of shell to start subprocess."), _("\
 Show use of shell to start subprocess."), NULL,
   add_setshow_boolean_cmd ("shell", class_support, &useshell, _("\
 Set use of shell to start subprocess."), _("\
 Show use of shell to start subprocess."), NULL,


@@ -2358,6 +2153,7 @@ Show whether gdb breaks on exceptions in the Cygwin DLL itself."), NULL,
                           NULL,
                           NULL, /* FIXME: i18n: */
                           &setlist, &showlist);
                           NULL,
                           NULL, /* FIXME: i18n: */
                           &setlist, &showlist);

+#endif

 
   add_setshow_boolean_cmd ("new-console", class_support, &new_console, _("\
 Set creation of new console when creating child process."), _("\
 
   add_setshow_boolean_cmd ("new-console", class_support, &new_console, _("\
 Set creation of new console when creating child process."), _("\


@@ -2461,21 +2257,6 @@ win32_win32_thread_alive (ptid_t ptid)
     FALSE : TRUE;
 }
 
     FALSE : TRUE;
 }
 

-static struct core_fns win32_elf_core_fns =
-{
-  bfd_target_elf_flavour,
-  default_check_format,
-  default_core_sniffer,
-  fetch_elf_core_registers,
-  NULL
-};
-
-void
-_initialize_core_win32 (void)
-{
-  deprecated_add_core_fns (&win32_elf_core_fns);
-}
-

 void
 _initialize_check_for_gdb_ini (void)
 {
 void
 _initialize_check_for_gdb_ini (void)
 {


@@ -2504,3 +2285,34 @@ _initialize_check_for_gdb_ini (void)
        }
     }
 }
        }
     }
 }

+
+void
+_initialize_psapi (void)
+{
+  /* Load optional functions used for retrieving filename information
+     associated with the currently debugged process or its dlls. */
+  if (!psapi_loaded)
+    {
+      HMODULE psapi_module_handle;
+
+      psapi_loaded = -1;
+
+      psapi_module_handle = LoadLibrary ("psapi.dll");
+      if (psapi_module_handle)
+       {
+         psapi_EnumProcessModules = (void *) GetProcAddress (psapi_module_handle, "EnumProcessModules");
+         psapi_GetModuleInformation = (void *) GetProcAddress (psapi_module_handle, "GetModuleInformation");
+         psapi_GetModuleFileNameExA = (void *) GetProcAddress (psapi_module_handle, "GetModuleFileNameExA");
+
+         if (psapi_EnumProcessModules != NULL
+             && psapi_GetModuleInformation != NULL
+             && psapi_GetModuleFileNameExA != NULL)
+           psapi_loaded = 1;
+       }
+    }
+
+  /* This will probably fail on Windows 9x/Me.  Let the user know that we're
+     missing some functionality. */
+  if (psapi_loaded < 0)
+    warning(_("cannot automatically find executable file or library to read symbols.  Use \"file\" or \"dll\" command to load executable/libraries directly."));
+}