X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fwin32-nat.c;h=cbafa96d34c9d4513dea14146e85c39a9bb0ac47;hb=cb832706eb69c5150f3649931b3c17fd9a9e0982;hp=90a255ace90661c5343aebb096a61946f5cc14c0;hpb=786b8124cee36e9f5fce584db6662e6e68ff7029;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c index 90a255ace9..cbafa96d34 100644 --- a/gdb/win32-nat.c +++ b/gdb/win32-nat.c @@ -1,7 +1,8 @@ /* Target-vector operations for controlling win32 child processes, for GDB. - Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free - Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, + 2005, 2006 + Free Software Foundation, Inc. Contributed by Cygnus Solutions, A Red Hat Company. @@ -19,24 +20,23 @@ 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /* Originally by Steve Chamberlain, sac@cygnus.com */ /* We assume we're being built with and will be used for cygwin. */ #include "defs.h" -#include "tm.h" /* required for SSE registers */ #include "frame.h" /* required by inferior.h */ #include "inferior.h" #include "target.h" +#include "exceptions.h" #include "gdbcore.h" #include "command.h" #include "completer.h" #include "regcache.h" #include "top.h" -#include "i386-tdep.h" #include #include #include @@ -44,6 +44,7 @@ #include #include #include +#include #include "buildsym.h" #include "symfile.h" @@ -53,9 +54,22 @@ #include "gdbcmd.h" #include #include +#include "exec.h" +#include "solist.h" +#include "solib.h" + +#include "i386-tdep.h" +#include "i387-tdep.h" -/* The ui's event loop. */ -extern int (*ui_loop_hook) (int signo); +static struct target_ops win32_ops; +static struct target_so_ops win32_so_ops; + +/* The starting and ending address of the cygwin1.dll text segment. */ +static bfd_vma cygwin_load_start; +static bfd_vma cygwin_load_end; + +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. */ /* If we're not using the old Cygwin header file set, define the following which never should have been in the generic Win32 API @@ -70,20 +84,18 @@ enum #include #include -#ifdef HAVE_SSE_REGS #define CONTEXT_DEBUGGER_DR CONTEXT_DEBUGGER | CONTEXT_DEBUG_REGISTERS \ | CONTEXT_EXTENDED_REGISTERS -#else -#define CONTEXT_DEBUGGER_DR CONTEXT_DEBUGGER | CONTEXT_DEBUG_REGISTERS -#endif static unsigned dr[8]; -static int debug_registers_changed = 0; -static int debug_registers_used = 0; +static int debug_registers_changed; +static int debug_registers_used; /* The string sent by cygwin when it processes a signal. FIXME: This should be in a cygwin include file. */ -#define CYGWIN_SIGNAL_STRING "cygwin: signal" +#ifndef _CYGWIN_SIGNAL_STRING +#define _CYGWIN_SIGNAL_STRING "cYgSiGw00f" +#endif #define CHECK(x) check (x, __FILE__,__LINE__) #define DEBUG_EXEC(x) if (debug_exec) printf_unfiltered x @@ -91,12 +103,9 @@ static int debug_registers_used = 0; #define DEBUG_MEM(x) if (debug_memory) printf_unfiltered x #define DEBUG_EXCEPT(x) if (debug_exceptions) printf_unfiltered x -/* Forward declaration */ -extern struct target_ops child_ops; - -static void child_stop (void); -static int win32_child_thread_alive (ptid_t); -void child_kill_inferior (void); +static void win32_stop (void); +static int win32_win32_thread_alive (ptid_t); +static void win32_kill_inferior (void); static enum target_signal last_sig = TARGET_SIGNAL_0; /* Set if a signal was received from the debugged process */ @@ -110,6 +119,7 @@ typedef struct thread_info_struct HANDLE h; char *name; int suspend_count; + int reload_context; CONTEXT context; STACKFRAME sf; } @@ -187,7 +197,6 @@ static const int mappings[] = context_offset (FloatSave.DataSelector), context_offset (FloatSave.DataOffset), context_offset (FloatSave.ErrorSelector) -#ifdef HAVE_SSE_REGS /* XMM0-7 */ , context_offset (ExtendedRegisters[10*16]), context_offset (ExtendedRegisters[11*16]), @@ -199,7 +208,6 @@ static const int mappings[] = context_offset (ExtendedRegisters[17*16]), /* MXCSR */ context_offset (ExtendedRegisters[24]) -#endif }; #undef context_offset @@ -232,7 +240,6 @@ check (BOOL ok, const char *file, int line) GetLastError ()); } - /* Find a thread record given a thread id. If get_context then also retrieve the context for this thread. */ @@ -250,19 +257,7 @@ thread_rec (DWORD id, int get_context) th->suspend_count = SuspendThread (th->h) + 1; else if (get_context < 0) th->suspend_count = -1; - - th->context.ContextFlags = CONTEXT_DEBUGGER_DR; - GetThreadContext (th->h, &th->context); - if (id == current_event.dwThreadId) - { - /* 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; - } + th->reload_context = 1; } return th; } @@ -272,15 +267,14 @@ thread_rec (DWORD id, int get_context) /* Add a thread to the thread list */ static thread_info * -child_add_thread (DWORD id, HANDLE h) +win32_add_thread (DWORD id, HANDLE h) { thread_info *th; if ((th = thread_rec (id, FALSE))) return th; - th = (thread_info *) xmalloc (sizeof (*th)); - memset (th, 0, sizeof (*th)); + th = XZALLOC (thread_info); th->id = id; th->h = h; th->next = thread_head.next; @@ -308,11 +302,11 @@ child_add_thread (DWORD id, HANDLE h) /* Clear out any old thread list and reintialize it to a pristine state. */ static void -child_init_thread_list (void) +win32_init_thread_list (void) { thread_info *th = &thread_head; - DEBUG_EVENTS (("gdb: child_init_thread_list\n")); + DEBUG_EVENTS (("gdb: win32_init_thread_list\n")); init_thread_list (); while (th->next != NULL) { @@ -321,11 +315,12 @@ child_init_thread_list (void) (void) CloseHandle (here->h); xfree (here); } + thread_head.next = NULL; } /* Delete a thread from the list of threads */ static void -child_delete_thread (DWORD id) +win32_delete_thread (DWORD id) { thread_info *th; @@ -348,54 +343,100 @@ child_delete_thread (DWORD id) } static void -do_child_fetch_inferior_registers (int r) +do_win32_fetch_inferior_registers (int r) { char *context_offset = ((char *) ¤t_thread->context) + mappings[r]; long l; - if (r == FCS_REGNUM) + + if (!current_thread) + return; /* Windows sometimes uses a non-existent thread id in its + events */ + + if (current_thread->reload_context) + { +#ifdef __COPY_CONTEXT_SIZE + if (have_saved_context) + { + /* Lie about where the program actually is stopped since cygwin has informed us that + we should consider the signal to have occurred at another location which is stored + in "saved_context. */ + memcpy (¤t_thread->context, &saved_context, __COPY_CONTEXT_SIZE); + have_saved_context = 0; + } + else +#endif + { + 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; + } + current_thread->reload_context = 0; + } + +#define I387_ST0_REGNUM I386_ST0_REGNUM + + if (r == I387_FISEG_REGNUM) { l = *((long *) context_offset) & 0xffff; - supply_register (r, (char *) &l); + regcache_raw_supply (current_regcache, r, (char *) &l); } - else if (r == FOP_REGNUM) + else if (r == I387_FOP_REGNUM) { l = (*((long *) context_offset) >> 16) & ((1 << 11) - 1); - supply_register (r, (char *) &l); + regcache_raw_supply (current_regcache, r, (char *) &l); } else if (r >= 0) - supply_register (r, context_offset); + regcache_raw_supply (current_regcache, r, context_offset); else { for (r = 0; r < NUM_REGS; r++) - do_child_fetch_inferior_registers (r); + do_win32_fetch_inferior_registers (r); } + +#undef I387_ST0_REGNUM } static void -child_fetch_inferior_registers (int r) +win32_fetch_inferior_registers (int r) { current_thread = thread_rec (PIDGET (inferior_ptid), TRUE); - do_child_fetch_inferior_registers (r); + /* 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); } static void -do_child_store_inferior_registers (int r) +do_win32_store_inferior_registers (int r) { - if (r >= 0) - regcache_collect (r, ((char *) ¤t_thread->context) + mappings[r]); + if (!current_thread) + /* Windows sometimes uses a non-existent thread id in its events */; + else if (r >= 0) + regcache_raw_collect (current_regcache, r, + ((char *) ¤t_thread->context) + mappings[r]); else { for (r = 0; r < NUM_REGS; r++) - do_child_store_inferior_registers (r); + do_win32_store_inferior_registers (r); } } /* Store a new register value into the current thread context */ static void -child_store_inferior_registers (int r) +win32_store_inferior_registers (int r) { current_thread = thread_rec (PIDGET (inferior_ptid), TRUE); - do_child_store_inferior_registers (r); + /* 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); } static int psapi_loaded = 0; @@ -404,7 +445,7 @@ static BOOL WINAPI (*psapi_EnumProcessModules) (HANDLE, HMODULE *, DWORD, LPDWOR static BOOL WINAPI (*psapi_GetModuleInformation) (HANDLE, HMODULE, LPMODULEINFO, DWORD) = NULL; static DWORD WINAPI (*psapi_GetModuleFileNameExA) (HANDLE, HMODULE, LPSTR, DWORD) = NULL; -int +static int psapi_get_dll_name (DWORD BaseAddress, char *dll_name_ret) { DWORD len; @@ -465,14 +506,14 @@ psapi_get_dll_name (DWORD BaseAddress, char *dll_name_ret) 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\n", (unsigned) GetLastError ()); + error (_("Error getting dll name: %u."), (unsigned) GetLastError ()); if ((DWORD) (mi.lpBaseOfDll) == BaseAddress) return 1; @@ -497,27 +538,21 @@ struct safe_symbol_file_add_args }; /* Maintain a linked list of "so" information. */ -struct so_stuff +struct lm_info { - struct so_stuff *next; DWORD load_addr; - DWORD end_addr; - int loaded; - struct objfile *objfile; - char name[1]; -} solib_start, *solib_end; +}; + +static struct so_list solib_start, *solib_end; /* Call symbol_file_add with stderr redirected. We don't care if there are errors. */ static int safe_symbol_file_add_stub (void *argv) { -#define p ((struct safe_symbol_file_add_args *)argv) - struct so_stuff *so = &solib_start; +#define p ((struct safe_symbol_file_add_args *) argv) + struct so_list *so = &solib_start; - while ((so = so->next)) - if (so->loaded && strcasecmp (so->name, p->name) == 0) - return 0; p->ret = symbol_file_add (p->name, p->from_tty, p->addrs, p->mainline, p->flags); return !!p->ret; #undef p @@ -565,14 +600,125 @@ safe_symbol_file_add (char *name, int from_tty, return p.ret; } -/* Remember the maximum DLL length for printing in info dll command. */ -int max_dll_name_len; +/* 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 -register_loaded_dll (const char *name, DWORD load_addr) +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) { - struct so_stuff *so; - char ppath[MAX_PATH + 1]; + struct so_list *so; char buf[MAX_PATH + 1]; char cwd[MAX_PATH + 1]; char *p; @@ -598,28 +744,27 @@ register_loaded_dll (const char *name, DWORD load_addr) } } - cygwin_conv_to_posix_path (buf, ppath); - so = (struct so_stuff *) xmalloc (sizeof (struct so_stuff) + strlen (ppath) + 8 + 1); - so->loaded = 0; - so->load_addr = load_addr; - if (!VirtualQueryEx (current_process_handle, (void *) load_addr, &m, - sizeof (m))) - so->end_addr = (DWORD) m.AllocationBase + m.RegionSize; - else - so->end_addr = load_addr + 0x2000; /* completely arbitrary */ - - so->next = NULL; - so->objfile = NULL; - strcpy (so->name, ppath); + if (strcasecmp (buf, "ntdll.dll") == 0) + { + GetSystemDirectory (buf, sizeof (buf)); + strcat (buf, "\\ntdll.dll"); + } + so = XZALLOC (struct so_list); + so->lm_info = (struct lm_info *) xmalloc (sizeof (struct lm_info)); + so->lm_info->load_addr = load_addr; + cygwin_conv_to_posix_path (buf, so->so_name); + strcpy (so->so_original_name, so->so_name); solib_end->next = so; solib_end = so; - len = strlen (ppath); - if (len > max_dll_name_len) - max_dll_name_len = len; + len = strlen (so->so_name); + if (readsyms) + solib_symbols_add (so, (CORE_ADDR) load_addr); + + return so->so_name; } -char * +static char * get_image_name (HANDLE h, void *address, int unicode) { static char buf[(2 * MAX_PATH) + 1]; @@ -635,21 +780,16 @@ get_image_name (HANDLE h, void *address, int unicode) if (address == NULL) return NULL; - ReadProcessMemory (h, address, &address_ptr, sizeof (address_ptr), &done); - /* See if we could read the address of a string, and that the address isn't null. */ - - if (done != sizeof (address_ptr) || !address_ptr) + if (!ReadProcessMemory (h, address, &address_ptr, sizeof (address_ptr), &done) + || done != sizeof (address_ptr) || !address_ptr) return NULL; /* Find the length of the string */ - do - { - ReadProcessMemory (h, address_ptr + len * size, &b, size, &done); - len++; - } - while ((b[0] != 0 || b[size - 1] != 0) && done == size); + while (ReadProcessMemory (h, address_ptr + len++ * size, &b, size, &done) + && (b[0] != 0 || b[size - 1] != 0) && done == size) + continue; if (!unicode) ReadProcessMemory (h, address_ptr, buf, len, &done); @@ -673,7 +813,6 @@ handle_load_dll (void *dummy) LOAD_DLL_DEBUG_INFO *event = ¤t_event.u.LoadDll; char dll_buf[MAX_PATH + 1]; char *dll_name = NULL; - char *p; dll_buf[0] = dll_buf[sizeof (dll_buf) - 1] = '\0'; @@ -687,255 +826,150 @@ handle_load_dll (void *dummy) if (!dll_name) return 1; - register_loaded_dll (dll_name, (DWORD) event->lpBaseOfDll + 0x1000); + register_loaded_dll (dll_name, (DWORD) event->lpBaseOfDll + 0x1000, auto_solib_add); return 1; } +static void +win32_free_so (struct so_list *so) +{ + 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; +} + static int handle_unload_dll (void *dummy) { DWORD lpBaseOfDll = (DWORD) current_event.u.UnloadDll.lpBaseOfDll + 0x1000; - struct so_stuff *so; + struct so_list *so; for (so = &solib_start; so->next != NULL; so = so->next) - if (so->next->load_addr == lpBaseOfDll) + if (so->next->lm_info->load_addr == lpBaseOfDll) { - struct so_stuff *sodel = so->next; + struct so_list *sodel = so->next; so->next = sodel->next; if (!so->next) solib_end = so; - if (sodel->objfile) - free_objfile (sodel->objfile); - xfree(sodel); + free_so (sodel); + solib_add (NULL, 0, NULL, auto_solib_add); return 1; } - error ("Error: dll starting at 0x%lx not found.\n", (DWORD) lpBaseOfDll); + + error (_("Error: dll starting at 0x%lx not found."), (DWORD) lpBaseOfDll); return 0; } -char * -solib_address (CORE_ADDR address) +/* Clear list of loaded DLLs. */ +static void +win32_clear_solib (void) { - struct so_stuff *so; - for (so = &solib_start; so->next != NULL; so = so->next) - if (address >= so->load_addr && address <= so->end_addr) - return so->name; - return NULL; + solib_start.next = NULL; + solib_end = &solib_start; } -/* Return name of last loaded DLL. */ -char * -child_solib_loaded_library_pathname (int pid) +static void +win32_special_symbol_handling (void) { - return !solib_end || !solib_end->name[0] ? NULL : solib_end->name; + return; } -/* Clear list of loaded DLLs. */ +/* Load DLL symbol info. */ void -child_clear_solibs (void) +dll_symbol_command (char *args, int from_tty) { - struct so_stuff *so, *so1 = solib_start.next; + int n; + dont_repeat (); + + if (args == NULL) + error (_("dll-symbols requires a file name")); - while ((so = so1) != NULL) + n = strlen (args); + if (n > 4 && strcasecmp (args + n - 4, ".dll") != 0) { - so1 = so->next; - xfree (so); + char *newargs = (char *) alloca (n + 4 + 1); + strcpy (newargs, args); + strcat (newargs, ".dll"); + args = newargs; } - solib_start.next = NULL; - solib_start.objfile = NULL; - solib_end = &solib_start; - max_dll_name_len = sizeof ("DLL Name") - 1; + safe_symbol_file_add (args, from_tty, NULL, 0, OBJF_SHARED | OBJF_USERLOADED); } - -/* 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) +/* Handle DEBUG_STRING output from child process. + Cygwin prepends its messages with a "cygwin:". Interpret this as + a Cygwin signal. Otherwise just print the string as a warning. */ +static int +handle_output_debug_string (struct target_waitstatus *ourstatus) { - 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. */ - } + char *s = NULL; + int retval = 0; - else if (text_load == (text_vma = bfd_get_section_vma (abfd, text_section))) + if (!target_read_string + ((CORE_ADDR) 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) { - /* DLL wasn't relocated. */ + if (strncmp (s, "cYg", 3) != 0) + warning (("%s"), s); } - +#ifdef __COPY_CONTEXT_SIZE 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) + /* Got a cygwin signal marker. A cygwin signal is followed by the signal number + itself and then optionally followed by the thread id and address to saved context + within the DLL. If these are supplied, then the given thread is assumed to have + issued the signal and the context from the thread is assumed to be stored at the + given address in the inferior. Tell gdb to treat this like a real signal. */ + char *p; + int sig = strtol (s + sizeof (_CYGWIN_SIGNAL_STRING) - 1, &p, 0); + int gotasig = target_signal_from_host (sig); + ourstatus->value.sig = gotasig; + if (gotasig) { - /* Relocated addresses. */ - iter->addr += offset; - iter->endaddr += offset; + LPCVOID x; + DWORD n; + ourstatus->kind = TARGET_WAITKIND_STOPPED; + retval = strtoul (p, &p, 0); + if (!retval) + retval = main_thread_id; + else if ((x = (LPCVOID) strtoul (p, &p, 0)) + && ReadProcessMemory (current_process_handle, x, + &saved_context, __COPY_CONTEXT_SIZE, &n) + && n == __COPY_CONTEXT_SIZE) + have_saved_context = 1; + current_event.dwThreadId = retval; } - - result = build_section_addr_info_from_section_table (table_start, - table_end); - - xfree (table_start); } +#endif - return result; + if (s) + xfree (s); + return retval; } - -/* Add DLL symbol information. */ -static struct objfile * -solib_symbols_add (char *name, int from_tty, CORE_ADDR load_addr) -{ - struct section_addr_info *section_addrs_ptr = NULL; - static struct objfile *result = NULL; - bfd *abfd = NULL; - - /* 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 NULL; - 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)) - { - section_addrs_ptr = get_relocated_section_addrs (abfd, load_addr); - } - - bfd_close (abfd); - } - - if (section_addrs_ptr) - { - result = safe_symbol_file_add (name, from_tty, section_addrs_ptr, - 0, OBJF_SHARED); - - free_section_addr_info (section_addrs_ptr); - } - - else - { - /* Fallback on handling just the .text section. */ - struct section_addr_info section_addrs; - - memset (§ion_addrs, 0, sizeof (section_addrs)); - section_addrs.other[0].name = ".text"; - section_addrs.other[0].addr = load_addr; - - result = safe_symbol_file_add (name, from_tty, §ion_addrs, - 0, OBJF_SHARED); - } - - return result; -} - -/* Load DLL symbol info. */ -void -dll_symbol_command (char *args, int from_tty) -{ - int n; - dont_repeat (); - - if (args == NULL) - error ("dll-symbols requires a file name"); - - n = strlen (args); - if (n > 4 && strcasecmp (args + n - 4, ".dll") != 0) - { - char *newargs = (char *) alloca (n + 4 + 1); - strcpy (newargs, args); - strcat (newargs, ".dll"); - args = newargs; - } - - safe_symbol_file_add (args, from_tty, NULL, 0, OBJF_SHARED | OBJF_USERLOADED); -} - -/* List currently loaded DLLs. */ -void -info_dll_command (char *ignore, int from_tty) -{ - struct so_stuff *so = &solib_start; - - if (!so->next) - return; - - printf_filtered ("%*s Load Address\n", -max_dll_name_len, "DLL Name"); - while ((so = so->next) != NULL) - printf_filtered ("%*s %08lx\n", -max_dll_name_len, so->name, so->load_addr); - - return; -} - -/* Handle DEBUG_STRING output from child process. - Cygwin prepends its messages with a "cygwin:". Interpret this as - a Cygwin signal. Otherwise just print the string as a warning. */ -static int -handle_output_debug_string (struct target_waitstatus *ourstatus) -{ - char *s; - int gotasig = FALSE; - - if (!target_read_string - ((CORE_ADDR) current_event.u.DebugString.lpDebugStringData, &s, 1024, 0) - || !s || !*s) - return gotasig; - - if (strncmp (s, CYGWIN_SIGNAL_STRING, sizeof (CYGWIN_SIGNAL_STRING) - 1) != 0) - { - if (strncmp (s, "cYg", 3) != 0) - warning ("%s", s); - } - else - { - char *p; - int sig = strtol (s + sizeof (CYGWIN_SIGNAL_STRING) - 1, &p, 0); - gotasig = target_signal_from_host (sig); - ourstatus->value.sig = gotasig; - if (gotasig) - ourstatus->kind = TARGET_WAITKIND_STOPPED; - } - - xfree (s); - return gotasig; -} - -static int -display_selector (HANDLE thread, DWORD sel) -{ - LDT_ENTRY info; - if (GetThreadSelectorEntry (thread, sel, &info)) +static int +display_selector (HANDLE thread, DWORD sel) +{ + LDT_ENTRY info; + if (GetThreadSelectorEntry (thread, sel, &info)) { int base, limit; printf_filtered ("0x%03lx: ", sel); @@ -949,7 +983,7 @@ display_selector (HANDLE thread, DWORD sel) + info.BaseLow; limit = (info.HighWord.Bits.LimitHi << 16) + info.LimitLow; if (info.HighWord.Bits.Granularity) - limit = (limit << 12) | 0xfff; + limit = (limit << 12) | 0xfff; printf_filtered ("base=0x%08x limit=0x%08x", base, limit); if (info.HighWord.Bits.Default_Big) puts_filtered(" 32-bit "); @@ -1071,6 +1105,20 @@ handle_exception (struct target_waitstatus *ourstatus) case EXCEPTION_ACCESS_VIOLATION: DEBUG_EXCEPTION_SIMPLE ("EXCEPTION_ACCESS_VIOLATION"); ourstatus->value.sig = TARGET_SIGNAL_SEGV; + { + /* 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 + should not treat these as real SEGVs since they will be silently handled by + cygwin. A real SEGV will (theoretically) be caught by cygwin later in the process + 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; + if ((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; + } break; case STATUS_STACK_OVERFLOW: DEBUG_EXCEPTION_SIMPLE ("STATUS_STACK_OVERFLOW"); @@ -1145,8 +1193,9 @@ handle_exception (struct target_waitstatus *ourstatus) ourstatus->value.sig = TARGET_SIGNAL_ILL; break; default: + /* Treat unhandled first chance exceptions specially. */ if (current_event.u.Exception.dwFirstChance) - return 0; + return -1; printf_unfiltered ("gdb: unknown target exception 0x%08lx at 0x%08lx\n", current_event.u.Exception.ExceptionRecord.ExceptionCode, (DWORD) current_event.u.Exception.ExceptionRecord.ExceptionAddress); @@ -1161,7 +1210,7 @@ handle_exception (struct target_waitstatus *ourstatus) /* Resume all artificially suspended threads if we are continuing execution */ static BOOL -child_continue (DWORD continue_status, int id) +win32_continue (DWORD continue_status, int id) { int i; thread_info *th; @@ -1174,7 +1223,6 @@ child_continue (DWORD continue_status, int id) res = ContinueDebugEvent (current_event.dwProcessId, current_event.dwThreadId, continue_status); - continue_status = 0; if (res) for (th = &thread_head; (th = th->next) != NULL;) if (((id == -1) || (id == (int) th->id)) && th->suspend_count) @@ -1185,7 +1233,7 @@ child_continue (DWORD continue_status, int id) th->suspend_count = 0; if (debug_registers_changed) { - /* Only change the value of the debug reisters */ + /* Only change the value of the debug registers */ th->context.ContextFlags = CONTEXT_DEBUG_REGISTERS; th->context.Dr0 = dr[0]; th->context.Dr1 = dr[1]; @@ -1203,17 +1251,112 @@ child_continue (DWORD continue_status, int id) return res; } +/* Called in pathological case where Windows fails to send a + CREATE_PROCESS_DEBUG_EVENT after an attach. */ +static DWORD +fake_create_process (void) +{ + current_process_handle = OpenProcess (PROCESS_ALL_ACCESS, FALSE, + current_event.dwProcessId); + main_thread_id = current_event.dwThreadId; + current_thread = win32_add_thread (main_thread_id, + current_event.u.CreateThread.hThread); + return main_thread_id; +} + +static void +win32_resume (ptid_t ptid, int step, enum target_signal sig) +{ + thread_info *th; + DWORD continue_status = DBG_CONTINUE; + + int pid = PIDGET (ptid); + + if (sig != TARGET_SIGNAL_0) + { + if (current_event.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) + { + DEBUG_EXCEPT(("Cannot continue with signal %d here.\n",sig)); + } + else if (sig == last_sig) + continue_status = DBG_EXCEPTION_NOT_HANDLED; + else +#if 0 +/* This code does not seem to work, because + the kernel does probably not consider changes in the ExceptionRecord + structure when passing the exception to the inferior. + Note that this seems possible in the exception handler itself. */ + { + int i; + for (i = 0; xlate[i].them != -1; i++) + if (xlate[i].us == sig) + { + current_event.u.Exception.ExceptionRecord.ExceptionCode = + xlate[i].them; + continue_status = DBG_EXCEPTION_NOT_HANDLED; + break; + } + if (continue_status == DBG_CONTINUE) + { + DEBUG_EXCEPT(("Cannot continue with signal %d.\n",sig)); + } + } +#endif + DEBUG_EXCEPT(("Can only continue with recieved signal %d.\n", + last_sig)); + } + + last_sig = TARGET_SIGNAL_0; + + DEBUG_EXEC (("gdb: win32_resume (pid=%d, step=%d, sig=%d);\n", + pid, step, sig)); + + /* Get context for currently selected thread */ + th = thread_rec (current_event.dwThreadId, FALSE); + if (th) + { + if (step) + { + /* Single step by setting t bit */ + win32_fetch_inferior_registers (PS_REGNUM); + th->context.EFlags |= FLAG_TRACE_BIT; + } + + if (th->context.ContextFlags) + { + if (debug_registers_changed) + { + 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; + } + } + + /* Allow continuing with the same signal that interrupted us. + Otherwise complain. */ + + win32_continue (continue_status, pid); +} + /* Get the next event from the child. Return 1 if the event requires handling by WFI (or whatever). */ static int -get_child_debug_event (int pid, struct target_waitstatus *ourstatus) +get_win32_debug_event (int pid, struct target_waitstatus *ourstatus) { BOOL debug_event; DWORD continue_status, event_code; - thread_info *th = NULL; + thread_info *th; static thread_info dummy_thread_info; int retval = 0; + ptid_t ptid = {-1}; last_sig = TARGET_SIGNAL_0; @@ -1225,6 +1368,8 @@ get_child_debug_event (int pid, struct target_waitstatus *ourstatus) event_code = current_event.dwDebugEventCode; ourstatus->kind = TARGET_WAITKIND_SPURIOUS; + th = NULL; + have_saved_context = 0; switch (event_code) { @@ -1234,9 +1379,19 @@ get_child_debug_event (int pid, struct target_waitstatus *ourstatus) (unsigned) current_event.dwThreadId, "CREATE_THREAD_DEBUG_EVENT")); if (saw_create != 1) - break; + { + if (!saw_create && attach_flag) + { + /* Kludge around a Windows bug where first event is a create + thread event. Caused when attached process does not have + a main thread. */ + retval = ourstatus->value.related_pid = fake_create_process (); + saw_create++; + } + break; + } /* Record the existence of this thread */ - th = child_add_thread (current_event.dwThreadId, + th = win32_add_thread (current_event.dwThreadId, current_event.u.CreateThread.hThread); if (info_verbose) printf_unfiltered ("[New %s]\n", @@ -1250,10 +1405,11 @@ get_child_debug_event (int pid, struct target_waitstatus *ourstatus) (unsigned) current_event.dwProcessId, (unsigned) current_event.dwThreadId, "EXIT_THREAD_DEBUG_EVENT")); - if (saw_create != 1) - break; - child_delete_thread (current_event.dwThreadId); - th = &dummy_thread_info; + if (current_event.dwThreadId != main_thread_id) + { + win32_delete_thread (current_event.dwThreadId); + th = &dummy_thread_info; + } break; case CREATE_PROCESS_DEBUG_EVENT: @@ -1269,13 +1425,11 @@ get_child_debug_event (int pid, struct target_waitstatus *ourstatus) } current_process_handle = current_event.u.CreateProcessInfo.hProcess; + if (main_thread_id) + win32_delete_thread (main_thread_id); main_thread_id = current_event.dwThreadId; /* Add the main thread */ -#if 0 - th = child_add_thread (current_event.dwProcessId, - current_event.u.CreateProcessInfo.hProcess); -#endif - th = child_add_thread (main_thread_id, + th = win32_add_thread (main_thread_id, current_event.u.CreateProcessInfo.hThread); retval = ourstatus->value.related_pid = current_event.dwThreadId; break; @@ -1329,8 +1483,19 @@ get_child_debug_event (int pid, struct target_waitstatus *ourstatus) "EXCEPTION_DEBUG_EVENT")); if (saw_create != 1) break; - if (handle_exception (ourstatus)) - retval = current_event.dwThreadId; + switch (handle_exception (ourstatus)) + { + case 0: + continue_status = DBG_EXCEPTION_NOT_HANDLED; + break; + case 1: + retval = current_event.dwThreadId; + break; + case -1: + last_sig = 1; + continue_status = -1; + break; + } break; case OUTPUT_DEBUG_STRING_EVENT: /* message from the kernel */ @@ -1340,8 +1505,7 @@ get_child_debug_event (int pid, struct target_waitstatus *ourstatus) "OUTPUT_DEBUG_STRING_EVENT")); if (saw_create != 1) break; - if (handle_output_debug_string (ourstatus)) - retval = main_thread_id; + retval = handle_output_debug_string (ourstatus); break; default: @@ -1356,11 +1520,16 @@ get_child_debug_event (int pid, struct target_waitstatus *ourstatus) } if (!retval || saw_create != 1) - CHECK (child_continue (continue_status, -1)); + { + if (continue_status == -1) + win32_resume (ptid, 0, 1); + else + CHECK (win32_continue (continue_status, -1)); + } else { - current_thread = th ? : thread_rec (current_event.dwThreadId, TRUE); inferior_ptid = pid_to_ptid (retval); + current_thread = th ?: thread_rec (current_event.dwThreadId, TRUE); } out: @@ -1369,7 +1538,7 @@ out: /* Wait for interesting events to occur in the target process. */ static ptid_t -child_wait (ptid_t ptid, struct target_waitstatus *ourstatus) +win32_wait (ptid_t ptid, struct target_waitstatus *ourstatus) { int pid = PIDGET (ptid); @@ -1381,24 +1550,24 @@ child_wait (ptid_t ptid, struct target_waitstatus *ourstatus) while (1) { - int retval = get_child_debug_event (pid, ourstatus); + int retval = get_win32_debug_event (pid, ourstatus); if (retval) return pid_to_ptid (retval); else { int detach = 0; - if (ui_loop_hook != NULL) - detach = ui_loop_hook (0); + if (deprecated_ui_loop_hook != NULL) + detach = deprecated_ui_loop_hook (0); if (detach) - child_kill_inferior (); + win32_kill_inferior (); } } } static void -do_initial_child_stuff (DWORD pid) +do_initial_win32_stuff (DWORD pid) { extern int stop_after_trap; int i; @@ -1412,10 +1581,9 @@ do_initial_child_stuff (DWORD pid) dr[i] = 0; current_event.dwProcessId = pid; memset (¤t_event, 0, sizeof (current_event)); - push_target (&child_ops); - child_init_thread_list (); + push_target (&win32_ops); disable_breakpoints_in_shlibs (1); - child_clear_solibs (); + win32_clear_solib (); clear_proceed_status (); init_wait_for_inferior (); @@ -1501,12 +1669,12 @@ set_process_privilege (const char *privilege, BOOL enable) AdjustTokenPrivileges = GetProcAddress (advapi32, "AdjustTokenPrivileges"); if (!OpenProcessToken || !LookupPrivilegeValue || !AdjustTokenPrivileges) - { + { advapi32 = NULL; goto out; } } - + if (!OpenProcessToken (GetCurrentProcess (), TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, &token_hdl)) @@ -1520,12 +1688,12 @@ set_process_privilege (const char *privilege, BOOL enable) new_priv.Privileges[0].Attributes = enable ? SE_PRIVILEGE_ENABLED : 0; if (!AdjustTokenPrivileges (token_hdl, FALSE, &new_priv, - sizeof orig_priv, &orig_priv, &size)) + sizeof orig_priv, &orig_priv, &size)) goto out; #if 0 /* Disabled, otherwise every `attach' in an unprivileged user session would raise the "Failed to get SE_DEBUG_NAME privilege" warning in - child_attach(). */ + win32_attach(). */ /* AdjustTokenPrivileges returns TRUE even if the privilege could not be enabled. GetLastError () returns an correct error code, though. */ if (enable && GetLastError () == ERROR_NOT_ALL_ASSIGNED) @@ -1543,13 +1711,13 @@ out: /* Attach to process PID, then initialize for debugging it. */ static void -child_attach (char *args, int from_tty) +win32_attach (char *args, int from_tty) { BOOL ok; DWORD pid; if (!args) - error_no_arg ("process-id to attach"); + error_no_arg (_("process-id to attach")); if (set_process_privilege (SE_DEBUG_NAME, TRUE) < 0) { @@ -1559,6 +1727,7 @@ child_attach (char *args, int from_tty) pid = strtoul (args, 0, 0); /* Windows pid */ + win32_init_thread_list (); ok = DebugActiveProcess (pid); saw_create = 0; @@ -1571,14 +1740,13 @@ child_attach (char *args, int from_tty) ok = DebugActiveProcess (pid); if (!ok) - error ("Can't attach to process."); + error (_("Can't attach to process.")); } if (has_detach_ability ()) - { - attach_flag = 1; - DebugSetProcessKillOnExit (FALSE); - } + DebugSetProcessKillOnExit (FALSE); + + attach_flag = 1; if (from_tty) { @@ -1594,22 +1762,22 @@ child_attach (char *args, int from_tty) gdb_flush (gdb_stdout); } - do_initial_child_stuff (pid); + do_initial_win32_stuff (pid); target_terminal_ours (); } static void -child_detach (char *args, int from_tty) +win32_detach (char *args, int from_tty) { int detached = 1; if (has_detach_ability ()) { delete_command (NULL, 0); - child_continue (DBG_CONTINUE, -1); + win32_continue (DBG_CONTINUE, -1); if (!DebugActiveProcessStop (current_event.dwProcessId)) { - error ("Can't detach process %lu (error %lu)", + error (_("Can't detach process %lu (error %lu)"), current_event.dwProcessId, GetLastError ()); detached = 0; } @@ -1625,23 +1793,61 @@ child_detach (char *args, int from_tty) gdb_flush (gdb_stdout); } inferior_ptid = null_ptid; - unpush_target (&child_ops); + unpush_target (&win32_ops); +} + +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]; + 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) + { + if (pinfo->dwProcessId == current_event.dwProcessId) /* Got it */ + { + cygwin_conv_to_full_posix_path (pinfo->progname, path); + path_ptr = path; + break; + } + } + cygwin_internal (CW_UNLOCK_PINFO); + return path_ptr; } /* Print status information about what we're accessing. */ static void -child_files_info (struct target_ops *ignore) +win32_files_info (struct target_ops *ignore) { printf_unfiltered ("\tUsing the running image of %s %s.\n", attach_flag ? "attached" : "child", target_pid_to_str (inferior_ptid)); } -/* ARGSUSED */ static void -child_open (char *arg, int from_tty) +win32_open (char *arg, int from_tty) { - error ("Use the \"run\" command to start a Unix child process."); + error (_("Use the \"run\" command to start a Unix child process.")); +} + +/* Function called by qsort to sort environment strings. */ +static int +env_sort (const void *a, const void *b) +{ + const char **p = (const char **) a; + const char **q = (const char **) b; + return strcasecmp (*p, *q); } /* Start an inferior win32 child process and sets inferior_ptid to its pid. @@ -1650,7 +1856,8 @@ child_open (char *arg, int from_tty) ENV is the environment vector to pass. Errors reported with error(). */ static void -child_create_inferior (char *exec_file, char *allargs, char **env) +win32_create_inferior (char *exec_file, char *allargs, char **in_env, + int from_tty) { char *winenv; char *temp; @@ -1667,9 +1874,10 @@ child_create_inferior (char *exec_file, char *allargs, char **env) const char *sh; int tty; int ostdin, ostdout, ostderr; + const char *inferior_io_terminal = get_inferior_io_terminal (); if (!exec_file) - error ("No executable specified, use `target exec'.\n"); + error (_("No executable specified, use `target exec'.")); memset (&si, 0, sizeof (si)); si.cb = sizeof (si); @@ -1701,6 +1909,8 @@ child_create_inferior (char *exec_file, char *allargs, char **env) if (new_console) flags |= CREATE_NEW_CONSOLE; + attach_flag = 0; + args = alloca (strlen (toexec) + strlen (allargs) + 2); strcpy (args, toexec); strcat (args, " "); @@ -1726,27 +1936,33 @@ child_create_inferior (char *exec_file, char *allargs, char **env) strings (i.e. two nulls terminate the list). */ /* Get total size for env strings. */ - for (envlen = 0, i = 0; env[i] && *env[i]; i++) + for (envlen = 0, i = 0; in_env[i] && *in_env[i]; i++) { int j, len; for (j = 0; conv_path_names[j]; j++) { len = strlen (conv_path_names[j]); - if (strncmp (conv_path_names[j], env[i], len) == 0) + if (strncmp (conv_path_names[j], in_env[i], len) == 0) { - if (cygwin_posix_path_list_p (env[i] + len)) + if (cygwin_posix_path_list_p (in_env[i] + len)) envlen += len - + cygwin_posix_to_win32_path_list_buf_size (env[i] + len); + + cygwin_posix_to_win32_path_list_buf_size (in_env[i] + len); else - envlen += strlen (env[i]) + 1; + envlen += strlen (in_env[i]) + 1; break; } } if (conv_path_names[j] == NULL) - envlen += strlen (env[i]) + 1; + envlen += strlen (in_env[i]) + 1; } + size_t envsize = sizeof (in_env[0]) * (i + 1); + char **env = (char **) alloca (envsize); + memcpy (env, in_env, envsize); + /* Windows programs expect the environment block to be sorted. */ + qsort (env, i, sizeof (char *), env_sort); + winenv = alloca (envlen + 1); /* Copy env strings into new buffer. */ @@ -1800,6 +2016,7 @@ child_create_inferior (char *exec_file, char *allargs, char **env) } } + win32_init_thread_list (); ret = CreateProcess (0, args, /* command line */ NULL, /* Security */ @@ -1822,7 +2039,8 @@ child_create_inferior (char *exec_file, char *allargs, char **env) } if (!ret) - error ("Error creating process %s, (error %d)\n", exec_file, (unsigned) GetLastError ()); + error (_("Error creating process %s, (error %d)."), + exec_file, (unsigned) GetLastError ()); CloseHandle (pi.hThread); CloseHandle (pi.hProcess); @@ -1832,18 +2050,17 @@ child_create_inferior (char *exec_file, char *allargs, char **env) else saw_create = 0; - do_initial_child_stuff (pi.dwProcessId); + do_initial_win32_stuff (pi.dwProcessId); - /* child_continue (DBG_CONTINUE, -1); */ - proceed ((CORE_ADDR) - 1, TARGET_SIGNAL_0, 0); + /* win32_continue (DBG_CONTINUE, -1); */ } static void -child_mourn_inferior (void) +win32_mourn_inferior (void) { - (void) child_continue (DBG_CONTINUE, -1); + (void) win32_continue (DBG_CONTINUE, -1); i386_cleanup_dregs(); - unpush_target (&child_ops); + unpush_target (&win32_ops); generic_mourn_inferior (); } @@ -1851,45 +2068,47 @@ child_mourn_inferior (void) ^C on the controlling terminal. */ static void -child_stop (void) +win32_stop (void) { DEBUG_EVENTS (("gdb: GenerateConsoleCtrlEvent (CTRLC_EVENT, 0)\n")); CHECK (GenerateConsoleCtrlEvent (CTRL_C_EVENT, current_event.dwProcessId)); registers_changed (); /* refresh register state */ } -int -child_xfer_memory (CORE_ADDR memaddr, char *our, int len, +static int +win32_xfer_memory (CORE_ADDR memaddr, gdb_byte *our, int len, int write, struct mem_attrib *mem, struct target_ops *target) { - DWORD done; + DWORD done = 0; if (write) { DEBUG_MEM (("gdb: write target memory, %d bytes at 0x%08lx\n", len, (DWORD) memaddr)); - WriteProcessMemory (current_process_handle, (LPVOID) memaddr, our, - len, &done); + if (!WriteProcessMemory (current_process_handle, (LPVOID) memaddr, our, + len, &done)) + done = 0; FlushInstructionCache (current_process_handle, (LPCVOID) memaddr, len); } else { DEBUG_MEM (("gdb: read target memory, %d bytes at 0x%08lx\n", len, (DWORD) memaddr)); - ReadProcessMemory (current_process_handle, (LPCVOID) memaddr, our, len, - &done); + if (!ReadProcessMemory (current_process_handle, (LPCVOID) memaddr, our, + len, &done)) + done = 0; } return done; } -void -child_kill_inferior (void) +static void +win32_kill_inferior (void) { CHECK (TerminateProcess (current_process_handle, 0)); for (;;) { - if (!child_continue (DBG_CONTINUE, -1)) + if (!win32_continue (DBG_CONTINUE, -1)) break; if (!WaitForDebugEvent (¤t_event, INFINITE)) break; @@ -1900,273 +2119,32 @@ child_kill_inferior (void) CHECK (CloseHandle (current_process_handle)); /* this may fail in an attached process so don't check. */ - (void) CloseHandle (current_thread->h); - target_mourn_inferior (); /* or just child_mourn_inferior? */ -} - -void -child_resume (ptid_t ptid, int step, enum target_signal sig) -{ - thread_info *th; - DWORD continue_status = DBG_CONTINUE; - - int pid = PIDGET (ptid); - - if (sig != TARGET_SIGNAL_0) - { - if (current_event.dwDebugEventCode != EXCEPTION_DEBUG_EVENT) - { - DEBUG_EXCEPT(("Cannot continue with signal %d here.\n",sig)); - } - else if (sig == last_sig) - continue_status = DBG_EXCEPTION_NOT_HANDLED; - else -#if 0 -/* This code does not seem to work, because - the kernel does probably not consider changes in the ExceptionRecord - structure when passing the exception to the inferior. - Note that this seems possible in the exception handler itself. */ - { - int i; - for (i = 0; xlate[i].them != -1; i++) - if (xlate[i].us == sig) - { - current_event.u.Exception.ExceptionRecord.ExceptionCode = - xlate[i].them; - continue_status = DBG_EXCEPTION_NOT_HANDLED; - break; - } - if (continue_status == DBG_CONTINUE) - { - DEBUG_EXCEPT(("Cannot continue with signal %d.\n",sig)); - } - } -#endif - DEBUG_EXCEPT(("Can only continue with recieved signal %d.\n", - last_sig)); - } - - last_sig = TARGET_SIGNAL_0; - - DEBUG_EXEC (("gdb: child_resume (pid=%d, step=%d, sig=%d);\n", - pid, step, sig)); - - /* Get context for currently selected thread */ - th = thread_rec (current_event.dwThreadId, FALSE); - if (th) - { - if (step) - { - /* Single step by setting t bit */ - child_fetch_inferior_registers (PS_REGNUM); - th->context.EFlags |= FLAG_TRACE_BIT; - } - - if (th->context.ContextFlags) - { - if (debug_registers_changed) - { - 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; - } - } - - /* Allow continuing with the same signal that interrupted us. - Otherwise complain. */ - - child_continue (continue_status, pid); + if (current_thread && current_thread->h) + (void) CloseHandle (current_thread->h); + target_mourn_inferior (); /* or just win32_mourn_inferior? */ } static void -child_prepare_to_store (void) +win32_prepare_to_store (void) { /* Do nothing, since we can store individual regs */ } static int -child_can_run (void) +win32_can_run (void) { return 1; } static void -child_close (int x) +win32_close (int x) { - DEBUG_EVENTS (("gdb: child_close, inferior_ptid=%d\n", + DEBUG_EVENTS (("gdb: win32_close, inferior_ptid=%d\n", PIDGET (inferior_ptid))); } -struct target_ops child_ops; - -static void -init_child_ops (void) -{ - child_ops.to_shortname = "child"; - child_ops.to_longname = "Win32 child process"; - child_ops.to_doc = "Win32 child process (started by the \"run\" command)."; - child_ops.to_open = child_open; - child_ops.to_close = child_close; - child_ops.to_attach = child_attach; - child_ops.to_detach = child_detach; - child_ops.to_resume = child_resume; - child_ops.to_wait = child_wait; - child_ops.to_fetch_registers = child_fetch_inferior_registers; - child_ops.to_store_registers = child_store_inferior_registers; - child_ops.to_prepare_to_store = child_prepare_to_store; - child_ops.to_xfer_memory = child_xfer_memory; - child_ops.to_files_info = child_files_info; - child_ops.to_insert_breakpoint = memory_insert_breakpoint; - child_ops.to_remove_breakpoint = memory_remove_breakpoint; - child_ops.to_terminal_init = terminal_init_inferior; - child_ops.to_terminal_inferior = terminal_inferior; - child_ops.to_terminal_ours_for_output = terminal_ours_for_output; - child_ops.to_terminal_ours = terminal_ours; - child_ops.to_terminal_save_ours = terminal_save_ours; - child_ops.to_terminal_info = child_terminal_info; - child_ops.to_kill = child_kill_inferior; - child_ops.to_create_inferior = child_create_inferior; - child_ops.to_mourn_inferior = child_mourn_inferior; - child_ops.to_can_run = child_can_run; - child_ops.to_thread_alive = win32_child_thread_alive; - child_ops.to_pid_to_str = cygwin_pid_to_str; - child_ops.to_stop = child_stop; - child_ops.to_stratum = process_stratum; - child_ops.to_has_all_memory = 1; - child_ops.to_has_memory = 1; - child_ops.to_has_stack = 1; - child_ops.to_has_registers = 1; - child_ops.to_has_execution = 1; - child_ops.to_magic = OPS_MAGIC; -} - -void -_initialize_win32_nat (void) -{ - struct cmd_list_element *c; - - init_child_ops (); - - c = add_com ("dll-symbols", class_files, dll_symbol_command, - "Load dll library symbols from FILE."); - set_cmd_completer (c, filename_completer); - - add_com_alias ("sharedlibrary", "dll-symbols", class_alias, 1); - - add_show_from_set (add_set_cmd ("shell", class_support, var_boolean, - (char *) &useshell, - "Set use of shell to start subprocess.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("new-console", class_support, var_boolean, - (char *) &new_console, - "Set creation of new console when creating child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("new-group", class_support, var_boolean, - (char *) &new_group, - "Set creation of new group when creating child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugexec", class_support, var_boolean, - (char *) &debug_exec, - "Set whether to display execution in child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugevents", class_support, var_boolean, - (char *) &debug_events, - "Set whether to display kernel events in child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugmemory", class_support, var_boolean, - (char *) &debug_memory, - "Set whether to display memory accesses in child process.", - &setlist), - &showlist); - - add_show_from_set (add_set_cmd ("debugexceptions", class_support, var_boolean, - (char *) &debug_exceptions, - "Set whether to display kernel exceptions in child process.", - &setlist), - &showlist); - - add_info ("dll", info_dll_command, "Status of loaded DLLs."); - add_info_alias ("sharedlibrary", "dll", 1); - - add_prefix_cmd ("w32", class_info, info_w32_command, - "Print information specific to Win32 debugging.", - &info_w32_cmdlist, "info w32 ", 0, &infolist); - - add_cmd ("selector", class_info, display_selectors, - "Display selectors infos.", - &info_w32_cmdlist); - - add_target (&child_ops); -} - -/* Hardware watchpoint support, adapted from go32-nat.c code. */ - -/* Pass the address ADDR to the inferior in the I'th debug register. - Here we just store the address in dr array, the registers will be - actually set up when child_continue is called. */ -void -cygwin_set_dr (int i, CORE_ADDR addr) -{ - if (i < 0 || i > 3) - internal_error (__FILE__, __LINE__, - "Invalid register %d in cygwin_set_dr.\n", i); - dr[i] = (unsigned) addr; - debug_registers_changed = 1; - debug_registers_used = 1; -} - -/* Pass the value VAL to the inferior in the DR7 debug control - register. Here we just store the address in D_REGS, the watchpoint - will be actually set up in child_wait. */ -void -cygwin_set_dr7 (unsigned val) -{ - dr[7] = val; - debug_registers_changed = 1; - debug_registers_used = 1; -} - -/* Get the value of the DR6 debug status register from the inferior. - Here we just return the value stored in dr[6] - by the last call to thread_rec for current_event.dwThreadId id. */ -unsigned -cygwin_get_dr6 (void) -{ - return dr[6]; -} - - -/* Determine if the thread referenced by "pid" is alive - by "polling" it. If WaitForSingleObject returns WAIT_OBJECT_0 - it means that the pid has died. Otherwise it is assumed to be alive. */ -static int -win32_child_thread_alive (ptid_t ptid) -{ - int pid = PIDGET (ptid); - - return WaitForSingleObject (thread_rec (pid, FALSE)->h, 0) == WAIT_OBJECT_0 ? - FALSE : TRUE; -} - /* Convert pid to printable format. */ -char * +static char * cygwin_pid_to_str (ptid_t ptid) { static char buf[80]; @@ -2179,47 +2157,14 @@ cygwin_pid_to_str (ptid_t ptid) return buf; } -static int -core_dll_symbols_add (char *dll_name, DWORD base_addr) -{ - struct objfile *objfile; - char *objfile_basename; - const char *dll_basename; - - if (!(dll_basename = strrchr (dll_name, '/'))) - dll_basename = dll_name; - else - dll_basename++; - - ALL_OBJFILES (objfile) - { - objfile_basename = strrchr (objfile->name, '/'); - - if (objfile_basename && - strcmp (dll_basename, objfile_basename + 1) == 0) - { - printf_unfiltered ("%08lx:%s (symbols previously loaded)\n", - base_addr, dll_name); - goto out; - } - } - - register_loaded_dll (dll_name, base_addr + 0x1000); - solib_symbols_add (dll_name, 0, (CORE_ADDR) base_addr + 0x1000); - -out: - return 1; -} - typedef struct { struct target_ops *target; bfd_vma addr; -} -map_code_section_args; +} map_code_section_args; static void -map_single_dll_code_section (bfd * abfd, asection * sect, void *obj) +map_single_dll_code_section (bfd *abfd, asection *sect, void *obj) { int old; int update_coreops; @@ -2291,79 +2236,97 @@ dll_code_sections_add (const char *dll_name, int base_addr, struct target_ops *t } static void -core_section_load_dll_symbols (bfd * abfd, asection * sect, void *obj) +core_section_load_dll_symbols (bfd *abfd, asection *sect, void *obj) { struct target_ops *target = (struct target_ops *) obj; DWORD base_addr; int dll_name_size; - char *dll_name = NULL; - char *buf = NULL; struct win32_pstatus *pstatus; + 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)) + if (strncmp (sect->name, ".module", 7) != 0) return; - buf = (char *) xmalloc (sect->_raw_size + 1); + 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, sect->_raw_size)) + if (!bfd_get_section_contents (abfd, sect, buf, 0, bfd_get_section_size (sect))) goto out; pstatus = (struct win32_pstatus *) buf; 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 > sect->_raw_size) + if (offsetof (struct win32_pstatus, data.module_info.module_name) + dll_name_size > bfd_get_section_size (sect)) goto out; - dll_name = (char *) xmalloc (dll_name_size + 1); - if (!dll_name) - { - printf_unfiltered ("memory allocation failed for %s\n", sect->name); - goto out; - } - strncpy (dll_name, pstatus->data.module_info.module_name, dll_name_size); + dll_name = pstatus->data.module_info.module_name; + + if (!(dll_basename = strrchr (dll_name, '/'))) + dll_basename = dll_name; + else + dll_basename++; - while ((p = strchr (dll_name, '\\'))) - *p = '/'; + ALL_OBJFILES (objfile) + { + char *objfile_basename = strrchr (objfile->name, '/'); - if (!core_dll_symbols_add (dll_name, (DWORD) base_addr)) - printf_unfiltered ("%s: Failed to load dll symbols.\n", dll_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); - if (!dll_code_sections_add (dll_name, (DWORD) base_addr + 0x1000, target)) + if (!dll_code_sections_add (dll_name, (DWORD) base_addr, target)) printf_unfiltered ("%s: Failed to map dll code sections.\n", dll_name); out: if (buf) xfree (buf); - if (dll_name) - xfree (dll_name); return; } -void -child_solib_add (char *filename, int from_tty, struct target_ops *target, - int readsyms) +static struct so_list * +win32_current_sos (void) { - if (!readsyms) - return; - if (core_bfd) + struct so_list *sop; + struct so_list *start = NULL; + struct so_list *last = NULL; + + if (!solib_start.next && core_bfd) { - child_clear_solibs (); - bfd_map_over_sections (core_bfd, &core_section_load_dll_symbols, target); + win32_clear_solib (); + bfd_map_over_sections (core_bfd, &core_section_load_dll_symbols, + &win32_ops); } - else + + for (sop = solib_start.next; sop; sop = sop->next) { - if (solib_end && solib_end->name) - solib_end->objfile = solib_symbols_add (solib_end->name, from_tty, - solib_end->load_addr); + 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; } static void @@ -2375,11 +2338,193 @@ fetch_elf_core_registers (char *core_reg_sect, int r; if (core_reg_size < sizeof (CONTEXT)) { - error ("Core file register section too small (%u bytes).", core_reg_size); + error (_("Core file register section too small (%u bytes)."), core_reg_size); return; } for (r = 0; r < NUM_REGS; r++) - supply_register (r, core_reg_sect + mappings[r]); + regcache_raw_supply (current_regcache, r, core_reg_sect + mappings[r]); +} + +static void +init_win32_ops (void) +{ + win32_ops.to_shortname = "child"; + win32_ops.to_longname = "Win32 child process"; + win32_ops.to_doc = "Win32 child process (started by the \"run\" command)."; + win32_ops.to_open = win32_open; + win32_ops.to_close = win32_close; + win32_ops.to_attach = win32_attach; + win32_ops.to_detach = win32_detach; + win32_ops.to_resume = win32_resume; + win32_ops.to_wait = win32_wait; + win32_ops.to_fetch_registers = win32_fetch_inferior_registers; + 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_files_info = win32_files_info; + win32_ops.to_insert_breakpoint = memory_insert_breakpoint; + win32_ops.to_remove_breakpoint = memory_remove_breakpoint; + win32_ops.to_terminal_init = terminal_init_inferior; + win32_ops.to_terminal_inferior = terminal_inferior; + win32_ops.to_terminal_ours_for_output = terminal_ours_for_output; + win32_ops.to_terminal_ours = terminal_ours; + win32_ops.to_terminal_save_ours = terminal_save_ours; + win32_ops.to_terminal_info = child_terminal_info; + win32_ops.to_kill = win32_kill_inferior; + win32_ops.to_create_inferior = win32_create_inferior; + 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_stop = win32_stop; + win32_ops.to_stratum = process_stratum; + win32_ops.to_has_all_memory = 1; + win32_ops.to_has_memory = 1; + win32_ops.to_has_stack = 1; + win32_ops.to_has_registers = 1; + 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 = NULL; + win32_so_ops.in_dynsym_resolve_code = NULL; + + /* FIXME: Don't do this here. *_gdbarch_init() should set so_ops. */ + current_target_so_ops = &win32_so_ops; +} + +static void +set_win32_aliases (char *argv0) +{ + add_info_alias ("dll", "sharedlibrary", 1); +} + +void +_initialize_win32_nat (void) +{ + struct cmd_list_element *c; + + init_win32_ops (); + + c = add_com ("dll-symbols", class_files, dll_symbol_command, + _("Load dll library symbols from FILE.")); + set_cmd_completer (c, filename_completer); + + add_com_alias ("sharedlibrary", "dll-symbols", class_alias, 1); + + add_setshow_boolean_cmd ("shell", class_support, &useshell, _("\ +Set use of shell to start subprocess."), _("\ +Show use of shell to start subprocess."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_boolean_cmd ("new-console", class_support, &new_console, _("\ +Set creation of new console when creating child process."), _("\ +Show creation of new console when creating child process."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_boolean_cmd ("new-group", class_support, &new_group, _("\ +Set creation of new group when creating child process."), _("\ +Show creation of new group when creating child process."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_boolean_cmd ("debugexec", class_support, &debug_exec, _("\ +Set whether to display execution in child process."), _("\ +Show whether to display execution in child process."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_boolean_cmd ("debugevents", class_support, &debug_events, _("\ +Set whether to display kernel events in child process."), _("\ +Show whether to display kernel events in child process."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_boolean_cmd ("debugmemory", class_support, &debug_memory, _("\ +Set whether to display memory accesses in child process."), _("\ +Show whether to display memory accesses in child process."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_setshow_boolean_cmd ("debugexceptions", class_support, + &debug_exceptions, _("\ +Set whether to display kernel exceptions in child process."), _("\ +Show whether to display kernel exceptions in child process."), NULL, + NULL, + NULL, /* FIXME: i18n: */ + &setlist, &showlist); + + add_prefix_cmd ("w32", class_info, info_w32_command, + _("Print information specific to Win32 debugging."), + &info_w32_cmdlist, "info w32 ", 0, &infolist); + + add_cmd ("selector", class_info, display_selectors, + _("Display selectors infos."), + &info_w32_cmdlist); + add_target (&win32_ops); + deprecated_init_ui_hook = set_win32_aliases; +} + +/* Hardware watchpoint support, adapted from go32-nat.c code. */ + +/* Pass the address ADDR to the inferior in the I'th debug register. + Here we just store the address in dr array, the registers will be + actually set up when win32_continue is called. */ +void +cygwin_set_dr (int i, CORE_ADDR addr) +{ + if (i < 0 || i > 3) + internal_error (__FILE__, __LINE__, + _("Invalid register %d in cygwin_set_dr.\n"), i); + dr[i] = (unsigned) addr; + debug_registers_changed = 1; + debug_registers_used = 1; +} + +/* Pass the value VAL to the inferior in the DR7 debug control + register. Here we just store the address in D_REGS, the watchpoint + will be actually set up in win32_wait. */ +void +cygwin_set_dr7 (unsigned val) +{ + dr[7] = val; + debug_registers_changed = 1; + debug_registers_used = 1; +} + +/* Get the value of the DR6 debug status register from the inferior. + Here we just return the value stored in dr[6] + by the last call to thread_rec for current_event.dwThreadId id. */ +unsigned +cygwin_get_dr6 (void) +{ + return dr[6]; +} + +/* Determine if the thread referenced by "pid" is alive + by "polling" it. If WaitForSingleObject returns WAIT_OBJECT_0 + it means that the pid has died. Otherwise it is assumed to be alive. */ +static int +win32_win32_thread_alive (ptid_t ptid) +{ + int pid = PIDGET (ptid); + + return WaitForSingleObject (thread_rec (pid, FALSE)->h, 0) == WAIT_OBJECT_0 ? + FALSE : TRUE; } static struct core_fns win32_elf_core_fns = @@ -2394,7 +2539,7 @@ static struct core_fns win32_elf_core_fns = void _initialize_core_win32 (void) { - add_core_fns (&win32_elf_core_fns); + deprecated_add_core_fns (&win32_elf_core_fns); } void @@ -2421,7 +2566,7 @@ _initialize_check_for_gdb_ini (void) char *newini = alloca (len + 1); sprintf (newini, "%.*s.gdbinit", (int) (len - (sizeof ("gdb.ini") - 1)), oldini); - warning ("obsolete '%s' found. Rename to '%s'.", oldini, newini); + warning (_("obsolete '%s' found. Rename to '%s'."), oldini, newini); } } }