#include "solib-target.h"
#include "gdbcore.h"
+/* 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;
typedef struct thread_information_block_32
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;
/* Do not rebuild type if same gdbarch as last time. */
if (last_tlb_type && last_gdbarch == 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);
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;
+}
+
/* 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_gdbarch_gdb_signal_to_target (gdbarch, windows_gdb_signal_to_target);
+
set_solib_ops (gdbarch, &solib_target_so_ops);
}
NULL
};
+void _initialize_windows_tdep ();
void
-_initialize_windows_tdep (void)
+_initialize_windows_tdep ()
{
init_w32_command_list ();
add_cmd ("thread-information-block", class_info, display_tib,