From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id OFPiI7aY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:38 -0500 Received: by simark.ca (Postfix, from userid 112) id 9D1A01E590; Fri, 1 Jan 2021 16:48:37 -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 2A2EB1F0AA for ; Fri, 1 Jan 2021 16:48:32 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 199CA3893666; Fri, 1 Jan 2021 21:48:15 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 5030F38930DB for ; Fri, 1 Jan 2021 21:48:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5030F38930DB 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 cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway31.websitewelcome.com (Postfix) with ESMTP id E79152F6EC for ; Fri, 1 Jan 2021 15:48:09 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHJk10sPiQiZvSHJki83v; Fri, 01 Jan 2021 15:48:09 -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=0068lvvTHPBz7mPS/2TZCFZvX4CZT3vdqiodCKbVKZo=; b=FtFaERlHP8wjxx0CASnVU5D6TT F0Vbdm6onFkJfz50uYyZmOnwTL1Eg4cjXAc0C3DHSi/OdxVmTwtAxx10dhjWAHV7YgQyVtLzA4n3G +yhYawEuMUmEhyRB/X30bWDRs; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60394 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 1kvSHJ-0029Ua-Iv for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:09 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 097/203] Introduce add_operation Date: Fri, 1 Jan 2021 14:45:37 -0700 Message-Id: <20210101214723.1784144-98-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: 1kvSHJ-0029Ua-Iv X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60394 X-Source-Auth: tom+tromey.com X-Email-Count: 98 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 add_operation, which implements BINOP_ADD. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class add_operation): New. * eval.c (eval_op_add): No longer static. Remove "op" parameter. (evaluate_subexp_standard): Update. --- gdb/ChangeLog | 6 ++++++ gdb/eval.c | 10 +++++----- gdb/expop.h | 40 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 5 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 3942e4afaf2..305143134c5 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1444,15 +1444,15 @@ eval_op_member (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_ADD. */ -static struct value * +struct value * eval_op_add (struct type *expect_type, struct expression *exp, - enum noside noside, enum exp_opcode op, + enum noside noside, struct value *arg1, struct value *arg2) { if (noside == EVAL_SKIP) return eval_skip_value (exp); - if (binop_user_defined_p (op, arg1, arg2)) - return value_x_binop (arg1, arg2, op, OP_NULL, noside); + if (binop_user_defined_p (BINOP_ADD, arg1, arg2)) + return value_x_binop (arg1, arg2, BINOP_ADD, OP_NULL, noside); else if (ptrmath_type_p (exp->language_defn, value_type (arg1)) && is_integral_or_integral_reference (value_type (arg2))) return value_ptradd (arg1, value_as_long (arg2)); @@ -2797,7 +2797,7 @@ evaluate_subexp_standard (struct type *expect_type, case BINOP_ADD: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (exp, pos, noside); - return eval_op_add (expect_type, exp, noside, op, arg1, arg2); + return eval_op_add (expect_type, exp, noside, arg1, arg2); case BINOP_SUB: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); diff --git a/gdb/expop.h b/gdb/expop.h index 9b7119b9e92..a571a262775 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -87,6 +87,10 @@ extern struct value *eval_op_concat (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2); +extern struct value *eval_op_add (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *arg1, struct value *arg2); namespace expr { @@ -950,6 +954,42 @@ class concat_operation { return BINOP_CONCAT; } }; +class add_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_with_coercion (exp, noside); + value *rhs + = std::get<1> (m_storage)->evaluate_with_coercion (exp, noside); + return eval_op_add (expect_type, exp, noside, lhs, rhs); + } + + enum exp_opcode opcode () const override + { return BINOP_ADD; } + +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, BINOP_ADD, + std::get<0> (this->m_storage).get (), + std::get<1> (this->m_storage).get (), + ax, value); + } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2