From 62a5151b6b47d9e31bc49599b3f83803421d5819 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Tue, 30 Jun 2020 16:52:41 +0100 Subject: [PATCH] Promote windows_core_xfer_shared_libraries and windows_core_pid_to_str Move windows_core_xfer_shared_libraries() and windows_core_pid_to_str() to windows-tdep, and use in amd64-windows-tdep.c to handle Cygwin x86_64 core dumps. v2: Keep _initialize function at the bottom of the file. gdb/ChangeLog: 2020-07-01 Jon Turney * windows-tdep.h: Add prototypes. * i386-windows-tdep.c(windows_core_xfer_shared_libraries): Move. (i386_windows_core_pid_to_str): Move and rename ... * windows-tdep.c (windows_core_xfer_shared_libraries): ... to here (windows_core_pid_to_str): ... and here. * amd64-windows-tdep.c (amd64_windows_init_abi_common): Register here. --- gdb/ChangeLog | 8 ++++ gdb/amd64-windows-tdep.c | 5 ++ gdb/i386-windows-tdep.c | 100 +-------------------------------------- gdb/windows-tdep.c | 98 ++++++++++++++++++++++++++++++++++++++ gdb/windows-tdep.h | 8 ++++ 5 files changed, 120 insertions(+), 99 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index dbac4255bb1..7b6de038490 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2020-07-01 Jon Turney + * windows-tdep.h: Add prototypes. + * i386-windows-tdep.c(windows_core_xfer_shared_libraries): Move. + (i386_windows_core_pid_to_str): Move and rename ... + * windows-tdep.c (windows_core_xfer_shared_libraries): ... to here + (windows_core_pid_to_str): ... and here. + * amd64-windows-tdep.c (amd64_windows_init_abi_common): Register here. + +2020-07-01 Jon Turney * amd64-windows-tdep.c(amd64_windows_gregset_reg_offset): Add. (amd64_windows_init_abi_common): ... and register. diff --git a/gdb/amd64-windows-tdep.c b/gdb/amd64-windows-tdep.c index 7bb98bd2bd2..e427c205389 100644 --- a/gdb/amd64-windows-tdep.c +++ b/gdb/amd64-windows-tdep.c @@ -1310,6 +1310,11 @@ amd64_windows_init_abi_common (gdbarch_info info, struct gdbarch *gdbarch) tdep->sizeof_gregset = AMD64_WINDOWS_SIZEOF_GREGSET; tdep->sizeof_fpregset = 0; + /* Core file support. */ + set_gdbarch_core_xfer_shared_libraries + (gdbarch, windows_core_xfer_shared_libraries); + set_gdbarch_core_pid_to_str (gdbarch, windows_core_pid_to_str); + set_gdbarch_auto_wide_charset (gdbarch, amd64_windows_auto_wide_charset); } diff --git a/gdb/i386-windows-tdep.c b/gdb/i386-windows-tdep.c index ae61ed8291c..1477e54b4d5 100644 --- a/gdb/i386-windows-tdep.c +++ b/gdb/i386-windows-tdep.c @@ -89,104 +89,6 @@ static int i386_windows_gregset_reg_offset[] = #define I386_WINDOWS_SIZEOF_GREGSET 716 -struct cpms_data -{ - struct gdbarch *gdbarch; - struct obstack *obstack; - int module_count; -}; - -static void -core_process_module_section (bfd *abfd, asection *sect, void *obj) -{ - struct cpms_data *data = (struct cpms_data *) obj; - enum bfd_endian byte_order = gdbarch_byte_order (data->gdbarch); - - char *module_name; - size_t module_name_size; - CORE_ADDR base_addr; - - gdb_byte *buf = NULL; - - if (!startswith (sect->name, ".module")) - return; - - buf = (gdb_byte *) xmalloc (bfd_section_size (sect) + 1); - if (!buf) - { - printf_unfiltered ("memory allocation failed for %s\n", sect->name); - goto out; - } - if (!bfd_get_section_contents (abfd, sect, - buf, 0, bfd_section_size (sect))) - goto out; - - - - /* A DWORD (data_type) followed by struct windows_core_module_info. */ - - base_addr = - extract_unsigned_integer (buf + 4, 4, byte_order); - - module_name_size = - extract_unsigned_integer (buf + 8, 4, byte_order); - - if (12 + module_name_size > bfd_section_size (sect)) - goto out; - module_name = (char *) buf + 12; - - /* The first module is the .exe itself. */ - if (data->module_count != 0) - windows_xfer_shared_library (module_name, base_addr, - NULL, data->gdbarch, data->obstack); - data->module_count++; - -out: - xfree (buf); - return; -} - -static ULONGEST -windows_core_xfer_shared_libraries (struct gdbarch *gdbarch, - gdb_byte *readbuf, - ULONGEST offset, ULONGEST len) -{ - struct obstack obstack; - const char *buf; - ULONGEST len_avail; - struct cpms_data data = { gdbarch, &obstack, 0 }; - - obstack_init (&obstack); - obstack_grow_str (&obstack, "\n"); - bfd_map_over_sections (core_bfd, - core_process_module_section, - &data); - obstack_grow_str0 (&obstack, "\n"); - - buf = (const char *) obstack_finish (&obstack); - len_avail = strlen (buf); - if (offset >= len_avail) - return 0; - - if (len > len_avail - offset) - len = len_avail - offset; - memcpy (readbuf, buf + offset, len); - - obstack_free (&obstack, NULL); - return len; -} - -/* This is how we want PTIDs from core files to be printed. */ - -static std::string -i386_windows_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid) -{ - if (ptid.lwp () != 0) - return string_printf ("Thread 0x%lx", ptid.lwp ()); - - return normal_pid_to_str (ptid); -} - static CORE_ADDR i386_windows_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc) { @@ -251,7 +153,7 @@ i386_windows_init_abi_common (struct gdbarch_info info, struct gdbarch *gdbarch) /* Core file support. */ set_gdbarch_core_xfer_shared_libraries (gdbarch, windows_core_xfer_shared_libraries); - set_gdbarch_core_pid_to_str (gdbarch, i386_windows_core_pid_to_str); + set_gdbarch_core_pid_to_str (gdbarch, windows_core_pid_to_str); set_gdbarch_auto_wide_charset (gdbarch, i386_windows_auto_wide_charset); } diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c index 0dee73a7bba..49c1c252a95 100644 --- a/gdb/windows-tdep.c +++ b/gdb/windows-tdep.c @@ -1088,6 +1088,104 @@ range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."), return false; } +struct cpms_data +{ + struct gdbarch *gdbarch; + struct obstack *obstack; + int module_count; +}; + +static void +core_process_module_section (bfd *abfd, asection *sect, void *obj) +{ + struct cpms_data *data = (struct cpms_data *) obj; + enum bfd_endian byte_order = gdbarch_byte_order (data->gdbarch); + + char *module_name; + size_t module_name_size; + CORE_ADDR base_addr; + + gdb_byte *buf = NULL; + + if (!startswith (sect->name, ".module")) + return; + + buf = (gdb_byte *) xmalloc (bfd_section_size (sect) + 1); + if (!buf) + { + printf_unfiltered ("memory allocation failed for %s\n", sect->name); + goto out; + } + if (!bfd_get_section_contents (abfd, sect, + buf, 0, bfd_section_size (sect))) + goto out; + + + + /* A DWORD (data_type) followed by struct windows_core_module_info. */ + + base_addr = + extract_unsigned_integer (buf + 4, 4, byte_order); + + module_name_size = + extract_unsigned_integer (buf + 8, 4, byte_order); + + if (12 + module_name_size > bfd_section_size (sect)) + goto out; + module_name = (char *) buf + 12; + + /* The first module is the .exe itself. */ + if (data->module_count != 0) + windows_xfer_shared_library (module_name, base_addr, + NULL, data->gdbarch, data->obstack); + data->module_count++; + +out: + xfree (buf); + return; +} + +ULONGEST +windows_core_xfer_shared_libraries (struct gdbarch *gdbarch, + gdb_byte *readbuf, + ULONGEST offset, ULONGEST len) +{ + struct obstack obstack; + const char *buf; + ULONGEST len_avail; + struct cpms_data data = { gdbarch, &obstack, 0 }; + + obstack_init (&obstack); + obstack_grow_str (&obstack, "\n"); + bfd_map_over_sections (core_bfd, + core_process_module_section, + &data); + obstack_grow_str0 (&obstack, "\n"); + + buf = (const char *) obstack_finish (&obstack); + len_avail = strlen (buf); + if (offset >= len_avail) + return 0; + + if (len > len_avail - offset) + len = len_avail - offset; + memcpy (readbuf, buf + offset, len); + + obstack_free (&obstack, NULL); + return len; +} + +/* This is how we want PTIDs from core files to be printed. */ + +std::string +windows_core_pid_to_str (struct gdbarch *gdbarch, ptid_t ptid) +{ + if (ptid.lwp () != 0) + return string_printf ("Thread 0x%lx", ptid.lwp ()); + + return normal_pid_to_str (ptid); +} + void _initialize_windows_tdep (); void _initialize_windows_tdep () diff --git a/gdb/windows-tdep.h b/gdb/windows-tdep.h index cd7717bd917..ec677cbdd46 100644 --- a/gdb/windows-tdep.h +++ b/gdb/windows-tdep.h @@ -31,6 +31,14 @@ extern void windows_xfer_shared_library (const char* so_name, struct gdbarch *gdbarch, struct obstack *obstack); +extern ULONGEST windows_core_xfer_shared_libraries (struct gdbarch *gdbarch, + gdb_byte *readbuf, + ULONGEST offset, + ULONGEST len); + +extern std::string windows_core_pid_to_str (struct gdbarch *gdbarch, + ptid_t ptid); + /* To be called from the various GDB_OSABI_WINDOWS handlers for the various Windows architectures and machine types. */ -- 2.30.2