From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 2E6lC6WY71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:48:21 -0500 Received: by simark.ca (Postfix, from userid 112) id 9D22C1F0C2; Fri, 1 Jan 2021 16:48:19 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: * X-Spam-Status: No, score=1.6 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,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 A41DE1E590 for ; Fri, 1 Jan 2021 16:48:18 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 6FEB038930C7; Fri, 1 Jan 2021 21:48:06 +0000 (GMT) Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.46.187]) by sourceware.org (Postfix) with ESMTPS id 28B383892469 for ; Fri, 1 Jan 2021 21:48:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 28B383892469 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 gateway22.websitewelcome.com (Postfix) with ESMTP id 3A4723B8B for ; Fri, 1 Jan 2021 15:48:01 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHBkXAk1HPnUvSHBkgzTF; Fri, 01 Jan 2021 15:48:01 -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=mnvWrSwRSE15QbHu0pdUfhvjcf8e3qQuKI7vDOqbqDA=; b=M4kIxAAgw5PXXhSR/oNHjYilYd bHEYIsMn+Y+Wfvd+S06eigrazd1eRqoUDZaVKw8kcS9JGFi7UsIVLRlIXZX/NvgwPY2wy0sZD1JMQ VabFLWad6tght7DLBDeMVOyPN; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60390 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 1kvSHB-0029Mc-0W for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:01 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 077/203] Introduce scope_operation Date: Fri, 1 Jan 2021 14:45:17 -0700 Message-Id: <20210101214723.1784144-78-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: 1kvSHB-0029Mc-0W X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60390 X-Source-Auth: tom+tromey.com X-Email-Count: 78 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 scope_operation, an implementation of OP_SCOPE. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class scope_operation): New. * eval.c (eval_op_scope): No longer static. (scope_operation::evaluate_for_address): New method. * ax-gdb.c (scope_operation::do_generate_ax): New method. --- gdb/ChangeLog | 7 +++++++ gdb/ax-gdb.c | 14 ++++++++++++++ gdb/eval.c | 14 +++++++++++++- gdb/expop.h | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+), 1 deletion(-) diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c index 1ffa8e49bf1..6d568a71e03 100644 --- a/gdb/ax-gdb.c +++ b/gdb/ax-gdb.c @@ -45,6 +45,7 @@ #include "typeprint.h" #include "valprint.h" #include "c-lang.h" +#include "expop.h" #include "gdbsupport/format.h" @@ -2300,6 +2301,19 @@ operation::generate_ax (struct expression *exp, } } +void +scope_operation::do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) +{ + struct type *type = std::get<0> (m_storage); + const std::string &name = std::get<1> (m_storage); + int found = gen_aggregate_elt_ref (ax, value, type, name.c_str ()); + if (!found) + error (_("There is no field named %s"), name.c_str ()); +} + } /* This handles the middle-to-right-side of code generation for binary diff --git a/gdb/eval.c b/gdb/eval.c index 970e7d7c0bc..fe8698342db 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1182,7 +1182,7 @@ is_integral_or_integral_reference (struct type *type) /* Helper function that implements the body of OP_SCOPE. */ -static struct value * +struct value * eval_op_scope (struct type *expect_type, struct expression *exp, enum noside noside, struct type *type, const char *string) @@ -3264,6 +3264,18 @@ operation::evaluate_for_address (struct expression *exp, enum noside noside) return evaluate_subexp_for_address_base (exp, noside, val); } +value * +scope_operation::evaluate_for_address (struct expression *exp, + enum noside noside) +{ + value *x = value_aggregate_elt (std::get<0> (m_storage), + std::get<1> (m_storage).c_str (), + NULL, 1, noside); + if (x == NULL) + error (_("There is no field named %s"), std::get<1> (m_storage).c_str ()); + return x; +} + } /* Evaluate like `evaluate_subexp' except coercing arrays to pointers. diff --git a/gdb/expop.h b/gdb/expop.h index 6af6504332e..3fcd25ddcea 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -41,6 +41,11 @@ extern void gen_expr_structop (struct expression *exp, const char *name, struct agent_expr *ax, struct axs_value *value); +extern struct value *eval_op_scope (struct type *expect_type, + struct expression *exp, + enum noside noside, + struct type *type, const char *string); + namespace expr { @@ -413,6 +418,37 @@ class float_const_operation float_data m_data; }; +class scope_operation + : public maybe_constant_operation +{ +public: + + using maybe_constant_operation::maybe_constant_operation; + + value *evaluate (struct type *expect_type, + struct expression *exp, + enum noside noside) override + { + return eval_op_scope (expect_type, exp, noside, + std::get<0> (m_storage), + std::get<1> (m_storage).c_str ()); + } + + value *evaluate_for_address (struct expression *exp, + enum noside noside) override; + + enum exp_opcode opcode () const override + { return OP_SCOPE; } + +protected: + + void do_generate_ax (struct expression *exp, + struct agent_expr *ax, + struct axs_value *value, + struct type *cast_type) + override; +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2