diff mbox

[v2,16/18] Adjust s_floorf.c and s_floorl.c regarding code style.

Message ID 1575895568-26473-17-git-send-email-stli@linux.ibm.com
State Committed
Headers show

Commit Message

Stefan Liebler Dec. 9, 2019, 12:46 p.m. UTC
This patch just adjusts the generic implementation regarding code style.
No functional change.
---
 sysdeps/ieee754/flt-32/s_floorf.c   | 55 +++++++++++-------
 sysdeps/ieee754/ldbl-128/s_floorl.c | 89 ++++++++++++++++++-----------
 2 files changed, 90 insertions(+), 54 deletions(-)

Comments

Adhemerval Zanella Dec. 10, 2019, 7:15 p.m. UTC | #1
On 09/12/2019 09:46, Stefan Liebler wrote:
> This patch just adjusts the generic implementation regarding code style.
> No functional change.

LGTM, thanks.

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>

> ---
>  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 <math-use-builtins.h>
>  
>  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

Ok.

> 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 <libm-alias-ldouble.h>
>  #include <math-use-builtins.h>
>  
> -_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<i1) i0 +=1 ; 	/* got a carry */
> -		    i1=j;
> -		}
> +	  else if (((i0 & 0x7fffffffffffffffLL) | i1) != 0)
> +	    {
> +	      i0 = 0xbfff000000000000ULL;
> +	      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_FLOORL_BUILTIN  */
>  }
>  libm_alias_ldouble (__floor, floor)
> 

Ok.
diff mbox

Patch

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 <math-use-builtins.h>
 
 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 <libm-alias-ldouble.h>
 #include <math-use-builtins.h>
 
-_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<i1) i0 +=1 ; 	/* got a carry */
-		    i1=j;
-		}
+	  else if (((i0 & 0x7fffffffffffffffLL) | i1) != 0)
+	    {
+	      i0 = 0xbfff000000000000ULL;
+	      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_FLOORL_BUILTIN  */
 }
 libm_alias_ldouble (__floor, floor)