[powerpc] fenv_private.h clean up

[thirdparty/glibc.git] / sysdeps / powerpc / fpu / feenablxcpt.c

diff --git a/sysdeps/powerpc/fpu/feenablxcpt.c b/sysdeps/powerpc/fpu/feenablxcpt.c
index e9293252472c41d21e6a5b26e662e94943d90d33..cf670b86d112dc4057761e9a68d7486f60b48ebd 100644 (file)
--- a/sysdeps/powerpc/fpu/feenablxcpt.c
+++ b/sysdeps/powerpc/fpu/feenablxcpt.c
@@ -1,5 +1,5 @@
 /* Enable floating-point exceptions.
-   Copyright (C) 2000, 2008 Free Software Foundation, Inc.
+   Copyright (C) 2000-2019 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Geoffrey Keating <geoffk@geoffk.org>, 2000.
 
@@ -15,40 +15,35 @@
 
    You should have received a copy of the GNU Lesser General Public
    License along with the GNU C Library; if not, see
-   <http://www.gnu.org/licenses/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 #include <fenv_libc.h>
 
 int
 feenableexcept (int excepts)
 {
-  fenv_union_t fe;
+  fenv_union_t fe, curr;
   int result, new;
 
-  result = __fegetexcept ();
+  /* Get current exception mask to return.  */
+  fe.fenv = curr.fenv = fegetenv_status ();
+  result = fenv_reg_to_exceptions (fe.l);
 
   if ((excepts & FE_ALL_INVALID) == FE_ALL_INVALID)
     excepts = (excepts | FE_INVALID) & ~ FE_ALL_INVALID;
 
-  fe.fenv = fegetenv_register ();
-  if (excepts & FE_INEXACT)
-    fe.l[1] |= (1 << (31 - FPSCR_XE));
-  if (excepts & FE_DIVBYZERO)
-    fe.l[1] |= (1 << (31 - FPSCR_ZE));
-  if (excepts & FE_UNDERFLOW)
-    fe.l[1] |= (1 << (31 - FPSCR_UE));
-  if (excepts & FE_OVERFLOW)
-    fe.l[1] |= (1 << (31 - FPSCR_OE));
-  if (excepts & FE_INVALID)
-    fe.l[1] |= (1 << (31 - FPSCR_VE));
-  fesetenv_register (fe.fenv);
-
-  new = __fegetexcept ();
-  if (new != 0 && result == 0)
-    (void)__fe_nomask_env ();
-
-  if ((new & excepts) != excepts)
-    result = -1;
+  new = fenv_exceptions_to_reg (excepts);
+
+  if (fenv_reg_to_exceptions (new) != excepts)
+    return -1;
+
+  /* Sets the new exception mask.  */
+  fe.l |= new;
+
+  if (fe.l != curr.l)
+    fesetenv_mode (fe.fenv);
+
+  __TEST_AND_EXIT_NON_STOP (0ULL, fe.l);
 
   return result;
 }