From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.50.91]) by sourceware.org (Postfix) with ESMTPS id 94C72385E021 for ; Sun, 22 Mar 2020 18:45:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 94C72385E021 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway24.websitewelcome.com (Postfix) with ESMTP id 3D43F46261 for ; Sun, 22 Mar 2020 13:45:29 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id G5bFjAtiVEfyqG5bFjACpW; Sun, 22 Mar 2020 13:45:29 -0500 X-Authority-Reason: nr=8 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=T/+BIxBApyhfjoj0VBxf+XNeEMEcrubQH8I2ke8vNS0=; b=CY/laT4yrqL/EE7127RTWzBfQE 2qa65BhbkauRagvawuGPpgRWWZb81/mgbJ5Lq8sX9Uh212uwKFWnSly67UZ8VDVO9u2TJ9yHQLifn YR9AoXoaVTNigt3r1gBvLfBkP; Received: from 97-118-117-21.hlrn.qwest.net ([97.118.117.21]:48304 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1jG5bF-000LNS-1A; Sun, 22 Mar 2020 12:45:29 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 17/22] Change dwarf2_attr_no_follow to be a method Date: Sun, 22 Mar 2020 12:45:18 -0600 Message-Id: <20200322184523.28959-18-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200322184523.28959-1-tom@tromey.com> References: <20200322184523.28959-1-tom@tromey.com> X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.118.117.21 X-Source-L: No X-Exim-ID: 1jG5bF-000LNS-1A X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-118-117-21.hlrn.qwest.net (bapiya.Home) [97.118.117.21]:48304 X-Source-Auth: tom+tromey.com X-Email-Count: 18 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-23.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_DNSWL_NONE, RCVD_IN_SBL_CSS, SPF_HELO_PASS, SPF_NEUTRAL, TXREP, URIBL_CSS, URIBL_CSS_A autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 22 Mar 2020 18:45:32 -0000 This changes dwarf2_attr_no_follow to be a method on die_info. gdb/ChangeLog 2020-03-22 Tom Tromey * dwarf2/read.c (lookup_addr_base, lookup_ranges_base) (build_type_psymtabs_reader, read_structure_type) (read_enumeration_type, read_full_die_1): Update. (dwarf2_attr_no_follow): Move to die.h. * dwarf2/die.h (struct die_info) : New method. --- gdb/ChangeLog | 8 ++++++++ gdb/dwarf2/die.h | 11 +++++++++++ gdb/dwarf2/read.c | 37 ++++++++----------------------------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/gdb/dwarf2/die.h b/gdb/dwarf2/die.h index f8826a276e8..3a265b7df03 100644 --- a/gdb/dwarf2/die.h +++ b/gdb/dwarf2/die.h @@ -23,6 +23,17 @@ /* This data structure holds a complete die structure. */ struct die_info { + /* Return the named attribute or NULL if not there, but do not + follow DW_AT_specification, etc. */ + struct attribute *attr (dwarf_attribute name) + { + for (unsigned i = 0; i < num_attrs; ++i) + if (attrs[i].name == name) + return &attrs[i]; + return NULL; + } + + /* DWARF-2 tag for this DIE. */ ENUM_BITFIELD(dwarf_tag) tag : 16; diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 3479cd55a2e..87c4cae9b01 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1224,9 +1224,6 @@ static void set_cu_language (unsigned int, struct dwarf2_cu *); static struct attribute *dwarf2_attr (struct die_info *, unsigned int, struct dwarf2_cu *); -static struct attribute *dwarf2_attr_no_follow (struct die_info *, - unsigned int); - static const char *dwarf2_string_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *cu); @@ -6397,9 +6394,9 @@ static gdb::optional lookup_addr_base (struct die_info *comp_unit_die) { struct attribute *attr; - attr = dwarf2_attr_no_follow (comp_unit_die, DW_AT_addr_base); + attr = comp_unit_die->attr (DW_AT_addr_base); if (attr == nullptr) - attr = dwarf2_attr_no_follow (comp_unit_die, DW_AT_GNU_addr_base); + attr = comp_unit_die->attr (DW_AT_GNU_addr_base); if (attr == nullptr) return gdb::optional (); return DW_UNSND (attr); @@ -6411,9 +6408,9 @@ static ULONGEST lookup_ranges_base (struct die_info *comp_unit_die) { struct attribute *attr; - attr = dwarf2_attr_no_follow (comp_unit_die, DW_AT_rnglists_base); + attr = comp_unit_die->attr (DW_AT_rnglists_base); if (attr == nullptr) - attr = dwarf2_attr_no_follow (comp_unit_die, DW_AT_GNU_ranges_base); + attr = comp_unit_die->attr (DW_AT_GNU_ranges_base); if (attr == nullptr) return 0; return DW_UNSND (attr); @@ -7399,7 +7396,7 @@ build_type_psymtabs_reader (const struct die_reader_specs *reader, if (! type_unit_die->has_children) return; - attr = dwarf2_attr_no_follow (type_unit_die, DW_AT_stmt_list); + attr = type_unit_die->attr (DW_AT_stmt_list); tu_group = get_type_unit_group (cu, attr); if (tu_group->tus == nullptr) @@ -14977,7 +14974,7 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu) /* If the definition of this type lives in .debug_types, read that type. Don't follow DW_AT_specification though, that will take us back up the chain and we want to go down. */ - attr = dwarf2_attr_no_follow (die, DW_AT_signature); + attr = die->attr (DW_AT_signature); if (attr != nullptr) { type = get_DW_AT_signature_type (die, attr, cu); @@ -15513,7 +15510,7 @@ read_enumeration_type (struct die_info *die, struct dwarf2_cu *cu) /* If the definition of this type lives in .debug_types, read that type. Don't follow DW_AT_specification though, that will take us back up the chain and we want to go down. */ - attr = dwarf2_attr_no_follow (die, DW_AT_signature); + attr = die->attr (DW_AT_signature); if (attr != nullptr) { type = get_DW_AT_signature_type (die, attr, cu); @@ -17539,7 +17536,7 @@ read_full_die_1 (const struct die_reader_specs *reader, indexes_that_need_reprocess.push_back (i); } - struct attribute *attr = dwarf2_attr_no_follow (die, DW_AT_str_offsets_base); + struct attribute *attr = die->attr (DW_AT_str_offsets_base); if (attr != nullptr) cu->str_offsets_base = DW_UNSND (attr); @@ -18984,24 +18981,6 @@ dwarf2_attr (struct die_info *die, unsigned int name, struct dwarf2_cu *cu) return NULL; } -/* Return the named attribute or NULL if not there, - but do not follow DW_AT_specification, etc. - This is for use in contexts where we're reading .debug_types dies. - Following DW_AT_specification, DW_AT_abstract_origin will take us - back up the chain, and we want to go down. */ - -static struct attribute * -dwarf2_attr_no_follow (struct die_info *die, unsigned int name) -{ - unsigned int i; - - for (i = 0; i < die->num_attrs; ++i) - if (die->attrs[i].name == name) - return &die->attrs[i]; - - return NULL; -} - /* Return the string associated with a string-typed attribute, or NULL if it is either not found or is of an incorrect type. */ -- 2.17.2