From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway21.websitewelcome.com (gateway21.websitewelcome.com [192.185.45.163]) by sourceware.org (Postfix) with ESMTPS id A70B13951C03 for ; Sat, 20 Feb 2021 20:16:35 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A70B13951C03 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 gateway21.websitewelcome.com (Postfix) with ESMTP id 54766400C5B3C for ; Sat, 20 Feb 2021 14:16:35 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYg7lIhYNuDoADYg7lBfpp; Sat, 20 Feb 2021 14:16:35 -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=9Uqlmuy2404YgeCyGL0pR5ffBSiDpmdLdfcczkjXPyo=; b=Qla5TUOagblfs+PMwH1IUF2Mvy oxJmWD0/Cu7dkmCpCE9gYATD0lnbyX0zEcMomOQ4hcgBop7WMDyqUcSNae06M/s8B5RiC1vxrLjfE wv02PntdvQdxF+UNheuxjTuHT; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52692 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 1lDYg7-000GZH-53 for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:35 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 102/206] Implement binary comparison operations Date: Sat, 20 Feb 2021 13:14:25 -0700 Message-Id: <20210220201609.838264-103-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-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.70.152 X-Source-L: No X-Exim-ID: 1lDYg7-000GZH-53 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52692 X-Source-Auth: tom+tromey.com X-Email-Count: 103 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3032.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L3, 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: Sat, 20 Feb 2021 20:16:42 -0000 This implements the binary comparison operations via a template class. gdb/ChangeLog 2021-02-20 Tom Tromey * expop.h (class comparison_operation): New. (equal_operation, notequal_operation, less_operation) (gtr_operation, geq_operation, leq_operation): New typedefs. * eval.c (eval_op_equal, eval_op_notequal, eval_op_less) (eval_op_gtr, eval_op_geq, eval_op_leq): No longer static. --- gdb/ChangeLog | 8 +++++++ gdb/eval.c | 12 +++++------ gdb/expop.h | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 6 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index cd17b27c14e..014e79cd08c 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1594,7 +1594,7 @@ eval_op_subscript (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_EQUAL. */ -static struct value * +struct value * eval_op_equal (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) @@ -1617,7 +1617,7 @@ eval_op_equal (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_NOTEQUAL. */ -static struct value * +struct value * eval_op_notequal (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) @@ -1640,7 +1640,7 @@ eval_op_notequal (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_LESS. */ -static struct value * +struct value * eval_op_less (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) @@ -1663,7 +1663,7 @@ eval_op_less (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_GTR. */ -static struct value * +struct value * eval_op_gtr (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) @@ -1686,7 +1686,7 @@ eval_op_gtr (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_GEQ. */ -static struct value * +struct value * eval_op_geq (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2) @@ -1709,7 +1709,7 @@ eval_op_geq (struct type *expect_type, struct expression *exp, /* A helper function for BINOP_LEQ. */ -static struct value * +struct value * eval_op_leq (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 5c3b0afee55..af378d011f8 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -105,6 +105,36 @@ extern struct value *eval_op_subscript (struct type *expect_type, enum noside noside, enum exp_opcode op, struct value *arg1, struct value *arg2); +extern struct value *eval_op_equal (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, + struct value *arg2); +extern struct value *eval_op_notequal (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, + struct value *arg2); +extern struct value *eval_op_less (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, + struct value *arg2); +extern struct value *eval_op_gtr (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, + struct value *arg2); +extern struct value *eval_op_geq (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, + struct value *arg2); +extern struct value *eval_op_leq (struct type *expect_type, + struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1, + struct value *arg2); namespace expr { @@ -1128,6 +1158,36 @@ class subscript_operation enum noside noside) override; }; +/* Implementation of comparison operations. */ +template +class comparison_operation + : public usual_ax_binop_operation +{ +public: + + using usual_ax_binop_operation::usual_ax_binop_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + value *lhs + = std::get<0> (this->m_storage)->evaluate (nullptr, exp, noside); + value *rhs + = std::get<1> (this->m_storage)->evaluate (value_type (lhs), exp, + noside); + return FUNC (expect_type, exp, noside, OP, lhs, rhs); + } +}; + +using equal_operation = comparison_operation; +using notequal_operation + = comparison_operation; +using less_operation = comparison_operation; +using gtr_operation = comparison_operation; +using geq_operation = comparison_operation; +using leq_operation = comparison_operation; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2