From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 0H8OJOWY718XTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:25 -0500 Received: by simark.ca (Postfix, from userid 112) id 904351F0BC; Fri, 1 Jan 2021 16:49:24 -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=unavailable 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 9FC421F0BA for ; Fri, 1 Jan 2021 16:49:13 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6AA3A389852F; Fri, 1 Jan 2021 21:48:45 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 2F37B3896C2D for ; Fri, 1 Jan 2021 21:48:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2F37B3896C2D 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 C5F2B31878 for ; Fri, 1 Jan 2021 15:48:38 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHmk118NiQiZvSHmki8Jg; Fri, 01 Jan 2021 15:48:38 -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=Glor97HjN+o86ioEQ+cEwjyH0Cvqt51bofRjYdKRQXs=; b=uuoH+Wu2V35pPaYATw7EiWq1Kb 23b+vUDpxjNNGyPueOCViX40MOwUEl3INWirgrM/NFKvfVDRqV7tJjhu1UUzI9y9Vyvswo+HdErFj 1IHL0BWL+trupPALDGEHrh3iS; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60416 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 1kvSHm-0029oI-KO for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:38 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 152/203] Introduce ada_binop_addsub_operation Date: Fri, 1 Jan 2021 14:46:32 -0700 Message-Id: <20210101214723.1784144-153-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: 1kvSHm-0029oI-KO X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60416 X-Source-Auth: tom+tromey.com X-Email-Count: 153 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_addsub_operation, which implements the Ada + and - operators. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_binop_addsub_operation::evaluate): New method. * ada-exp.h (class ada_binop_addsub_operation): New. --- gdb/ChangeLog | 5 +++++ gdb/ada-exp.h | 16 ++++++++++++++++ gdb/ada-lang.c | 37 +++++++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+) diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h index de69210bd2a..ad69d939489 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -134,6 +134,22 @@ class ada_unop_range_operation { return UNOP_IN_RANGE; } }; +/* The Ada + and - operators. */ +class ada_binop_addsub_operation + : public tuple_holding_operation +{ +public: + + using tuple_holding_operation::tuple_holding_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return std::get<0> (m_storage); } +}; + } /* namespace expr */ #endif /* ADA_EXP_H */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 50b82e6bcf9..0c36ec4cd2e 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10637,6 +10637,43 @@ ada_ternop_range_operation::evaluate (struct type *expect_type, return eval_ternop_in_range (expect_type, exp, noside, arg0, arg1, arg2); } +value * +ada_binop_addsub_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *arg1 = std::get<1> (m_storage)->evaluate_with_coercion (exp, noside); + value *arg2 = std::get<2> (m_storage)->evaluate_with_coercion (exp, noside); + + auto do_op = [=] (LONGEST x, LONGEST y) + { + if (std::get<0> (m_storage) == BINOP_ADD) + return x + y; + return x - y; + }; + + if (value_type (arg1)->code () == TYPE_CODE_PTR) + return (value_from_longest + (value_type (arg1), + do_op (value_as_long (arg1), value_as_long (arg2)))); + if (value_type (arg2)->code () == TYPE_CODE_PTR) + return (value_from_longest + (value_type (arg2), + do_op (value_as_long (arg1), value_as_long (arg2)))); + if ((ada_is_gnat_encoded_fixed_point_type (value_type (arg1)) + || ada_is_gnat_encoded_fixed_point_type (value_type (arg2))) + && value_type (arg1) != value_type (arg2)) + error (_("Operands of fixed-point operation must have the same type")); + /* Do the work, and cast the result to the type of the first + argument. We cannot cast the result to a reference type, so if + ARG1 is a reference type, find its underlying type. */ + struct type *type = value_type (arg1); + while (type->code () == TYPE_CODE_REF) + type = TYPE_TARGET_TYPE (type); + binop_promote (exp->language_defn, exp->gdbarch, &arg1, &arg2); + return value_cast (type, value_binop (arg1, arg2, std::get<0> (m_storage))); +} + } /* Implement the evaluate_exp routine in the exp_descriptor structure -- 2.26.2