From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 014FF389364A for ; Fri, 1 Jan 2021 21:48:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 014FF389364A 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 gateway33.websitewelcome.com (Postfix) with ESMTP id 97EEFE92CB1 for ; Fri, 1 Jan 2021 15:48:13 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHNka1WdnPrxvSHNkldy6; Fri, 01 Jan 2021 15:48:13 -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=+mN96wkl48Q11PpaugWPe1OZs8lYQBG+5Mhq6l4/bJE=; b=xH8fEbDt73TvMnLSuYBK6Q0FdU oRzAuTSaTbPa9kfsF2jN968JvHgExivQnLjy/nv35ZBu7KzKS3+DQ9+WF4NS/yKG1oLZ0HhFV8rdQ c+OAfn7cybHuyFWYUJ1M0jovB; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60400 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 1kvSHN-0029XH-D8 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:13 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 099/203] Introduce binop_operation Date: Fri, 1 Jan 2021 14:45:39 -0700 Message-Id: <20210101214723.1784144-100-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: 1kvSHN-0029XH-D8 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60400 X-Source-Auth: tom+tromey.com X-Email-Count: 100 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3033.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: Fri, 01 Jan 2021 21:48:15 -0000 This adds two new template classes, binop_operation and usual_ax_binop_operation, and then uses these to implement a number of binary operations that follow similar patterns. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class binop_operation, class usual_ax_binop_operation): New. (exp_operation, intdiv_operation, mod_operation, mul_operation) (div_operation, rem_operation, lsh_operation, rsh_operation) (bitwise_and_operation, bitwise_ior_operation) (bitwise_xor_operation): New typedefs. * eval.c (eval_op_binary): No longer static. --- gdb/ChangeLog | 10 ++++++++ gdb/eval.c | 2 +- gdb/expop.h | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 1 deletion(-) diff --git a/gdb/eval.c b/gdb/eval.c index ba47f6d999d..282abc910ce 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1496,7 +1496,7 @@ eval_op_sub (struct type *expect_type, struct expression *exp, /* Helper function for several different binary operations. */ -static struct value * +struct value * eval_op_binary (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 2e846668282..f4a33f491e3 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -95,6 +95,10 @@ extern struct value *eval_op_sub (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2); +extern struct value *eval_op_binary (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, struct value *arg2); namespace expr { @@ -1030,6 +1034,73 @@ class sub_operation } }; +typedef struct value *binary_ftype (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, struct value *arg2); + +template +class binop_operation + : public maybe_constant_operation +{ +public: + + using maybe_constant_operation::maybe_constant_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + value *lhs + = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + value *rhs + = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return FUNC (expect_type, exp, noside, OP, lhs, rhs); + } + + enum exp_opcode opcode () const override + { return OP; } +}; + +template +class usual_ax_binop_operation + : public binop_operation +{ +public: + + using binop_operation::binop_operation; + +protected: + + void do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) + override + { + gen_expr_binop (exp, OP, + std::get<0> (this->m_storage).get (), + std::get<1> (this->m_storage).get (), + ax, value); + } +}; + +using exp_operation = binop_operation; +using intdiv_operation = binop_operation; +using mod_operation = binop_operation; + +using mul_operation = usual_ax_binop_operation; +using div_operation = usual_ax_binop_operation; +using rem_operation = usual_ax_binop_operation; +using lsh_operation = usual_ax_binop_operation; +using rsh_operation = usual_ax_binop_operation; +using bitwise_and_operation + = usual_ax_binop_operation; +using bitwise_ior_operation + = usual_ax_binop_operation; +using bitwise_xor_operation + = usual_ax_binop_operation; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2