convert to internal format, for GDB. Used as a last resort if no
debugging symbols recognized.
- Copyright (C) 2003-2013 Free Software Foundation, Inc.
+ Copyright (C) 2003-2020 Free Software Foundation, Inc.
This file is part of GDB.
#include "symtab.h"
#include "symfile.h"
#include "objfiles.h"
-#include "common/common-utils.h"
+#include "gdbsupport/common-utils.h"
#include "coff/internal.h"
#include <ctype.h>
unsigned long rva_end; /* End offset within the pe. */
enum minimal_symbol_type ms_type; /* Type to assign symbols in
section. */
- char *section_name; /* Recorded section name. */
+ unsigned int index; /* BFD section number. */
+ std::string section_name; /* Recorded section name. */
};
#define IMAGE_SCN_CNT_CODE 0x20
}
}
-/* Get the index of the named section in our own full arrayi.
+/* Get the index of the named section in our own full array.
text, data and bss in that order. Return PE_SECTION_INDEX_INVALID
if passed an unrecognised section name. */
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;
}
static void
get_section_vmas (bfd *abfd, asection *sectp, void *context)
{
- struct pe_sections_info *data = context;
+ struct pe_sections_info *data = (struct pe_sections_info *) context;
struct read_pe_section_data *sections = data->sections;
int sectix = get_pe_section_index (sectp->name, sections,
data->nb_sections);
bfd_get_section_vma() within memory. Store the offset. */
sections[sectix].vma_offset
- = bfd_get_section_vma (abfd, sectp) - sections[sectix].rva_start;
+ = bfd_section_vma (sectp) - sections[sectix].rva_start;
}
}
\f
OBJFILE is the objfile struct of DLL_NAME. */
static void
-add_pe_exported_sym (const char *sym_name,
+add_pe_exported_sym (minimal_symbol_reader &reader,
+ const char *sym_name,
unsigned long func_rva,
int ordinal,
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);
- prim_record_minimal_symbol (qualified_name, vma,
- section_data->ms_type, objfile);
+ 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. */
- prim_record_minimal_symbol (bare_name, vma, section_data->ms_type, objfile);
+ 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.
OBJFILE is the objfile struct of DLL_NAME. */
static int
-add_pe_forwarded_sym (const char *sym_name, const char *forward_dll_name,
+add_pe_forwarded_sym (minimal_symbol_reader &reader,
+ const char *sym_name, const char *forward_dll_name,
const char *forward_func_name, int ordinal,
const char *dll_name, struct objfile *objfile)
{
- CORE_ADDR vma;
+ 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;
- char *forward_qualified_name = alloca (forward_len);
+ char *forward_qualified_name = (char *) alloca (forward_len);
+ short section;
xsnprintf (forward_qualified_name, forward_len, "%s!%s", forward_dll_name,
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)
" \"%s\" in dll \"%s\", pointing to \"%s\"\n"),
sym_name, dll_name, forward_qualified_name);
- vma = SYMBOL_VALUE_ADDRESS (msymbol.minsym);
+ vma = BMSYMBOL_VALUE_ADDRESS (msymbol);
msymtype = MSYMBOL_TYPE (msymbol.minsym);
+ section = MSYMBOL_SECTION (msymbol.minsym);
/* Generate a (hopefully unique) qualified name using the first part
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 ());
- prim_record_minimal_symbol (qualified_name, vma, msymtype, objfile);
+ /* Note that this code makes a minimal symbol whose value may point
+ outside of any section in this objfile. These symbols can't
+ really be relocated properly, but nevertheless we make a stab at
+ it, choosing an approach consistent with the history of this
+ code. */
+ baseaddr = objfile->text_section_offset ();
+
+ reader.record_with_info (qualified_name.c_str (), vma - baseaddr, msymtype,
+ section);
/* Enter the plain name as well, which might not be unique. */
- prim_record_minimal_symbol (bare_name, vma, msymtype, objfile);
- xfree (qualified_name);
- xfree (bare_name);
+ reader.record_with_info (bare_name.c_str(), vma - baseaddr, msymtype,
+ section);
return 1;
}
static unsigned int
pe_as16 (void *ptr)
{
- unsigned char *b = ptr;
+ unsigned char *b = (unsigned char *) ptr;
return b[0] + (b[1] << 8);
}
static unsigned int
pe_as32 (void *ptr)
{
- unsigned char *b = ptr;
+ unsigned char *b = (unsigned char *) ptr;
return b[0] + (b[1] << 8) + (b[2] << 16) + (b[3] << 24);
}
pe_implied_import_dll in pe-dll.c. */
void
-read_pe_exported_syms (struct objfile *objfile)
+read_pe_exported_syms (minimal_symbol_reader &reader,
+ struct objfile *objfile)
{
bfd *dll = objfile->obfd;
unsigned long nbnormal, nbforward;
unsigned long exp_funcbase;
unsigned char *expdata, *erva;
unsigned long name_rvas, ordinals, nexp, ordbase;
- char *dll_name = (char *) dll->filename;
+ char *dll_name = (char *) bfd_get_filename (dll);
int otherix = PE_SECTION_TABLE_SIZE;
int is_pe64 = 0;
int is_pe32 = 0;
/* 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 = xzalloc (PE_SECTION_TABLE_SIZE
- * sizeof (struct read_pe_section_data));
-
- 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 (expptr == 0)
+ {
+ /* no section contains export table rva */
+ return;
+ }
+
export_rva = export_opthdrrva;
export_size = export_opthdrsize;
if (export_size == 0)
{
/* Empty export table. */
- do_cleanups (back_to);
return;
}
unsigned long characteristics = pe_get32 (dll, secptr1 + 36);
char sec_name[SCNNMLEN + 1];
int sectix;
+ unsigned int bfd_section_index;
+ asection *section;
bfd_seek (dll, (file_ptr) secptr1 + 0, SEEK_SET);
bfd_bread (sec_name, (bfd_size_type) SCNNMLEN, dll);
sec_name[SCNNMLEN] = '\0';
sectix = read_pe_section_index (sec_name);
+ section = bfd_get_section_by_name (dll, sec_name);
+ if (section)
+ bfd_section_index = section->index;
+ else
+ bfd_section_index = -1;
if (sectix != PE_SECTION_INDEX_INVALID)
{
section_data[sectix].rva_start = vaddr;
section_data[sectix].rva_end = vaddr + vsize;
+ section_data[sectix].index = bfd_section_index;
}
else
{
- char *name;
-
- section_data = xrealloc (section_data, (otherix + 1)
- * sizeof (struct read_pe_section_data));
- 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;
+ section_data[otherix].index = bfd_section_index;
if (characteristics & IMAGE_SCN_CNT_CODE)
section_data[otherix].ms_type = mst_text;
else if (characteristics & IMAGE_SCN_CNT_INITIALIZED_DATA)
}
}
- 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);
exp_funcbase = pe_as32 (expdata + 28);
/* Use internal dll name instead of full pathname. */
- dll_name = pe_as32 (expdata + 12) + erva;
+ 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);
- /* Adjust the vma_offsets in case this PE got relocated. This
- assumes that *all* sections share the same relocation offset
- as the text section. */
- for (i = 0; i < otherix; i++)
- {
- section_data[i].vma_offset
- += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile));
- }
-
/* Truncate name at first dot. Should maybe also convert to all
lower case for convenience on Windows. */
read_pe_truncate_name (dll_name);
/* Pointer to the function address vector. */
- /* This is relatived to ordinal value. */
+ /* This is relative to ordinal value. */
unsigned long func_rva = pe_as32 (erva + exp_funcbase +
ordinal * 4);
{
int len = (int) (sep - forward_name);
- forward_dll_name = alloca (len + 1);
+ forward_dll_name = (char *) alloca (len + 1);
strncpy (forward_dll_name, forward_name, len);
forward_dll_name[len] = '\0';
forward_func_name = ++sep;
}
- if (add_pe_forwarded_sym (funcname, forward_dll_name,
+ if (add_pe_forwarded_sym (reader, funcname, forward_dll_name,
forward_func_name, ordinal,
dll_name, objfile) != 0)
++nbforward;
if ((func_rva >= section_data[sectix].rva_start)
&& (func_rva < section_data[sectix].rva_end))
{
+ char *sym_name = (char *) (erva + name_rva);
+
section_found = 1;
- add_pe_exported_sym (erva + name_rva,
- func_rva, ordinal,
- section_data + sectix, dll_name, objfile);
+ add_pe_exported_sym (reader, sym_name, func_rva, ordinal,
+ §ion_data[sectix], dll_name, objfile);
++nbnormal;
break;
}
if (name_rva == 0)
{
- add_pe_exported_sym (NULL, func_rva, ordinal,
- section_data, dll_name, objfile);
+ add_pe_exported_sym (reader, NULL, func_rva, ordinal,
+ §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.
This offset is mainly related to the offset within the file.
The value was previously expected to be 0x1000 for all files,
- but some Windows OS core DLLs seem to use 0x10000 section alignement
+ but some Windows OS core DLLs seem to use 0x10000 section alignment
which modified the return value of that function.
Still return default 0x1000 value if ABFD is NULL or
if '.text' section is not found, but that should not happen... */
fprintf_filtered (file, _("Coff PE read debugging is %s.\n"), value);
}
-/* Provide a prototype to silence -Wmissing-prototypes. */
-
-void _initialize_coff_pe_read (void);
-
/* Adds "Set/show debug coff_pe_read" commands. */
+void _initialize_coff_pe_read ();
void
-_initialize_coff_pe_read (void)
+_initialize_coff_pe_read ()
{
add_setshow_zuinteger_cmd ("coff-pe-read", class_maintenance,
&debug_coff_pe_read,
projects / deliverable / binutils-gdb.git / blobdiff