From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22591 invoked by alias); 5 Dec 2019 20:40:40 -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 22497 invoked by uid 89); 5 Dec 2019 20:40:39 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-vs1-f68.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=XBB4VNTsaj3UfZ1jbDho9pErgTcXpwRLPK0pDYDeUdA=; b=Qhj/EsJ5nzyo/i6s5tkzzAR3HBoojhe+fiirl3O2mvCo3Rx+CZODDwJS5BtG7YplAy lT5m8yrCAN3CVqSzmcxDQn/nin5Qi3Vu6hoV2NxFJeRTsS2gbZVC644HgiJQvSYGXOTG V99ER2ePoCO/+GWsozrXS3EmfvWSLIlfgINAoN48xXQnnkapPzL/SORV4xh4dvzkXRs2 dtnJ5QLQswlNGGBfF+v7iY0CwkDVdcWaoOtSTAZ9VJvWUFq7J4djhAmtJBTHG2134ngi 1MTCetgTpotMHeV/SgZRcD5NFFxoiQyGJAxrMQyhJOIni1z2cUOcmO894U7mIE9nclAO slKQ== Return-Path: To: libc-alpha@sourceware.org References: <1575297977-2589-1-git-send-email-stli@linux.ibm.com> <1575297977-2589-6-git-send-email-stli@linux.ibm.com> From: Adhemerval Zanella Subject: Re: [PATCH 05/13] Always use wordsize-64 version of s_trunc.c. Message-ID: <503ae7fc-a1ed-a45a-fabd-4400a2e2f18a@linaro.org> 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-6-git-send-email-stli@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2019-12/txt/msg00195.txt.bz2 On 02/12/2019 11:46, Stefan Liebler wrote: > This patch replaces s_trunc.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 and sparc64 files. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > sysdeps/ieee754/dbl-64/s_trunc.c | 25 ++++----- > sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c | 55 ------------------- > .../sparc64/fpu/multiarch/s_trunc-generic.c | 2 +- > .../sparc64/fpu/multiarch/s_trunc-vis3.c | 2 +- > sysdeps/x86_64/fpu/multiarch/s_trunc-c.c | 2 +- > 5 files changed, 13 insertions(+), 73 deletions(-) > delete mode 100644 sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c > > diff --git a/sysdeps/ieee754/dbl-64/s_trunc.c b/sysdeps/ieee754/dbl-64/s_trunc.c > index 154feb9aa3..0de68ce298 100644 > --- a/sysdeps/ieee754/dbl-64/s_trunc.c > +++ b/sysdeps/ieee754/dbl-64/s_trunc.c > @@ -27,31 +27,26 @@ > double > __trunc (double x) > { > - int32_t i0, j0; > - uint32_t i1; > - int sx; > - > - EXTRACT_WORDS (i0, i1, x); > - sx = i0 & 0x80000000; > - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; > - if (j0 < 20) > + int64_t i0, j0; > + int64_t sx; > + > + EXTRACT_WORDS64 (i0, x); > + sx = i0 & UINT64_C (0x8000000000000000); > + j0 = ((i0 >> 52) & 0x7ff) - 0x3ff; > + if (j0 < 52) > { > if (j0 < 0) > /* The magnitude of the number is < 1 so the result is +-0. */ > - INSERT_WORDS (x, sx, 0); > + INSERT_WORDS64 (x, sx); > else > - INSERT_WORDS (x, sx | (i0 & ~(0x000fffff >> j0)), 0); > + INSERT_WORDS64 (x, sx | (i0 & ~(UINT64_C (0x000fffffffffffff) >> j0))); > } > - else if (j0 > 51) > + else > { > if (j0 == 0x400) > /* x is inf or NaN. */ > return x + x; > } > - else > - { > - INSERT_WORDS (x, i0, i1 & ~(0xffffffffu >> (j0 - 20))); > - } > > return x; > } Ok. > diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c > deleted file mode 100644 > index 3f040bbf83..0000000000 > --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_trunc.c > +++ /dev/null > @@ -1,55 +0,0 @@ > -/* Truncate argument to nearest integral value not larger than the argument. > - Copyright (C) 1997-2019 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Ulrich Drepper , 1997. > - > - The GNU C Library is free software; you can redistribute it and/or > - modify it under the terms of the GNU Lesser General Public > - License as published by the Free Software Foundation; either > - version 2.1 of the License, or (at your option) any later version. > - > - The GNU C Library is distributed in the hope that it will be useful, > - but WITHOUT ANY WARRANTY; without even the implied warranty of > - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > - Lesser General Public License for more details. > - > - You should have received a copy of the GNU Lesser General Public > - License along with the GNU C Library; if not, see > - . */ > - > -#define NO_MATH_REDIRECT > -#include > - > -#include > -#include > - > - > -double > -__trunc (double x) > -{ > - int64_t i0, j0; > - int64_t sx; > - > - EXTRACT_WORDS64 (i0, x); > - sx = i0 & UINT64_C(0x8000000000000000); > - j0 = ((i0 >> 52) & 0x7ff) - 0x3ff; > - if (j0 < 52) > - { > - if (j0 < 0) > - /* The magnitude of the number is < 1 so the result is +-0. */ > - INSERT_WORDS64 (x, sx); > - else > - INSERT_WORDS64 (x, sx | (i0 & ~(UINT64_C(0x000fffffffffffff) >> j0))); > - } > - else > - { > - if (j0 == 0x400) > - /* x is inf or NaN. */ > - return x + x; > - } > - > - return x; > -} > -#ifndef __trunc > -libm_alias_double (__trunc, trunc) > -#endif Ok. > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc-generic.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc-generic.c > index 00abd2a643..c198ebb3d5 100644 > --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc-generic.c > +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc-generic.c > @@ -1,2 +1,2 @@ > #define __trunc __trunc_generic > -#include > +#include Ok. > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc-vis3.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc-vis3.c > index 45646c5d66..321a9eded6 100644 > --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc-vis3.c > +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_trunc-vis3.c > @@ -20,4 +20,4 @@ > > #define __trunc __trunc_vis3 > > -#include > +#include Ok. > diff --git a/sysdeps/x86_64/fpu/multiarch/s_trunc-c.c b/sysdeps/x86_64/fpu/multiarch/s_trunc-c.c > index 6204ae3c77..8aa499fbb8 100644 > --- a/sysdeps/x86_64/fpu/multiarch/s_trunc-c.c > +++ b/sysdeps/x86_64/fpu/multiarch/s_trunc-c.c > @@ -1,2 +1,2 @@ > #define __trunc __trunc_c > -#include > +#include > Ok.