From 3173aa2fc212389268f76433e70b35116a936a8d Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 24 May 2018 22:32:24 -0600 Subject: [PATCH] Remove cleanups from coff-pe-read.c This removes cleanups from coff-pe-read.c, using std::string, std::vector, and gdb::def_vector. Tested by the buildbot, though I'm not sure these code paths are exercised there. ChangeLog 2018-05-25 Tom Tromey * coff-pe-read.c (struct read_pe_section_data) : Now a std::string. (get_pe_section_index, add_pe_exported_sym): Update. (read_pe_exported_syms): Use gdb::def_vector. --- gdb/ChangeLog | 7 +++++++ gdb/coff-pe-read.c | 43 ++++++++++++++----------------------------- 2 files changed, 21 insertions(+), 29 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 863fbaea00..dd01ce376c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2018-05-25 Tom Tromey + + * coff-pe-read.c (struct read_pe_section_data) : Now + a std::string. + (get_pe_section_index, add_pe_exported_sym): Update. + (read_pe_exported_syms): Use gdb::def_vector. + 2018-05-25 Tom Tromey * frame.c (remove_prev_frame): Remove. diff --git a/gdb/coff-pe-read.c b/gdb/coff-pe-read.c index 3f89977b13..0e9309e463 100644 --- a/gdb/coff-pe-read.c +++ b/gdb/coff-pe-read.c @@ -54,7 +54,7 @@ struct read_pe_section_data 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 @@ -106,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; } @@ -175,7 +175,8 @@ add_pe_exported_sym (minimal_symbol_reader &reader, 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, section_data->index); @@ -349,16 +350,12 @@ read_pe_exported_syms (minimal_symbol_reader &reader, /* 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 section_data + (PE_SECTION_TABLE_SIZE); for (i=0; i < PE_SECTION_TABLE_SIZE; i++) { @@ -384,7 +381,6 @@ read_pe_exported_syms (minimal_symbol_reader &reader, /* 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; } @@ -397,10 +393,7 @@ read_pe_exported_syms (minimal_symbol_reader &reader, 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); @@ -454,7 +447,6 @@ read_pe_exported_syms (minimal_symbol_reader &reader, if (export_size == 0) { /* Empty export table. */ - do_cleanups (back_to); return; } @@ -490,13 +482,8 @@ read_pe_exported_syms (minimal_symbol_reader &reader, } 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; @@ -513,8 +500,8 @@ read_pe_exported_syms (minimal_symbol_reader &reader, } } - 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); @@ -530,7 +517,7 @@ read_pe_exported_syms (minimal_symbol_reader &reader, 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); @@ -596,7 +583,7 @@ read_pe_exported_syms (minimal_symbol_reader &reader, 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; } @@ -608,7 +595,7 @@ read_pe_exported_syms (minimal_symbol_reader &reader, 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) @@ -622,8 +609,6 @@ read_pe_exported_syms (minimal_symbol_reader &reader, 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.