From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id qGTFKOWY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:25 -0500 Received: by simark.ca (Postfix, from userid 112) id 96F3E1F0C2; Fri, 1 Jan 2021 16:49:25 -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 A5B441F0B8 for ; Fri, 1 Jan 2021 16:49:23 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 1D2953938C07; Fri, 1 Jan 2021 21:48:52 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id CA3FF389C422 for ; Fri, 1 Jan 2021 21:48:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CA3FF389C422 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 760DE31A6B for ; Fri, 1 Jan 2021 15:48:47 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHvk11DjiQiZvSHvki8P0; Fri, 01 Jan 2021 15:48:47 -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=L/6cIqE06P6rxSvEzrIyoUM6iw6crVebnCEYD+kpunU=; b=k5UUhCJxoQPUoAY6lVDlie3kiC 3Eb9oP2dDq33QiPDqtDhDnjvuQtDSpj+xbJHwB4kFQXkRRJ+Sfzjz9Kiw+ALteCBSqdtapqX4QIt4 vuABgZFM4PHbVqewDjdf4vSkJ; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60422 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 1kvSHv-0029t6-7p for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:47 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 164/203] Introduce ada_atr_val_operation Date: Fri, 1 Jan 2021 14:46:44 -0700 Message-Id: <20210101214723.1784144-165-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: 1kvSHv-0029t6-7p X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60422 X-Source-Auth: tom+tromey.com X-Email-Count: 165 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_atr_val_operation, which implements OP_ATR_VAL. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_val_atr): No longer static. (ada_atr_val_operation::evaluate): New method. * ada-exp.h (class ada_atr_val_operation): New. --- gdb/ChangeLog | 6 ++++++ gdb/ada-exp.h | 19 +++++++++++++++++++ gdb/ada-lang.c | 11 ++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h index 07744c1c8ea..c86b0548947 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -69,6 +69,9 @@ extern struct value *ada_pos_atr (struct type *expect_type, struct expression *exp, enum noside noside, enum exp_opcode op, struct value *arg); +extern struct value *ada_val_atr (enum noside noside, struct type *type, + struct value *arg); + namespace expr { @@ -334,6 +337,22 @@ class ada_var_msym_value_operation using operation::do_generate_ax; }; +/* Implement the Ada 'val attribute. */ +class ada_atr_val_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 OP_ATR_VAL; } +}; + } /* namespace expr */ #endif /* ADA_EXP_H */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 2f7eb354e4d..eb34121bf17 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -8989,7 +8989,7 @@ val_atr (struct type *type, LONGEST val) return value_from_longest (type, val); } -static struct value * +struct value * ada_val_atr (enum noside noside, struct type *type, struct value *arg) { if (noside == EVAL_AVOID_SIDE_EFFECTS) @@ -10836,6 +10836,15 @@ ada_var_value_operation::evaluate (struct type *expect_type, return ada_to_fixed_value (arg1); } +value * +ada_atr_val_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *arg = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return ada_val_atr (noside, std::get<0> (m_storage), arg); +} + } /* Implement the evaluate_exp routine in the exp_descriptor structure -- 2.26.2