From patchwork Fri Feb 10 21:52:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 64730 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 79A293881D10 for ; Fri, 10 Feb 2023 23:21:56 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from gproxy4-pub.mail.unifiedlayer.com (gproxy4-pub.mail.unifiedlayer.com [69.89.23.142]) by sourceware.org (Postfix) with ESMTPS id DDAF2385840C for ; Fri, 10 Feb 2023 23:21:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org DDAF2385840C Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tromey.com Received: from cmgw14.mail.unifiedlayer.com (unknown [10.0.90.129]) by progateway6.mail.pro1.eigbox.com (Postfix) with ESMTP id 592D310043685 for ; Fri, 10 Feb 2023 23:21:36 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id Qci0p9FB8t25AQci0pOba0; Fri, 10 Feb 2023 23:21:36 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=AMXXMzya c=1 sm=1 tr=0 ts=63e6d180 a=ApxJNpeYhEAb1aAlGBBbmA==:117 a=ApxJNpeYhEAb1aAlGBBbmA==:17 a=dLZJa+xiwSxG16/P+YVxDGlgEgI=:19 a=IkcTkHD0fZMA:10:nop_charset_1 a=m04uMKEZRckA:10:nop_rcvd_month_year a=Qbun_eYptAEA:10:endurance_base64_authed_username_1 a=7d_E57ReAAAA:8 a=RxpNcV5vAaEiEZTR0RsA:9 a=QEXdDO2ut3YA:10:nop_charset_2 a=xH1sMMQ5UvlYppkfzd5P:22 a=jhqOcbufqs7Y1TYCrUUU:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Cc:To:In-Reply-To:References:Message-Id: Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date:From:Sender: Reply-To: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=5wtBGq0vJL4XAkbc19nf0ldTVlrOmBZR2cPuEgdgEKc=; b=V4GYRN1miKxInLFWAjnR+6PfFI oIx5v3CAwr3BprQr3Gx45kTUS0wdhg5LY9BxSJrzq33pGNKvCL/WRM2jcLarwnxQlMKd4dbggWaRu hQmGlCufqJfcP6QuzJRQ4+wxi; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:57244 helo=[192.168.0.21]) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1pQbJu-000WcR-7I; Fri, 10 Feb 2023 14:52:38 -0700 From: Tom Tromey Date: Fri, 10 Feb 2023 14:52:57 -0700 Subject: [PATCH v2 39/48] Change some code to use value methods MIME-Version: 1.0 Message-Id: <20230209-submit-value-fixups-2023-v2-39-b0b27fd97177@tromey.com> References: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v2-0-b0b27fd97177@tromey.com> To: gdb-patches@sourceware.org Cc: Simon Marchi X-Mailer: b4 0.12.0 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: 75.166.130.93 X-Source-L: No X-Exim-ID: 1pQbJu-000WcR-7I X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 75-166-130-93.hlrn.qwest.net ([192.168.0.21]) [75.166.130.93]:57244 X-Source-Auth: tom+tromey.com X-Email-Count: 7 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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: , Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" A few functions in value.c were accessing the internal fields of struct value. However, in these cases it seemed simpler to change them to use the public API rather than convert them to be methods. Approved-By: Simon Marchi --- gdb/value.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gdb/value.c b/gdb/value.c index 0d340897f10..b36c77694f6 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -819,7 +819,7 @@ value::allocate (struct type *type) struct value *val = value::allocate_lazy (type); val->allocate_contents (); - val->m_lazy = 0; + val->set_lazy (0); return val; } @@ -1930,7 +1930,7 @@ value_of_internalvar (struct gdbarch *gdbarch, struct internalvar *var) want. */ if (var->kind != INTERNALVAR_MAKE_VALUE - && val->m_lval != lval_computed) + && val->lval () != lval_computed) { VALUE_LVAL (val) = lval_internalvar; VALUE_INTERNALVAR (val) = var; @@ -2742,15 +2742,15 @@ value_primitive_field (struct value *arg1, LONGEST offset, LONGEST container_bitsize = type->length () * 8; v = value::allocate_lazy (type); - v->m_bitsize = TYPE_FIELD_BITSIZE (arg_type, fieldno); - if ((bitpos % container_bitsize) + v->m_bitsize <= container_bitsize + v->set_bitsize (TYPE_FIELD_BITSIZE (arg_type, fieldno)); + if ((bitpos % container_bitsize) + v->bitsize () <= container_bitsize && type->length () <= (int) sizeof (LONGEST)) - v->m_bitpos = bitpos % container_bitsize; + v->set_bitpos (bitpos % container_bitsize); else - v->m_bitpos = bitpos % 8; - v->m_offset = (arg1->embedded_offset () - + offset - + (bitpos - v->m_bitpos) / 8); + v->set_bitpos (bitpos % 8); + v->set_offset ((arg1->embedded_offset () + + offset + + (bitpos - v->bitpos ()) / 8)); v->set_parent (arg1); if (!arg1->lazy ()) v->fetch_lazy (); @@ -2786,9 +2786,9 @@ value_primitive_field (struct value *arg1, LONGEST offset, value_contents_copy_raw (v, 0, arg1, 0, arg1->enclosing_type ()->length ()); } - v->m_type = type; - v->m_offset = arg1->offset (); - v->m_embedded_offset = offset + arg1->embedded_offset () + boffset; + v->deprecated_set_type (type); + v->set_offset (arg1->offset ()); + v->set_embedded_offset (offset + arg1->embedded_offset () + boffset); } else if (NULL != TYPE_DATA_LOCATION (type)) { @@ -2820,8 +2820,8 @@ value_primitive_field (struct value *arg1, LONGEST offset, arg1, arg1->embedded_offset () + offset, type_length_units (type)); } - v->m_offset = (arg1->offset () + offset - + arg1->embedded_offset ()); + v->set_offset ((arg1->offset () + offset + + arg1->embedded_offset ())); } v->set_component_location (arg1); return v; @@ -3420,7 +3420,7 @@ value_from_component (struct value *whole, struct type *type, LONGEST offset) whole, whole->embedded_offset () + offset, type_length_units (type)); } - v->m_offset = whole->offset () + offset + whole->embedded_offset (); + v->set_offset (whole->offset () + offset + whole->embedded_offset ()); v->set_component_location (whole); return v;