From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 4A/eCbWY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:37 -0500 Received: by simark.ca (Postfix, from userid 112) id 3EA521F071; Fri, 1 Jan 2021 16:48:34 -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.9 required=5.0 tests=DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [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 DF93E1F071 for ; Fri, 1 Jan 2021 16:48:31 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C2951389365F; Fri, 1 Jan 2021 21:48:14 +0000 (GMT) Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.187.5]) by sourceware.org (Postfix) with ESMTPS id 7C14438930EC for ; Fri, 1 Jan 2021 21:48:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7C14438930EC 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 274B2400C8BBB for ; Fri, 1 Jan 2021 15:48:09 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHJkyODpsvw9vSHJkLuEo; Fri, 01 Jan 2021 15:48:09 -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=uCSDIcbn7RrmSdZjm5PivMQFUxqpdHf0gUUMzAKl2es=; b=ajCgO8SmqAByKPHIdYeY0mhqs9 Ugs1eSXszSdqcKFOLi/bKiOz9vJIosFgTrGjDdKp6sHW32e1IBhrGa5Pm19XGZ8eBiM9/3TfmQOfq LrBOwm2NHAUMQI1pAiGDQWmsi; 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-UU for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:09 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 094/203] Introduce structop_ptr_operation Date: Fri, 1 Jan 2021 14:45:34 -0700 Message-Id: <20210101214723.1784144-95-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-UU 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: 95 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_ptr_operation, which implements STRUCTOP_PTR. gdb/ChangeLog 2021-01-01 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 2da1cf5fdbc..156ef8530ce 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1343,9 +1343,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) @@ -1353,12 +1353,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) @@ -2734,7 +2734,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 c629614f5f1..85d2eaf063a 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -74,6 +74,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 { @@ -837,6 +842,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