diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/Makefile | 5 | ||||
| -rw-r--r-- | math/Versions | 3 | ||||
| -rw-r--r-- | math/fenv.h | 9 | ||||
| -rw-r--r-- | math/fesetexcept.c | 27 | ||||
| -rw-r--r-- | math/test-fesetexcept-traps.c | 68 | ||||
| -rw-r--r-- | math/test-fesetexcept.c | 129 |
6 files changed, 238 insertions, 3 deletions
diff --git a/math/Makefile b/math/Makefile index 1da1797198..38a4709802 100644 --- a/math/Makefile +++ b/math/Makefile @@ -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 + fegetexcept fesetexcept libm-calls = \ e_acosF e_acoshF e_asinF e_atan2F e_atanhF e_coshF e_expF e_fmodF \ @@ -146,7 +146,8 @@ tests = test-matherr test-fenv atest-exp atest-sincos atest-exp2 basic-test \ test-nearbyint-except-2 test-signgam-uchar test-signgam-uchar-init \ 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 $(tests-static) + test-fexcept test-fexcept-traps test-fesetexcept \ + test-fesetexcept-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 467d7ed3b5..ff4e4d4292 100644 --- a/math/Versions +++ b/math/Versions @@ -214,4 +214,7 @@ libm { nextup; nextupf; nextupl; nextdown; nextdownf; nextdownl; } + GLIBC_2.25 { + fesetexcept; + } } diff --git a/math/fenv.h b/math/fenv.h index 9a1e112f72..7f4ceb744c 100644 --- a/math/fenv.h +++ b/math/fenv.h @@ -22,7 +22,8 @@ #ifndef _FENV_H #define _FENV_H 1 -#include <features.h> +#define __GLIBC_INTERNAL_STARTING_HEADER_IMPLEMENTATION +#include <bits/libc-header-start.h> /* Get the architecture dependend definitions. The following definitions are expected to be done: @@ -70,6 +71,12 @@ extern int fegetexceptflag (fexcept_t *__flagp, int __excepts) __THROW; /* Raise the supported exceptions represented by EXCEPTS. */ extern int feraiseexcept (int __excepts) __THROW; +#if __GLIBC_USE (IEC_60559_BFP_EXT) +/* Set the supported exception flags represented by EXCEPTS, without + causing enabled traps to be taken. */ +extern int fesetexcept (int __excepts) __THROW; +#endif + /* Set complete status for exceptions indicated by EXCEPTS according to the representation in the object pointed to by FLAGP. */ extern int fesetexceptflag (const fexcept_t *__flagp, int __excepts) __THROW; diff --git a/math/fesetexcept.c b/math/fesetexcept.c new file mode 100644 index 0000000000..892d8adc5f --- /dev/null +++ b/math/fesetexcept.c @@ -0,0 +1,27 @@ +/* Set given exception flags. + 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 +fesetexcept (int excepts) +{ + /* This always fails unless nothing needs to be done. */ + return (excepts != 0); +} +stub_warning (fesetexcept) diff --git a/math/test-fesetexcept-traps.c b/math/test-fesetexcept-traps.c new file mode 100644 index 0000000000..c40b5bc2b8 --- /dev/null +++ b/math/test-fesetexcept-traps.c @@ -0,0 +1,68 @@ +/* Test fesetexcept: exception traps enabled. + 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 +do_test (void) +{ + int result = 0; + + fedisableexcept (FE_ALL_EXCEPT); + int ret = feenableexcept (FE_ALL_EXCEPT); + if (!EXCEPTION_ENABLE_SUPPORTED (FE_ALL_EXCEPT) && (ret == -1)) + { + puts ("feenableexcept (FE_ALL_EXCEPT) not supported, cannot test"); + return 77; + } + else if (ret != 0) + { + puts ("feenableexcept (FE_ALL_EXCEPT) failed"); + result = 1; + return result; + } + + if (EXCEPTION_SET_FORCES_TRAP) + { + puts ("setting exceptions traps, cannot test on this architecture"); + return 77; + } + /* Verify fesetexcept does not cause exception traps. */ + ret = fesetexcept (FE_ALL_EXCEPT); + if (ret == 0) + puts ("fesetexcept (FE_ALL_EXCEPT) succeeded"); + else + { + puts ("fesetexcept (FE_ALL_EXCEPT) failed"); + if (EXCEPTION_TESTS (float)) + { + puts ("failure of fesetexcept was unexpected"); + result = 1; + } + else + puts ("failure of fesetexcept OK"); + } + feclearexcept (FE_ALL_EXCEPT); + + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" diff --git a/math/test-fesetexcept.c b/math/test-fesetexcept.c new file mode 100644 index 0000000000..912a9a6bad --- /dev/null +++ b/math/test-fesetexcept.c @@ -0,0 +1,129 @@ +/* Test fesetexcept. + 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_fesetexcept (int exc, const char *exc_name) +{ + int result = 0; + + printf ("Testing %s\n", exc_name); + feclearexcept (FE_ALL_EXCEPT); + int ret = fesetexcept (exc); + if (ret == 0) + printf ("fesetexcept (%s) succeeded\n", exc_name); + else + { + printf ("fesetexcept (%s) failed\n", exc_name); + if (exc == 0 || EXCEPTION_TESTS (float)) + { + puts ("failure of fesetexcept was unexpected"); + result = 1; + } + else + puts ("failure of fesetexcept OK, skipping further tests"); + return result; + } + ret = fetestexcept (FE_ALL_EXCEPT); + if (ret != exc) + { + printf ("raised exceptions %x, expected %x\n", + (unsigned int) ret, (unsigned int) exc); + result = 1; + } + + ret = feraiseexcept (FE_ALL_EXCEPT); + if (ret != 0) + { + if (exc == 0 && !EXCEPTION_TESTS (float)) + { + puts ("feraiseexcept (FE_ALL_EXCEPT) failed, skipping further tests"); + return result; + } + puts ("feraiseexcept (FE_ALL_EXCEPT) unexpectedly failed"); + result = 1; + } + ret = fesetexcept (exc); + if (ret != 0) + { + puts ("fesetexcept (second test) unexpectedly failed"); + result = 1; + } + ret = fetestexcept (FE_ALL_EXCEPT); + if (ret != FE_ALL_EXCEPT) + { + printf ("raised exceptions (second test) %x, expected %x\n", + (unsigned int) ret, (unsigned int) FE_ALL_EXCEPT); + result = 1; + } + + feclearexcept (FE_ALL_EXCEPT); + ret = feraiseexcept (FE_ALL_EXCEPT & ~exc); + if (ret != 0) + { + puts ("feraiseexcept (third test) unexpectedly failed"); + result = 1; + } + ret = fesetexcept (exc); + if (ret != 0) + { + puts ("fesetexcept (third test) unexpectedly failed"); + result = 1; + } + ret = fetestexcept (FE_ALL_EXCEPT); + if (ret != FE_ALL_EXCEPT) + { + printf ("raised exceptions (third test) %x, expected %x\n", + (unsigned int) ret, (unsigned int) FE_ALL_EXCEPT); + result = 1; + } + + return result; +} + +static int +do_test (void) +{ + int result = 0; + + result |= test_fesetexcept (0, "0"); + result |= test_fesetexcept (FE_ALL_EXCEPT, "FE_ALL_EXCEPT"); +#ifdef FE_DIVBYZERO + result |= test_fesetexcept (FE_DIVBYZERO, "FE_DIVBYZERO"); +#endif +#ifdef FE_INEXACT + result |= test_fesetexcept (FE_INEXACT, "FE_INEXACT"); +#endif +#ifdef FE_INVALID + result |= test_fesetexcept (FE_INVALID, "FE_INVALID"); +#endif +#ifdef FE_OVERFLOW + result |= test_fesetexcept (FE_OVERFLOW, "FE_OVERFLOW"); +#endif +#ifdef FE_UNDERFLOW + result |= test_fesetexcept (FE_UNDERFLOW, "FE_UNDERFLOW"); +#endif + + return result; +} + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" |