From: Stefan Liebler <stli@linux.ibm.com>
To: libc-alpha@sourceware.org
Cc: Stefan Liebler <stli@linux.ibm.com>
Subject: [PATCH v2 17/18] Adjust s_ceilf.c and s_ceill.c regarding code style.
Date: Mon, 09 Dec 2019 12:52:00 -0000 [thread overview]
Message-ID: <1575895568-26473-18-git-send-email-stli@linux.ibm.com> (raw)
In-Reply-To: <1575895568-26473-1-git-send-email-stli@linux.ibm.com>
This patch just adjusts the generic implementation regarding code style.
No functional change.
---
sysdeps/ieee754/flt-32/s_ceilf.c | 54 +++++++++++-------
sysdeps/ieee754/ldbl-128/s_ceill.c | 91 +++++++++++++++++++-----------
2 files changed, 92 insertions(+), 53 deletions(-)
diff --git a/sysdeps/ieee754/flt-32/s_ceilf.c b/sysdeps/ieee754/flt-32/s_ceilf.c
index 7d4990f3ff..5c4abfe145 100644
--- a/sysdeps/ieee754/flt-32/s_ceilf.c
+++ b/sysdeps/ieee754/flt-32/s_ceilf.c
@@ -20,34 +20,46 @@
#include <math-use-builtins.h>
float
-__ceilf(float x)
+__ceilf (float x)
{
#if USE_CEILF_BUILTIN
return __builtin_ceilf (x);
#else
/* Use generic implementation. */
- int32_t i0,j0;
- uint32_t i;
+ 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=0x80000000;}
- else if(i0!=0) { i0=0x3f800000;}
- } 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 */
+ 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 = 0x80000000;
+ else if (i0 != 0)
+ i0 = 0x3f800000;
}
- 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_CEILF_BUILTIN */
}
#ifndef __ceilf
diff --git a/sysdeps/ieee754/ldbl-128/s_ceill.c b/sysdeps/ieee754/ldbl-128/s_ceill.c
index 02ffa7af2b..c5d98e1e37 100644
--- a/sysdeps/ieee754/ldbl-128/s_ceill.c
+++ b/sysdeps/ieee754/ldbl-128/s_ceill.c
@@ -13,7 +13,7 @@
* ====================================================
*/
-#if defined(LIBM_SCCS) && !defined(lint)
+#if defined (LIBM_SCCS) && ! defined (lint)
static char rcsid[] = "$NetBSD: $";
#endif
@@ -30,45 +30,72 @@ static char rcsid[] = "$NetBSD: $";
#include <libm-alias-ldouble.h>
#include <math-use-builtins.h>
-_Float128 __ceill(_Float128 x)
+_Float128
+__ceill (_Float128 x)
{
#if USE_CEILL_BUILTIN
return __builtin_ceill (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=0x8000000000000000ULL;i1=0;}
- else if((i0|i1)!=0) { i0=0x3fff000000000000ULL;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 = 0x8000000000000000ULL;
+ 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;
- }
+ else if ((i0 | i1) != 0)
+ {
+ i0 = 0x3fff000000000000ULL;
+ i1 = 0;
}
- i1 &= (~i);
}
- SET_LDOUBLE_WORDS64(x,i0,i1);
- return x;
+ else
+ {
+ i = (0x0000ffffffffffffULL) >> 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_CEILL_BUILTIN */
}
libm_alias_ldouble (__ceil, ceil)
--
2.19.1
next prev parent reply other threads:[~2019-12-09 12:52 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-09 12:46 [PATCH v2 00/18] Use GCC builtins for some math functions if desired Stefan Liebler
2019-12-09 12:47 ` [PATCH v2 01/18] Always use wordsize-64 version of s_nearbyint.c Stefan Liebler
2019-12-09 12:47 ` [PATCH v2 02/18] Always use wordsize-64 version of s_rint.c Stefan Liebler
2019-12-09 12:48 ` [PATCH v2 03/18] Always use wordsize-64 version of s_floor.c Stefan Liebler
2019-12-09 12:48 ` [PATCH v2 04/18] Always use wordsize-64 version of s_ceil.c Stefan Liebler
2019-12-09 12:49 ` [PATCH v2 05/18] Always use wordsize-64 version of s_trunc.c Stefan Liebler
2019-12-09 12:49 ` [PATCH v2 07/18] Use GCC builtins for nearbyint functions if desired Stefan Liebler
2019-12-10 19:16 ` Adhemerval Zanella
2019-12-09 12:49 ` [PATCH v2 06/18] Always use wordsize-64 version of s_round.c Stefan Liebler
2019-12-09 12:50 ` [PATCH v2 10/18] Use GCC builtins for ceil functions if desired Stefan Liebler
2019-12-10 19:16 ` Adhemerval Zanella
2019-12-09 12:50 ` [PATCH v2 08/18] Use GCC builtins for rint " Stefan Liebler
2019-12-10 19:15 ` Adhemerval Zanella
2019-12-09 12:50 ` [PATCH v2 11/18] Use GCC builtins for trunc " Stefan Liebler
2019-12-10 19:15 ` Adhemerval Zanella
2019-12-09 12:50 ` [PATCH v2 09/18] Use GCC builtins for floor " Stefan Liebler
2019-12-10 19:15 ` Adhemerval Zanella
2019-12-09 12:51 ` [PATCH v2 12/18] Use GCC builtins for round " Stefan Liebler
2019-12-10 19:15 ` Adhemerval Zanella
2019-12-09 12:51 ` [PATCH v2 15/18] Adjust s_rintf.c and s_rintl.c regarding code style Stefan Liebler
2019-12-10 19:15 ` Adhemerval Zanella
2019-12-09 12:51 ` [PATCH v2 16/18] Adjust s_floorf.c and s_floorl.c " Stefan Liebler
2019-12-10 19:16 ` Adhemerval Zanella
2019-12-09 12:51 ` [PATCH v2 13/18] Use GCC builtins for copysign functions if desired Stefan Liebler
2019-12-10 19:16 ` Adhemerval Zanella
2019-12-09 12:51 ` [PATCH v2 14/18] Adjust s_nearbyintf.c and s_nearbyintl.c regarding code style Stefan Liebler
2019-12-10 19:16 ` Adhemerval Zanella
2019-12-09 12:52 ` [PATCH v2 18/18] Adjust s_copysignl.c " Stefan Liebler
2019-12-10 19:16 ` Adhemerval Zanella
2019-12-09 12:52 ` Stefan Liebler [this message]
2019-12-10 19:15 ` [PATCH v2 17/18] Adjust s_ceilf.c and s_ceill.c " Adhemerval Zanella
2019-12-10 19:18 ` [PATCH v2 00/18] Use GCC builtins for some math functions if desired Adhemerval Zanella
2019-12-11 14:16 ` Stefan Liebler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1575895568-26473-18-git-send-email-stli@linux.ibm.com \
--to=stli@linux.ibm.com \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).