From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id API1KMaY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:54 -0500 Received: by simark.ca (Postfix, from userid 112) id 96CEE1F0BC; Fri, 1 Jan 2021 16:48:54 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id B58281F0AA for ; Fri, 1 Jan 2021 16:48:50 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BCC733896817; Fri, 1 Jan 2021 21:48:27 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 7507A3894C39 for ; Fri, 1 Jan 2021 21:48:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7507A3894C39 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 gateway31.websitewelcome.com (Postfix) with ESMTP id 18A9731857 for ; Fri, 1 Jan 2021 15:48:24 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHYkJAawuDoAvSHYkccWN; Fri, 01 Jan 2021 15:48:24 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type: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=Q8RkZAwpDgMFgIitEUSblkQK+3fJ9wEQyWJhs8RWNoY=; b=VPNNADhNFFzYeNMszSAv1OsjNy bA1WJLIT1cVPrGcNFMSvK4agCuXrwepexziJxDgsZRc5WPJWhEFxf1l34eYUpv7OqLmPFdILuJYsX 0R3r8LV9aHDed4pDbhMwbJc3J; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60410 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1kvSHX-0029f3-Sn for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:23 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 118/203] Introduce assign_modify_operation Date: Fri, 1 Jan 2021 14:45:58 -0700 Message-Id: <20210101214723.1784144-119-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210101214723.1784144-1-tom@tromey.com> References: <20210101214723.1784144-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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.122.81.39 X-Source-L: No X-Exim-ID: 1kvSHX-0029f3-Sn X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60410 X-Source-Auth: tom+tromey.com X-Email-Count: 119 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes 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@sourceware.org Sender: "Gdb-patches" This adds class assign_modify_operation, which implements BINOP_ASSIGN_MODIFY. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class assign_modify_operation): New. * eval.c (eval_binop_assign_modify): No longer static. * ax-gdb.c (assign_modify_operation::do_generate_ax): New method. --- gdb/ChangeLog | 6 ++++++ gdb/ax-gdb.c | 42 ++++++++++++++++++++++++++++++++++++++++++ gdb/eval.c | 2 +- gdb/expop.h | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 1 deletion(-) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index d8b5ed78a40..f81e5b9ad29 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -2609,6 +2609,48 @@ assign_operation::do_generate_ax (struct expression *exp, "may not assign to it"), name); } +void +assign_modify_operation::do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) +{ + operation *subop = std::get<1> (m_storage).get (); + if (subop->opcode () != OP_INTERNALVAR) + error (_("May only assign to trace state variables")); + + internalvar_operation *ivarop + = dynamic_cast (subop); + gdb_assert (ivarop != nullptr); + + const char *name = internalvar_name (ivarop->get_internalvar ()); + struct trace_state_variable *tsv; + + tsv = find_trace_state_variable (name); + if (tsv) + { + /* The tsv will be the left half of the binary operation. */ + ax_tsv (ax, aop_getv, tsv->number); + if (ax->tracing) + ax_tsv (ax, aop_tracev, tsv->number); + /* Trace state variables are always 64-bit integers. */ + struct axs_value value1, value2; + value1.kind = axs_rvalue; + value1.type = builtin_type (ax->gdbarch)->builtin_long_long; + /* Now do right half of expression. */ + std::get<2> (m_storage)->generate_ax (exp, ax, &value2); + gen_expr_binop_rest (exp, std::get<0> (m_storage), ax, + value, &value1, &value2); + /* We have a result of the binary op, set the tsv. */ + ax_tsv (ax, aop_setv, tsv->number); + if (ax->tracing) + ax_tsv (ax, aop_tracev, tsv->number); + } + else + error (_("$%s is not a trace state variable, " + "may not assign to it"), name); +} + } /* This handles the middle-to-right-side of code generation for binary diff --git a/gdb/eval.c b/gdb/eval.c index 65214a2bd3a..51a737ac5a5 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -2049,7 +2049,7 @@ eval_op_type (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_ASSIGN_MODIFY. */ -static struct value * +struct value * eval_binop_assign_modify (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) diff --git a/gdb/expop.h b/gdb/expop.h index 5acbca3db61..b0ed119a989 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -196,6 +196,12 @@ extern struct value *eval_op_memval (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct type *type); +extern struct value *eval_binop_assign_modify (struct type *expect_type, + struct expression *exp, + enum noside noside, + enum exp_opcode op, + struct value *arg1, + struct value *arg2); namespace expr { @@ -1789,6 +1795,36 @@ class assign_operation override; }; +/* Assignment with modification, like "+=". */ +class assign_modify_operation + : public tuple_holding_operation +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + value *lhs = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + value *rhs = std::get<2> (m_storage)->evaluate (expect_type, exp, noside); + return eval_binop_assign_modify (expect_type, exp, noside, + std::get<0> (m_storage), lhs, rhs); + } + + enum exp_opcode opcode () const override + { return BINOP_ASSIGN_MODIFY; } + +protected: + + void do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) + override; +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2