From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id wDK8D7SY71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:36 -0500 Received: by simark.ca (Postfix, from userid 112) id 5C6AF1F0C2; Fri, 1 Jan 2021 16:48:33 -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.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RDNS_NONE,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from sourceware.org (unknown [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 69E1C1E590 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 440383893670; Fri, 1 Jan 2021 21:48:16 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id D39A638930F5 for ; Fri, 1 Jan 2021 21:48:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org D39A638930F5 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 cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 76E51D847DC for ; Fri, 1 Jan 2021 15:48:10 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHKkzb3mDT64vSHKk797X; Fri, 01 Jan 2021 15:48:10 -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=AWlph2kYZT2li3wdfVTPqJy/RjNFxlFdIJwjM+iNo8s=; b=rA55kjwpcsCkSO24mqP22dr4N8 cmLgnhCEJoUbkNYDxaQtFjwfiIs8llsoh6b296/TwYwdg9lSAQ0J+lakR3oBP7TSiD3JKnPv6rd3a KwKprqIV8Zoqlu93ziabM4uIi; 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 1kvSHK-0029Ua-8S for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:10 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 098/203] Introduce sub_operation Date: Fri, 1 Jan 2021 14:45:38 -0700 Message-Id: <20210101214723.1784144-99-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: 1kvSHK-0029Ua-8S 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: 99 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 sub_operation, which implements BINOP_SUB. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class sub_operation): New. * eval.c (eval_op_sub): 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 305143134c5..ba47f6d999d 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1468,15 +1468,15 @@ eval_op_add (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_SUB. */ -static struct value * +struct value * eval_op_sub (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_SUB, arg1, arg2)) + return value_x_binop (arg1, arg2, BINOP_SUB, OP_NULL, noside); else if (ptrmath_type_p (exp->language_defn, value_type (arg1)) && ptrmath_type_p (exp->language_defn, value_type (arg2))) { @@ -2802,7 +2802,7 @@ evaluate_subexp_standard (struct type *expect_type, case BINOP_SUB: arg1 = evaluate_subexp_with_coercion (exp, pos, noside); arg2 = evaluate_subexp_with_coercion (exp, pos, noside); - return eval_op_sub (expect_type, exp, noside, op, arg1, arg2); + return eval_op_sub (expect_type, exp, noside, arg1, arg2); case BINOP_EXP: case BINOP_MUL: diff --git a/gdb/expop.h b/gdb/expop.h index a571a262775..2e846668282 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -91,6 +91,10 @@ extern struct value *eval_op_add (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2); +extern struct value *eval_op_sub (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *arg1, struct value *arg2); namespace expr { @@ -990,6 +994,42 @@ class add_operation } }; +class sub_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_sub (expect_type, exp, noside, lhs, rhs); + } + + enum exp_opcode opcode () const override + { return BINOP_SUB; } + +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_SUB, + std::get<0> (this->m_storage).get (), + std::get<1> (this->m_storage).get (), + ax, value); + } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2