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 E35173952537 for ; Sat, 20 Feb 2021 20:16:38 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E35173952537 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 cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway36.websitewelcome.com (Postfix) with ESMTP id C0258400CA24B for ; Sat, 20 Feb 2021 14:16:33 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYg5lk3Ybsvw9DYg5lj4cY; 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=WcrPgnexdujUqdmzIzBqqhg+jCWmp5s6VUjhCWEmnB4=; b=iQZ+7m4zQ2dKwt0/ZAzsM1nfBw y1tI+xLeTM72ZQHg7OiftX2gQzfpMItL4M40XwhHx7Rjk5ZzEafxwU067jCabvs/lxI5Gz+5zRuGj H2OIT43EPeWp9P+89UvAWIkQ5; 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-IR for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:33 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 095/206] Introduce structop_ptr_operation Date: Sat, 20 Feb 2021 13:14:18 -0700 Message-Id: <20210220201609.838264-96-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-IR 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: 96 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:47 -0000 This adds class structop_ptr_operation, which implements STRUCTOP_PTR. gdb/ChangeLog 2021-02-20 Tom Tromey * expop.h (class structop_ptr_operation): New. * eval.c (eval_op_structop_ptr): No longer static. Remove "op" parameter. --- gdb/ChangeLog | 6 ++++++ gdb/eval.c | 10 +++++----- gdb/expop.h | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 5 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 5002c25a347..2eed506f8d9 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1358,9 +1358,9 @@ eval_op_structop_struct (struct type *expect_type, struct expression *exp, /* A helper function for STRUCTOP_PTR. */ -static struct value * +struct value * eval_op_structop_ptr (struct type *expect_type, struct expression *exp, - enum noside noside, enum exp_opcode op, + enum noside noside, struct value *arg1, const char *string) { if (noside == EVAL_SKIP) @@ -1368,12 +1368,12 @@ eval_op_structop_ptr (struct type *expect_type, struct expression *exp, /* Check to see if operator '->' has been overloaded. If so replace arg1 with the value returned by evaluating operator->(). */ - while (unop_user_defined_p (op, arg1)) + while (unop_user_defined_p (STRUCTOP_PTR, arg1)) { struct value *value = NULL; try { - value = value_x_unop (arg1, op, noside); + value = value_x_unop (arg1, STRUCTOP_PTR, noside); } catch (const gdb_exception_error &except) @@ -2749,7 +2749,7 @@ evaluate_subexp_standard (struct type *expect_type, tem = longest_to_int (exp->elts[pc + 1].longconst); (*pos) += 3 + BYTES_TO_EXP_ELEM (tem + 1); arg1 = evaluate_subexp (nullptr, exp, pos, noside); - return eval_op_structop_ptr (expect_type, exp, noside, op, arg1, + return eval_op_structop_ptr (expect_type, exp, noside, arg1, &exp->elts[pc + 2].string); case STRUCTOP_MEMBER: diff --git a/gdb/expop.h b/gdb/expop.h index 9f1625ca7f7..38f3ffb5aef 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -75,6 +75,11 @@ extern struct value *eval_op_structop_struct (struct type *expect_type, enum noside noside, struct value *arg1, const char *string); +extern struct value *eval_op_structop_ptr (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct value *arg1, + const char *string); namespace expr { @@ -848,6 +853,40 @@ class structop_operation } }; +class structop_ptr_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_ptr (expect_type, exp, noside, val, + std::get<1> (m_storage).c_str ()); + } + + enum exp_opcode opcode () const override + { return STRUCTOP_PTR; } + +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_PTR, + 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