diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2020-06-29 17:11:51 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2020-09-18 17:12:12 +0100 |
| commit | e7d612adc7496ce4bfa2cd31454701f99cb4df17 (patch) | |
| tree | 12504ef629588edc90385eca9e55b254fe52091b | |
| parent | 62a5151b6b47d9e31bc49599b3f83803421d5819 (diff) | |
| download | gdb-e7d612adc7496ce4bfa2cd31454701f99cb4df17.zip gdb-e7d612adc7496ce4bfa2cd31454701f99cb4df17.tar.gz gdb-e7d612adc7496ce4bfa2cd31454701f99cb4df17.tar.bz2 | |
Add handling for 64-bit module addresses in Cygwin core dumps
Add handling for 64-bit module addresses when processing '.module' fake
sections in Cygwin core dumps.
gdb/ChangeLog:
2020-07-01 Jon Turney <jon.turney@dronecode.org.uk>
* windows-tdep.c (NOTE_INFO_MODULE, NOTE_INFO_MODULE64): Define.
(core_process_module_section): Handle NOTE_INFO_MODULE64.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/windows-tdep.c | 30 |
2 files changed, 28 insertions, 7 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7b6de03..4f8fee8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2020-07-01 Jon Turney <jon.turney@dronecode.org.uk> + * windows-tdep.c (NOTE_INFO_MODULE, NOTE_INFO_MODULE64): Define. + (core_process_module_section): Handle NOTE_INFO_MODULE64. + +2020-07-01 Jon Turney <jon.turney@dronecode.org.uk> + * windows-tdep.h: Add prototypes. * i386-windows-tdep.c(windows_core_xfer_shared_libraries): Move. (i386_windows_core_pid_to_str): Move and rename ... diff --git a/gdb/windows-tdep.c b/gdb/windows-tdep.c index 49c1c25..0c3fa91 100644 --- a/gdb/windows-tdep.c +++ b/gdb/windows-tdep.c @@ -105,6 +105,10 @@ enum CYGWIN_SIGUSR2 = 31, }; +/* These constants are defined by Cygwin's core_dump.h */ +static constexpr unsigned int NOTE_INFO_MODULE = 3; +static constexpr unsigned int NOTE_INFO_MODULE64 = 4; + struct cmd_list_element *info_w32_cmdlist; typedef struct thread_information_block_32 @@ -1101,8 +1105,10 @@ 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); + unsigned int data_type; char *module_name; size_t module_name_size; + size_t module_name_offset; CORE_ADDR base_addr; gdb_byte *buf = NULL; @@ -1123,16 +1129,26 @@ core_process_module_section (bfd *abfd, asection *sect, void *obj) /* A DWORD (data_type) followed by struct windows_core_module_info. */ + data_type = extract_unsigned_integer (buf, 4, byte_order); - base_addr = - extract_unsigned_integer (buf + 4, 4, byte_order); - - module_name_size = - extract_unsigned_integer (buf + 8, 4, byte_order); + if (data_type == NOTE_INFO_MODULE) + { + base_addr = extract_unsigned_integer (buf + 4, 4, byte_order); + module_name_size = extract_unsigned_integer (buf + 8, 4, byte_order); + module_name_offset = 12; + } + else if (data_type == NOTE_INFO_MODULE64) + { + base_addr = extract_unsigned_integer (buf + 4, 8, byte_order); + module_name_size = extract_unsigned_integer (buf + 12, 4, byte_order); + module_name_offset = 16; + } + else + goto out; - if (12 + module_name_size > bfd_section_size (sect)) + if (module_name_offset + module_name_size > bfd_section_size (sect)) goto out; - module_name = (char *) buf + 12; + module_name = (char *) buf + module_name_offset; /* The first module is the .exe itself. */ if (data->module_count != 0) |