X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcoff-pe-read.c;h=f5721382f4c7b28aaf5c752cc7fba6f1bf9f5e9c;hb=739b5c9c778dee9e2f54d864f83a81ecb0639535;hp=01b5b82062d615ca82e098a12e540516ed7259c3;hpb=78ea0eca85031f7a37097311f90323347fb89d2d;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c index 01b5b82062..f5721382f4 100644 --- a/gdb/coff-pe-read.c +++ b/gdb/coff-pe-read.c @@ -2,7 +2,7 @@ convert to internal format, for GDB. Used as a last resort if no debugging symbols recognized. - Copyright (C) 2003, 2007-2012 Free Software Foundation, Inc. + Copyright (C) 2003-2019 Free Software Foundation, Inc. This file is part of GDB. @@ -34,6 +34,7 @@ #include "symfile.h" #include "objfiles.h" #include "common/common-utils.h" +#include "coff/internal.h" #include @@ -52,7 +53,8 @@ struct read_pe_section_data 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 @@ -92,7 +94,7 @@ read_pe_section_index (const char *section_name) } } -/* 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. */ @@ -104,7 +106,7 @@ get_pe_section_index (const char *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; } @@ -123,7 +125,7 @@ struct pe_sections_info 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); @@ -148,43 +150,44 @@ get_section_vmas (bfd *abfd, asection *sectp, void *context) 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; - int dll_name_len = strlen (dll_name); /* 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 ()); 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. @@ -197,40 +200,36 @@ add_pe_exported_sym (const char *sym_name, 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; - struct objfile *forward_objfile; - struct minimal_symbol *msymbol; - short section; + CORE_ADDR vma, baseaddr; + struct bound_minimal_symbol msymbol; enum minimal_symbol_type msymtype; - int dll_name_len = strlen (dll_name); - 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, - &forward_objfile); + msymbol = lookup_bound_minimal_symbol (forward_qualified_name); - if (!msymbol) + if (!msymbol.minsym) { int i; 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, - &forward_objfile); + msymbol = lookup_bound_minimal_symbol (forward_qualified_name); } - if (!msymbol) + if (!msymbol.minsym) { if (debug_coff_pe_read) fprintf_unfiltered (gdb_stdlog, _("Unable to find function \"%s\" in" @@ -245,27 +244,36 @@ add_pe_forwarded_sym (const char *sym_name, const char *forward_dll_name, " \"%s\" in dll \"%s\", pointing to \"%s\"\n"), sym_name, dll_name, forward_qualified_name); - vma = SYMBOL_VALUE_ADDRESS (msymbol); - section = SYMBOL_SECTION (msymbol); - msymtype = MSYMBOL_TYPE (msymbol); + 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; + + std::string qualified_name + = string_printf ("%s!%s", dll_name, bare_name.c_str ()); - qualified_name = xstrprintf ("%s!%s", dll_name, bare_name); + /* 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 = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); - prim_record_minimal_symbol (qualified_name, vma, msymtype, objfile); + 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; } @@ -305,7 +313,7 @@ pe_get32 (bfd *abfd, int where) static unsigned int pe_as16 (void *ptr) { - unsigned char *b = ptr; + unsigned char *b = (unsigned char *) ptr; return b[0] + (b[1] << 8); } @@ -313,7 +321,7 @@ pe_as16 (void *ptr) 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); } @@ -323,7 +331,8 @@ pe_as32 (void *ptr) 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; @@ -335,24 +344,18 @@ read_pe_exported_syms (struct objfile *objfile) unsigned long name_rvas, ordinals, nexp, ordbase; char *dll_name = (char *) dll->filename; int otherix = PE_SECTION_TABLE_SIZE; - int exportix = -1; 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 section_data + (PE_SECTION_TABLE_SIZE); for (i=0; i < PE_SECTION_TABLE_SIZE; i++) { @@ -390,9 +393,7 @@ read_pe_exported_syms (struct objfile *objfile) num_entries = pe_get32 (dll, opthdr_ofs + 92); if (num_entries < 1) /* No exports. */ - { - return; - } + return; if (is_pe64) { export_opthdrrva = pe_get32 (dll, opthdr_ofs + 112); @@ -436,7 +437,6 @@ read_pe_exported_syms (struct objfile *objfile) " for dll \"%s\": 0x%lx instead of 0x%lx\n"), dll_name, export_opthdrrva, vaddr); expptr = fptr + (export_opthdrrva - vaddr); - exportix = i; break; } } @@ -458,32 +458,36 @@ read_pe_exported_syms (struct objfile *objfile) unsigned long vsize = pe_get32 (dll, secptr1 + 8); unsigned long vaddr = pe_get32 (dll, secptr1 + 12); unsigned long characteristics = pe_get32 (dll, secptr1 + 36); - char sec_name[9]; + char sec_name[SCNNMLEN + 1]; int sectix; + unsigned int bfd_section_index; + asection *section; - memset (sec_name, 0, sizeof (sec_name)); bfd_seek (dll, (file_ptr) secptr1 + 0, SEEK_SET); - bfd_bread (sec_name, (bfd_size_type) 8, dll); + 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) @@ -496,8 +500,8 @@ read_pe_exported_syms (struct objfile *objfile) } } - expdata = (unsigned char *) xmalloc (export_size); - make_cleanup (xfree, expdata); + gdb::def_vector 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); @@ -510,22 +514,13 @@ read_pe_exported_syms (struct objfile *objfile) 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); @@ -567,12 +562,12 @@ read_pe_exported_syms (struct objfile *objfile) { 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; @@ -584,10 +579,11 @@ read_pe_exported_syms (struct objfile *objfile) 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; } @@ -598,8 +594,8 @@ read_pe_exported_syms (struct objfile *objfile) 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) @@ -613,8 +609,6 @@ read_pe_exported_syms (struct objfile *objfile) 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. @@ -631,12 +625,8 @@ CORE_ADDR pe_text_section_offset (struct bfd *abfd) { - unsigned long pe_header_offset, opthdr_ofs, num_entries, i; - unsigned long export_rva, export_size, nsections, secptr, expptr; - unsigned long exp_funcbase; - unsigned char *expdata, *erva; - unsigned long name_rvas, ordinals, nexp, ordbase; - char *dll_name; + unsigned long pe_header_offset, i; + unsigned long nsections, secptr; int is_pe64 = 0; int is_pe32 = 0; char const *target; @@ -663,7 +653,6 @@ pe_text_section_offset (struct bfd *abfd) /* Get pe_header, optional header and numbers of sections. */ pe_header_offset = pe_get32 (abfd, 0x3c); - opthdr_ofs = pe_header_offset + 4 + 20; nsections = pe_get16 (abfd, pe_header_offset + 4 + 2); secptr = (pe_header_offset + 4 + 20 + pe_get16 (abfd, pe_header_offset + 4 + 16)); @@ -671,12 +660,13 @@ pe_text_section_offset (struct bfd *abfd) /* Get the rva and size of the export section. */ for (i = 0; i < nsections; i++) { - char sname[8]; + char sname[SCNNMLEN + 1]; unsigned long secptr1 = secptr + 40 * i; unsigned long vaddr = pe_get32 (abfd, secptr1 + 12); bfd_seek (abfd, (file_ptr) secptr1, SEEK_SET); - bfd_bread (sname, (bfd_size_type) 8, abfd); + bfd_bread (sname, (bfd_size_type) SCNNMLEN, abfd); + sname[SCNNMLEN] = '\0'; if (strcmp (sname, ".text") == 0) return vaddr; } @@ -693,21 +683,17 @@ show_debug_coff_pe_read (struct ui_file *file, int from_tty, 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) { - add_setshow_uinteger_cmd ("coff_pe_read", class_maintenance, - &debug_coff_pe_read, - _("Set coff PE read debugging."), - _("Show coff PE read debugging."), - _("When set, debugging messages for coff reading " - "of exported symbols are displayed."), - NULL, show_debug_coff_pe_read, - &setdebuglist, &showdebuglist); + add_setshow_zuinteger_cmd ("coff-pe-read", class_maintenance, + &debug_coff_pe_read, + _("Set coff PE read debugging."), + _("Show coff PE read debugging."), + _("When set, debugging messages for coff reading " + "of exported symbols are displayed."), + NULL, show_debug_coff_pe_read, + &setdebuglist, &showdebuglist); }