From patchwork Mon Dec 9 12:45:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1206171 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-107828-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="DqV71OPx"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47Wjdl1gn9z9sNH for ; Mon, 9 Dec 2019 23:47:39 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:in-reply-to:references :message-id; q=dns; s=default; b=TsqhbQzZXkSHpvgdtOZDT05P2bqNlUS WYRcK2XGhMY+hADSaL9k6kr2UDKn76OVuJ39xmDHOBlMWOli54wZ4bxTW9L+wcMM MyIsD8hvJUGT8FGotdTSRszEUeUJi8Q53QBX/YF8Tnblzc7t4QbJTXViogSL0w3L 4uu3+8ZhtNq0= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:in-reply-to:references :message-id; s=default; bh=TV1jyfhO1wKqxIw4H3TV5UTJdP8=; b=DqV71 OPxYVnJX93I4AR5hb2+YlsPzA5qPr5qK+lNuWE2YodlAn4s7ih1A57j3whVHfESN hxruc4HPUy/oF1LXYXdZLd7r2EgzPmbRcodMVZkwxMeVHW8BeTnUI0sX/JQVto7I qcHzS5IaG1SRKFVcNw1wpuDg2AGBwZ/VhFmQ74= Received: (qmail 81563 invoked by alias); 9 Dec 2019 12:47:20 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 81500 invoked by uid 89); 9 Dec 2019 12:47:19 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=51, 5.1 X-HELO: mx0a-001b2d01.pphosted.com From: Stefan Liebler To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH v2 02/18] Always use wordsize-64 version of s_rint.c. Date: Mon, 9 Dec 2019 13:45:52 +0100 In-Reply-To: <1575895568-26473-1-git-send-email-stli@linux.ibm.com> References: <1575895568-26473-1-git-send-email-stli@linux.ibm.com> x-cbid: 19120912-4275-0000-0000-0000038D4068 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19120912-4276-0000-0000-000038A0ED76 Message-Id: <1575895568-26473-3-git-send-email-stli@linux.ibm.com> This patch replaces s_rint.c in sysdeps/dbl-64 with the one in sysdeps/dbl-64/wordsize-64 and removes the latter one. The code is not changed except changes in code style. Also adjusted the include path in x86_64 file. --- sysdeps/ieee754/dbl-64/s_rint.c | 32 ++++++------ sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c | 58 --------------------- sysdeps/x86_64/fpu/multiarch/s_rint-c.c | 2 +- 3 files changed, 17 insertions(+), 75 deletions(-) delete mode 100644 sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c diff --git a/sysdeps/ieee754/dbl-64/s_rint.c b/sysdeps/ieee754/dbl-64/s_rint.c index dd01a84176..66c9196473 100644 --- a/sysdeps/ieee754/dbl-64/s_rint.c +++ b/sysdeps/ieee754/dbl-64/s_rint.c @@ -1,4 +1,3 @@ -/* @(#)s_rint.c 5.1 93/09/24 */ /* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. @@ -26,38 +25,39 @@ #include static const double - TWO52[2] = { - 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ - -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ +TWO52[2] = { + 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ + -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ }; double __rint (double x) { - int32_t i0, j0, sx; - double w, t; - GET_HIGH_WORD (i0, x); - sx = (i0 >> 31) & 1; - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; + int64_t i0, sx; + int32_t j0; + EXTRACT_WORDS64 (i0, x); + sx = (i0 >> 63) & 1; + j0 = ((i0 >> 52) & 0x7ff) - 0x3ff; if (j0 < 52) { if (j0 < 0) { - w = TWO52[sx] + x; - t = w - TWO52[sx]; - GET_HIGH_WORD (i0, t); - SET_HIGH_WORD (t, (i0 & 0x7fffffff) | (sx << 31)); + double w = TWO52[sx] + x; + double t = w - TWO52[sx]; + EXTRACT_WORDS64 (i0, t); + INSERT_WORDS64 (t, (i0 & UINT64_C (0x7fffffffffffffff)) + | (sx << 63)); return t; } } else { if (j0 == 0x400) - return x + x; /* inf or NaN */ + return x + x; /* inf or NaN */ else - return x; /* x is integral */ + return x; /* x is integral */ } - w = TWO52[sx] + x; + double w = TWO52[sx] + x; return w - TWO52[sx]; } #ifndef __rint diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c deleted file mode 100644 index 378b73a544..0000000000 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c +++ /dev/null @@ -1,58 +0,0 @@ -/* - * ==================================================== - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. - * - * Developed at SunPro, a Sun Microsystems, Inc. business. - * Permission to use, copy, modify, and distribute this - * software is freely granted, provided that this notice - * is preserved. - * ==================================================== - */ - -/* - * rint(x) - * Return x rounded to integral value according to the prevailing - * rounding mode. - * Method: - * Using floating addition. - * Exception: - * Inexact flag raised if x not equal to rint(x). - */ - -#define NO_MATH_REDIRECT -#include -#include -#include - -static const double -TWO52[2]={ - 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ - -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ -}; - -double -__rint(double x) -{ - int64_t i0,sx; - int32_t j0; - EXTRACT_WORDS64(i0,x); - sx = (i0>>63)&1; - j0 = ((i0>>52)&0x7ff)-0x3ff; - if(j0<52) { - if(j0<0) { - double w = TWO52[sx]+x; - double t = w-TWO52[sx]; - EXTRACT_WORDS64(i0,t); - INSERT_WORDS64(t,(i0&UINT64_C(0x7fffffffffffffff))|(sx<<63)); - return t; - } - } else { - if(j0==0x400) return x+x; /* inf or NaN */ - else return x; /* x is integral */ - } - double w = TWO52[sx]+x; - return w-TWO52[sx]; -} -#ifndef __rint -libm_alias_double (__rint, rint) -#endif diff --git a/sysdeps/x86_64/fpu/multiarch/s_rint-c.c b/sysdeps/x86_64/fpu/multiarch/s_rint-c.c index 162a630ff9..b010150f52 100644 --- a/sysdeps/x86_64/fpu/multiarch/s_rint-c.c +++ b/sysdeps/x86_64/fpu/multiarch/s_rint-c.c @@ -1,3 +1,3 @@ #undef __rint #define __rint __rint_c -#include +#include