From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id kBeVE+CY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:20 -0500 Received: by simark.ca (Postfix, from userid 112) id 4BCCA1F0C2; Fri, 1 Jan 2021 16:49:20 -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, RCVD_IN_BL_SPAMCOP_NET,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 2E6831F0BE for ; Fri, 1 Jan 2021 16:49:18 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F349D3898519; Fri, 1 Jan 2021 21:48:46 +0000 (GMT) Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.46.187]) by sourceware.org (Postfix) with ESMTPS id 387313896C32 for ; Fri, 1 Jan 2021 21:48:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 387313896C32 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 cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway22.websitewelcome.com (Postfix) with ESMTP id D5FB94036 for ; Fri, 1 Jan 2021 15:48:42 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHqkXB7yHPnUvSHqkgzqv; Fri, 01 Jan 2021 15:48:42 -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=Til177lt/K47X4f17XTxE7k8m9ZJo1V7V0QfFAKYHT8=; b=lAuTicv2wivxtXtFVHE3IBnGcC RIfCzZfwQqWugOQJdEeA/uUfoCoxRqS3AhtfM2y4ySmvu0AEANX1QOMyvLVEEK2UzC2lARzTxWJbQ b08jwPRCynfcLOUHoWwbx12Vi; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60418 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 1kvSHq-0029qJ-MP for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:42 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 157/203] Introduce ada_binop_in_bounds Date: Fri, 1 Jan 2021 14:46:37 -0700 Message-Id: <20210101214723.1784144-158-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: 1kvSHq-0029qJ-MP X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60418 X-Source-Auth: tom+tromey.com X-Email-Count: 158 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 ada_binop_in_bounds, which implements BINOP_IN_BOUNDS. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_binop_in_bounds): No longer static. * ada-exp.h (class ada_binop_in_bounds_operation): New. --- gdb/ChangeLog | 5 +++++ gdb/ada-exp.h | 27 +++++++++++++++++++++++++++ gdb/ada-lang.c | 2 +- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h index 96e3c407b6f..4c30734171f 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -55,6 +55,11 @@ extern struct value *ada_ternop_slice (struct expression *exp, struct value *array, struct value *low_bound_val, struct value *high_bound_val); +extern struct value *ada_binop_in_bounds (struct expression *exp, + enum noside noside, + struct value *arg1, + struct value *arg2, + int n); namespace expr { @@ -240,6 +245,28 @@ class ada_ternop_slice_operation { return TERNOP_SLICE; } }; +/* Implement BINOP_IN_BOUNDS for Ada. */ +class ada_binop_in_bounds_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 *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + value *arg2 = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return ada_binop_in_bounds (exp, noside, arg1, arg2, + std::get<2> (m_storage)); + } + + enum exp_opcode opcode () const override + { return BINOP_IN_BOUNDS; } +}; + } /* namespace expr */ #endif /* ADA_EXP_H */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 00912a4136d..8ed4949238c 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10382,7 +10382,7 @@ ada_ternop_slice (struct expression *exp, /* A helper function for BINOP_IN_BOUNDS. */ -static value * +value * ada_binop_in_bounds (struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2, int n) { -- 2.26.2