From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.50.93]) by sourceware.org (Postfix) with ESMTPS id 16EC7385DC3E for ; Sat, 4 Apr 2020 14:43:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 16EC7385DC3E 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 cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway24.websitewelcome.com (Postfix) with ESMTP id ACDA315BB for ; Sat, 4 Apr 2020 09:43:26 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id Kk18jwthVSl8qKk18jRzdY; Sat, 04 Apr 2020 09:43:26 -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=2fA8bAdAKfbqUWX1Gpar4HAsRp3gWB0h5urbIS2kxgc=; b=oOX7FubzGlA0JRClH4KtCktRXD 1zCTxxhYKHo0pwXBvaY9hVvIDEcBzi/QK/kMpLCuAY8j81yio/ib5w3Bo37rIUpXb+ORyeih/TKLf G+sMuu2HvbM1OOz7WyA1sgab2; Received: from 174-16-110-145.hlrn.qwest.net ([174.16.110.145]:58434 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92) (envelope-from ) id 1jKk18-003j51-F4; Sat, 04 Apr 2020 08:43:26 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v2 10/20] Use setter for attribute's unsigned value Date: Sat, 4 Apr 2020 08:43:10 -0600 Message-Id: <20200404144320.18851-11-tom@tromey.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20200404144320.18851-1-tom@tromey.com> References: <20200404144320.18851-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: 174.16.110.145 X-Source-L: No X-Exim-ID: 1jKk18-003j51-F4 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 174-16-110-145.hlrn.qwest.net (bapiya.Home) [174.16.110.145]:58434 X-Source-Auth: tom+tromey.com X-Email-Count: 21 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-17.9 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, SPF_HELO_PASS, SPF_NEUTRAL, TXREP 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: Sat, 04 Apr 2020 14:43:29 -0000 This adds form_is_unsigned and an unsigned setter method to struct attribute, and updates the remaining code. Now DW_UNSND is no longer used as an lvalue. gdb/ChangeLog 2020-04-04 Tom Tromey * dwarf2/read.c (read_attribute_value): Update. * dwarf2/attribute.h (struct attribute) : New methods. * dwarf2/attribute.c (attribute::form_is_unsigned): New method. --- gdb/ChangeLog | 7 ++++++ gdb/dwarf2/attribute.c | 23 +++++++++++++++++++ gdb/dwarf2/attribute.h | 10 ++++++++ gdb/dwarf2/read.c | 52 +++++++++++++++++++++--------------------- 4 files changed, 66 insertions(+), 26 deletions(-) diff --git a/gdb/dwarf2/attribute.c b/gdb/dwarf2/attribute.c index bacbd087b8a..092a09295ba 100644 --- a/gdb/dwarf2/attribute.c +++ b/gdb/dwarf2/attribute.c @@ -183,3 +183,26 @@ attribute::constant_value (int default_value) const return default_value; } } + +/* See attribute.h. */ + +bool +attribute::form_is_unsigned () const +{ + return (form == DW_FORM_ref_addr + || form == DW_FORM_GNU_ref_alt + || form == DW_FORM_data2 + || form == DW_FORM_data4 + || form == DW_FORM_data8 + || form == DW_FORM_sec_offset + || form == DW_FORM_data1 + || form == DW_FORM_flag + || form == DW_FORM_flag_present + || form == DW_FORM_udata + || form == DW_FORM_rnglistx + || form == DW_FORM_ref1 + || form == DW_FORM_ref2 + || form == DW_FORM_ref4 + || form == DW_FORM_ref8 + || form == DW_FORM_ref_udata); +} diff --git a/gdb/dwarf2/attribute.h b/gdb/dwarf2/attribute.h index b40cb369030..2617cab7188 100644 --- a/gdb/dwarf2/attribute.h +++ b/gdb/dwarf2/attribute.h @@ -115,6 +115,9 @@ struct attribute /* Check if the attribute's form is a string form. */ bool form_is_string () const; + /* Check if the attribute's form is an unsigned integer form. */ + bool form_is_unsigned () const; + /* Return DIE offset of this attribute. Return 0 with complaint if the attribute is not of the required kind. */ @@ -175,6 +178,13 @@ struct attribute u.snd = snd; } + /* Set this attribute to an unsigned integer. */ + void set_unsigned (ULONGEST unsnd) + { + gdb_assert (form_is_unsigned ()); + u.unsnd = unsnd; + } + ENUM_BITFIELD(dwarf_attribute) name : 16; ENUM_BITFIELD(dwarf_form) form : 15; diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index aedac3fc006..3539fb0136e 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -18403,15 +18403,16 @@ read_attribute_value (const struct die_reader_specs *reader, { case DW_FORM_ref_addr: if (cu->header.version == 2) - DW_UNSND (attr) = cu->header.read_address (abfd, info_ptr, - &bytes_read); + attr->set_unsigned (cu->header.read_address (abfd, info_ptr, + &bytes_read)); else - DW_UNSND (attr) = cu->header.read_offset (abfd, info_ptr, - &bytes_read); + attr->set_unsigned (cu->header.read_offset (abfd, info_ptr, + &bytes_read)); info_ptr += bytes_read; break; case DW_FORM_GNU_ref_alt: - DW_UNSND (attr) = cu->header.read_offset (abfd, info_ptr, &bytes_read); + attr->set_unsigned (cu->header.read_offset (abfd, info_ptr, + &bytes_read)); info_ptr += bytes_read; break; case DW_FORM_addr: @@ -18436,15 +18437,15 @@ read_attribute_value (const struct die_reader_specs *reader, attr->set_block (blk); break; case DW_FORM_data2: - DW_UNSND (attr) = read_2_bytes (abfd, info_ptr); + attr->set_unsigned (read_2_bytes (abfd, info_ptr)); info_ptr += 2; break; case DW_FORM_data4: - DW_UNSND (attr) = read_4_bytes (abfd, info_ptr); + attr->set_unsigned (read_4_bytes (abfd, info_ptr)); info_ptr += 4; break; case DW_FORM_data8: - DW_UNSND (attr) = read_8_bytes (abfd, info_ptr); + attr->set_unsigned (read_8_bytes (abfd, info_ptr)); info_ptr += 8; break; case DW_FORM_data16: @@ -18455,7 +18456,8 @@ read_attribute_value (const struct die_reader_specs *reader, attr->set_block (blk); break; case DW_FORM_sec_offset: - DW_UNSND (attr) = cu->header.read_offset (abfd, info_ptr, &bytes_read); + attr->set_unsigned (cu->header.read_offset (abfd, info_ptr, + &bytes_read)); info_ptr += bytes_read; break; case DW_FORM_string: @@ -18513,15 +18515,12 @@ read_attribute_value (const struct die_reader_specs *reader, attr->set_block (blk); break; case DW_FORM_data1: - DW_UNSND (attr) = read_1_byte (abfd, info_ptr); - info_ptr += 1; - break; case DW_FORM_flag: - DW_UNSND (attr) = read_1_byte (abfd, info_ptr); + attr->set_unsigned (read_1_byte (abfd, info_ptr)); info_ptr += 1; break; case DW_FORM_flag_present: - DW_UNSND (attr) = 1; + attr->set_unsigned (1); break; case DW_FORM_sdata: attr->set_signed (read_signed_leb128 (abfd, info_ptr, &bytes_read)); @@ -18529,27 +18528,27 @@ read_attribute_value (const struct die_reader_specs *reader, break; case DW_FORM_udata: case DW_FORM_rnglistx: - DW_UNSND (attr) = read_unsigned_leb128 (abfd, info_ptr, &bytes_read); + attr->set_unsigned (read_unsigned_leb128 (abfd, info_ptr, &bytes_read)); info_ptr += bytes_read; break; case DW_FORM_ref1: - DW_UNSND (attr) = (to_underlying (cu->header.sect_off) - + read_1_byte (abfd, info_ptr)); + attr->set_unsigned ((to_underlying (cu->header.sect_off) + + read_1_byte (abfd, info_ptr))); info_ptr += 1; break; case DW_FORM_ref2: - DW_UNSND (attr) = (to_underlying (cu->header.sect_off) - + read_2_bytes (abfd, info_ptr)); + attr->set_unsigned ((to_underlying (cu->header.sect_off) + + read_2_bytes (abfd, info_ptr))); info_ptr += 2; break; case DW_FORM_ref4: - DW_UNSND (attr) = (to_underlying (cu->header.sect_off) - + read_4_bytes (abfd, info_ptr)); + attr->set_unsigned ((to_underlying (cu->header.sect_off) + + read_4_bytes (abfd, info_ptr))); info_ptr += 4; break; case DW_FORM_ref8: - DW_UNSND (attr) = (to_underlying (cu->header.sect_off) - + read_8_bytes (abfd, info_ptr)); + attr->set_unsigned ((to_underlying (cu->header.sect_off) + + read_8_bytes (abfd, info_ptr))); info_ptr += 8; break; case DW_FORM_ref_sig8: @@ -18557,8 +18556,9 @@ read_attribute_value (const struct die_reader_specs *reader, info_ptr += 8; break; case DW_FORM_ref_udata: - DW_UNSND (attr) = (to_underlying (cu->header.sect_off) - + read_unsigned_leb128 (abfd, info_ptr, &bytes_read)); + attr->set_unsigned ((to_underlying (cu->header.sect_off) + + read_unsigned_leb128 (abfd, info_ptr, + &bytes_read))); info_ptr += bytes_read; break; case DW_FORM_indirect: @@ -18641,7 +18641,7 @@ read_attribute_value (const struct die_reader_specs *reader, complaint (_("Suspicious DW_AT_byte_size value treated as zero instead of %s"), hex_string (DW_UNSND (attr))); - DW_UNSND (attr) = 0; + attr->set_unsigned (0); } return info_ptr; -- 2.17.2