From patchwork Mon Dec 9 12:46:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 36660 Received: (qmail 102865 invoked by alias); 9 Dec 2019 12:51:48 -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 102857 invoked by uid 89); 9 Dec 2019 12:51:48 -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= X-HELO: mx0a-001b2d01.pphosted.com From: Stefan Liebler To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH v2 15/18] Adjust s_rintf.c and s_rintl.c regarding code style. Date: Mon, 9 Dec 2019 13:46:05 +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-0028-0000-0000-000003C6D837 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19120912-0029-0000-0000-0000248A0363 Message-Id: <1575895568-26473-16-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_rintf.c | 44 +++++++++++++++------------ sysdeps/ieee754/ldbl-128/s_rintl.c | 49 +++++++++++++++++------------- 2 files changed, 53 insertions(+), 40 deletions(-) diff --git a/sysdeps/ieee754/flt-32/s_rintf.c b/sysdeps/ieee754/flt-32/s_rintf.c index 34c16ea164..627bada566 100644 --- a/sysdeps/ieee754/flt-32/s_rintf.c +++ b/sysdeps/ieee754/flt-32/s_rintf.c @@ -20,7 +20,7 @@ #include float -__rintf(float x) +__rintf (float x) { #if USE_RINTF_BUILTIN return __builtin_rintf (x); @@ -31,25 +31,31 @@ __rintf(float x) 8.3886080000e+06, /* 0x4b000000 */ -8.3886080000e+06, /* 0xcb000000 */ }; - int32_t i0,j0,sx; - float w,t; - GET_FLOAT_WORD(i0,x); - sx = (i0>>31)&1; - j0 = ((i0>>23)&0xff)-0x7f; - if(j0<23) { - if(j0<0) { - w = TWO23[sx]+x; - t = w-TWO23[sx]; - GET_FLOAT_WORD(i0,t); - SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31)); - return t; - } - } else { - if(j0==0x80) return x+x; /* inf or NaN */ - else return x; /* x is integral */ + int32_t i0, j0, sx; + float w, t; + GET_FLOAT_WORD (i0, x); + sx = (i0 >> 31) & 1; + j0 = ((i0 >> 23) & 0xff) - 0x7f; + if (j0 < 23) + { + if(j0 < 0) + { + w = TWO23[sx] + x; + t = w - TWO23[sx]; + GET_FLOAT_WORD (i0, t); + SET_FLOAT_WORD (t, (i0 & 0x7fffffff) | (sx << 31)); + return t; } - w = TWO23[sx]+x; - return w-TWO23[sx]; + } + else + { + if (j0 == 0x80) + return x + x; /* inf or NaN */ + else + return x; /* x is integral */ + } + w = TWO23[sx] + x; + return w - TWO23[sx]; #endif /* ! USE_RINTF_BUILTIN */ } #ifndef __rintf diff --git a/sysdeps/ieee754/ldbl-128/s_rintl.c b/sysdeps/ieee754/ldbl-128/s_rintl.c index 3340c35ee1..16965f9582 100644 --- a/sysdeps/ieee754/ldbl-128/s_rintl.c +++ b/sysdeps/ieee754/ldbl-128/s_rintl.c @@ -13,7 +13,7 @@ * ==================================================== */ -#if defined(LIBM_SCCS) && !defined(lint) +#if defined (LIBM_SCCS) && ! defined (lint) static char rcsid[] = "$NetBSD: $"; #endif @@ -33,7 +33,8 @@ static char rcsid[] = "$NetBSD: $"; #include #include -_Float128 __rintl(_Float128 x) +_Float128 +__rintl (_Float128 x) { #if USE_RINTL_BUILTIN return __builtin_rintl (x); @@ -44,26 +45,32 @@ _Float128 __rintl(_Float128 x) 5.19229685853482762853049632922009600E+33L, /* 0x406F000000000000, 0 */ -5.19229685853482762853049632922009600E+33L /* 0xC06F000000000000, 0 */ }; - int64_t i0,j0,sx; - uint64_t i1 __attribute__ ((unused)); - _Float128 w,t; - GET_LDOUBLE_WORDS64(i0,i1,x); - sx = (((uint64_t)i0)>>63); - j0 = ((i0>>48)&0x7fff)-0x3fff; - if(j0<112) { - if(j0<0) { - w = TWO112[sx]+x; - t = w-TWO112[sx]; - GET_LDOUBLE_MSW64(i0,t); - SET_LDOUBLE_MSW64(t,(i0&0x7fffffffffffffffLL)|(sx<<63)); - return t; - } - } else { - if(j0==0x4000) return x+x; /* inf or NaN */ - else return x; /* x is integral */ + int64_t i0, j0, sx; + uint64_t i1 __attribute__ ((unused)); + _Float128 w, t; + GET_LDOUBLE_WORDS64 (i0, i1, x); + sx = (((uint64_t) i0) >> 63); + j0 = ((i0 >> 48) & 0x7fff) - 0x3fff; + if (j0 < 112) + { + if (j0 < 0) + { + w = TWO112[sx] + x; + t = w - TWO112[sx]; + GET_LDOUBLE_MSW64 (i0, t); + SET_LDOUBLE_MSW64 (t, (i0 & 0x7fffffffffffffffLL) | (sx << 63)); + return t; } - w = TWO112[sx]+x; - return w-TWO112[sx]; + } + else + { + if (j0 == 0x4000) + return x + x; /* inf or NaN */ + else + return x; /* x is integral */ + } + w = TWO112[sx] + x; + return w - TWO112[sx]; #endif /* ! USE_RINTL_BUILTIN */ } libm_alias_ldouble (__rint, rint)