From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [50.116.126.2]) by sourceware.org (Postfix) with ESMTPS id 9945D393D034 for ; Sat, 20 Feb 2021 20:16:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9945D393D034 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 cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway36.websitewelcome.com (Postfix) with ESMTP id 4ABFB400C88BA for ; Sat, 20 Feb 2021 14:16:22 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id DYfulk3OQsvw9DYfulj4SP; Sat, 20 Feb 2021 14:16:22 -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=6tVH0qQMkMv5Mu90aUzWuv+0rLvfLNO7ktyzlLOH/hA=; b=FcJGqucgn9GT+VlxN0yHu7D2oq F0FToxdZMXYJscZ5vZObWaUnbF6JCdMO6FAUkw4ehRSOh2ssmojHtm1thk+PSJCBaXlEI2T8FPx+k JOTFYyV0YhjRoYjE6KiAqDgjq; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:52680 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 1lDYfu-000GJm-2K for gdb-patches@sourceware.org; Sat, 20 Feb 2021 13:16:22 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH v3 041/206] Split out eval_op_f_cmplx Date: Sat, 20 Feb 2021 13:13:24 -0700 Message-Id: <20210220201609.838264-42-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: 1lDYfu-000GJm-2K X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:52680 X-Source-Auth: tom+tromey.com X-Email-Count: 42 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, 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:24 -0000 This splits BINOP_FORTRAN_CMPLX into a new function for future use. gdb/ChangeLog 2021-02-20 Tom Tromey * f-lang.c (eval_op_f_cmplx): New function. (evaluate_subexp_f): Use it. --- gdb/ChangeLog | 5 +++++ gdb/f-lang.c | 18 ++++++++++++++---- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/gdb/f-lang.c b/gdb/f-lang.c index f40cdaccebb..2c67631a862 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -945,6 +945,19 @@ eval_op_f_modulo (struct type *expect_type, struct expression *exp, error (_("MODULO of type %s not supported"), TYPE_SAFE_NAME (type)); } +/* A helper function for BINOP_FORTRAN_CMPLX. */ + +static struct value * +eval_op_f_cmplx (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *arg1, struct value *arg2) +{ + if (noside == EVAL_SKIP) + return eval_skip_value (exp); + struct type *type = builtin_f_type(exp->gdbarch)->builtin_complex_s16; + return value_literal_complex (arg1, arg2, type); +} + /* Special expression evaluation cases for Fortran. */ static struct value * @@ -1046,10 +1059,7 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp, case BINOP_FORTRAN_CMPLX: arg1 = evaluate_subexp (nullptr, exp, pos, noside); arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside); - if (noside == EVAL_SKIP) - return eval_skip_value (exp); - type = builtin_f_type(exp->gdbarch)->builtin_complex_s16; - return value_literal_complex (arg1, arg2, type); + return eval_op_f_cmplx (expect_type, exp, noside, arg1, arg2); case UNOP_FORTRAN_KIND: arg1 = evaluate_subexp (NULL, exp, pos, EVAL_AVOID_SIDE_EFFECTS); -- 2.26.2