diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/Makefile | 6 | ||||
| -rw-r--r-- | math/Versions | 2 | ||||
| -rw-r--r-- | math/fegetmode.c | 27 | ||||
| -rw-r--r-- | math/fenv.h | 18 | ||||
| -rw-r--r-- | math/fesetmode.c | 27 | ||||
| -rw-r--r-- | math/test-femode-traps.c | 149 | ||||
| -rw-r--r-- | math/test-femode.c | 231 |
7 files changed, 457 insertions, 3 deletions
diff --git a/math/Makefile b/math/Makefile index 6a90a367ab..fc48960fb0 100644 --- a/math/Makefile +++ b/math/Makefile @@ -41,7 +41,8 @@ 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 fetestexceptflag + fegetexcept fesetexcept fetestexceptflag fegetmode \ + fesetmode # Wrappers for these functions generated per type using a file named # <func>_template.c and the appropriate math-type-macros-<TYPE>.h. @@ -152,7 +153,8 @@ 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 test-fetestexceptflag $(tests-static) + test-fesetexcept-traps test-fetestexceptflag test-femode \ + test-femode-traps $(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 \ diff --git a/math/Versions b/math/Versions index 1c1683fed4..a429221340 100644 --- a/math/Versions +++ b/math/Versions @@ -215,6 +215,6 @@ libm { nextdown; nextdownf; nextdownl; } GLIBC_2.25 { - fesetexcept; fetestexceptflag; + fesetexcept; fetestexceptflag; fegetmode; fesetmode; } } diff --git a/math/fegetmode.c b/math/fegetmode.c new file mode 100644 index 0000000000..25f299fc13 --- /dev/null +++ b/math/fegetmode.c @@ -0,0 +1,27 @@ +/* Store current floating-point control modes. + 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 +fegetmode (femode_t *modep) +{ + /* Nothing to do. */ + return 0; +} +stub_warning (fegetmode) diff --git a/math/fenv.h b/math/fenv.h index 10d32db909..9006aa2fff 100644 --- a/math/fenv.h +++ b/math/fenv.h @@ -38,6 +38,12 @@ fexcept_t type for object representing the floating-point exception flags including status associated with the flags + femode_t type for object representing floating-point control modes + + FE_DFL_MODE macro of type pointer to const femode_t to be used as the + argument to fesetmode; in this case the default control + modes will be used + The following macros are defined iff the implementation supports this kind of exception. FE_INEXACT inexact result @@ -122,6 +128,18 @@ extern int fesetenv (const fenv_t *__envp) __THROW; extern int feupdateenv (const fenv_t *__envp) __THROW; +/* Control modes. */ + +#if __GLIBC_USE (IEC_60559_BFP_EXT) +/* Store the current floating-point control modes in the object + pointed to by MODEP. */ +extern int fegetmode (femode_t *__modep) __THROW; + +/* Establish the floating-point control modes represented by the + object pointed to by MODEP. */ +extern int fesetmode (const femode_t *__modep) __THROW; +#endif + /* Include optimization. */ #ifdef __OPTIMIZE__ # include <bits/fenvinline.h> diff --git a/math/fesetmode.c b/math/fesetmode.c new file mode 100644 index 0000000000..0d040e49a4 --- /dev/null +++ b/math/fesetmode.c @@ -0,0 +1,27 @@ +/* Install given floating-point control modes. + 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 +fesetmode (const femode_t *modep) +{ + /* Nothing to do. */ + return 0; +} +stub_warning (fesetmode) diff --git a/math/test-femode-traps.c b/math/test-femode-traps.c new file mode 100644 index 0000000000..dd22765831 --- /dev/null +++ b/math/test-femode-traps.c @@ -0,0 +1,149 @@ +/* Test femode_t functions: test handling of exception traps. + 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_ee (int exc1, int exc2) +{ + int result = 0; + printf ("testing %x %x\n", (unsigned int) exc1, (unsigned int) exc2); + + fedisableexcept (FE_ALL_EXCEPT); + int ret = feenableexcept (exc1); + if (ret == -1) + { + if (EXCEPTION_ENABLE_SUPPORTED (exc1)) + { + puts ("first feenableexcept failed unexpectedly"); + result = 1; + } + else + puts ("first feenableexcept failed, cannot test"); + return result; + } + femode_t saved; + ret = fegetmode (&saved); + if (ret != 0) + { + puts ("fegetmode failed"); + result = 1; + return result; + } + fedisableexcept (FE_ALL_EXCEPT); + ret = feenableexcept (exc2); + if (ret == -1) + { + if (EXCEPTION_ENABLE_SUPPORTED (exc2)) + { + puts ("second feenableexcept failed unexpectedly"); + result = 1; + } + else + puts ("second feenableexcept failed, cannot test"); + return result; + } + ret = fesetmode (&saved); + if (ret != 0) + { + puts ("fesetmode failed"); + result = 1; + return result; + } + /* Verify that the set of enabled traps was restored. */ + ret = fegetexcept (); + if (ret != exc1) + { + printf ("restored enabled traps %x not %x\n", (unsigned int) ret, + (unsigned int) exc1); + result = 1; + } + /* Likewise, with default modes. */ + ret = fesetmode (FE_DFL_MODE); + if (ret != 0) + { + puts ("fesetmode (FE_DFL_MODE) failed"); + result = 1; + return result; + } + ret = fegetexcept (); + if (ret != 0) + { + printf ("FE_DFL_MODE enabled traps %x not 0\n", (unsigned int) ret); + result = 1; + } + + return result; +} + +static int +test_e (int exc1) +{ + int result = 0; + + result |= test_ee (exc1, 0); + result |= test_ee (exc1, FE_ALL_EXCEPT); +#ifdef FE_DIVBYZERO + result |= test_ee (exc1, FE_DIVBYZERO); +#endif +#ifdef FE_INEXACT + result |= test_ee (exc1, FE_INEXACT); +#endif +#ifdef FE_INVALID + result |= test_ee (exc1, FE_INVALID); +#endif +#ifdef FE_OVERFLOW + result |= test_ee (exc1, FE_OVERFLOW); +#endif +#ifdef FE_UNDERFLOW + result |= test_ee (exc1, FE_UNDERFLOW); +#endif + + return result; +} + +static int +do_test (void) +{ + int result = 0; + + result |= test_e (0); + result |= test_e (FE_ALL_EXCEPT); +#ifdef FE_DIVBYZERO + result |= test_e (FE_DIVBYZERO); +#endif +#ifdef FE_INEXACT + result |= test_e (FE_INEXACT); +#endif +#ifdef FE_INVALID + result |= test_e (FE_INVALID); +#endif +#ifdef FE_OVERFLOW + result |= test_e (FE_OVERFLOW); +#endif +#ifdef FE_UNDERFLOW + result |= test_e (FE_UNDERFLOW); +#endif + + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/math/test-femode.c b/math/test-femode.c new file mode 100644 index 0000000000..1e80f32225 --- /dev/null +++ b/math/test-femode.c @@ -0,0 +1,231 @@ +/* Test femode_t functions. + 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_mmee (int mode1, int mode2, int exc1, int exc2) +{ + int result = 0; + printf ("testing %x %x %x %x\n", (unsigned int) mode1, (unsigned int) mode2, + (unsigned int) exc1, (unsigned int) exc2); + + feclearexcept (FE_ALL_EXCEPT); + int ret = fesetround (mode1); + if (ret != 0) + { + if (ROUNDING_TESTS (float, mode1)) + { + puts ("first fesetround failed unexpectedly"); + result = 1; + } + else + puts ("first fesetround failed, cannot test"); + return result; + } + ret = fesetexcept (exc1); + if (ret != 0) + { + if (EXCEPTION_TESTS (float) || exc1 == 0) + { + puts ("first fesetexcept failed unexpectedly"); + result = 1; + } + else + puts ("first fesetexcept failed, cannot test"); + return result; + } + femode_t saved; + ret = fegetmode (&saved); + if (ret != 0) + { + puts ("fegetmode failed"); + result = 1; + return result; + } + feclearexcept (FE_ALL_EXCEPT); + ret = fesetround (mode2); + if (ret != 0) + { + if (ROUNDING_TESTS (float, mode2)) + { + puts ("second fesetround failed unexpectedly"); + result = 1; + } + else + puts ("second fesetround failed, cannot test"); + return result; + } + ret = fesetexcept (exc2); + if (ret != 0) + { + if (EXCEPTION_TESTS (float) || exc2 == 0) + { + puts ("second fesetexcept failed unexpectedly"); + result = 1; + } + else + puts ("second fesetexcept failed, cannot test"); + return result; + } + ret = fesetmode (&saved); + if (ret != 0) + { + puts ("fesetmode failed"); + result = 1; + return result; + } + /* Verify that the rounding mode was restored but the exception + flags remain unchanged. */ + ret = fegetround (); + if (ret != mode1) + { + printf ("restored rounding mode %x not %x\n", (unsigned int) ret, + (unsigned int) mode1); + result = 1; + } + ret = fetestexcept (FE_ALL_EXCEPT); + if (ret != exc2) + { + printf ("exceptions %x not %x\n", (unsigned int) ret, + (unsigned int) exc2); + result = 1; + } + /* Likewise, with default modes. */ + ret = fesetmode (FE_DFL_MODE); + if (ret != 0) + { + puts ("fesetmode (FE_DFL_MODE) failed"); + result = 1; + return result; + } + ret = fegetround (); + if (ret != FE_TONEAREST) + { + printf ("FE_DFL_MODE rounding mode %x not %x\n", (unsigned int) ret, + (unsigned int) FE_TONEAREST); + result = 1; + } + ret = fetestexcept (FE_ALL_EXCEPT); + if (ret != exc2) + { + printf ("FE_DFL_MODE exceptions %x not %x\n", (unsigned int) ret, + (unsigned int) exc2); + result = 1; + } + return result; +} + +static int +test_mme (int mode1, int mode2, int exc1) +{ + int result = 0; + + result |= test_mmee (mode1, mode2, exc1, 0); + result |= test_mmee (mode1, mode2, exc1, FE_ALL_EXCEPT); +#ifdef FE_DIVBYZERO + result |= test_mmee (mode1, mode2, exc1, FE_DIVBYZERO); +#endif +#ifdef FE_INEXACT + result |= test_mmee (mode1, mode2, exc1, FE_INEXACT); +#endif +#ifdef FE_INVALID + result |= test_mmee (mode1, mode2, exc1, FE_INVALID); +#endif +#ifdef FE_OVERFLOW + result |= test_mmee (mode1, mode2, exc1, FE_OVERFLOW); +#endif +#ifdef FE_UNDERFLOW + result |= test_mmee (mode1, mode2, exc1, FE_UNDERFLOW); +#endif + + return result; +} + +static int +test_mm (int mode1, int mode2) +{ + int result = 0; + + result |= test_mme (mode1, mode2, 0); + result |= test_mme (mode1, mode2, FE_ALL_EXCEPT); +#ifdef FE_DIVBYZERO + result |= test_mme (mode1, mode2, FE_DIVBYZERO); +#endif +#ifdef FE_INEXACT + result |= test_mme (mode1, mode2, FE_INEXACT); +#endif +#ifdef FE_INVALID + result |= test_mme (mode1, mode2, FE_INVALID); +#endif +#ifdef FE_OVERFLOW + result |= test_mme (mode1, mode2, FE_OVERFLOW); +#endif +#ifdef FE_UNDERFLOW + result |= test_mme (mode1, mode2, FE_UNDERFLOW); +#endif + + return result; +} + +static int +test_m (int mode1) +{ + int result = 0; + +#ifdef FE_DOWNWARD + result |= test_mm (mode1, FE_DOWNWARD); +#endif +#ifdef FE_TONEAREST + result |= test_mm (mode1, FE_TONEAREST); +#endif +#ifdef FE_TOWARDZERO + result |= test_mm (mode1, FE_TOWARDZERO); +#endif +#ifdef FE_UPWARD + result |= test_mm (mode1, FE_UPWARD); +#endif + + return result; +} + +static int +do_test (void) +{ + int result = 0; + +#ifdef FE_DOWNWARD + result |= test_m (FE_DOWNWARD); +#endif +#ifdef FE_TONEAREST + result |= test_m (FE_TONEAREST); +#endif +#ifdef FE_TOWARDZERO + result |= test_m (FE_TOWARDZERO); +#endif +#ifdef FE_UPWARD + result |= test_m (FE_UPWARD); +#endif + + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |