Add _FPU_MASK_RM and use it instead of FE_TOWARDZERO.

2014-06-24  Wilco  <wdijkstr@arm.com>

	* sysdeps/arm/fpu_control.h (_FPU_MASK_RM): Define.
	* sysdeps/arm/fenv_private.h (libc_fesetround_vfp)
	(libc_feholdexcept_setround_vfp) (libc_feholdsetround_vfp)
	(libc_feresetround_vfp) (libc_feholdsetround_vfp_ctx)
	(libc_feresetround_vfp_ctx): Use _FPU_MASK_RM.
	* sysdeps/arm/fesetround.c (fesetround): Use _FPU_MASK_RM.
	* sysdeps/arm/get-rounding-mode.h (get_rounding_mode):
	Use _FPU_MASK_RM.

5 files changed, 23 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ecd1f174b..67759941ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2014-06-24  Wilco  <wdijkstr@arm.com>
 
+	* sysdeps/arm/fpu_control.h (_FPU_MASK_RM): Define.
+	* sysdeps/arm/fenv_private.h (libc_fesetround_vfp)
+	(libc_feholdexcept_setround_vfp) (libc_feholdsetround_vfp)
+	(libc_feresetround_vfp) (libc_feholdsetround_vfp_ctx)
+	(libc_feresetround_vfp_ctx): Use _FPU_MASK_RM.
+	* sysdeps/arm/fesetround.c (fesetround): Use _FPU_MASK_RM.
+	* sysdeps/arm/get-rounding-mode.h (get_rounding_mode):
+	Use _FPU_MASK_RM.
+
+2014-06-24  Wilco  <wdijkstr@arm.com>
+
 	* sysdeps/arm/fsetexcptflg.c (fesetexceptflag): Remove unused include.
 
 2014-06-24  Wilco  <wdijkstr@arm.com>
diff --git a/sysdeps/arm/fenv_private.h b/sysdeps/arm/fenv_private.h
index bff8acd62d..743df18c35 100644
--- a/sysdeps/arm/fenv_private.h
+++ b/sysdeps/arm/fenv_private.h
@@ -43,8 +43,8 @@ libc_fesetround_vfp (int round)
   _FPU_GETCW (fpscr);
 
   /* Set new rounding mode if different.  */
-  if (__glibc_unlikely ((fpscr & FE_TOWARDZERO) != round))
-    _FPU_SETCW ((fpscr & ~FE_TOWARDZERO) | round);
+  if (__glibc_unlikely ((fpscr & _FPU_MASK_RM) != round))
+    _FPU_SETCW ((fpscr & ~_FPU_MASK_RM) | round);
 }
 
 static __always_inline void
@@ -57,7 +57,7 @@ libc_feholdexcept_setround_vfp (fenv_t *envp, int round)
 
   /* Clear exception flags, set all exceptions to non-stop,
      and set new rounding mode.  */
-  fpscr &= ~(_FPU_MASK_EXCEPT | FE_TOWARDZERO);
+  fpscr &= ~(_FPU_MASK_EXCEPT | _FPU_MASK_RM);
   _FPU_SETCW (fpscr | round);
 }
 
@@ -70,8 +70,8 @@ libc_feholdsetround_vfp (fenv_t *envp, int round)
   envp->__cw = fpscr;
 
   /* Set new rounding mode if different.  */
-  if (__glibc_unlikely ((fpscr & FE_TOWARDZERO) != round))
-    _FPU_SETCW ((fpscr & ~FE_TOWARDZERO) | round);
+  if (__glibc_unlikely ((fpscr & _FPU_MASK_RM) != round))
+    _FPU_SETCW ((fpscr & ~_FPU_MASK_RM) | round);
 }
 
 static __always_inline void
@@ -82,7 +82,7 @@ libc_feresetround_vfp (fenv_t *envp)
   _FPU_GETCW (fpscr);
 
   /* Check whether rounding modes are different.  */
-  round = (envp->__cw ^ fpscr) & FE_TOWARDZERO;
+  round = (envp->__cw ^ fpscr) & _FPU_MASK_RM;
 
   /* Restore the rounding mode if it was changed.  */
   if (__glibc_unlikely (round != 0))
@@ -150,7 +150,7 @@ libc_feholdsetround_vfp_ctx (struct rm_ctx *ctx, int r)
   ctx->env.__cw = fpscr;
 
   /* Check whether rounding modes are different.  */
-  round = (fpscr ^ r) & FE_TOWARDZERO;
+  round = (fpscr ^ r) & _FPU_MASK_RM;
 
   /* Set the rounding mode if changed.  */
   if (__glibc_unlikely (round != 0))
@@ -169,7 +169,7 @@ libc_feresetround_vfp_ctx (struct rm_ctx *ctx)
       fpu_control_t fpscr;
 
       _FPU_GETCW (fpscr);
-      fpscr = (fpscr & ~FE_TOWARDZERO) | (ctx->env.__cw & FE_TOWARDZERO);
+      fpscr = (fpscr & ~_FPU_MASK_RM) | (ctx->env.__cw & _FPU_MASK_RM);
       _FPU_SETCW (fpscr);
     }
 }
diff --git a/sysdeps/arm/fesetround.c b/sysdeps/arm/fesetround.c
index 2e21925137..530a6ba91f 100644
--- a/sysdeps/arm/fesetround.c
+++ b/sysdeps/arm/fesetround.c
@@ -28,8 +28,7 @@ fesetround (int round)
   if (!ARM_HAVE_VFP)
     return (round == FE_TONEAREST) ? 0 : 1;
 
-  /* Fail if the rounding mode is not valid.  */
-  if (round & ~FE_TOWARDZERO)
+  if (round & ~_FPU_MASK_RM)
     return 1;
 
   libc_fesetround_vfp (round);
diff --git a/sysdeps/arm/fpu_control.h b/sysdeps/arm/fpu_control.h
index 0377697215..dbce935402 100644
--- a/sysdeps/arm/fpu_control.h
+++ b/sysdeps/arm/fpu_control.h
@@ -37,8 +37,8 @@ extern fpu_control_t __fpu_control;
 #define _FPU_MASK_UM	0x00000800	/* underflow */
 #define _FPU_MASK_PM	0x00001000	/* inexact */
 
-#define _FPU_MASK_NZCV	0xF0000000	/* NZCV flags */
-
+#define _FPU_MASK_NZCV	0xf0000000	/* NZCV flags */
+#define _FPU_MASK_RM	0x00c00000	/* rounding mode */
 #define _FPU_MASK_EXCEPT 0x00001f1f	/* all exception flags */
 
 /* Some bits in the FPSCR are not yet defined.  They must be preserved when
diff --git a/sysdeps/arm/get-rounding-mode.h b/sysdeps/arm/get-rounding-mode.h
index a1ecf51a46..f50ef24ca8 100644
--- a/sysdeps/arm/get-rounding-mode.h
+++ b/sysdeps/arm/get-rounding-mode.h
@@ -36,7 +36,7 @@ get_rounding_mode (void)
     return FE_TONEAREST;
 
   _FPU_GETCW (fpscr);
-  return fpscr & FE_TOWARDZERO;
+  return fpscr & _FPU_MASK_RM;
 }
 
 #endif /* get-rounding-mode.h */