X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fwindows-tdep.c;h=bb69a79996ac8ad798d48190fbacc61a79cb556a;hb=fe33e22e7b2ef36f564df92c7259728eaf2e5028;hp=116525c9fa290c175a045599222288fd35a19915;hpb=a8e1bb344dad8bc875d9faf0c68d41bca8e142c1;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c index 116525c9fa..bb69a79996 100644 --- a/gdb/windows-tdep.c +++ b/gdb/windows-tdep.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2012 Free Software Foundation, Inc. +/* Copyright (C) 2008-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -27,6 +27,13 @@ #include "gdbcmd.h" #include "gdbthread.h" #include "objfiles.h" +#include "symfile.h" +#include "coff-pe-read.h" +#include "gdb_bfd.h" +#include "complaints.h" +#include "solib.h" +#include "solib-target.h" +#include "gdbcore.h" struct cmd_list_element *info_w32_cmdlist; @@ -93,7 +100,7 @@ static const int MAX_TIB64 = sizeof (thread_information_64) / sizeof (uint64_t); static const int FULL_TIB_SIZE = 0x1000; -static int maint_display_all_tib = 0; +static bool maint_display_all_tib = false; /* Define Thread Local Base pointer type. */ @@ -104,7 +111,7 @@ windows_get_tlb_type (struct gdbarch *gdbarch) 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, *list_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; @@ -123,9 +130,6 @@ windows_get_tlb_type (struct gdbarch *gdbarch) list_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT); TYPE_NAME (list_type) = xstrdup ("list"); - list_ptr_type = arch_type (gdbarch, TYPE_CODE_PTR, - TYPE_LENGTH (void_ptr_type), NULL); - module_list_ptr_type = void_ptr_type; append_composite_type_field (list_type, "forward_list", @@ -139,7 +143,8 @@ windows_get_tlb_type (struct gdbarch *gdbarch) TYPE_NAME (seh_type) = xstrdup ("seh"); seh_ptr_type = arch_type (gdbarch, TYPE_CODE_PTR, - TYPE_LENGTH (void_ptr_type), NULL); + TYPE_LENGTH (void_ptr_type) * TARGET_CHAR_BIT, + NULL); TYPE_TARGET_TYPE (seh_ptr_type) = seh_type; append_composite_type_field (seh_type, "next_seh", seh_ptr_type); @@ -159,7 +164,8 @@ windows_get_tlb_type (struct gdbarch *gdbarch) append_composite_type_field (peb_ldr_type, "entry_in_progress", void_ptr_type); peb_ldr_ptr_type = arch_type (gdbarch, TYPE_CODE_PTR, - TYPE_LENGTH (void_ptr_type), NULL); + TYPE_LENGTH (void_ptr_type) * TARGET_CHAR_BIT, + NULL); TYPE_TARGET_TYPE (peb_ldr_ptr_type) = peb_ldr_type; @@ -177,7 +183,8 @@ windows_get_tlb_type (struct gdbarch *gdbarch) append_composite_type_field (peb_type, "process_heap", void_ptr_type); append_composite_type_field (peb_type, "fast_peb_lock", void_ptr_type); peb_ptr_type = arch_type (gdbarch, TYPE_CODE_PTR, - TYPE_LENGTH (void_ptr_type), NULL); + TYPE_LENGTH (void_ptr_type) * TARGET_CHAR_BIT, + NULL); TYPE_TARGET_TYPE (peb_ptr_type) = peb_type; @@ -220,7 +227,8 @@ windows_get_tlb_type (struct gdbarch *gdbarch) append_composite_type_field (tib_type, "last_error_number", dword_ptr_type); tib_ptr_type = arch_type (gdbarch, TYPE_CODE_PTR, - TYPE_LENGTH (void_ptr_type), NULL); + TYPE_LENGTH (void_ptr_type) * TARGET_CHAR_BIT, + NULL); TYPE_TARGET_TYPE (tib_ptr_type) = tib_type; last_tlb_type = tib_ptr_type; @@ -271,7 +279,7 @@ static const struct lval_funcs tlb_value_funcs = static struct value * tlb_make_value (struct gdbarch *gdbarch, struct internalvar *var, void *ignore) { - if (target_has_stack && !ptid_equal (inferior_ptid, null_ptid)) + if (target_has_stack && inferior_ptid != null_ptid) { struct type *type = windows_get_tlb_type (gdbarch); return allocate_computed_value (type, &tlb_value_funcs, NULL); @@ -290,8 +298,8 @@ display_one_tib (ptid_t ptid) gdb_byte *index; CORE_ADDR thread_local_base; ULONGEST i, val, max, max_name, size, tib_size; - ULONGEST sizeof_ptr = gdbarch_ptr_bit (target_gdbarch); - enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch); + ULONGEST sizeof_ptr = gdbarch_ptr_bit (target_gdbarch ()); + enum bfd_endian byte_order = gdbarch_byte_order (target_gdbarch ()); if (sizeof_ptr == 64) { @@ -314,28 +322,28 @@ display_one_tib (ptid_t ptid) max = tib_size / size; } - tib = alloca (tib_size); + tib = (gdb_byte *) alloca (tib_size); if (target_get_tib_address (ptid, &thread_local_base) == 0) { printf_filtered (_("Unable to get thread local base for %s\n"), - target_pid_to_str (ptid)); + target_pid_to_str (ptid).c_str ()); return -1; } - if (target_read (¤t_target, TARGET_OBJECT_MEMORY, + if (target_read (current_top_target (), TARGET_OBJECT_MEMORY, NULL, tib, thread_local_base, tib_size) != tib_size) { printf_filtered (_("Unable to read thread information " "block for %s at address %s\n"), - target_pid_to_str (ptid), - paddress (target_gdbarch, thread_local_base)); + target_pid_to_str (ptid).c_str (), + paddress (target_gdbarch (), thread_local_base)); return -1; } printf_filtered (_("Thread Information Block %s at %s\n"), - target_pid_to_str (ptid), - paddress (target_gdbarch, thread_local_base)); + target_pid_to_str (ptid).c_str (), + paddress (target_gdbarch (), thread_local_base)); index = (gdb_byte *) tib; @@ -354,31 +362,12 @@ display_one_tib (ptid_t ptid) return 1; } -/* Display thread information block of a thread specified by ARGS. - If ARGS is empty, display thread information block of current_thread - if current_thread is non NULL. - Otherwise ARGS is parsed and converted to a integer that should - be the windows ThreadID (not the internal GDB thread ID). */ +/* Display thread information block of the current thread. */ static void -display_tib (char * args, int from_tty) +display_tib (const char * args, int from_tty) { - if (args) - { - struct thread_info *tp; - int gdb_id = value_as_long (parse_and_eval (args)); - - tp = find_thread_id (gdb_id); - - if (!tp) - error (_("Thread ID %d not known."), gdb_id); - - if (!target_thread_alive (tp->ptid)) - error (_("Thread ID %d has terminated."), gdb_id); - - display_one_tib (tp->ptid); - } - else if (!ptid_equal (inferior_ptid, null_ptid)) + if (inferior_ptid != null_ptid) display_one_tib (inferior_ptid); } @@ -386,16 +375,18 @@ void windows_xfer_shared_library (const char* so_name, CORE_ADDR load_addr, struct gdbarch *gdbarch, struct obstack *obstack) { - char *p; + CORE_ADDR text_offset; + obstack_grow_str (obstack, ""); } @@ -417,14 +408,13 @@ windows_xfer_shared_library (const char* so_name, CORE_ADDR load_addr, to print the value of another global variable defined with the same name, but in a different DLL. */ -void +static void windows_iterate_over_objfiles_in_search_order (struct gdbarch *gdbarch, iterate_over_objfiles_in_search_order_cb_ftype *cb, void *cb_data, struct objfile *current_objfile) { int stop; - struct objfile *objfile; if (current_objfile) { @@ -433,7 +423,7 @@ windows_iterate_over_objfiles_in_search_order return; } - ALL_OBJFILES (objfile) + for (objfile *objfile : current_program_space->objfiles ()) { if (objfile != current_objfile) { @@ -453,7 +443,7 @@ show_maint_show_all_tib (struct ui_file *file, int from_tty, } static void -info_w32_command (char *args, int from_tty) +info_w32_command (const char *args, int from_tty) { help_list (info_w32_cmdlist, "info w32 ", class_info, gdb_stdout); } @@ -471,8 +461,24 @@ init_w32_command_list (void) } } -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern initialize_file_ftype _initialize_windows_tdep; +/* To be called from the various GDB_OSABI_CYGWIN handlers for the + various Windows architectures and machine types. */ + +void +windows_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) +{ + set_gdbarch_wchar_bit (gdbarch, 16); + set_gdbarch_wchar_signed (gdbarch, 0); + + /* Canonical paths on this target look like + `c:\Program Files\Foo App\mydll.dll', for example. */ + set_gdbarch_has_dos_based_file_system (gdbarch, 1); + + set_gdbarch_iterate_over_objfiles_in_search_order + (gdbarch, windows_iterate_over_objfiles_in_search_order); + + set_solib_ops (gdbarch, &solib_target_so_ops); +} /* Implementation of `tlb' variable. */