From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20381 invoked by alias); 5 Dec 2019 20:40:31 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 19416 invoked by uid 89); 5 Dec 2019 20:40:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.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_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-vs1-f66.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=to:references:from:autocrypt:subject:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=ksu5HwFgueo+iWCaCcz/+gk2HswvjIcJfCRpATiRmu4=; b=yVoXDly9fmFN3ROQQAOKWcphlgh5NJ5IfmULECNFruFoydyJ1Xr8ESuP3ksrpLSA7q WafrEjXsaYHOJoAx4iLqVwy6I0DB3IHpWKZOgSQ0R5dy3WMDHVeBthfI/r6NslJQWQAY QV30ecULgR4a8GzEi94qFFXaV7OO/qSweTzZyaTuFBHN+x9VRlIgQ7opy+1JKwK396nQ G5VTvvmpRkPC9f4Ym9hi4n2hR+TrOXJX6UiGMMQ4heSer19AjGK9EuY75QjjSON2NwFo YneeARGEL/MT971nrJZ0rISwxTdw9PMxw/JAsFrdshE2Kw+OaHnJR4r9jrAikQms7XRs VdiQ== Return-Path: To: libc-alpha@sourceware.org References: <1575297977-2589-1-git-send-email-stli@linux.ibm.com> <1575297977-2589-3-git-send-email-stli@linux.ibm.com> From: Adhemerval Zanella Subject: Re: [PATCH 02/13] Always use wordsize-64 version of s_rint.c. Message-ID: Date: Thu, 05 Dec 2019 20:40:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.1 MIME-Version: 1.0 In-Reply-To: <1575297977-2589-3-git-send-email-stli@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2019-12/txt/msg00192.txt.bz2 On 02/12/2019 11:46, Stefan Liebler wrote: > 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. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > sysdeps/ieee754/dbl-64/s_rint.c | 36 ++++++------- > sysdeps/ieee754/dbl-64/wordsize-64/s_rint.c | 58 --------------------- > sysdeps/x86_64/fpu/multiarch/s_rint-c.c | 2 +- > 3 files changed, 19 insertions(+), 77 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..f96078c405 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)); > - return t; > + 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 */ > - } > - w = TWO52[sx] + x; > + return x; /* x is integral */ > + } > + double w = TWO52[sx] + x; > return w - TWO52[sx]; > } > #ifndef __rint Ok. > 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 Ok. > 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 > Ok.