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 C687F38460A3 for ; Fri, 1 Jan 2021 21:47:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C687F38460A3 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 cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway33.websitewelcome.com (Postfix) with ESMTP id 6688CA6E327 for ; Fri, 1 Jan 2021 15:47:26 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGckZENSoE4DvSGckuGnQ; 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=zcQIV/z/XgBCApbKfso+U90HohTaAIA00j/tzSXtppM=; b=O7jy00t2/IDQsu2WlD++mk0d8O qSEaphD/SFNab5K4Zxy5g2Yqh/U/zjYILd7At2877Bix0BGkIJli1P9lLPNUJBx1P/o+S9s2sgfaH VNL8+36J/xFycdy27O+fYUYK8; 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-72 for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:26 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 002/203] Split out eval_op_var_entry_value Date: Fri, 1 Jan 2021 14:44:02 -0700 Message-Id: <20210101214723.1784144-3-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-72 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: 3 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3030.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_STOCKGEN, RCVD_IN_ABUSEAT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_BL_SPAMCOP_NET, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=no 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:47:28 -0000 This splits OP_VAR_ENTRY_VALUE into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_op_var_entry_value): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 34 +++++++++++++++++++++------------- 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 74123b0d13f..745333d31f9 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1195,6 +1195,26 @@ eval_op_scope (struct type *expect_type, struct expression *exp, return arg1; } +/* Helper function that implements the body of OP_VAR_ENTRY_VALUE. */ + +static struct value * +eval_op_var_entry_value (struct type *expect_type, struct expression *exp, + enum noside noside, symbol *sym) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + if (noside == EVAL_AVOID_SIDE_EFFECTS) + return value_zero (SYMBOL_TYPE (sym), not_lval); + + if (SYMBOL_COMPUTED_OPS (sym) == NULL + || SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry == NULL) + error (_("Symbol \"%s\" does not have any specific entry value"), + sym->print_name ()); + + struct frame_info *frame = get_selected_frame (NULL); + return SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry (sym, frame); +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -1270,23 +1290,11 @@ evaluate_subexp_standard (struct type *expect_type, case OP_VAR_ENTRY_VALUE: (*pos) += 2; - if (noside == EVAL_SKIP) - return eval_skip_value (exp); { struct symbol *sym = exp->elts[pc + 1].symbol; - struct frame_info *frame; - - if (noside == EVAL_AVOID_SIDE_EFFECTS) - return value_zero (SYMBOL_TYPE (sym), not_lval); - - if (SYMBOL_COMPUTED_OPS (sym) == NULL - || SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry == NULL) - error (_("Symbol \"%s\" does not have any specific entry value"), - sym->print_name ()); - frame = get_selected_frame (NULL); - return SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry (sym, frame); + return eval_op_var_entry_value (expect_type, exp, noside, sym); } case OP_FUNC_STATIC_VAR: -- 2.26.2