#include "solib.h"
#include "solib-target.h"
#include "gdbcore.h"
+#include "coff/internal.h"
+#include "libcoff.h"
+#include "solist.h"
+
+#define CYGWIN_DLL_NAME "cygwin1.dll"
+
+/* Windows signal numbers differ between MinGW flavors and between
+ those and Cygwin. The below enumeration was gleaned from the
+ respective headers; the ones marked with MinGW64/Cygwin are defined
+ only by MinGW64 and Cygwin, not by mingw.org's MinGW. FIXME: We
+ should really have distinct MinGW vs Cygwin OSABIs, and two
+ separate enums, selected at runtime. */
+
+enum
+ {
+ WINDOWS_SIGHUP = 1, /* MinGW64/Cygwin */
+ WINDOWS_SIGINT = 2,
+ WINDOWS_SIGQUIT = 3, /* MinGW64/Cygwin */
+ WINDOWS_SIGILL = 4,
+ WINDOWS_SIGTRAP = 5, /* MinGW64/Cygwin */
+#ifdef __CYGWIN__
+ WINDOWS_SIGABRT = 6,
+#else
+ WINDOWS_SIGIOT = 6, /* MinGW64 */
+#endif
+ WINDOWS_SIGEMT = 7, /* MinGW64/Cygwin */
+ WINDOWS_SIGFPE = 8,
+ WINDOWS_SIGKILL = 9, /* MinGW64/Cygwin */
+ WINDOWS_SIGBUS = 10, /* MinGW64/Cygwin */
+ WINDOWS_SIGSEGV = 11,
+ WINDOWS_SIGSYS = 12, /* MinGW64/Cygwin */
+ WINDOWS_SIGPIPE = 13,/* MinGW64/Cygwin */
+ WINDOWS_SIGALRM = 14,/* MinGW64/Cygwin */
+ WINDOWS_SIGTERM = 15,
+#ifdef __CYGWIN__
+ WINDOWS_SIGURG = 16,
+ WINDOWS_SIGSTOP = 17,
+ WINDOWS_SIGTSTP = 18,
+ WINDOWS_SIGCONT = 19,
+ WINDOWS_SIGCHLD = 20,
+ WINDOWS_SIGTTIN = 21,
+ WINDOWS_SIGTTOU = 22,
+ WINDOWS_SIGIO = 23,
+ WINDOWS_SIGXCPU = 24,
+ WINDOWS_SIGXFSZ = 25,
+ WINDOWS_SIGVTALRM = 26,
+ WINDOWS_SIGPROF = 27,
+ WINDOWS_SIGWINCH = 28,
+ WINDOWS_SIGLOST = 29,
+ WINDOWS_SIGUSR1 = 30,
+ WINDOWS_SIGUSR2 = 31
+#else
+ WINDOWS_SIGBREAK = 21,
+ WINDOWS_SIGABRT = 22
+#endif
+ };
struct cmd_list_element *info_w32_cmdlist;
static bool maint_display_all_tib = false;
+static struct gdbarch_data *windows_gdbarch_data_handle;
+
+struct windows_gdbarch_data
+{
+ struct type *siginfo_type;
+ struct type *tib_ptr_type; /* Type of thread information block */
+};
+
+/* Allocate windows_gdbarch_data for an arch. */
+
+static void *
+init_windows_gdbarch_data (struct gdbarch *gdbarch)
+{
+ return GDBARCH_OBSTACK_ZALLOC (gdbarch, struct windows_gdbarch_data);
+}
+
+/* Get windows_gdbarch_data of an arch. */
+
+static struct windows_gdbarch_data *
+get_windows_gdbarch_data (struct gdbarch *gdbarch)
+{
+ return ((struct windows_gdbarch_data *)
+ gdbarch_data (gdbarch, windows_gdbarch_data_handle));
+}
+
/* Define Thread Local Base pointer type. */
static struct type *
windows_get_tlb_type (struct gdbarch *gdbarch)
{
- static struct gdbarch *last_gdbarch = NULL;
- static struct type *last_tlb_type = NULL;
struct type *dword_ptr_type, *dword32_type, *void_ptr_type;
struct type *peb_ldr_type, *peb_ldr_ptr_type;
struct type *peb_type, *peb_ptr_type, *list_type;
struct type *module_list_ptr_type;
struct type *tib_type, *seh_type, *tib_ptr_type, *seh_ptr_type;
+ struct type *word_type, *wchar_type, *wchar_ptr_type;
+ struct type *uni_str_type, *rupp_type, *rupp_ptr_type;
+
+ windows_gdbarch_data *windows_gdbarch_data
+ = get_windows_gdbarch_data (gdbarch);
+ if (windows_gdbarch_data->tib_ptr_type != nullptr)
+ return windows_gdbarch_data->tib_ptr_type;
- /* Do not rebuild type if same gdbarch as last time. */
- if (last_tlb_type && last_gdbarch == gdbarch)
- return last_tlb_type;
-
dword_ptr_type = arch_integer_type (gdbarch, gdbarch_ptr_bit (gdbarch),
1, "DWORD_PTR");
dword32_type = arch_integer_type (gdbarch, 32,
1, "DWORD32");
+ word_type = arch_integer_type (gdbarch, 16,
+ 1, "WORD");
+ wchar_type = arch_integer_type (gdbarch, 16,
+ 1, "wchar_t");
void_ptr_type = lookup_pointer_type (builtin_type (gdbarch)->builtin_void);
+ wchar_ptr_type = arch_pointer_type (gdbarch, gdbarch_ptr_bit (gdbarch),
+ NULL, wchar_type);
/* list entry */
NULL);
TYPE_TARGET_TYPE (peb_ldr_ptr_type) = peb_ldr_type;
+ /* struct UNICODE_STRING */
+ uni_str_type = arch_composite_type (gdbarch, "unicode_string",
+ TYPE_CODE_STRUCT);
+
+ append_composite_type_field (uni_str_type, "length", word_type);
+ append_composite_type_field (uni_str_type, "maximum_length", word_type);
+ append_composite_type_field_aligned (uni_str_type, "buffer",
+ wchar_ptr_type,
+ TYPE_LENGTH (wchar_ptr_type));
+
+ /* struct _RTL_USER_PROCESS_PARAMETERS */
+ rupp_type = arch_composite_type (gdbarch, "rtl_user_process_parameters",
+ TYPE_CODE_STRUCT);
+
+ append_composite_type_field (rupp_type, "maximum_length", dword32_type);
+ append_composite_type_field (rupp_type, "length", dword32_type);
+ append_composite_type_field (rupp_type, "flags", dword32_type);
+ append_composite_type_field (rupp_type, "debug_flags", dword32_type);
+ append_composite_type_field (rupp_type, "console_handle", void_ptr_type);
+ append_composite_type_field (rupp_type, "console_flags", dword32_type);
+ append_composite_type_field_aligned (rupp_type, "standard_input",
+ void_ptr_type,
+ TYPE_LENGTH (void_ptr_type));
+ append_composite_type_field (rupp_type, "standard_output", void_ptr_type);
+ append_composite_type_field (rupp_type, "standard_error", void_ptr_type);
+ append_composite_type_field (rupp_type, "current_directory", uni_str_type);
+ append_composite_type_field (rupp_type, "current_directory_handle",
+ void_ptr_type);
+ append_composite_type_field (rupp_type, "dll_path", uni_str_type);
+ append_composite_type_field (rupp_type, "image_path_name", uni_str_type);
+ append_composite_type_field (rupp_type, "command_line", uni_str_type);
+ append_composite_type_field (rupp_type, "environment", void_ptr_type);
+ append_composite_type_field (rupp_type, "starting_x", dword32_type);
+ append_composite_type_field (rupp_type, "starting_y", dword32_type);
+ append_composite_type_field (rupp_type, "count_x", dword32_type);
+ append_composite_type_field (rupp_type, "count_y", dword32_type);
+ append_composite_type_field (rupp_type, "count_chars_x", dword32_type);
+ append_composite_type_field (rupp_type, "count_chars_y", dword32_type);
+ append_composite_type_field (rupp_type, "fill_attribute", dword32_type);
+ append_composite_type_field (rupp_type, "window_flags", dword32_type);
+ append_composite_type_field (rupp_type, "show_window_flags", dword32_type);
+ append_composite_type_field_aligned (rupp_type, "window_title",
+ uni_str_type,
+ TYPE_LENGTH (void_ptr_type));
+ append_composite_type_field (rupp_type, "desktop_info", uni_str_type);
+ append_composite_type_field (rupp_type, "shell_info", uni_str_type);
+ append_composite_type_field (rupp_type, "runtime_data", uni_str_type);
+
+ rupp_ptr_type = arch_pointer_type (gdbarch, gdbarch_ptr_bit (gdbarch),
+ NULL, rupp_type);
+
/* struct process environment block */
peb_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
append_composite_type_field (peb_type, "mutant", void_ptr_type);
append_composite_type_field (peb_type, "image_base_address", void_ptr_type);
append_composite_type_field (peb_type, "ldr", peb_ldr_ptr_type);
- append_composite_type_field (peb_type, "process_parameters", void_ptr_type);
+ append_composite_type_field (peb_type, "process_parameters", rupp_ptr_type);
append_composite_type_field (peb_type, "sub_system_data", void_ptr_type);
append_composite_type_field (peb_type, "process_heap", void_ptr_type);
append_composite_type_field (peb_type, "fast_peb_lock", void_ptr_type);
NULL);
TYPE_TARGET_TYPE (tib_ptr_type) = tib_type;
- last_tlb_type = tib_ptr_type;
- last_gdbarch = gdbarch;
+ windows_gdbarch_data->tib_ptr_type = tib_ptr_type;
return tib_ptr_type;
}
void
windows_xfer_shared_library (const char* so_name, CORE_ADDR load_addr,
+ CORE_ADDR *text_offset_cached,
struct gdbarch *gdbarch, struct obstack *obstack)
{
- CORE_ADDR text_offset;
+ CORE_ADDR text_offset = text_offset_cached ? *text_offset_cached : 0;
obstack_grow_str (obstack, "<library name=\"");
std::string p = xml_escape_text (so_name);
obstack_grow_str (obstack, p.c_str ());
obstack_grow_str (obstack, "\"><segment address=\"");
- gdb_bfd_ref_ptr dll (gdb_bfd_open (so_name, gnutarget, -1));
- /* The following calls are OK even if dll is NULL.
- The default value 0x1000 is returned by pe_text_section_offset
- in that case. */
- text_offset = pe_text_section_offset (dll.get ());
+
+ if (!text_offset)
+ {
+ gdb_bfd_ref_ptr dll (gdb_bfd_open (so_name, gnutarget, -1));
+ /* The following calls are OK even if dll is NULL.
+ The default value 0x1000 is returned by pe_text_section_offset
+ in that case. */
+ text_offset = pe_text_section_offset (dll.get ());
+ if (text_offset_cached)
+ *text_offset_cached = text_offset;
+ }
+
obstack_grow_str (obstack, paddress (gdbarch, load_addr + text_offset));
obstack_grow_str (obstack, "\"/></library>");
}
}
}
+/* Implementation of `gdbarch_gdb_signal_to_target'. */
+
+static int
+windows_gdb_signal_to_target (struct gdbarch *gdbarch, enum gdb_signal signal)
+{
+ switch (signal)
+ {
+ case GDB_SIGNAL_0:
+ return 0;
+ case GDB_SIGNAL_HUP:
+ return WINDOWS_SIGHUP;
+ case GDB_SIGNAL_INT:
+ return WINDOWS_SIGINT;
+ case GDB_SIGNAL_QUIT:
+ return WINDOWS_SIGQUIT;
+ case GDB_SIGNAL_ILL:
+ return WINDOWS_SIGILL;
+ case GDB_SIGNAL_TRAP:
+ return WINDOWS_SIGTRAP;
+ case GDB_SIGNAL_ABRT:
+ return WINDOWS_SIGABRT;
+ case GDB_SIGNAL_EMT:
+ return WINDOWS_SIGEMT;
+ case GDB_SIGNAL_FPE:
+ return WINDOWS_SIGFPE;
+ case GDB_SIGNAL_KILL:
+ return WINDOWS_SIGKILL;
+ case GDB_SIGNAL_BUS:
+ return WINDOWS_SIGBUS;
+ case GDB_SIGNAL_SEGV:
+ return WINDOWS_SIGSEGV;
+ case GDB_SIGNAL_SYS:
+ return WINDOWS_SIGSYS;
+ case GDB_SIGNAL_PIPE:
+ return WINDOWS_SIGPIPE;
+ case GDB_SIGNAL_ALRM:
+ return WINDOWS_SIGALRM;
+ case GDB_SIGNAL_TERM:
+ return WINDOWS_SIGTERM;
+#ifdef __CYGWIN__
+ case GDB_SIGNAL_URG:
+ return WINDOWS_SIGURG;
+ case GDB_SIGNAL_STOP:
+ return WINDOWS_SIGSTOP;
+ case GDB_SIGNAL_TSTP:
+ return WINDOWS_SIGTSTP;
+ case GDB_SIGNAL_CONT:
+ return WINDOWS_SIGCONT;
+ case GDB_SIGNAL_CHLD:
+ return WINDOWS_SIGCHLD;
+ case GDB_SIGNAL_TTIN:
+ return WINDOWS_SIGTTIN;
+ case GDB_SIGNAL_TTOU:
+ return WINDOWS_SIGTTOU;
+ case GDB_SIGNAL_IO:
+ return WINDOWS_SIGIO;
+ case GDB_SIGNAL_XCPU:
+ return WINDOWS_SIGXCPU;
+ case GDB_SIGNAL_XFSZ:
+ return WINDOWS_SIGXFSZ;
+ case GDB_SIGNAL_VTALRM:
+ return WINDOWS_SIGVTALRM;
+ case GDB_SIGNAL_PROF:
+ return WINDOWS_SIGPROF;
+ case GDB_SIGNAL_WINCH:
+ return WINDOWS_SIGWINCH;
+ case GDB_SIGNAL_PWR:
+ return WINDOWS_SIGLOST;
+ case GDB_SIGNAL_USR1:
+ return WINDOWS_SIGUSR1;
+ case GDB_SIGNAL_USR2:
+ return WINDOWS_SIGUSR2;
+#endif /* __CYGWIN__ */
+ }
+ return -1;
+}
+
+struct enum_value_name
+{
+ uint32_t value;
+ const char *name;
+};
+
+/* Allocate a TYPE_CODE_ENUM type structure with its named values. */
+
+static struct type *
+create_enum (struct gdbarch *gdbarch, int bit, const char *name,
+ const struct enum_value_name *values, int count)
+{
+ struct type *type;
+ int i;
+
+ type = arch_type (gdbarch, TYPE_CODE_ENUM, bit, name);
+ TYPE_NFIELDS (type) = count;
+ TYPE_FIELDS (type) = (struct field *)
+ TYPE_ZALLOC (type, sizeof (struct field) * count);
+ TYPE_UNSIGNED (type) = 1;
+
+ for (i = 0; i < count; i++)
+ {
+ TYPE_FIELD_NAME (type, i) = values[i].name;
+ SET_FIELD_ENUMVAL (TYPE_FIELD (type, i), values[i].value);
+ }
+
+ return type;
+}
+
+static const struct enum_value_name exception_values[] =
+{
+ { 0x40000015, "FATAL_APP_EXIT" },
+ { 0x40010005, "DBG_CONTROL_C" },
+ { 0x40010008, "DBG_CONTROL_BREAK" },
+ { 0x80000002, "DATATYPE_MISALIGNMENT" },
+ { 0x80000003, "BREAKPOINT" },
+ { 0x80000004, "SINGLE_STEP" },
+ { 0xC0000005, "ACCESS_VIOLATION" },
+ { 0xC0000006, "IN_PAGE_ERROR" },
+ { 0xC000001D, "ILLEGAL_INSTRUCTION" },
+ { 0xC0000025, "NONCONTINUABLE_EXCEPTION" },
+ { 0xC0000026, "INVALID_DISPOSITION" },
+ { 0xC000008C, "ARRAY_BOUNDS_EXCEEDED" },
+ { 0xC000008D, "FLOAT_DENORMAL_OPERAND" },
+ { 0xC000008E, "FLOAT_DIVIDE_BY_ZERO" },
+ { 0xC000008F, "FLOAT_INEXACT_RESULT" },
+ { 0xC0000090, "FLOAT_INVALID_OPERATION" },
+ { 0xC0000091, "FLOAT_OVERFLOW" },
+ { 0xC0000092, "FLOAT_STACK_CHECK" },
+ { 0xC0000093, "FLOAT_UNDERFLOW" },
+ { 0xC0000094, "INTEGER_DIVIDE_BY_ZERO" },
+ { 0xC0000095, "INTEGER_OVERFLOW" },
+ { 0xC0000096, "PRIV_INSTRUCTION" },
+ { 0xC00000FD, "STACK_OVERFLOW" },
+ { 0xC0000409, "FAST_FAIL" },
+};
+
+static const struct enum_value_name violation_values[] =
+{
+ { 0, "READ_ACCESS_VIOLATION" },
+ { 1, "WRITE_ACCESS_VIOLATION" },
+ { 8, "DATA_EXECUTION_PREVENTION_VIOLATION" },
+};
+
+/* Implement the "get_siginfo_type" gdbarch method. */
+
+static struct type *
+windows_get_siginfo_type (struct gdbarch *gdbarch)
+{
+ struct windows_gdbarch_data *windows_gdbarch_data;
+ struct type *dword_type, *pvoid_type, *ulongptr_type;
+ struct type *code_enum, *violation_enum;
+ struct type *violation_type, *para_type, *siginfo_ptr_type, *siginfo_type;
+
+ windows_gdbarch_data = get_windows_gdbarch_data (gdbarch);
+ if (windows_gdbarch_data->siginfo_type != NULL)
+ return windows_gdbarch_data->siginfo_type;
+
+ dword_type = arch_integer_type (gdbarch, gdbarch_int_bit (gdbarch),
+ 1, "DWORD");
+ pvoid_type = arch_pointer_type (gdbarch, gdbarch_ptr_bit (gdbarch), "PVOID",
+ builtin_type (gdbarch)->builtin_void);
+ ulongptr_type = arch_integer_type (gdbarch, gdbarch_ptr_bit (gdbarch),
+ 1, "ULONG_PTR");
+
+ /* ExceptionCode value names */
+ code_enum = create_enum (gdbarch, gdbarch_int_bit (gdbarch),
+ "ExceptionCode", exception_values,
+ ARRAY_SIZE (exception_values));
+
+ /* ACCESS_VIOLATION type names */
+ violation_enum = create_enum (gdbarch, gdbarch_ptr_bit (gdbarch),
+ "ViolationType", violation_values,
+ ARRAY_SIZE (violation_values));
+
+ /* ACCESS_VIOLATION information */
+ violation_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
+ append_composite_type_field (violation_type, "Type", violation_enum);
+ append_composite_type_field (violation_type, "Address", pvoid_type);
+
+ /* Unnamed union of the documented field ExceptionInformation,
+ and the alternative AccessViolationInformation (which displays
+ human-readable values for ExceptionCode ACCESS_VIOLATION). */
+ para_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_UNION);
+ append_composite_type_field (para_type, "ExceptionInformation",
+ lookup_array_range_type (ulongptr_type, 0, 14));
+ append_composite_type_field (para_type, "AccessViolationInformation",
+ violation_type);
+
+ siginfo_type = arch_composite_type (gdbarch, "EXCEPTION_RECORD",
+ TYPE_CODE_STRUCT);
+ siginfo_ptr_type = arch_pointer_type (gdbarch, gdbarch_ptr_bit (gdbarch),
+ NULL, siginfo_type);
+
+ /* ExceptionCode is documented as type DWORD, but here a helper
+ enum type is used instead to display a human-readable value. */
+ append_composite_type_field (siginfo_type, "ExceptionCode", code_enum);
+ append_composite_type_field (siginfo_type, "ExceptionFlags", dword_type);
+ append_composite_type_field (siginfo_type, "ExceptionRecord",
+ siginfo_ptr_type);
+ append_composite_type_field (siginfo_type, "ExceptionAddress",
+ pvoid_type);
+ append_composite_type_field (siginfo_type, "NumberParameters", dword_type);
+ /* The 64-bit variant needs some padding. */
+ append_composite_type_field_aligned (siginfo_type, "",
+ para_type, TYPE_LENGTH (ulongptr_type));
+
+ windows_gdbarch_data->siginfo_type = siginfo_type;
+
+ return siginfo_type;
+}
+
+/* Implement the "solib_create_inferior_hook" target_so_ops method. */
+
+static void
+windows_solib_create_inferior_hook (int from_tty)
+{
+ CORE_ADDR exec_base = 0;
+
+ /* Find base address of main executable in
+ TIB->process_environment_block->image_base_address. */
+ struct gdbarch *gdbarch = target_gdbarch ();
+ enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
+ int ptr_bytes;
+ int peb_offset; /* Offset of process_environment_block in TIB. */
+ int base_offset; /* Offset of image_base_address in PEB. */
+ if (gdbarch_ptr_bit (gdbarch) == 32)
+ {
+ ptr_bytes = 4;
+ peb_offset = 48;
+ base_offset = 8;
+ }
+ else
+ {
+ ptr_bytes = 8;
+ peb_offset = 96;
+ base_offset = 16;
+ }
+ CORE_ADDR tlb;
+ gdb_byte buf[8];
+ if (target_has_execution
+ && target_get_tib_address (inferior_ptid, &tlb)
+ && !target_read_memory (tlb + peb_offset, buf, ptr_bytes))
+ {
+ CORE_ADDR peb = extract_unsigned_integer (buf, ptr_bytes, byte_order);
+ if (!target_read_memory (peb + base_offset, buf, ptr_bytes))
+ exec_base = extract_unsigned_integer (buf, ptr_bytes, byte_order);
+ }
+
+ /* Rebase executable if the base address changed because of ASLR. */
+ if (symfile_objfile != nullptr && exec_base != 0)
+ {
+ CORE_ADDR vmaddr = pe_data (exec_bfd)->pe_opthdr.ImageBase;
+ if (vmaddr != exec_base)
+ objfile_rebase (symfile_objfile, exec_base - vmaddr);
+ }
+}
+
+static struct target_so_ops windows_so_ops;
+
/* To be called from the various GDB_OSABI_CYGWIN handlers for the
various Windows architectures and machine types. */
set_gdbarch_iterate_over_objfiles_in_search_order
(gdbarch, windows_iterate_over_objfiles_in_search_order);
- set_solib_ops (gdbarch, &solib_target_so_ops);
+ set_gdbarch_gdb_signal_to_target (gdbarch, windows_gdb_signal_to_target);
+
+ windows_so_ops = solib_target_so_ops;
+ windows_so_ops.solib_create_inferior_hook
+ = windows_solib_create_inferior_hook;
+ set_solib_ops (gdbarch, &windows_so_ops);
+
+ set_gdbarch_get_siginfo_type (gdbarch, windows_get_siginfo_type);
}
/* Implementation of `tlb' variable. */
NULL
};
+/* Layout of an element of a PE's Import Directory Table. Based on:
+
+ https://docs.microsoft.com/en-us/windows/win32/debug/pe-format#import-directory-table
+ */
+
+struct pe_import_directory_entry
+{
+ uint32_t import_lookup_table_rva;
+ uint32_t timestamp;
+ uint32_t forwarder_chain;
+ uint32_t name_rva;
+ uint32_t import_address_table_rva;
+};
+
+gdb_static_assert (sizeof (pe_import_directory_entry) == 20);
+
+/* See windows-tdep.h. */
+
+bool
+is_linked_with_cygwin_dll (bfd *abfd)
+{
+ /* The list of DLLs a PE is linked to is in the .idata section. See:
+
+ https://docs.microsoft.com/en-us/windows/win32/debug/pe-format#the-idata-section
+ */
+ asection *idata_section = bfd_get_section_by_name (abfd, ".idata");
+ if (idata_section == nullptr)
+ return false;
+
+ /* Find the virtual address of the .idata section. We must subtract this
+ from the RVAs (relative virtual addresses) to obtain an offset in the
+ section. */
+ bfd_vma idata_addr
+ = pe_data (abfd)->pe_opthdr.DataDirectory[PE_IMPORT_TABLE].VirtualAddress;
+
+ /* Map the section's data. */
+ bfd_size_type idata_size;
+ const gdb_byte *const idata_contents
+ = gdb_bfd_map_section (idata_section, &idata_size);
+ if (idata_contents == nullptr)
+ {
+ warning (_("Failed to get content of .idata section."));
+ return false;
+ }
+
+ const gdb_byte *iter = idata_contents;
+ const gdb_byte *end = idata_contents + idata_size;
+ const pe_import_directory_entry null_dir_entry = { 0 };
+
+ /* Iterate through all directory entries. */
+ while (true)
+ {
+ /* Is there enough space left in the section for another entry? */
+ if (iter + sizeof (pe_import_directory_entry) > end)
+ {
+ warning (_("Failed to parse .idata section: unexpected end of "
+ ".idata section."));
+ break;
+ }
+
+ pe_import_directory_entry *dir_entry = (pe_import_directory_entry *) iter;
+
+ /* Is it the end of list marker? */
+ if (memcmp (dir_entry, &null_dir_entry,
+ sizeof (pe_import_directory_entry)) == 0)
+ break;
+
+ bfd_vma name_addr = dir_entry->name_rva;
+
+ /* If the name's virtual address is smaller than the section's virtual
+ address, there's a problem. */
+ if (name_addr < idata_addr
+ || name_addr >= (idata_addr + idata_size))
+ {
+ warning (_("\
+Failed to parse .idata section: name's virtual address (0x%" BFD_VMA_FMT "x) \
+is outside .idata section's range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
+ name_addr, idata_addr, idata_addr + idata_size);
+ break;
+ }
+
+ const gdb_byte *name = &idata_contents[name_addr - idata_addr];
+
+ /* Make sure we don't overshoot the end of the section with the streq. */
+ if (name + sizeof (CYGWIN_DLL_NAME) > end)
+ continue;
+
+ /* Finally, check if this is the dll name we are looking for. */
+ if (streq ((const char *) name, CYGWIN_DLL_NAME))
+ return true;
+
+ iter += sizeof (pe_import_directory_entry);
+ }
+
+ return false;
+}
+
+void _initialize_windows_tdep ();
void
-_initialize_windows_tdep (void)
+_initialize_windows_tdep ()
{
+ windows_gdbarch_data_handle
+ = gdbarch_data_register_post_init (init_windows_gdbarch_data);
+
init_w32_command_list ();
add_cmd ("thread-information-block", class_info, display_tib,
_("Display thread information block."),