From patchwork Thu Feb 9 21:38:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 64600 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 F3566382E686 for ; Thu, 9 Feb 2023 23:37:22 +0000 (GMT) X-Original-To: gdb-patches@sourceware.org Delivered-To: gdb-patches@sourceware.org Received: from progateway7-pub.mail.pro1.eigbox.com (gproxy5-pub.mail.unifiedlayer.com [67.222.38.55]) by sourceware.org (Postfix) with ESMTPS id F293B3858C2D for ; Thu, 9 Feb 2023 23:36:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org F293B3858C2D 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 cmgw10.mail.unifiedlayer.com (unknown [10.0.90.125]) by progateway7.mail.pro1.eigbox.com (Postfix) with ESMTP id 687221004817B for ; Thu, 9 Feb 2023 23:36:33 +0000 (UTC) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with ESMTP id QGSvpxeHkOscKQGSvpXStb; Thu, 09 Feb 2023 23:36:33 +0000 X-Authority-Reason: nr=8 X-Authority-Analysis: v=2.4 cv=Y5c9DjSN c=1 sm=1 tr=0 ts=63e58381 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=ZyA2r0vRcygUns3lk1sA: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=y3ZJ1TB2Y0YrThJtgmBioznSpr+bNAoVZW0bI8LGMxQ=; b=PmCJD9R5wfjLNguQyZ8Nv0jsmw DIqJfMgxuT1+UTqh/GVC2wzgRlI6DzVTlFM6jYnyY7ZvCCkshV/BdcWMe3FOHGa2pv3+ekNjdd5+U kaPRX547FgqhJLSztBYA17uRq; 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 1pQEcu-001ZcE-Ns for gdb-patches@sourceware.org; Thu, 09 Feb 2023 14:38:44 -0700 From: Tom Tromey Date: Thu, 09 Feb 2023 14:38:58 -0700 Subject: [PATCH 37/47] Turn value_non_lval and value_force_lval into methods MIME-Version: 1.0 Message-Id: <20230209-submit-value-fixups-2023-v1-37-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: 1pQEcu-001ZcE-Ns 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: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3027.6 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_non_lval and value_force_lval to be methods of value. --- gdb/eval.c | 6 +++--- gdb/infcall.c | 2 +- gdb/value.c | 30 +++++++++++++++--------------- gdb/value.h | 11 +++++++---- 4 files changed, 26 insertions(+), 23 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index dca98d07fbe..808cc916bb4 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -111,7 +111,7 @@ expression::evaluate (struct type *expect_type, enum noside noside) if (stack_temporaries.has_value () && value_in_thread_stack_temporaries (retval, inferior_thread ())) - retval = value_non_lval (retval); + retval = retval->non_lval (); return retval; } @@ -1820,7 +1820,7 @@ eval_op_postinc (struct type *expect_type, struct expression *exp, } else { - struct value *arg3 = value_non_lval (arg1); + struct value *arg3 = arg1->non_lval (); struct value *arg2; if (ptrmath_type_p (exp->language_defn, arg1->type ())) @@ -1854,7 +1854,7 @@ eval_op_postdec (struct type *expect_type, struct expression *exp, } else { - struct value *arg3 = value_non_lval (arg1); + struct value *arg3 = arg1->non_lval (); struct value *arg2; if (ptrmath_type_p (exp->language_defn, arg1->type ())) diff --git a/gdb/infcall.c b/gdb/infcall.c index d6992228498..81a073d2123 100644 --- a/gdb/infcall.c +++ b/gdb/infcall.c @@ -492,7 +492,7 @@ get_call_return_value (struct call_return_meta_info *ri) requiring GDB to evaluate the "this" pointer. To evaluate the this pointer, GDB needs the memory address of the value. */ - value_force_lval (retval, ri->struct_addr); + retval->force_lval (ri->struct_addr); push_thread_stack_temporary (thr, retval); } } diff --git a/gdb/value.c b/gdb/value.c index a9db9e04bab..9cef9f4fcea 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -1432,35 +1432,35 @@ make_cv_value (int cnst, int voltl, struct value *v) return cv_val; } -/* Return a version of ARG that is non-lvalue. */ +/* See value.h. */ struct value * -value_non_lval (struct value *arg) +value::non_lval () { - if (VALUE_LVAL (arg) != not_lval) + if (VALUE_LVAL (this) != not_lval) { - struct type *enc_type = arg->enclosing_type (); + struct type *enc_type = enclosing_type (); struct value *val = value::allocate (enc_type); - gdb::copy (arg->contents_all (), val->contents_all_raw ()); - val->m_type = arg->m_type; - val->set_embedded_offset (arg->embedded_offset ()); - val->set_pointed_to_offset (arg->pointed_to_offset ()); + gdb::copy (contents_all (), val->contents_all_raw ()); + val->m_type = m_type; + val->set_embedded_offset (embedded_offset ()); + val->set_pointed_to_offset (pointed_to_offset ()); return val; } - return arg; + return this; } -/* Write contents of V at ADDR and set its lval type to be LVAL_MEMORY. */ +/* See value.h. */ void -value_force_lval (struct value *v, CORE_ADDR addr) +value::force_lval (CORE_ADDR addr) { - gdb_assert (VALUE_LVAL (v) == not_lval); + gdb_assert (VALUE_LVAL (this) == not_lval); - write_memory (addr, v->contents_raw ().data (), v->type ()->length ()); - v->m_lval = lval_memory; - v->m_location.address = addr; + write_memory (addr, contents_raw ().data (), type ()->length ()); + m_lval = lval_memory; + m_location.address = addr; } void diff --git a/gdb/value.h b/gdb/value.h index f46d0fc9d78..ba45ad64ff0 100644 --- a/gdb/value.h +++ b/gdb/value.h @@ -533,6 +533,13 @@ struct value for LENGTH bits as optimized out. */ void mark_bits_optimized_out (LONGEST offset, LONGEST length); + /* Return a version of this that is non-lvalue. */ + struct value *non_lval (); + + /* Write contents of this value at ADDR and set its lval type to be + LVAL_MEMORY. */ + void force_lval (CORE_ADDR); + /* Type of value; either not an lval, or one of the various different possible kinds of lval. */ @@ -1412,10 +1419,6 @@ extern void preserve_values (struct objfile *); /* From values.c */ -extern struct value *value_non_lval (struct value *); - -extern void value_force_lval (struct value *, CORE_ADDR); - extern struct value *make_cv_value (int, int, struct value *); extern void preserve_one_value (struct value *, struct objfile *, htab_t);