convert to internal format, for GDB. Used as a last resort if no
debugging symbols recognized.
- Copyright (C) 2003-2017 Free Software Foundation, Inc.
+ Copyright (C) 2003-2019 Free Software Foundation, Inc.
This file is part of GDB.
enum minimal_symbol_type ms_type; /* Type to assign symbols in
section. */
unsigned int index; /* BFD section number. */
- const char *section_name; /* Recorded section name. */
+ std::string section_name; /* Recorded section name. */
};
#define IMAGE_SCN_CNT_CODE 0x20
int i;
for (i = 0; i < nb_sections; i++)
- if (strcmp (sections[i].section_name, section_name) == 0)
+ if (sections[i].section_name == section_name)
return i;
return PE_SECTION_INDEX_INVALID;
}
const struct read_pe_section_data *section_data,
const char *dll_name, struct objfile *objfile)
{
- char *qualified_name, *bare_name;
/* Add the stored offset to get the loaded address of the symbol. */
CORE_ADDR vma = func_rva + section_data->vma_offset;
of the dll name, e.g. KERNEL32!AddAtomA. This matches the style
used by windbg from the "Microsoft Debugging Tools for Windows". */
+ std::string bare_name;
if (sym_name == NULL || *sym_name == '\0')
- bare_name = xstrprintf ("#%d", ordinal);
+ bare_name = string_printf ("#%d", ordinal);
else
- bare_name = xstrdup (sym_name);
+ bare_name = sym_name;
- qualified_name = xstrprintf ("%s!%s", dll_name, bare_name);
+ std::string qualified_name
+ = string_printf ("%s!%s", dll_name, bare_name.c_str ());
if ((section_data->ms_type == mst_unknown) && debug_coff_pe_read)
fprintf_unfiltered (gdb_stdlog , _("Unknown section type for \"%s\""
" for entry \"%s\" in dll \"%s\"\n"),
- section_data->section_name, sym_name, dll_name);
+ section_data->section_name.c_str (), sym_name,
+ dll_name);
- reader.record_with_info (qualified_name, vma, section_data->ms_type,
+ reader.record_with_info (qualified_name.c_str (), vma, section_data->ms_type,
section_data->index);
/* Enter the plain name as well, which might not be unique. */
- reader.record_with_info (bare_name, vma, section_data->ms_type,
+ reader.record_with_info (bare_name.c_str (), vma, section_data->ms_type,
section_data->index);
if (debug_coff_pe_read > 1)
fprintf_unfiltered (gdb_stdlog, _("Adding exported symbol \"%s\""
" in dll \"%s\"\n"), sym_name, dll_name);
- xfree (qualified_name);
- xfree (bare_name);
}
/* Create a minimal symbol entry for an exported forward symbol.
CORE_ADDR vma, baseaddr;
struct bound_minimal_symbol msymbol;
enum minimal_symbol_type msymtype;
- char *qualified_name, *bare_name;
int forward_dll_name_len = strlen (forward_dll_name);
int forward_func_name_len = strlen (forward_func_name);
int forward_len = forward_dll_name_len + forward_func_name_len + 2;
forward_func_name);
- msymbol = lookup_minimal_symbol_and_objfile (forward_qualified_name);
+ msymbol = lookup_bound_minimal_symbol (forward_qualified_name);
if (!msymbol.minsym)
{
for (i = 0; i < forward_dll_name_len; i++)
forward_qualified_name[i] = tolower (forward_qualified_name[i]);
- msymbol = lookup_minimal_symbol_and_objfile (forward_qualified_name);
+ msymbol = lookup_bound_minimal_symbol (forward_qualified_name);
}
if (!msymbol.minsym)
of the dll name, e.g. KERNEL32!AddAtomA. This matches the style
used by windbg from the "Microsoft Debugging Tools for Windows". */
+ std::string bare_name;
if (sym_name == NULL || *sym_name == '\0')
- bare_name = xstrprintf ("#%d", ordinal);
+ bare_name = string_printf ("#%d", ordinal);
else
- bare_name = xstrdup (sym_name);
+ bare_name = sym_name;
- qualified_name = xstrprintf ("%s!%s", dll_name, bare_name);
+ std::string qualified_name
+ = string_printf ("%s!%s", dll_name, bare_name.c_str ());
/* Note that this code makes a minimal symbol whose value may point
outside of any section in this objfile. These symbols can't
code. */
baseaddr = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- reader.record_with_info (qualified_name, vma - baseaddr, msymtype, section);
+ reader.record_with_info (qualified_name.c_str (), vma - baseaddr, msymtype,
+ section);
/* Enter the plain name as well, which might not be unique. */
- reader.record_with_info (bare_name, vma - baseaddr, msymtype, section);
- xfree (qualified_name);
- xfree (bare_name);
+ reader.record_with_info (bare_name.c_str(), vma - baseaddr, msymtype,
+ section);
return 1;
}
/* Array elements are for text, data and bss in that order
Initialization with RVA_START > RVA_END guarantees that
unused sections won't be matched. */
- struct read_pe_section_data *section_data;
struct pe_sections_info pe_sections_info;
- struct cleanup *back_to = make_cleanup (null_cleanup, 0);
-
char const *target = bfd_get_target (objfile->obfd);
- section_data = XCNEWVEC (struct read_pe_section_data, PE_SECTION_TABLE_SIZE);
-
- make_cleanup (free_current_contents, §ion_data);
+ std::vector<struct read_pe_section_data> section_data
+ (PE_SECTION_TABLE_SIZE);
for (i=0; i < PE_SECTION_TABLE_SIZE; i++)
{
/* This is not a recognized PE format file. Abort now, because
the code is untested on anything else. *FIXME* test on
further architectures and loosen or remove this test. */
- do_cleanups (back_to);
return;
}
num_entries = pe_get32 (dll, opthdr_ofs + 92);
if (num_entries < 1) /* No exports. */
- {
- do_cleanups (back_to);
- return;
- }
+ return;
if (is_pe64)
{
export_opthdrrva = pe_get32 (dll, opthdr_ofs + 112);
if (export_size == 0)
{
/* Empty export table. */
- do_cleanups (back_to);
return;
}
}
else
{
- char *name;
-
- section_data = XRESIZEVEC (struct read_pe_section_data, section_data,
- otherix + 1);
- name = xstrdup (sec_name);
- section_data[otherix].section_name = name;
- make_cleanup (xfree, name);
+ section_data.resize (otherix + 1);
+ section_data[otherix].section_name = sec_name;
section_data[otherix].rva_start = vaddr;
section_data[otherix].rva_end = vaddr + vsize;
section_data[otherix].vma_offset = 0;
}
}
- expdata = (unsigned char *) xmalloc (export_size);
- make_cleanup (xfree, expdata);
+ gdb::def_vector<unsigned char> expdata_storage (export_size);
+ expdata = expdata_storage.data ();
bfd_seek (dll, (file_ptr) expptr, SEEK_SET);
bfd_bread (expdata, (bfd_size_type) export_size, dll);
dll_name = (char *) (pe_as32 (expdata + 12) + erva);
pe_sections_info.nb_sections = otherix;
- pe_sections_info.sections = section_data;
+ pe_sections_info.sections = section_data.data ();
bfd_map_over_sections (dll, get_section_vmas, &pe_sections_info);
section_found = 1;
add_pe_exported_sym (reader, sym_name, func_rva, ordinal,
- section_data + sectix, dll_name, objfile);
+ §ion_data[sectix], dll_name, objfile);
++nbnormal;
break;
}
if (name_rva == 0)
{
add_pe_exported_sym (reader, NULL, func_rva, ordinal,
- section_data, dll_name, objfile);
+ §ion_data[0], dll_name, objfile);
++nbnormal;
}
else if (debug_coff_pe_read)
fprintf_unfiltered (gdb_stdlog, _("Finished reading \"%s\", exports %ld,"
" forwards %ld, total %ld/%ld.\n"), dll_name, nbnormal,
nbforward, nbnormal + nbforward, nexp);
- /* Discard expdata and section_data. */
- do_cleanups (back_to);
}
/* Extract from ABFD the offset of the .text section.