@@ -32,7 +32,8 @@ Version 2.25
presently cannot avoid being compiled under _GNU_SOURCE, exacerbating the
problem.
-* The fesetexcept function from TS 18661-1:2014 is added to libm.
+* The fesetexcept and fetestexceptflag functions from TS 18661-1:2014 are
+ added to libm.
Security related changes:
@@ -834,6 +834,17 @@ Note that the value stored in @code{fexcept_t} bears no resemblance to
the bit mask returned by @code{fetestexcept}. The type may not even be
an integer. Do not attempt to modify an @code{fexcept_t} variable.
+@comment fenv.h
+@comment ISO
+@deftypefun int fetestexceptflag (const fexcept_t *@var{flagp}, int @var{excepts})
+@safety{@prelim{}@mtsafe{}@assafe{}@acsafe{}}
+Test whether the exception flags indicated by the parameter
+@var{excepts} are set in the variable pointed to by @var{flagp}. If
+any of them are, a nonzero value is returned which specifies which
+exceptions are set. Otherwise the result is zero.
+@code{fetestexceptflag} is from TS 18661-1:2014.
+@end deftypefun
+
@node Math Error Reporting
@subsection Error Reporting by Mathematical Functions
@cindex errors, mathematical
@@ -41,7 +41,7 @@ libm-support = s_lib_version s_matherr s_signgam \
fclrexcpt fgetexcptflg fraiseexcpt fsetexcptflg \
ftestexcept fegetround fesetround fegetenv feholdexcpt \
fesetenv feupdateenv t_exp fedisblxcpt feenablxcpt \
- fegetexcept fesetexcept
+ fegetexcept fesetexcept fetestexceptflag
# Wrappers for these functions generated per type using a file named
# <func>_template.c and the appropriate math-type-macros-<TYPE>.h.
@@ -153,7 +153,7 @@ tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \
test-signgam-uint test-signgam-uint-init test-signgam-ullong \
test-signgam-ullong-init test-nan-overflow test-nan-payload \
test-fexcept test-fexcept-traps test-fesetexcept \
- test-fesetexcept-traps $(tests-static)
+ test-fesetexcept-traps test-fetestexceptflag $(tests-static)
tests-static = test-fpucw-static test-fpucw-ieee-static \
test-signgam-uchar-static test-signgam-uchar-init-static \
test-signgam-uint-static test-signgam-uint-init-static \
@@ -215,6 +215,6 @@ libm {
nextdown; nextdownf; nextdownl;
}
GLIBC_2.25 {
- fesetexcept;
+ fesetexcept; fetestexceptflag;
}
}
@@ -85,6 +85,12 @@ extern int fesetexceptflag (const fexcept_t *__flagp, int __excepts) __THROW;
currently set. */
extern int fetestexcept (int __excepts) __THROW;
+#if __GLIBC_USE (IEC_60559_BFP_EXT)
+/* Determine which of subset of the exceptions specified by EXCEPTS
+ are set in *FLAGP. */
+extern int fetestexceptflag (const fexcept_t *__flagp, int __excepts) __THROW;
+#endif
+
/* Rounding control. */
new file mode 100644
@@ -0,0 +1,27 @@
+/* Test exception in saved exception state.
+ Copyright (C) 2016 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ 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/>. */
+
+#include <fenv.h>
+
+int
+fetestexceptflag (const fexcept_t *flagp, int excepts)
+{
+ /* Most versions of fegetexceptflag store exceptions in a form such
+ that this works. */
+ return *flagp & excepts & FE_ALL_EXCEPT;
+}
new file mode 100644
@@ -0,0 +1,130 @@
+/* Test fetestexceptflag.
+ Copyright (C) 2016 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ 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/>. */
+
+#include <fenv.h>
+#include <stdio.h>
+#include <math-tests.h>
+
+static int
+test_one (int exc_test, int exc_set, int exc_save)
+{
+ int result = 0;
+
+ printf ("Individual test: %x %x %x\n", (unsigned int) exc_test,
+ (unsigned int) exc_set, (unsigned int) exc_save);
+
+ feclearexcept (FE_ALL_EXCEPT);
+ int ret = fesetexcept (exc_set);
+ if (ret != 0)
+ {
+ puts ("fesetexcept failed");
+ if (exc_set == 0 || EXCEPTION_TESTS (float))
+ {
+ puts ("failure of fesetexcept was unexpected");
+ result = 1;
+ }
+ else
+ puts ("failure of fesetexcept OK, skipping further tests");
+ return result;
+ }
+ fexcept_t saved;
+ ret = fegetexceptflag (&saved, exc_save);
+ if (ret == 0)
+ puts ("fegetexceptflag succeeded");
+ else
+ {
+ puts ("fegetexceptflag failed");
+ result = 1;
+ return result;
+ }
+ ret = fetestexceptflag (&saved, exc_test);
+ if (ret == (exc_set & exc_test))
+ puts ("fetestexceptflag result correct");
+ else
+ {
+ printf ("fetestexceptflag returned %x, expected %x\n", ret,
+ exc_set & exc_test);
+ result = 1;
+ }
+ if (exc_save == FE_ALL_EXCEPT)
+ {
+ /* Also test fetestexceptflag testing all exceptions but
+ possibly with only some set. */
+ ret = fetestexceptflag (&saved, FE_ALL_EXCEPT);
+ if (ret == exc_set)
+ puts ("fetestexceptflag (FE_ALL_EXCEPT) result correct");
+ else
+ {
+ printf ("fetestexceptflag (FE_ALL_EXCEPT) returned %x, expected %x\n",
+ ret, exc_set);
+ result = 1;
+ }
+ }
+ return result;
+}
+
+static int
+test_fetestexceptflag (int exc, const char *exc_name)
+{
+ int result = 0;
+
+ printf ("Testing %s\n", exc_name);
+
+ /* Test each case of: whether this exception is set or clear;
+ whether other exceptions are set or clear; whether the whole
+ state is saved or just the state for this exception. */
+ result |= test_one (exc, 0, exc);
+ result |= test_one (exc, 0, FE_ALL_EXCEPT);
+ result |= test_one (exc, exc, exc);
+ result |= test_one (exc, exc, FE_ALL_EXCEPT);
+ result |= test_one (exc, FE_ALL_EXCEPT & ~exc, exc);
+ result |= test_one (exc, FE_ALL_EXCEPT & ~exc, FE_ALL_EXCEPT);
+ result |= test_one (exc, FE_ALL_EXCEPT, exc);
+ result |= test_one (exc, FE_ALL_EXCEPT, FE_ALL_EXCEPT);
+
+ return result;
+}
+
+static int
+do_test (void)
+{
+ int result = 0;
+
+ result |= test_fetestexceptflag (0, "0");
+ result |= test_fetestexceptflag (FE_ALL_EXCEPT, "FE_ALL_EXCEPT");
+#ifdef FE_DIVBYZERO
+ result |= test_fetestexceptflag (FE_DIVBYZERO, "FE_DIVBYZERO");
+#endif
+#ifdef FE_INEXACT
+ result |= test_fetestexceptflag (FE_INEXACT, "FE_INEXACT");
+#endif
+#ifdef FE_INVALID
+ result |= test_fetestexceptflag (FE_INVALID, "FE_INVALID");
+#endif
+#ifdef FE_OVERFLOW
+ result |= test_fetestexceptflag (FE_OVERFLOW, "FE_OVERFLOW");
+#endif
+#ifdef FE_UNDERFLOW
+ result |= test_fetestexceptflag (FE_UNDERFLOW, "FE_UNDERFLOW");
+#endif
+
+ return result;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"
@@ -381,3 +381,4 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
new file mode 100644
@@ -0,0 +1,28 @@
+/* Test exception in saved exception state. S/390 version.
+ Copyright (C) 2016 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ 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/>. */
+
+#include <fenv.h>
+#include <fenv_libc.h>
+
+int
+fetestexceptflag (const fexcept_t *flagp, int excepts)
+{
+ return (((*flagp >> FPC_FLAGS_SHIFT) | (*flagp >> FPC_DXC_SHIFT))
+ & excepts
+ & FE_ALL_EXCEPT);
+}
@@ -412,3 +412,4 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
@@ -422,6 +422,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.3.4 GLIBC_2.3.4 A
GLIBC_2.3.4 __c1_cabsf F
GLIBC_2.3.4 __c1_cacosf F
@@ -70,6 +70,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 _LIB_VERSION D 0x4
GLIBC_2.4 __clog10 F
@@ -382,5 +382,6 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 exp2l F
@@ -424,4 +424,5 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
@@ -353,4 +353,5 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
@@ -70,6 +70,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 _LIB_VERSION D 0x4
GLIBC_2.4 __clog10 F
@@ -422,4 +422,5 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
@@ -381,3 +381,4 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
@@ -383,6 +383,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 exp2l F
_gp_disp _gp_disp A
@@ -414,4 +414,5 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
@@ -381,3 +381,4 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
@@ -423,6 +423,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 __clog10l F
GLIBC_2.4 __finitel F
@@ -422,6 +422,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 __clog10l F
GLIBC_2.4 __finitel F
@@ -417,3 +417,4 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
@@ -98,6 +98,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.3 GLIBC_2.3 A
GLIBC_2.3 _LIB_VERSION D 0x4
GLIBC_2.3 __clog10 F
@@ -412,6 +412,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 __clog10l F
GLIBC_2.4 __finitel F
@@ -410,6 +410,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 __clog10l F
GLIBC_2.4 __finitel F
@@ -382,5 +382,6 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 exp2l F
@@ -415,6 +415,7 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
GLIBC_2.4 __clog10l F
GLIBC_2.4 __finitel F
@@ -413,4 +413,5 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
@@ -382,3 +382,4 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
@@ -382,3 +382,4 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
@@ -382,3 +382,4 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
@@ -413,4 +413,5 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F
GLIBC_2.4 GLIBC_2.4 A
@@ -412,3 +412,4 @@ GLIBC_2.24 nextupf F
GLIBC_2.24 nextupl F
GLIBC_2.25 GLIBC_2.25 A
GLIBC_2.25 fesetexcept F
+GLIBC_2.25 fetestexceptflag F