From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [50.116.126.2]) by sourceware.org (Postfix) with ESMTPS id EA0A73952DA7 for ; Sat, 20 Feb 2021 20:16:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EA0A73952DA7 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 gateway36.websitewelcome.com (Postfix) with ESMTP id E8901400CA258 for ; Sat, 20 Feb 2021 14:16:33 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYg5ldOa4HPnUDYg5l4D7e; Sat, 20 Feb 2021 14:16:33 -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=SOyNFolDi2l5gvpXAHujXtT9x1GYiOdvjAe/FbqejcA=; b=RgLuaRHFtSY1lKsYu0v6MJNCe4 lHNG/oNDPO/t7sVLVIg9RFwrIq4a5K9vxSadVN0yJLokO86+nz/K6xmQGxn6P9ERUGKmnd3OoWSgE 93CuH+yH0G42k8EPxU9BCuIc7; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52690 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 1lDYg5-000GWv-NW for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:33 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 096/206] Introduce structop_member_operation and structop_mptr_operation Date: Sat, 20 Feb 2021 13:14:19 -0700 Message-Id: <20210220201609.838264-97-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-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.70.152 X-Source-L: No X-Exim-ID: 1lDYg5-000GWv-NW X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52690 X-Source-Auth: tom+tromey.com X-Email-Count: 97 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3034.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-List-Received-Date: Sat, 20 Feb 2021 20:16:48 -0000 This adds class structop_member_operation and structop_mptr_operation, which implement STRUCTOP_MEMBER and STRUCTOP_MPTR. gdb/ChangeLog 2021-02-20 Tom Tromey * expop.h (class structop_member_operation) (class structop_mptr_operation): New. * eval.c (eval_op_member): No longer static. --- gdb/ChangeLog | 6 ++++++ gdb/eval.c | 2 +- gdb/expop.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 55 insertions(+), 1 deletion(-) diff --git a/gdb/eval.c b/gdb/eval.c index 2eed506f8d9..8c9d0ba1b1c 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1417,7 +1417,7 @@ eval_op_structop_ptr (struct type *expect_type, struct expression *exp, /* A helper function for STRUCTOP_MEMBER. */ -static struct value * +struct value * eval_op_member (struct type *expect_type, struct expression *exp, enum noside noside, struct value *arg1, struct value *arg2) diff --git a/gdb/expop.h b/gdb/expop.h index 38f3ffb5aef..cbd4d6267da 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -80,6 +80,10 @@ extern struct value *eval_op_structop_ptr (struct type *expect_type, enum noside noside, struct value *arg1, const char *string); +extern struct value *eval_op_member (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *arg1, struct value *arg2); namespace expr { @@ -887,6 +891,50 @@ class structop_ptr_operation } }; +class structop_member_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 + { + value *lhs + = std::get<0> (m_storage)->evaluate_for_address (exp, noside); + value *rhs + = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_member (expect_type, exp, noside, lhs, rhs); + } + + enum exp_opcode opcode () const override + { return STRUCTOP_MEMBER; } +}; + +class structop_mptr_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 + { + value *lhs + = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + value *rhs + = std::get<1> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_member (expect_type, exp, noside, lhs, rhs); + } + + enum exp_opcode opcode () const override + { return STRUCTOP_MPTR; } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2