From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id CKB7E6+Y71/aTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:31 -0500 Received: by simark.ca (Postfix, from userid 112) id 3FE321E590; Fri, 1 Jan 2021 16:48:31 -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 750E31E590 for ; Fri, 1 Jan 2021 16:48:30 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A92CD3893648; Fri, 1 Jan 2021 21:48:13 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id 4777238930E7 for ; Fri, 1 Jan 2021 21:48:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4777238930E7 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 gateway31.websitewelcome.com (Postfix) with ESMTP id E79B52F6F1 for ; Fri, 1 Jan 2021 15:48:08 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHIkJATKuDoAvSHIkccOp; Fri, 01 Jan 2021 15:48:08 -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=JpE6qaYhYSy3e6fuRJ0A8JpxqRYOgbbjXKnRnFaTMaM=; b=CTJEgaqTz089RMOSiAIjMa/sbf sAfld5TAF2iR8Ft/mIwq+RjOn3Zd9dCQYvskgEtcK0SRs1cs4WE5edUpakSWbwoJDbaGI/YR6Id1y ZeBsqyQb1zXan1PMtUEAYZOFW; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60394 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 1kvSHI-0029Ua-P1 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:08 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 093/203] Introduce structop_operation Date: Fri, 1 Jan 2021 14:45:33 -0700 Message-Id: <20210101214723.1784144-94-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: 1kvSHI-0029Ua-P1 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60394 X-Source-Auth: tom+tromey.com X-Email-Count: 94 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 structop_base_operation and structop_operation, which implement STRUCTOP_STRUCT. The base class exists to unify the completion code between STRUCTOP_STRUCT and STRUCTOP_PTR. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class structop_base_operation) (class structop_operation): New. * eval.c (eval_op_structop_struct): No longer static. --- gdb/ChangeLog | 6 +++++ gdb/eval.c | 2 +- gdb/expop.h | 62 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 69 insertions(+), 1 deletion(-) diff --git a/gdb/eval.c b/gdb/eval.c index 217e37b8530..2da1cf5fdbc 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1327,7 +1327,7 @@ eval_op_ternop (struct type *expect_type, struct expression *exp, /* A helper function for STRUCTOP_STRUCT. */ -static struct value * +struct value * eval_op_structop_struct (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, const char *string) diff --git a/gdb/expop.h b/gdb/expop.h index 88ceb6033ac..c629614f5f1 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -69,6 +69,11 @@ extern struct value *eval_op_ternop (struct type *expect_type, enum noside noside, struct value *array, struct value *low, struct value *upper); +extern struct value *eval_op_structop_struct (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *arg1, + const char *string); namespace expr { @@ -775,6 +780,63 @@ class complex_operation { return OP_COMPLEX; } }; +class structop_base_operation + : public tuple_holding_operation +{ +public: + + /* Used for completion. Return the field name. */ + const std::string &get_string () const + { + return std::get<1> (m_storage); + } + + /* Used for completion. Evaluate the LHS for type. */ + value *evaluate_lhs (struct expression *exp) + { + return std::get<0> (m_storage)->evaluate (nullptr, exp, + EVAL_AVOID_SIDE_EFFECTS); + } + +protected: + + using tuple_holding_operation::tuple_holding_operation; +}; + +class 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 + { + value *val =std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_structop_struct (expect_type, exp, noside, val, + std::get<1> (m_storage).c_str ()); + } + + enum exp_opcode opcode () const override + { return STRUCTOP_STRUCT; } + +protected: + + void do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) + override + { + gen_expr_structop (exp, STRUCTOP_STRUCT, + std::get<0> (this->m_storage).get (), + std::get<1> (this->m_storage).c_str (), + ax, value); + } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2