From patchwork Thu Jan 23 00:56:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 37497 Received: (qmail 82526 invoked by alias); 23 Jan 2020 00:57:51 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 80789 invoked by uid 89); 23 Jan 2020 00:57:36 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.1 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.1 spammy=34107 X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.148.119) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 23 Jan 2020 00:57:27 +0000 Received: from cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway34.websitewelcome.com (Postfix) with ESMTP id CE5E279 for ; Wed, 22 Jan 2020 18:57:25 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id uQoHi9Z2OiJ43uQoHiNKRU; Wed, 22 Jan 2020 18:57:25 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DsSkXJjPuusbMEcd+FnE00F2KYWUnRg54GyLbFPr80I=; b=HvBBs5MEyheoDHA3VeRDC0LsH3 ua0QYep+JSsyuZOTpaubsJA1iu20OjOg/2IHwr6ErinYa5mZ03dFqleurq9iDzCTxW8DfDW385adN ZG8g+Z+usrRcOJGc1z/ivzWxZ; Received: from 75-166-123-50.hlrn.qwest.net ([75.166.123.50]:40828 helo=bapiya.Home) by box5379.bluehost.com with esmtpa (Exim 4.92) (envelope-from ) id 1iuQoH-004Kmd-Lj; Wed, 22 Jan 2020 17:57:25 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 25/38] Change file_full_name and file_file_name methods Date: Wed, 22 Jan 2020 17:56:57 -0700 Message-Id: <20200123005710.7978-26-tom@tromey.com> In-Reply-To: <20200123005710.7978-1-tom@tromey.com> References: <20200123005710.7978-1-tom@tromey.com> This changes file_full_name and file_file_name methods to be methods on line_header. This seems more clear to me. 2020-01-22 Tom Tromey * dwarf2/read.c (struct line_header) : Declare methods. (dw2_get_file_names_reader): Update. (file_file_name): Now a method. (file_full_name): Likewise. (macro_start_file): Update. Change-Id: I50d3e91665a9637c732e1e8d8e4263764c766d9c --- gdb/ChangeLog | 9 +++++++++ gdb/dwarf2/read.c | 47 ++++++++++++++++++++++++----------------------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index c230778980e..153faac8238 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1074,6 +1074,18 @@ struct line_header header. These point into dwarf2_per_objfile->line_buffer. */ const gdb_byte *statement_program_start {}, *statement_program_end {}; + /* Return the full name of file number I in this object's file name + table. Use COMP_DIR as the name of the current directory of the + compilation. The result is allocated using xmalloc; the caller + is responsible for freeing it. */ + char *file_full_name (int file, const char *comp_dir); + + /* Return file name relative to the compilation directory of file + number I in this object's file name table. The result is + allocated using xmalloc; the caller is responsible for freeing + it. */ + char *file_file_name (int file); + private: /* The include_directories table. Note these are observing pointers. The memory is owned by debug_line_buffer. */ @@ -1860,9 +1872,6 @@ struct file_and_directory static file_and_directory find_file_and_directory (struct die_info *die, struct dwarf2_cu *cu); -static char *file_full_name (int file, struct line_header *lh, - const char *comp_dir); - /* Expected enum dwarf_unit_type for read_comp_unit_head. */ enum class rcuh_kind { COMPILE, TYPE }; @@ -3401,7 +3410,7 @@ dw2_get_file_names_reader (const struct die_reader_specs *reader, if (offset != 0) qfn->file_names[0] = xstrdup (fnd.name); for (int i = 0; i < lh->file_names_size (); ++i) - qfn->file_names[i + offset] = file_full_name (i + 1, lh.get (), fnd.comp_dir); + qfn->file_names[i + offset] = lh->file_full_name (i + 1, fnd.comp_dir); qfn->real_names = NULL; lh_cu->v.quick->file_names = qfn; @@ -23788,22 +23797,18 @@ dwarf_alloc_die (struct dwarf2_cu *cu, int num_attrs) /* Macro support. */ -/* Return file name relative to the compilation directory of file number I in - *LH's file name table. The result is allocated using xmalloc; the caller is - responsible for freeing it. */ - -static char * -file_file_name (int file, struct line_header *lh) +char * +line_header::file_file_name (int file) { /* Is the file number a valid index into the line header's file name table? Remember that file numbers start with one, not zero. */ - if (lh->is_valid_file_index (file)) + if (is_valid_file_index (file)) { - const file_entry *fe = lh->file_name_at (file); + const file_entry *fe = file_name_at (file); if (!IS_ABSOLUTE_PATH (fe->name)) { - const char *dir = fe->include_dir (lh); + const char *dir = fe->include_dir (this); if (dir != NULL) return concat (dir, SLASH_STRING, fe->name, (char *) NULL); } @@ -23826,18 +23831,14 @@ file_file_name (int file, struct line_header *lh) } } -/* Return the full name of file number I in *LH's file name table. - Use COMP_DIR as the name of the current directory of the - compilation. The result is allocated using xmalloc; the caller is - responsible for freeing it. */ -static char * -file_full_name (int file, struct line_header *lh, const char *comp_dir) +char * +line_header::file_full_name (int file, const char *comp_dir) { /* Is the file number a valid index into the line header's file name table? Remember that file numbers start with one, not zero. */ - if (lh->is_valid_file_index (file)) + if (is_valid_file_index (file)) { - char *relative = file_file_name (file, lh); + char *relative = file_file_name (file); if (IS_ABSOLUTE_PATH (relative) || comp_dir == NULL) return relative; @@ -23845,7 +23846,7 @@ file_full_name (int file, struct line_header *lh, const char *comp_dir) relative, (char *) NULL); } else - return file_file_name (file, lh); + return file_file_name (file); } @@ -23856,7 +23857,7 @@ macro_start_file (struct dwarf2_cu *cu, struct line_header *lh) { /* File name relative to the compilation directory of this source file. */ - char *file_name = file_file_name (file, lh); + char *file_name = lh->file_file_name (file); if (! current_file) {