From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id UMPWBo6Y71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:58 -0500 Received: by simark.ca (Postfix, from userid 112) id 1568F1F0BC; Fri, 1 Jan 2021 16:47:58 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: * X-Spam-Status: No, score=1.6 required=5.0 tests=DKIM_SIGNED,MAILING_LIST_MULTI, RCVD_IN_BL_SPAMCOP_NET,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 21B9B1F071 for ; Fri, 1 Jan 2021 16:47:57 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 547F1388E82F; Fri, 1 Jan 2021 21:47:49 +0000 (GMT) Received: from gateway22.websitewelcome.com (gateway22.websitewelcome.com [192.185.46.187]) by sourceware.org (Postfix) with ESMTPS id A18AA386F803 for ; Fri, 1 Jan 2021 21:47:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A18AA386F803 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 cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway22.websitewelcome.com (Postfix) with ESMTP id 4BC445EBB for ; Fri, 1 Jan 2021 15:47:45 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGvkXAcYHPnUvSGvkgzLv; Fri, 01 Jan 2021 15:47:45 -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=OJ0PdvX4Y+ouC4ix/bsoX6jE/xs/1+d+RUquoqvmjDg=; b=eEH6ol7fpIvmCi8UF7oF7rr2Xe 483XtygItWy5iBhodR5BLns9TMncEiBVWkcib0IvkqoVT0VOewYfpXAsiX5rZFMg0t2ElBTHLwRiK qVs6zHpzGKzadDMg36IV32UT/; Received: from 97-122-81-39.hlrn.qwest.net ([97.122.81.39]:60382 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 1kvSGv-0029BJ-2E for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:45 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 043/203] Split out eval_op_f_kind Date: Fri, 1 Jan 2021 14:44:43 -0700 Message-Id: <20210101214723.1784144-44-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: 1kvSGv-0029BJ-2E X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-81-39.hlrn.qwest.net (localhost.localdomain) [97.122.81.39]:60382 X-Source-Auth: tom+tromey.com X-Email-Count: 44 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 UNOP_FORTRAN_KIND into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * f-lang.c (eval_op_f_kind): New function. (evaluate_subexp_f): Use it. --- gdb/ChangeLog | 5 +++++ gdb/f-lang.c | 43 ++++++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 949812cc15a..d0932389726 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -861,6 +861,31 @@ eval_op_f_cmplx (struct type *expect_type, struct expression *exp, return value_literal_complex (arg1, arg2, type); } +/* A helper function for UNOP_FORTRAN_KIND. */ + +static struct value * +eval_op_f_kind (struct type *expect_type, struct expression *exp, + enum noside noside, + struct value *arg1) +{ + struct type *type = value_type (arg1); + + switch (type->code ()) + { + case TYPE_CODE_STRUCT: + case TYPE_CODE_UNION: + case TYPE_CODE_MODULE: + case TYPE_CODE_FUNC: + error (_("argument to kind must be an intrinsic type")); + } + + if (!TYPE_TARGET_TYPE (type)) + return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, + TYPE_LENGTH (type)); + return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, + TYPE_LENGTH (TYPE_TARGET_TYPE (type))); +} + /* Special expression evaluation cases for Fortran. */ static struct value * @@ -911,23 +936,7 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp, case UNOP_FORTRAN_KIND: arg1 = evaluate_subexp (NULL, exp, pos, EVAL_AVOID_SIDE_EFFECTS); - type = value_type (arg1); - - switch (type->code ()) - { - case TYPE_CODE_STRUCT: - case TYPE_CODE_UNION: - case TYPE_CODE_MODULE: - case TYPE_CODE_FUNC: - error (_("argument to kind must be an intrinsic type")); - } - - if (!TYPE_TARGET_TYPE (type)) - return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, - TYPE_LENGTH (type)); - return value_from_longest (builtin_type (exp->gdbarch)->builtin_int, - TYPE_LENGTH (TYPE_TARGET_TYPE (type))); - + return eval_op_f_kind (expect_type, exp, noside, arg1); case OP_F77_UNDETERMINED_ARGLIST: /* Remember that in F77, functions, substring ops and array subscript -- 2.26.2