From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id B0FA8389246C for ; Fri, 1 Jan 2021 21:48:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B0FA8389246C 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 cm11.websitewelcome.com (cm11.websitewelcome.com [100.42.49.5]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 5C878CDB47F for ; Fri, 1 Jan 2021 15:48:04 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSHEka1RwnPrxvSHEkldtR; Fri, 01 Jan 2021 15:48:04 -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=m8OCrQuWfx/P1+4b8KJ6GchQwzZIocpF8SN+n7UYMrA=; b=XYbyvBKLxtYhP0NYlXits0FWHB y07sFq52bRqEkDipaQwlIs1NMzf8JoJykbayr6NTN0TEVC1oJhdJQQ4AwI/0P7f+Tk0+OjPV6dEfZ C82XdUcDMRDQeF5HVtR7tZwuQ; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60392 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 1kvSHE-0029SU-6E for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:48:04 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 081/203] Introduce func_static_var_operation Date: Fri, 1 Jan 2021 14:45:21 -0700 Message-Id: <20210101214723.1784144-82-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: 1kvSHE-0029SU-6E X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60392 X-Source-Auth: tom+tromey.com X-Email-Count: 82 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3033.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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: Fri, 01 Jan 2021 21:48:06 -0000 This adds class func_static_var_operation, which implements OP_FUNC_STATIC_VAR. gdb/ChangeLog 2021-01-01 Tom Tromey * expop.h (class func_static_var_operation): New. * eval.c (eval_op_func_static_var): No longer static. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 2 +- gdb/expop.h | 24 ++++++++++++++++++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) diff --git a/gdb/eval.c b/gdb/eval.c index 753d505b173..f28c7ace8be 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1230,7 +1230,7 @@ eval_op_var_msym_value (struct type *expect_type, struct expression *exp, return val; } -static struct value * +struct value * eval_op_func_static_var (struct type *expect_type, struct expression *exp, enum noside noside, value *func, const char *var) diff --git a/gdb/expop.h b/gdb/expop.h index d9052887739..49f1f561019 100644 --- a/gdb/expop.h +++ b/gdb/expop.h @@ -53,6 +53,10 @@ extern struct value *eval_op_var_msym_value (struct type *expect_type, extern struct value *eval_op_var_entry_value (struct type *expect_type, struct expression *exp, enum noside noside, symbol *sym); +extern struct value *eval_op_func_static_var (struct type *expect_type, + struct expression *exp, + enum noside noside, + value *func, const char *var); namespace expr { @@ -544,6 +548,26 @@ class var_entry_value_operation { return OP_VAR_ENTRY_VALUE; } }; +class func_static_var_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 + { + value *func = std::get<0> (m_storage)->evaluate (nullptr, exp, noside); + return eval_op_func_static_var (expect_type, exp, noside, func, + std::get<1> (m_storage).c_str ()); + } + + enum exp_opcode opcode () const override + { return OP_FUNC_STATIC_VAR; } +}; + } /* namespace expr */ #endif /* EXPOP_H */ -- 2.26.2