diff mbox

[v2,14/18] Adjust s_nearbyintf.c and s_nearbyintl.c regarding code style.

Message ID 1575895568-26473-15-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_nearbyintf.c   | 60 ++++++++++++-----------
 sysdeps/ieee754/ldbl-128/s_nearbyintl.c | 63 ++++++++++++++-----------
 2 files changed, 68 insertions(+), 55 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_nearbyintf.c   | 60 ++++++++++++-----------
>  sysdeps/ieee754/ldbl-128/s_nearbyintl.c | 63 ++++++++++++++-----------
>  2 files changed, 68 insertions(+), 55 deletions(-)
> 
> diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
> index b37e003e12..2a79907168 100644
> --- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
> +++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
> @@ -24,7 +24,7 @@
>  #include <math-use-builtins.h>
>  
>  float
> -__nearbyintf(float x)
> +__nearbyintf (float x)
>  {
>  #if USE_NEARBYINTF_BUILTIN
>    return __builtin_nearbyintf (x);
> @@ -35,33 +35,39 @@ __nearbyintf(float x)
>  		8.3886080000e+06, /* 0x4b000000 */
>  		-8.3886080000e+06, /* 0xcb000000 */
>    };
> -	fenv_t env;
> -	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) {
> -		libc_feholdexceptf (&env);
> -		w = TWO23[sx] + math_opt_barrier (x);
> -		t =  w-TWO23[sx];
> -		math_force_eval (t);
> -		libc_fesetenvf (&env);
> -		GET_FLOAT_WORD(i0,t);
> -		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
> -		return t;
> -	    }
> -	} else {
> -	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
> -	    else return x;		/* x is integral */
> +  fenv_t env;
> +  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)
> +	{
> +	  libc_feholdexceptf (&env);
> +	  w = TWO23[sx] + math_opt_barrier (x);
> +	  t =  w - TWO23[sx];
> +	  math_force_eval (t);
> +	  libc_fesetenvf (&env);
> +	  GET_FLOAT_WORD (i0, t);
> +	  SET_FLOAT_WORD (t, (i0 & 0x7fffffff) | (sx << 31));
> +	  return t;
>  	}
> -	libc_feholdexceptf (&env);
> -	w = TWO23[sx] + math_opt_barrier (x);
> -	t = w-TWO23[sx];
> -	math_force_eval (t);
> -	libc_fesetenvf (&env);
> -	return t;
> +    }
> +  else
> +    {
> +      if (__glibc_unlikely (j0 == 0x80))
> +	return x + x;		/* inf or NaN  */
> +      else
> +	return x;		/* x is integral  */
> +  }
> +  libc_feholdexceptf (&env);
> +  w = TWO23[sx] + math_opt_barrier (x);
> +  t = w - TWO23[sx];
> +  math_force_eval (t);
> +  libc_fesetenvf (&env);
> +  return t;
>  #endif /* ! USE_NEARBYINT_BUILTIN  */
>  }
>  libm_alias_float (__nearbyint, nearbyint)

Ok.

> diff --git a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
> index a4ad8e82e5..8d26786f78 100644
> --- a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
> +++ b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
> @@ -30,7 +30,8 @@
>  #include <libm-alias-ldouble.h>
>  #include <math-use-builtins.h>
>  
> -_Float128 __nearbyintl(_Float128 x)
> +_Float128
> +__nearbyintl (_Float128 x)
>  {
>  #if USE_NEARBYINTL_BUILTIN
>    return __builtin_nearbyintl (x);
> @@ -41,34 +42,40 @@ _Float128 __nearbyintl(_Float128 x)
>  		 L(5.19229685853482762853049632922009600E+33), /* 0x406F000000000000, 0 */
>  		 L(-5.19229685853482762853049632922009600E+33)  /* 0xC06F000000000000, 0 */
>    };
> -	fenv_t env;
> -	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) {
> -		feholdexcept (&env);
> -	        w = TWO112[sx] + math_opt_barrier (x);
> -	        t = w-TWO112[sx];
> -		math_force_eval (t);
> -	        fesetenv (&env);
> -		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 */
> +  fenv_t env;
> +  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)
> +	{
> +	  feholdexcept (&env);
> +	  w = TWO112[sx] + math_opt_barrier (x);
> +	  t = w - TWO112[sx];
> +	  math_force_eval (t);
> +	  fesetenv (&env);
> +	  GET_LDOUBLE_MSW64 (i0, t);
> +	  SET_LDOUBLE_MSW64 (t, (i0 & 0x7fffffffffffffffLL) | (sx << 63));
> +	  return t;
>  	}
> -	feholdexcept (&env);
> -	w = TWO112[sx] + math_opt_barrier (x);
> -	t = w-TWO112[sx];
> -	math_force_eval (t);
> -	fesetenv (&env);
> -	return t;
> +    }
> +  else
> +    {
> +      if (j0 == 0x4000)
> +	return x + x;		/* inf or NaN  */
> +      else
> +	return x;		/* x is integral  */
> +    }
> +  feholdexcept (&env);
> +  w = TWO112[sx] + math_opt_barrier (x);
> +  t = w - TWO112[sx];
> +  math_force_eval (t);
> +  fesetenv (&env);
> +  return t;
>  #endif /* ! USE_NEARBYINTL_BUILTIN  */
>  }
>  libm_alias_ldouble (__nearbyint, nearbyint)
> 

Ok.
diff mbox

Patch

diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c
index b37e003e12..2a79907168 100644
--- a/sysdeps/ieee754/flt-32/s_nearbyintf.c
+++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c
@@ -24,7 +24,7 @@ 
 #include <math-use-builtins.h>
 
 float
-__nearbyintf(float x)
+__nearbyintf (float x)
 {
 #if USE_NEARBYINTF_BUILTIN
   return __builtin_nearbyintf (x);
@@ -35,33 +35,39 @@  __nearbyintf(float x)
 		8.3886080000e+06, /* 0x4b000000 */
 		-8.3886080000e+06, /* 0xcb000000 */
   };
-	fenv_t env;
-	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) {
-		libc_feholdexceptf (&env);
-		w = TWO23[sx] + math_opt_barrier (x);
-		t =  w-TWO23[sx];
-		math_force_eval (t);
-		libc_fesetenvf (&env);
-		GET_FLOAT_WORD(i0,t);
-		SET_FLOAT_WORD(t,(i0&0x7fffffff)|(sx<<31));
-		return t;
-	    }
-	} else {
-	    if(__builtin_expect(j0==0x80, 0)) return x+x;	/* inf or NaN */
-	    else return x;		/* x is integral */
+  fenv_t env;
+  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)
+	{
+	  libc_feholdexceptf (&env);
+	  w = TWO23[sx] + math_opt_barrier (x);
+	  t =  w - TWO23[sx];
+	  math_force_eval (t);
+	  libc_fesetenvf (&env);
+	  GET_FLOAT_WORD (i0, t);
+	  SET_FLOAT_WORD (t, (i0 & 0x7fffffff) | (sx << 31));
+	  return t;
 	}
-	libc_feholdexceptf (&env);
-	w = TWO23[sx] + math_opt_barrier (x);
-	t = w-TWO23[sx];
-	math_force_eval (t);
-	libc_fesetenvf (&env);
-	return t;
+    }
+  else
+    {
+      if (__glibc_unlikely (j0 == 0x80))
+	return x + x;		/* inf or NaN  */
+      else
+	return x;		/* x is integral  */
+  }
+  libc_feholdexceptf (&env);
+  w = TWO23[sx] + math_opt_barrier (x);
+  t = w - TWO23[sx];
+  math_force_eval (t);
+  libc_fesetenvf (&env);
+  return t;
 #endif /* ! USE_NEARBYINT_BUILTIN  */
 }
 libm_alias_float (__nearbyint, nearbyint)
diff --git a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
index a4ad8e82e5..8d26786f78 100644
--- a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
+++ b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c
@@ -30,7 +30,8 @@ 
 #include <libm-alias-ldouble.h>
 #include <math-use-builtins.h>
 
-_Float128 __nearbyintl(_Float128 x)
+_Float128
+__nearbyintl (_Float128 x)
 {
 #if USE_NEARBYINTL_BUILTIN
   return __builtin_nearbyintl (x);
@@ -41,34 +42,40 @@  _Float128 __nearbyintl(_Float128 x)
 		 L(5.19229685853482762853049632922009600E+33), /* 0x406F000000000000, 0 */
 		 L(-5.19229685853482762853049632922009600E+33)  /* 0xC06F000000000000, 0 */
   };
-	fenv_t env;
-	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) {
-		feholdexcept (&env);
-	        w = TWO112[sx] + math_opt_barrier (x);
-	        t = w-TWO112[sx];
-		math_force_eval (t);
-	        fesetenv (&env);
-		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 */
+  fenv_t env;
+  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)
+	{
+	  feholdexcept (&env);
+	  w = TWO112[sx] + math_opt_barrier (x);
+	  t = w - TWO112[sx];
+	  math_force_eval (t);
+	  fesetenv (&env);
+	  GET_LDOUBLE_MSW64 (i0, t);
+	  SET_LDOUBLE_MSW64 (t, (i0 & 0x7fffffffffffffffLL) | (sx << 63));
+	  return t;
 	}
-	feholdexcept (&env);
-	w = TWO112[sx] + math_opt_barrier (x);
-	t = w-TWO112[sx];
-	math_force_eval (t);
-	fesetenv (&env);
-	return t;
+    }
+  else
+    {
+      if (j0 == 0x4000)
+	return x + x;		/* inf or NaN  */
+      else
+	return x;		/* x is integral  */
+    }
+  feholdexcept (&env);
+  w = TWO112[sx] + math_opt_barrier (x);
+  t = w - TWO112[sx];
+  math_force_eval (t);
+  fesetenv (&env);
+  return t;
 #endif /* ! USE_NEARBYINTL_BUILTIN  */
 }
 libm_alias_ldouble (__nearbyint, nearbyint)