From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id sCqEFI2Y71/2TAAAWB0awg (envelope-from ) for ; Fri, 01 Jan 2021 16:47:57 -0500 Received: by simark.ca (Postfix, from userid 112) id 364171E590; Fri, 1 Jan 2021 16:47:56 -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 98D941F071 for ; Fri, 1 Jan 2021 16:47:54 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 62EB0388E81F; Fri, 1 Jan 2021 21:47:48 +0000 (GMT) Received: from gateway36.websitewelcome.com (gateway36.websitewelcome.com [192.185.187.5]) by sourceware.org (Postfix) with ESMTPS id 4BE56386F00B for ; Fri, 1 Jan 2021 21:47:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4BE56386F00B 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 DF706400C8AC2 for ; Fri, 1 Jan 2021 15:47:44 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id vSGukyO16svw9vSGukLu2H; 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=HFPlNuTwA22i/lUyTbuQlgwPz1SJHEZ/SGSP6IpOycY=; b=epHchz6EETv7KYMS18jUZh427z Nez+HyHoWVWVkup9MxUeytRGeWKg7kmmNoEyfG67Mj96wKFzDG/ZWq3b+xSjlJrNsMSv+Gk+Xi0AM MSyQkIBxypRpEkrMmRNBodyeR; 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-MG for gdb-patches@sourceware.org; Fri, 01 Jan 2021 14:47:44 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 041/203] Split out eval_op_f_modulo Date: Fri, 1 Jan 2021 14:44:41 -0700 Message-Id: <20210101214723.1784144-42-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-MG 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: 42 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_FORTRAN_MODULO into a new function for future use. gdb/ChangeLog 2021-01-01 Tom Tromey * f-lang.c (eval_op_f_modulo): New function. (evaluate_subexp_f): Use it. --- gdb/ChangeLog | 5 ++++ gdb/f-lang.c | 80 ++++++++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 36 deletions(-) diff --git a/gdb/f-lang.c b/gdb/f-lang.c index df77a852fbc..b127f6edf05 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -807,6 +807,47 @@ eval_op_f_floor (struct type *expect_type, struct expression *exp, return value_from_host_double (type, val); } +/* A helper function for BINOP_FORTRAN_MODULO. */ + +static struct value * +eval_op_f_modulo (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 MODULO ()")); + /* MODULO(A, P) = A - FLOOR (A / P) * P */ + switch (type->code ()) + { + case TYPE_CODE_INT: + { + LONGEST a = value_as_long (arg1); + LONGEST p = value_as_long (arg2); + LONGEST result = a - (a / p) * p; + if (result != 0 && (a < 0) != (p < 0)) + result += p; + return value_from_longest (value_type (arg1), result); + } + case TYPE_CODE_FLT: + { + double a + = target_float_to_host_double (value_contents (arg1), + value_type (arg1)); + double p + = target_float_to_host_double (value_contents (arg2), + value_type (arg2)); + double result = fmod (a, p); + if (result != 0 && (a < 0.0) != (p < 0.0)) + result += p; + return value_from_host_double (type, result); + } + } + error (_("MODULO of type %s not supported"), TYPE_SAFE_NAME (type)); +} + /* Special expression evaluation cases for Fortran. */ static struct value * @@ -846,42 +887,9 @@ evaluate_subexp_f (struct type *expect_type, struct expression *exp, return eval_op_f_floor (expect_type, exp, noside, arg1); case BINOP_FORTRAN_MODULO: - { - 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 MODULO ()")); - /* MODULO(A, P) = A - FLOOR (A / P) * P */ - switch (type->code ()) - { - case TYPE_CODE_INT: - { - LONGEST a = value_as_long (arg1); - LONGEST p = value_as_long (arg2); - LONGEST result = a - (a / p) * p; - if (result != 0 && (a < 0) != (p < 0)) - result += p; - return value_from_longest (value_type (arg1), result); - } - case TYPE_CODE_FLT: - { - double a - = target_float_to_host_double (value_contents (arg1), - value_type (arg1)); - double p - = target_float_to_host_double (value_contents (arg2), - value_type (arg2)); - double result = fmod (a, p); - if (result != 0 && (a < 0.0) != (p < 0.0)) - result += p; - return value_from_host_double (type, result); - } - } - error (_("MODULO of type %s not supported"), TYPE_SAFE_NAME (type)); - } + arg1 = evaluate_subexp (nullptr, exp, pos, noside); + arg2 = evaluate_subexp (value_type (arg1), exp, pos, noside); + return eval_op_f_modulo (expect_type, exp, noside, arg1, arg2); case BINOP_FORTRAN_CMPLX: arg1 = evaluate_subexp (nullptr, exp, pos, noside); -- 2.26.2