From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id mLbSH3WY718DTQAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:33 -0500 Received: by simark.ca (Postfix, from userid 112) id 7E5F51F0C0; 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, RCVD_IN_BL_SPAMCOP_NET,T_DKIM_INVALID,URIBL_BLOCKED autolearn=no 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 DF51E1F0AA for ; Fri, 1 Jan 2021 16:47:31 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 77214384404C; 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 045AF3846013 for ; Fri, 1 Jan 2021 21:47:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 045AF3846013 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 8DEABA6E322 for ; Fri, 1 Jan 2021 15:47:26 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGckZENYoE4DvSGckuGnV; 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=fEnAqESvw+QvzDFsFAiPaDoY33tDzEMj+b8R+6NNx/8=; b=VqptSBqu4NUX628VnGwu/go15d iBTqV3X9nT7OphgU2heh5Ea0+Uuz00Bb9RFSL6mb22HSVe5XuY2GnyHlyq7wYsQvPTj6Dctz6VEIl bwKIFo2OfXFDpqO4dmxu2ujgs; 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-Co for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:26 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 003/203] Split out eval_op_var_msym_value Date: Fri, 1 Jan 2021 14:44:03 -0700 Message-Id: <20210101214723.1784144-4-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-Co 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: 4 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_VAR_MSYM_VALUE into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * eval.c (eval_op_var_msym_value): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 26 +++++++++++++++++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 745333d31f9..e896baa3dec 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1215,6 +1215,20 @@ eval_op_var_entry_value (struct type *expect_type, struct expression *exp, return SYMBOL_COMPUTED_OPS (sym)->read_variable_at_entry (sym, frame); } +static struct value * +eval_op_var_msym_value (struct type *expect_type, struct expression *exp, + enum noside noside, + minimal_symbol *msymbol, struct objfile *objfile) +{ + value *val = evaluate_var_msym_value (noside, objfile, msymbol); + + struct type *type = value_type (val); + if (type->code () == TYPE_CODE_ERROR + && (noside != EVAL_AVOID_SIDE_EFFECTS || pc != 0)) + error_unknown_type (msymbol->print_name ()); + return val; +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -1277,15 +1291,9 @@ evaluate_subexp_standard (struct type *expect_type, (*pos) += 3; minimal_symbol *msymbol = exp->elts[pc + 2].msymbol; - value *val = evaluate_var_msym_value (noside, - exp->elts[pc + 1].objfile, - msymbol); - - type = value_type (val); - if (type->code () == TYPE_CODE_ERROR - && (noside != EVAL_AVOID_SIDE_EFFECTS || pc != 0)) - error_unknown_type (msymbol->print_name ()); - return val; + return eval_op_var_msym_value (expect_type, exp, noside, + msymbol, + exp->elts[pc + 1].objfile); } case OP_VAR_ENTRY_VALUE: -- 2.26.2