From patchwork Thu Feb 9 21:38:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 64561 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 A696B3885523 for ; Thu, 9 Feb 2023 21:39:47 +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 AD12E3858423 for ; Thu, 9 Feb 2023 21:38:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org AD12E3858423 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 1630B10044F57 for ; Thu, 9 Feb 2023 21:38:41 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id QEcrpLOqUGAj8QEcrphq33; Thu, 09 Feb 2023 21:38:41 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=UdyU9IeN c=1 sm=1 tr=0 ts=63e567e1 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=vOnlYMU6DkMGRwN2TKcA:9 a=QEXdDO2ut3YA:10:nop_charset_2 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=To:In-Reply-To:References:Message-Id:Content-Transfer-Encoding: Content-Type:MIME-Version:Subject:Date:From:Sender:Reply-To:Cc: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=1pzfZOVEzlduP1IkzcN9MIWyoG19h0N28imczC5McP8=; b=drHT91QiZQv2BuzYoNRzAKXnMb hc0KxQDdZFyoKkEkARpNdGzZXJ/9i1W32MwyhZTDckP4l6jqf29MUbdPu0TNDJOj97tua8ffwEDec RD8pGLGCOvcpBzqqzeunQB3x3; Received: from 75-166-130-93.hlrn.qwest.net ([75.166.130.93]:52822 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 1pQEcq-001ZcE-TV for gdb-patches@sourceware.org; Thu, 09 Feb 2023 14:38:40 -0700 From: Tom Tromey Date: Thu, 09 Feb 2023 14:38:30 -0700 Subject: [PATCH 09/47] Turn value_parent into method MIME-Version: 1.0 Message-Id: <20230209-submit-value-fixups-2023-v1-9-55dc2794dbb9@tromey.com> References: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> In-Reply-To: <20230209-submit-value-fixups-2023-v1-0-55dc2794dbb9@tromey.com> To: gdb-patches@sourceware.org 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: 1pQEcq-001ZcE-TV 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]:52822 X-Source-Auth: tom+tromey.com X-Email-Count: 10 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" This changes value_parent to be a method of value. Much of this patch was written by script. --- gdb/ada-lang.c | 2 +- gdb/dwarf2/expr.c | 2 +- gdb/valops.c | 10 +++++----- gdb/value.c | 18 ++---------------- gdb/value.h | 17 ++++++++++------- 5 files changed, 19 insertions(+), 30 deletions(-) diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index d1ad9a28ca7..b4fcce21a73 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -2842,7 +2842,7 @@ ada_value_primitive_packed_val (struct value *obj, const gdb_byte *valaddr, /* Also set the parent value. This is needed when trying to assign a new value (in inferior memory). */ - set_value_parent (v, obj); + v->set_parent (obj); } else v->set_bitsize (bit_size); diff --git a/gdb/dwarf2/expr.c b/gdb/dwarf2/expr.c index 826573b628d..2b8feffe881 100644 --- a/gdb/dwarf2/expr.c +++ b/gdb/dwarf2/expr.c @@ -171,7 +171,7 @@ rw_pieced_value (value *v, value *from, bool check_optimized) ULONGEST bits_to_skip = 8 * value_offset (v); if (v->bitsize ()) { - bits_to_skip += (8 * value_offset (value_parent (v)) + bits_to_skip += (8 * value_offset (v->parent ()) + v->bitpos ()); if (from != nullptr && (type_byte_order (from->type ()) diff --git a/gdb/valops.c b/gdb/valops.c index f17a0b6a2d0..2037a8fc8cc 100644 --- a/gdb/valops.c +++ b/gdb/valops.c @@ -1125,14 +1125,14 @@ value_assign (struct value *toval, struct value *fromval) /* Are we dealing with a bitfield? - It is important to mention that `value_parent (toval)' is + It is important to mention that `toval->parent ()' is non-NULL iff `toval->bitsize ()' is non-zero. */ if (toval->bitsize ()) { /* VALUE_INTERNALVAR below refers to the parent value, while the offset is relative to this parent value. */ - gdb_assert (value_parent (value_parent (toval)) == NULL); - offset += value_offset (value_parent (toval)); + gdb_assert (toval->parent ()->parent () == NULL); + offset += value_offset (toval->parent ()); } set_internalvar_component (VALUE_INTERNALVAR (toval), @@ -1152,7 +1152,7 @@ value_assign (struct value *toval, struct value *fromval) if (toval->bitsize ()) { - struct value *parent = value_parent (toval); + struct value *parent = toval->parent (); changed_addr = value_address (parent) + value_offset (toval); changed_len = (toval->bitpos () @@ -1215,7 +1215,7 @@ value_assign (struct value *toval, struct value *fromval) if (toval->bitsize ()) { - struct value *parent = value_parent (toval); + struct value *parent = toval->parent (); LONGEST offset = value_offset (parent) + value_offset (toval); size_t changed_len; gdb_byte buffer[sizeof (LONGEST)]; diff --git a/gdb/value.c b/gdb/value.c index 3ef1d85a20a..9704d25be76 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -905,20 +905,6 @@ set_value_offset (struct value *value, LONGEST offset) value->m_offset = offset; } -struct value * -value_parent (const struct value *value) -{ - return value->m_parent.get (); -} - -/* See value.h. */ - -void -set_value_parent (struct value *value, struct value *parent) -{ - value->m_parent = value_ref_ptr::new_reference (parent); -} - gdb::array_view value_contents_raw (struct value *value) { @@ -2900,7 +2886,7 @@ value_primitive_field (struct value *arg1, LONGEST offset, v->m_offset = (value_embedded_offset (arg1) + offset + (bitpos - v->m_bitpos) / 8); - set_value_parent (v, arg1); + v->set_parent (arg1); if (!value_lazy (arg1)) value_fetch_lazy (v); } @@ -3761,7 +3747,7 @@ value_fetch_lazy_bitfield (struct value *val) per bitfield. It would be even better to read only the containing word, but we have no way to record that just specific bits of a value have been fetched. */ - struct value *parent = value_parent (val); + struct value *parent = val->parent (); if (value_lazy (parent)) value_fetch_lazy (parent); diff --git a/gdb/value.h b/gdb/value.h index 3f48b2350b9..d0e6b0363e4 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -188,6 +188,16 @@ struct value void set_bitpos (LONGEST bit) { m_bitpos = bit; } + /* Only used for bitfields; the containing value. This allows a + single read from the target when displaying multiple + bitfields. */ + + value *parent () const + { return m_parent.get (); } + + void set_parent (struct value *parent) + { m_parent = value_ref_ptr::new_reference (parent); } + /* Type of value; either not an lval, or one of the various different possible kinds of lval. */ @@ -355,13 +365,6 @@ struct value std::vector m_optimized_out; }; -/* Only used for bitfields; the containing value. This allows a - single read from the target when displaying multiple - bitfields. */ - -struct value *value_parent (const struct value *); -extern void set_value_parent (struct value *value, struct value *parent); - /* Describes offset of a value within lval of a structure in bytes. If lval == lval_memory, this is an offset to the address. If lval == lval_register, this is a further offset from location.address