From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.80]) by sourceware.org (Postfix) with ESMTPS id A2F68394EC35 for ; Sat, 20 Feb 2021 20:16:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A2F68394EC35 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 91B9F52F44 for ; Sat, 20 Feb 2021 14:16:18 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYfqloPrISrGMDYfqlK8jG; Sat, 20 Feb 2021 14:16:18 -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=6lKoYq17+6Fo251Zx67Cjpg9Y+1rOFlREA+bvEW90Ag=; b=spkUI7+dXVJBBjSIks5sxx3N4P woMlJTjg75lN+LBspSPqEJ1Tt023Y8o4SCqqo3N2THjkvNkp4dxDp5vjO0hoYtDJOP4btdN2zve1I D2a+PkinARRc0nKal9cNxsjuE; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52676 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 1lDYfq-000GEQ-JH for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:18 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 026/206] Split out eval_op_complement Date: Sat, 20 Feb 2021 13:13:09 -0700 Message-Id: <20210220201609.838264-27-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210220201609.838264-1-tom@tromey.com> References: <20210220201609.838264-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.70.152 X-Source-L: No X-Exim-ID: 1lDYfq-000GEQ-JH X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52676 X-Source-Auth: tom+tromey.com X-Email-Count: 27 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3034.9 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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: Sat, 20 Feb 2021 20:16:31 -0000 This splits UNOP_COMPLEMENT into a new function for future use. gdb/ChangeLog 2021-02-20 Tom Tromey * eval.c (eval_op_complement): New function. (evaluate_subexp_standard): Use it. --- gdb/ChangeLog | 5 +++++ gdb/eval.c | 28 +++++++++++++++++++--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/gdb/eval.c b/gdb/eval.c index 4d344a70e90..83fce82a870 100644 --- a/gdb/eval.c +++ b/gdb/eval.c @@ -1787,6 +1787,24 @@ eval_op_neg (struct type *expect_type, struct expression *exp, } } +/* A helper function for UNOP_COMPLEMENT. */ + +static struct value * +eval_op_complement (struct type *expect_type, struct expression *exp, + enum noside noside, enum exp_opcode op, + struct value *arg1) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + if (unop_user_defined_p (UNOP_COMPLEMENT, arg1)) + return value_x_unop (arg1, UNOP_COMPLEMENT, noside); + else + { + unop_promote (exp->language_defn, exp->gdbarch, &arg1); + return value_complement (arg1); + } +} + struct value * evaluate_subexp_standard (struct type *expect_type, struct expression *exp, int *pos, @@ -2646,15 +2664,7 @@ evaluate_subexp_standard (struct type *expect_type, /* C++: check for and handle destructor names. */ arg1 = evaluate_subexp (nullptr, exp, pos, noside); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - if (unop_user_defined_p (UNOP_COMPLEMENT, arg1)) - return value_x_unop (arg1, UNOP_COMPLEMENT, noside); - else - { - unop_promote (exp->language_defn, exp->gdbarch, &arg1); - return value_complement (arg1); - } + return eval_op_complement (expect_type, exp, noside, op, arg1); case UNOP_LOGICAL_NOT: arg1 = evaluate_subexp (nullptr, exp, pos, noside); -- 2.26.2