From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id aHTSKHWY71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:33 -0500 Received: by simark.ca (Postfix, from userid 112) id 81F271F0AA; Fri, 1 Jan 2021 16:47:33 -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.4 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, 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 4B68B1F0B8 for ; Fri, 1 Jan 2021 16:47:32 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C3DE63844072; Fri, 1 Jan 2021 21:47:30 +0000 (GMT) Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.130]) by sourceware.org (Postfix) with ESMTPS id 31B863846033 for ; Fri, 1 Jan 2021 21:47:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 31B863846033 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 cm17.websitewelcome.com (cm17.websitewelcome.com [100.42.49.20]) by gateway33.websitewelcome.com (Postfix) with ESMTP id BADA1A6E320 for ; Fri, 1 Jan 2021 15:47:26 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGckzaggDT64vSGck78km; Fri, 01 Jan 2021 15:47:26 -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=1vl3ycz+EiJY2c1YrRqnufQWAE7c4hEK3s+EOrXTaHU=; b=VlzQH8gpEl8B1P7Z+Iou9o3uTn uMl7pZrxiyx8vHl6NqlJ5szfiAWab80Zifk1cb6rrkxBRhBP3+hnnCyrFlsFih5crrcdO6jg9DpNP /fYovWrDG33QXPYfX6df79eoH; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60372 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 1kvSGc-0028yz-IM for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:26 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 004/203] Split out eval_op_func_static_var Date: Fri, 1 Jan 2021 14:44:04 -0700 Message-Id: <20210101214723.1784144-5-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: 1kvSGc-0028yz-IM X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60372 X-Source-Auth: tom+tromey.com X-Email-Count: 5 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 splits OP_FUNC_STATIC_VAR into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_op_func_static_var): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 27 +++++++++++++++++---------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index e896baa3dec..5312525e850 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1229,6 +1229,21 @@ eval_op_var_msym_value (struct type *expect_type, struct expression *exp, return val; } +static struct value * +eval_op_func_static_var (struct type *expect_type, struct expression *exp, + enum noside noside, + value *func, const char *var) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + CORE_ADDR addr = value_address (func); + const block *blk = block_for_pc (addr); + struct block_symbol sym = lookup_symbol (var, blk, VAR_DOMAIN, NULL); + if (sym.symbol == NULL) + error (_("No symbol \"%s\" in specified context."), var); + return evaluate_var_value (noside, sym.block, sym.symbol); +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -1313,17 +1328,9 @@ evaluate_subexp_standard (struct type *expect_type, { value *func = evaluate_subexp_standard (NULL, exp, pos, noside); - CORE_ADDR addr = value_address (func); - - const block *blk = block_for_pc (addr); - const char *var = &exp->elts[pc + 2].string; - - struct block_symbol sym = lookup_symbol (var, blk, VAR_DOMAIN, NULL); - - if (sym.symbol == NULL) - error (_("No symbol \"%s\" in specified context."), var); - return evaluate_var_value (noside, sym.block, sym.symbol); + return eval_op_func_static_var (expect_type, exp, noside, func, + &exp->elts[pc + 2].string); } case OP_LAST: -- 2.26.2