From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 71394 invoked by alias); 25 May 2018 15:08:53 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 70753 invoked by uid 89); 25 May 2018 15:08:52 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=530,7, 5307, Finished X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.148.142) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 25 May 2018 15:08:49 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 3E9D71BAD2 for ; Fri, 25 May 2018 10:08:47 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id MEKkfalYk79N3MEKkf6w0z; Fri, 25 May 2018 10:08:47 -0500 X-Authority-Reason: nr=8 Received: from 174-29-44-154.hlrn.qwest.net ([174.29.44.154]:46738 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1fMEKk-000N54-6g; Fri, 25 May 2018 10:08:46 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA] Remove cleanups from coff-pe-read.c Date: Fri, 25 May 2018 16:09:00 -0000 Message-Id: <20180525150844.30688-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fMEKk-000N54-6g X-Source-Sender: 174-29-44-154.hlrn.qwest.net (bapiya.Home) [174.29.44.154]:46738 X-Source-Auth: tom+tromey.com X-Email-Count: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-SW-Source: 2018-05/txt/msg00670.txt.bz2 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/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. -- 2.13.6