diff options
| -rw-r--r-- | libm/ldouble_wrappers.c | 48 | ||||
| -rw-r--r-- | test/math/Makefile.in | 2 | ||||
| -rw-r--r-- | test/math/c99_test.c | 117 |
3 files changed, 139 insertions, 28 deletions
diff --git a/libm/ldouble_wrappers.c b/libm/ldouble_wrappers.c index 80c9ed8b6..e2d4d8036 100644 --- a/libm/ldouble_wrappers.c +++ b/libm/ldouble_wrappers.c @@ -122,17 +122,6 @@ long long func##l(long double x) \ } #endif /* __i386__ && __OPTIMIZE__ */ -#if defined __NO_LONG_DOUBLE_MATH -# define int_WRAPPER_C99(func) /* not needed */ -# else -# define int_WRAPPER_C99(func) \ -int func##l(long double x) \ -{ \ - return func((double) x); \ -} \ -libm_hidden_def(func##l) -#endif - /* Implement the following, as defined by SuSv3 */ #if 0 long double acoshl(long double); @@ -508,26 +497,31 @@ long double significandl(long double x) } #endif -#ifdef __DO_C99_MATH__ +#if defined __DO_C99_MATH__ && !defined __NO_LONG_DOUBLE_MATH -#ifdef L___fpclassifyl -int_WRAPPER_C99(__fpclassify) -#endif +# ifdef L___fpclassifyl +int_WRAPPER1(__fpclassify) +libm_hidden_def(__fpclassifyl) +# endif -#ifdef L___finitel -int_WRAPPER_C99(__finite) -#endif +# ifdef L___finitel +int_WRAPPER1(__finite) +libm_hidden_def(__finitel) +# endif -#ifdef L___signbitl -int_WRAPPER_C99(__signbit) -#endif +# ifdef L___signbitl +int_WRAPPER1(__signbit) +libm_hidden_def(__signbitl) +# endif -#ifdef L___isnanl -int_WRAPPER_C99(__isnan) -#endif +# ifdef L___isnanl +int_WRAPPER1(__isnan) +libm_hidden_def(__isnanl) +# endif -#ifdef L___isinfl -int_WRAPPER_C99(__isinf) -#endif +# ifdef L___isinfl +int_WRAPPER1(__isinf) +libm_hidden_def(__isinfl) +# endif #endif diff --git a/test/math/Makefile.in b/test/math/Makefile.in index 0acbe9cac..3f9edf833 100644 --- a/test/math/Makefile.in +++ b/test/math/Makefile.in @@ -4,7 +4,7 @@ TESTS := basic-test tst-definitions test-fpucw test-float test-ifloat test-double test-idouble \ rint signgam ilogb ifeq ($(UCLIBC_HAS_LONG_DOUBLE_MATH),y) -TESTS += test-ldouble test-ildoubl compile_test +TESTS += test-ldouble test-ildoubl compile_test c99_test else CFLAGS_basic-test := -DNO_LONG_DOUBLE endif diff --git a/test/math/c99_test.c b/test/math/c99_test.c new file mode 100644 index 000000000..fd6feeafc --- /dev/null +++ b/test/math/c99_test.c @@ -0,0 +1,117 @@ +//#define _GNU_SOURCE 1 +#include <math.h> +#include <float.h> +#include <stdlib.h> +#include <stdint.h> +#include <limits.h> +#include <stdio.h> + +#define check_d1(func, param, expected) \ +do { \ + int err; hex_union ur; hex_union up; \ + double result = func(param); up.f = param; ur.f = result; \ + errors += (err = (result != (expected))); \ + err \ + ? printf("FAIL: %s(%g/"HEXFMT")=%g/"HEXFMT" (expected %g)\n", \ + #func, (double)(param), (long long)up.hex, result, (long long)ur.hex, (double)(expected)) \ + : printf("PASS: %s(%g)=%g\n", #func, (double)(param), result); \ +} while (0) + +#define check_i1(func, param, expected) \ +do { \ + int err; hex_union up; \ + long long result = func(param); up.f = param; \ + errors += (err = (result != (expected))); \ + err \ + ? printf("FAIL: %s(%g/"HEXFMT")=%lld/%llu (expected %llu)\n", \ + #func, (double)(param), (long long)up.hex, result, result, (long long)(expected)) \ + : printf("PASS: %s(%g)=%lld/%llu\n", #func, (double)(param), result, result); \ +} while (0) + +#define HEXFMT "%08llx" +typedef union { + double f; + uint64_t hex; +} hex_union; + +double zero = 0.0; +double minus_zero = 0.0; +double nan_value = 0.0; +int errors = 0; + +int main(void) +{ + nan_value /= nan_value; + minus_zero = copysign(zero, -1.0); + + check_i1(isfinite, 1.0, 1); + check_i1(isfinite, 2.0, 1); + check_i1(isfinite, 3.0, 1); + check_i1(isfinite, DBL_MAX, 1); + check_i1(isfinite, FLT_MAX, 1); + check_i1(isfinite, HUGE_VAL, 0); + check_i1(isfinite, HUGE_VALF, 0); + check_i1(isfinite, HUGE_VALL, 0); + check_i1(isfinite, nan_value, 0); + check_i1(isfinite, nan_value, 0); + check_i1(isfinite, nan_value, 0); + + check_i1(isnan, 1.0, 0); + check_i1(isnan, 2.0, 0); + check_i1(isnan, 3.0, 0); + check_i1(isnan, DBL_MAX, 0); + check_i1(isnan, FLT_MAX, 0); + check_i1(isnan, HUGE_VAL, 0); + check_i1(isnan, HUGE_VALF, 0); + check_i1(isnan, HUGE_VALL, 0); + check_i1(isnan, (float)HUGE_VALL, 0); + check_i1(isnan, nan_value, 1); + check_i1(isnan, nan_value, 1); + check_i1(isnan, nan_value, 1); + + check_i1(isinf, 1.0, 0); + check_i1(isinf, 2.0, 0); + check_i1(isinf, 3.0, 0); + check_i1(isinf, DBL_MAX, 0); + check_i1(isinf, FLT_MAX, 0); + check_i1(isinf, (float)DBL_MAX, 1); + check_i1(isinf, HUGE_VAL, 1); + check_i1(isinf, HUGE_VALF, 1); + check_i1(isinf, HUGE_VALL, 1); + check_i1(isinf, (float)HUGE_VALL, 1); + check_i1(isinf, nan_value, 0); + check_i1(isinf, nan_value, 0); + check_i1(isinf, nan_value, 0); + + check_i1(fpclassify, minus_zero, FP_ZERO); + check_i1(fpclassify, 0.0, FP_ZERO); + check_i1(fpclassify, 1.0, FP_NORMAL); + check_i1(fpclassify, 2.0, FP_NORMAL); + check_i1(fpclassify, 3.0, FP_NORMAL); + check_i1(fpclassify, DBL_MIN/1.01, FP_SUBNORMAL); + check_i1(fpclassify, DBL_MIN, FP_NORMAL); + check_i1(fpclassify, DBL_MAX, FP_NORMAL); + check_i1(fpclassify, FLT_MAX, FP_NORMAL); + check_i1(fpclassify, DBL_MAX, FP_NORMAL); + check_i1(fpclassify, DBL_MAX*1.01, FP_INFINITE); + check_i1(fpclassify, HUGE_VAL, FP_INFINITE); + check_i1(fpclassify, HUGE_VALF, FP_INFINITE); + check_i1(fpclassify, HUGE_VALL, FP_INFINITE); + check_i1(fpclassify, (float)HUGE_VALL, FP_INFINITE); + check_i1(fpclassify, nan_value, FP_NAN); + check_i1(fpclassify, nan_value, FP_NAN); + check_i1(fpclassify, nan_value, FP_NAN); + + check_i1(!!signbit, -1.0, 1); + check_i1(!!signbit, minus_zero, 1); + check_i1(!!signbit, 0.0, 0); + check_i1(!!signbit, HUGE_VAL, 0); + check_i1(!!signbit, HUGE_VALF, 0); + check_i1(!!signbit, HUGE_VALL, 0); + check_i1(!!signbit, -HUGE_VAL, 1); + check_i1(!!signbit, -HUGE_VALF, 1); + check_i1(!!signbit, -HUGE_VALL, 1); + + printf("Errors: %d\n", errors); + return errors; +} |