From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sIFPEIqY71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:54 -0500 Received: by simark.ca (Postfix, from userid 112) id 26EA91F0BA; Fri, 1 Jan 2021 16:47:53 -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, 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 EAF891F0B8 for ; Fri, 1 Jan 2021 16:47:51 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 79F11386F803; Fri, 1 Jan 2021 21:47:47 +0000 (GMT) Received: from gateway31.websitewelcome.com (gateway31.websitewelcome.com [192.185.143.47]) by sourceware.org (Postfix) with ESMTPS id B784F386F447 for ; Fri, 1 Jan 2021 21:47:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B784F386F447 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 cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway31.websitewelcome.com (Postfix) with ESMTP id 56ECF2B86D for ; Fri, 1 Jan 2021 15:47:44 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGuk10ekiQiZvSGuki7qU; Fri, 01 Jan 2021 15:47:44 -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=lzppva34fGZr45NjDqON9SCGSYCQqTylH/xdTswbCqY=; b=HmA3jBDhDfcr5r7G0Pw9PZZTFC eD8gTPAYTYQr5heruSE462D1vdjX7eRS78Z9r7o30UVkyDQppzkYMvc81/cuuR0N2exGSg4XOEwuI +r4Oixa7EV5gKPQtBbH2/TJ4s; 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 1kvSGu-0029BJ-4q for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:44 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 038/203] Split out eval_op_f_mod Date: Fri, 1 Jan 2021 14:44:38 -0700 Message-Id: <20210101214723.1784144-39-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: 1kvSGu-0029BJ-4q 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: 39 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 BINOP_MOD into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * f-lang.c (eval_op_f_mod): New function. (evaluate_subexp_f): Use it. --- gdb/ChangeLog | 5 ++++ gdb/f-lang.c | 68 +++++++++++++++++++++++++++++---------------------- 2 files changed, 44 insertions(+), 29 deletions(-) diff --git a/gdb/f-lang.c b/gdb/f-lang.c index 2098a89e133..5dcbb8194fa 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -731,6 +731,44 @@ eval_op_f_abs (struct type *expect_type, struct expression *exp, error (_("ABS of type %s not supported"), TYPE_SAFE_NAME (type)); } +/* A helper function for BINOP_MOD. */ + +static struct value * +eval_op_f_mod (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 = value_type (arg1); + if (type->code () != value_type (arg2)->code ()) + error (_("non-matching types for parameters to MOD ()")); + switch (type->code ()) + { + case TYPE_CODE_FLT: + { + double d1 + = target_float_to_host_double (value_contents (arg1), + value_type (arg1)); + double d2 + = target_float_to_host_double (value_contents (arg2), + value_type (arg2)); + double d3 = fmod (d1, d2); + return value_from_host_double (type, d3); + } + case TYPE_CODE_INT: + { + LONGEST v1 = value_as_long (arg1); + LONGEST v2 = value_as_long (arg2); + if (v2 == 0) + error (_("calling MOD (N, 0) is undefined")); + LONGEST v3 = v1 - (v1 / v2) * v2; + return value_from_longest (value_type (arg1), v3); + } + } + error (_("MOD of type %s not supported"), TYPE_SAFE_NAME (type)); +} + /* Special expression evaluation cases for Fortran. */ static struct value * @@ -759,35 +797,7 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp, case BINOP_MOD: 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 = value_type (arg1); - if (type->code () != value_type (arg2)->code ()) - error (_("non-matching types for parameters to MOD ()")); - switch (type->code ()) - { - case TYPE_CODE_FLT: - { - double d1 - = target_float_to_host_double (value_contents (arg1), - value_type (arg1)); - double d2 - = target_float_to_host_double (value_contents (arg2), - value_type (arg2)); - double d3 = fmod (d1, d2); - return value_from_host_double (type, d3); - } - case TYPE_CODE_INT: - { - LONGEST v1 = value_as_long (arg1); - LONGEST v2 = value_as_long (arg2); - if (v2 == 0) - error (_("calling MOD (N, 0) is undefined")); - LONGEST v3 = v1 - (v1 / v2) * v2; - return value_from_longest (value_type (arg1), v3); - } - } - error (_("MOD of type %s not supported"), TYPE_SAFE_NAME (type)); + return eval_op_f_mod (expect_type, exp, noside, arg1, arg2); case UNOP_FORTRAN_CEILING: { -- 2.26.2