/* list entry */
list_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
- TYPE_NAME (list_type) = xstrdup ("list");
+ list_type->set_name (xstrdup ("list"));
module_list_ptr_type = void_ptr_type;
/* Structured Exception Handler */
seh_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
- TYPE_NAME (seh_type) = xstrdup ("seh");
+ seh_type->set_name (xstrdup ("seh"));
seh_ptr_type = arch_type (gdbarch, TYPE_CODE_PTR,
TYPE_LENGTH (void_ptr_type) * TARGET_CHAR_BIT,
/* struct _PEB_LDR_DATA */
peb_ldr_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
- TYPE_NAME (peb_ldr_type) = xstrdup ("peb_ldr_data");
+ peb_ldr_type->set_name (xstrdup ("peb_ldr_data"));
append_composite_type_field (peb_ldr_type, "length", dword32_type);
append_composite_type_field (peb_ldr_type, "initialized", dword32_type);
/* struct process environment block */
peb_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
- TYPE_NAME (peb_type) = xstrdup ("peb");
+ peb_type->set_name (xstrdup ("peb"));
/* First bytes contain several flags. */
append_composite_type_field (peb_type, "flags", dword_ptr_type);
/* struct thread information block */
tib_type = arch_composite_type (gdbarch, NULL, TYPE_CODE_STRUCT);
- TYPE_NAME (tib_type) = xstrdup ("tib");
+ tib_type->set_name (xstrdup ("tib"));
/* uint32_t current_seh; %fs:0x0000 */
append_composite_type_field (tib_type, "current_seh", seh_ptr_type);
if (!text_offset)
{
- gdb_bfd_ref_ptr dll (gdb_bfd_open (so_name, gnutarget, -1));
+ gdb_bfd_ref_ptr dll (gdb_bfd_open (so_name, gnutarget));
/* The following calls are OK even if dll is NULL.
The default value 0x1000 is returned by pe_text_section_offset
in that case. */
"Thread Information Block is %s.\n"), value);
}
-static void
-info_w32_command (const char *args, int from_tty)
-{
- help_list (info_w32_cmdlist, "info w32 ", class_info, gdb_stdout);
-}
static int w32_prefix_command_valid = 0;
void
{
if (!w32_prefix_command_valid)
{
- add_prefix_cmd ("w32", class_info, info_w32_command,
- _("Print information specific to Win32 debugging."),
- &info_w32_cmdlist, "info w32 ", 0, &infolist);
+ add_basic_prefix_cmd
+ ("w32", class_info,
+ _("Print information specific to Win32 debugging."),
+ &info_w32_cmdlist, "info w32 ", 0, &infolist);
w32_prefix_command_valid = 1;
}
}
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->set_num_fields (count);
+ type->set_fields
+ ((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);
+ SET_FIELD_ENUMVAL (type->field (i), values[i].value);
}
return type;
static const struct enum_value_name exception_values[] =
{
{ 0x40000015, "FATAL_APP_EXIT" },
+ { 0x4000001E, "WX86_SINGLE_STEP" },
+ { 0x4000001F, "WX86_BREAKPOINT" },
{ 0x40010005, "DBG_CONTROL_C" },
{ 0x40010008, "DBG_CONTROL_BREAK" },
{ 0x80000002, "DATATYPE_MISALIGNMENT" },
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;
+ bfd_size_type idata_section_size = bfd_section_size (idata_section);
+ internal_extra_pe_aouthdr *pe_extra = &pe_data (abfd)->pe_opthdr;
+ bfd_vma import_table_va = pe_extra->DataDirectory[PE_IMPORT_TABLE].VirtualAddress;
+ bfd_vma idata_section_va = bfd_section_vma (idata_section);
+
+ /* The section's virtual address as reported by BFD has the image base applied,
+ remove it. */
+ gdb_assert (idata_section_va >= pe_extra->ImageBase);
+ idata_section_va -= pe_extra->ImageBase;
+
+ bfd_vma idata_section_end_va = idata_section_va + idata_section_size;
+
+ /* Make sure that the import table is indeed within the .idata section's range. */
+ if (import_table_va < idata_section_va
+ || import_table_va >= idata_section_end_va)
+ {
+ warning (_("\
+%s: import table's virtual address (0x%" BFD_VMA_FMT "x) is outside .idata \
+section's range [0x%" BFD_VMA_FMT "x, 0x%" BFD_VMA_FMT "x[."),
+ bfd_get_filename (abfd), import_table_va, idata_section_va,
+ idata_section_end_va);
+ return false;
+ }
+
+ /* The import table starts at this offset into the .idata section. */
+ bfd_vma import_table_offset_in_sect = import_table_va - idata_section_va;
/* Get the section's data. */
gdb::byte_vector idata_contents;
if (!gdb_bfd_get_full_section_contents (abfd, idata_section, &idata_contents))
{
- warning (_("Failed to get content of .idata section."));
+ warning (_("%s: failed to get contents of .idata section."),
+ bfd_get_filename (abfd));
return false;
}
- size_t idata_size = idata_contents.size ();
- const gdb_byte *iter = idata_contents.data ();
- const gdb_byte *end = idata_contents.data () + idata_size;
+ gdb_assert (idata_contents.size () == idata_section_size);
+
+ const gdb_byte *iter = idata_contents.data () + import_table_offset_in_sect;
+ const gdb_byte *end = idata_contents.data () + idata_section_size;
const pe_import_directory_entry null_dir_entry = { 0 };
/* Iterate through all directory entries. */
/* 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."));
+ warning (_("%s: unexpected end of .idata section."),
+ bfd_get_filename (abfd));
break;
}
sizeof (pe_import_directory_entry)) == 0)
break;
- bfd_vma name_addr = dir_entry->name_rva;
+ bfd_vma name_va = 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))
+ if (name_va < idata_section_va || name_va >= idata_section_end_va)
{
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);
+%s: 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[."),
+ bfd_get_filename (abfd), name_va, idata_section_va,
+ idata_section_end_va);
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;
+ const gdb_byte *name = &idata_contents[name_va - idata_section_va];
- /* Finally, check if this is the dll name we are looking for. */
- if (streq ((const char *) name, CYGWIN_DLL_NAME))
- return true;
+ /* Make sure we don't overshoot the end of the section with the
+ streq. */
+ if (name + sizeof (CYGWIN_DLL_NAME) <= end)
+ {
+ /* 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;
+ return false;
}
void _initialize_windows_tdep ();
projects / deliverable / binutils-gdb.git / blobdiff