From patchwork Mon Dec 9 12:46:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1206187 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-107842-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="i18vfjgw"; 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 47Wjks3yjDz9sNH for ; Mon, 9 Dec 2019 23:52:05 +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=VFr9zsP/ZzvmG7Za2GmZQK9itATAV9t J2UCwkyOzNCw7blevxR3liH/o4ywO1FVdJhXpv5gsBP/yHYKbT/DKxodsue8dn69 3jGgfIMhmqmx4K/jDekpANMcaW6jL576u5TjYv86X52G/gf0Ps3MJCDi1kC5ch8k tquuLeo7jslg= 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=vfeI9kyT4C3Gnn0smdYhcRxh1DI=; b=i18vf jgw8hkmECt/ubG0HCPMaHIees3BJYor50AoV9gcrmwbLaiZXXsx0OYtZgP23ymod wPVoXZUDPmA244ZvWCFNixjlrL91hwNQriDerJ2NP+D88gt7Mg9/QYxdXImCjl5s vVDTxaGvrqRkRNxraCqhyCLqmTIKa14I94DQfs= Received: (qmail 103979 invoked by alias); 9 Dec 2019 12:51:59 -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 103970 invoked by uid 89); 9 Dec 2019 12:51:59 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-23.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=3046 X-HELO: mx0a-001b2d01.pphosted.com From: Stefan Liebler To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH v2 16/18] Adjust s_floorf.c and s_floorl.c regarding code style. Date: Mon, 9 Dec 2019 13:46:06 +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-0016-0000-0000-000002D3202D X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19120912-0017-0000-0000-0000333531B5 Message-Id: <1575895568-26473-17-git-send-email-stli@linux.ibm.com> This patch just adjusts the generic implementation regarding code style. No functional change. Reviewed-by: Adhemerval Zanella --- sysdeps/ieee754/flt-32/s_floorf.c | 55 +++++++++++------- sysdeps/ieee754/ldbl-128/s_floorl.c | 89 ++++++++++++++++++----------- 2 files changed, 90 insertions(+), 54 deletions(-) diff --git a/sysdeps/ieee754/flt-32/s_floorf.c b/sysdeps/ieee754/flt-32/s_floorf.c index afe02a1693..da6c6dfa8a 100644 --- a/sysdeps/ieee754/flt-32/s_floorf.c +++ b/sysdeps/ieee754/flt-32/s_floorf.c @@ -27,34 +27,45 @@ #include float -__floorf(float x) +__floorf (float x) { #if USE_FLOORF_BUILTIN return __builtin_floorf (x); #else /* Use generic implementation. */ - int32_t i0,j0; - uint32_t i; - GET_FLOAT_WORD(i0,x); - j0 = ((i0>>23)&0xff)-0x7f; - if(j0<23) { - if(j0<0) { - /* return 0*sign(x) if |x|<1 */ - if(i0>=0) {i0=0;} - else if((i0&0x7fffffff)!=0) - { i0=0xbf800000;} - } else { - i = (0x007fffff)>>j0; - if((i0&i)==0) return x; /* x is integral */ - if(i0<0) i0 += (0x00800000)>>j0; - i0 &= (~i); - } - } else { - if(__builtin_expect(j0==0x80, 0)) return x+x; /* inf or NaN */ - else return x; /* x is integral */ + int32_t i0, j0; + uint32_t i; + GET_FLOAT_WORD (i0, x); + j0 = ((i0 >> 23) & 0xff) - 0x7f; + if (j0 < 23) + { + if (j0 < 0) + { + /* return 0 * sign (x) if |x| < 1 */ + if (i0 >= 0) + i0 = 0; + else if ((i0 & 0x7fffffff) != 0) + i0 = 0xbf800000; } - SET_FLOAT_WORD(x,i0); - return x; + else + { + i = (0x007fffff) >> j0; + if ((i0 & i) == 0) + return x; /* x is integral */ + if (i0 < 0) + i0 += (0x00800000) >> j0; + i0 &= (~i); + } + } + else + { + if (__glibc_unlikely (j0 == 0x80)) + return x + x; /* inf or NaN */ + else + return x; /* x is integral */ + } + SET_FLOAT_WORD (x, i0); + return x; #endif /* ! USE_FLOORF_BUILTIN */ } #ifndef __floorf diff --git a/sysdeps/ieee754/ldbl-128/s_floorl.c b/sysdeps/ieee754/ldbl-128/s_floorl.c index cfe008392a..0475120d7e 100644 --- a/sysdeps/ieee754/ldbl-128/s_floorl.c +++ b/sysdeps/ieee754/ldbl-128/s_floorl.c @@ -30,46 +30,71 @@ static char rcsid[] = "$NetBSD: $"; #include #include -_Float128 __floorl(_Float128 x) +_Float128 +__floorl (_Float128 x) { #if USE_FLOORL_BUILTIN return __builtin_floorl (x); #else /* Use generic implementation. */ - int64_t i0,i1,j0; - uint64_t i,j; - GET_LDOUBLE_WORDS64(i0,i1,x); - j0 = ((i0>>48)&0x7fff)-0x3fff; - if(j0<48) { - if(j0<0) { - /* return 0*sign(x) if |x|<1 */ - if(i0>=0) {i0=i1=0;} - else if(((i0&0x7fffffffffffffffLL)|i1)!=0) - { i0=0xbfff000000000000ULL;i1=0;} - } else { - i = (0x0000ffffffffffffULL)>>j0; - if(((i0&i)|i1)==0) return x; /* x is integral */ - if(i0<0) i0 += (0x0001000000000000LL)>>j0; - i0 &= (~i); i1=0; + int64_t i0, i1, j0; + uint64_t i, j; + GET_LDOUBLE_WORDS64 (i0, i1, x); + j0 = ((i0 >> 48) & 0x7fff) - 0x3fff; + if (j0 < 48) + { + if (j0 < 0) + { + /* return 0 * sign (x) if |x| < 1 */ + if (i0 >= 0) + { + i0 = i1 = 0; } - } else if (j0>111) { - if(j0==0x4000) return x+x; /* inf or NaN */ - else return x; /* x is integral */ - } else { - i = -1ULL>>(j0-48); - if((i1&i)==0) return x; /* x is integral */ - if(i0<0) { - if(j0==48) i0+=1; - else { - j = i1+(1LL<<(112-j0)); - if(j> j0; + if (((i0 & i) | i1) == 0) + return x; /* x is integral */ + if (i0 < 0) + i0 += (0x0001000000000000LL) >> j0; + i0 &= (~i); + i1 = 0; + } + } + else if (j0 > 111) + { + if (j0 == 0x4000) + return x + x; /* inf or NaN */ + else + return x; /* x is integral */ + } + else + { + i = -1ULL >> (j0 - 48); + if ((i1 & i) == 0) + return x; /* x is integral */ + if (i0 < 0) + { + if (j0 == 48) + i0 += 1; + else + { + j = i1 + (1LL << (112 - j0)); + if (j < i1) + i0 += 1 ; /* got a carry */ + i1 = j; + } + } + i1 &= (~i); + } + SET_LDOUBLE_WORDS64 (x, i0, i1); + return x; #endif /* ! USE_FLOORL_BUILTIN */ } libm_alias_ldouble (__floor, floor)