From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id aCZSAeiY71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:49:28 -0500 Received: by simark.ca (Postfix, from userid 112) id 9EA351F0C2; Fri, 1 Jan 2021 16:49:27 -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 3D3AB1F0BE for ; Fri, 1 Jan 2021 16:49:26 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 0A9CC3938C11; Fri, 1 Jan 2021 21:48:53 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id BB3843938380 for ; Fri, 1 Jan 2021 21:48:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BB3843938380 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 5DFAF31A74 for ; Fri, 1 Jan 2021 15:48:48 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHwk11EIiQiZvSHwki8PX; Fri, 01 Jan 2021 15:48:48 -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=3ihI26kWjaOtB9aCoI5TQdP0gyB+aT9GC562mtxfAzE=; b=s1uhYlAEkjJCV54zKpYOh+XWqp ppvq/3JCUOxILfd+BQDKl4DsvY4LFK1e4dXNj4v+PdbCzBqYPKovzJDlfxyfBuLjvKZCnz8vHrptd 3HpZ9z7/LU63qta22bdK2yrf3; 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 1kvSHw-0029t6-4K for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:48 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 167/203] Introduce ada_structop_operation Date: Fri, 1 Jan 2021 14:46:47 -0700 Message-Id: <20210101214723.1784144-168-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: 1kvSHw-0029t6-4K 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: 168 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_structop_operation, which implements STRUCTOP_STRUCT for Ada. gdb/ChangeLog 2021-01-01 Tom Tromey * ada-lang.c (ada_structop_operation::evaluate): New method. * ada-exp.h (class ada_structop_operation): New. --- gdb/ChangeLog | 5 +++++ gdb/ada-exp.h | 16 ++++++++++++++++ gdb/ada-lang.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+) diff --git a/gdb/ada-exp.h b/gdb/ada-exp.h index c87036e2d19..34b9c1d166d 100644 --- a/gdb/ada-exp.h +++ b/gdb/ada-exp.h @@ -371,6 +371,22 @@ class ada_unop_ind_operation enum noside noside) override; }; +/* Implement STRUCTOP_STRUCT for Ada. */ +class ada_structop_operation + : public structop_base_operation +{ +public: + + using structop_base_operation::structop_base_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return STRUCTOP_STRUCT; } +}; + } /* namespace expr */ #endif /* ADA_EXP_H */ diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index 6cceecc080a..c197afe7052 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -10930,6 +10930,48 @@ ada_unop_ind_operation::evaluate (struct type *expect_type, return ada_value_ind (arg1); } +value * +ada_structop_operation::evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) +{ + value *arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + const char *str = std::get<1> (m_storage).c_str (); + if (noside == EVAL_AVOID_SIDE_EFFECTS) + { + struct type *type; + struct type *type1 = value_type (arg1); + + if (ada_is_tagged_type (type1, 1)) + { + type = ada_lookup_struct_elt_type (type1, str, 1, 1); + + /* If the field is not found, check if it exists in the + extension of this object's type. This means that we + need to evaluate completely the expression. */ + + if (type == NULL) + { + arg1 = std::get<0> (m_storage)->evaluate (nullptr, exp, + EVAL_NORMAL); + arg1 = ada_value_struct_elt (arg1, str, 0); + arg1 = unwrap_value (arg1); + type = value_type (ada_to_fixed_value (arg1)); + } + } + else + type = ada_lookup_struct_elt_type (type1, str, 1, 0); + + return value_zero (ada_aligned_type (type), lval_memory); + } + else + { + arg1 = ada_value_struct_elt (arg1, str, 0); + arg1 = unwrap_value (arg1); + return ada_to_fixed_value (arg1); + } +} + } /* Implement the evaluate_exp routine in the exp_descriptor structure -- 2.26.2