diff options
Diffstat (limited to 'math')
| -rw-r--r-- | math/Makefile | 5 | ||||
| -rw-r--r-- | math/libm-test.c | 109 | ||||
| -rw-r--r-- | math/math.h | 8 |
3 files changed, 113 insertions, 9 deletions
diff --git a/math/Makefile b/math/Makefile index 0bf27c8065..64803a345c 100644 --- a/math/Makefile +++ b/math/Makefile @@ -35,7 +35,8 @@ aux := fpu_control setfpucw extra-libs := libm extra-libs-others = $(extra-libs) -libm-support = k_standard s_lib_version s_matherr s_signgam +libm-support = k_standard s_lib_version s_matherr s_signgam \ + s_rinttol s_rinttoll libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \ e_hypot e_j0 e_j1 e_jn e_lgamma_r e_log e_log10 e_pow \ e_rem_pio2 e_remainder e_scalb e_sinh e_sqrt k_cos \ @@ -49,7 +50,7 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \ w_log w_log10 w_pow w_remainder w_scalb w_sinh w_sqrt \ s_signbit s_fpclassify s_fmax s_fmin s_fdim s_nan s_trunc \ s_remquo s_log2 s_exp2 \ - conj cimag creal cabs carg s_cexp s_csinh s_ccosh + conj cimag creal cabs carg s_cexp s_csinh s_ccosh s_clog libm-routines = $(libm-support) $(libm-calls) \ $(patsubst %_rf,%f_r,$(libm-calls:=f)) \ $(long-m-$(long-double-fcts)) diff --git a/math/libm-test.c b/math/libm-test.c index 0c65eb174f..5171d0fc5e 100644 --- a/math/libm-test.c +++ b/math/libm-test.c @@ -367,6 +367,63 @@ check_bool (const char *test_name, int computed) static void +check_long (const char *test_name, long int computed, long int expected) +{ + long int diff = computed - expected; + int result = diff == 0; + + if (result) + { + if (verbose > 2) + printf ("Pass: %s\n", test_name); + } + else + { + if (verbose) + printf ("Fail: %s\n", test_name); + if (verbose > 1) + { + printf ("Result:\n"); + printf (" is: %ld\n", computed); + printf (" should be: %ld\n", expected); + } + noErrors++; + } + + fpstack_test (test_name); +} + + +static void +check_longlong (const char *test_name, long long int computed, + long long int expected) +{ + long long int diff = computed - expected; + int result = diff == 0; + + if (result) + { + if (verbose > 2) + printf ("Pass: %s\n", test_name); + } + else + { + if (verbose) + printf ("Fail: %s\n", test_name); + if (verbose > 1) + { + printf ("Result:\n"); + printf (" is: %lld\n", computed); + printf (" should be: %lld\n", expected); + } + noErrors++; + } + + fpstack_test (test_name); +} + + +static void check_isnan (const char *test_name, MATHTYPE computed) { output_isvalue (test_name, isnan (computed), computed); @@ -2485,6 +2542,7 @@ ctanh_test (void) check_isnan ("real(ctanh(NaN + i NaN)) = NaN", __real__ result); check_isnan ("imag(ctanh(NaN + i NaN)) = NaN", __imag__ result); } +#endif static void @@ -2504,7 +2562,7 @@ clog_test (void) check ("imag(clog(0 + i0)) = 0", __imag__ result, 0); result = FUNC(clog) (BUILD_COMPLEX (0, minus_zero)); check_isinfn ("real(clog(0 - i0)) = -Inf", __real__ result); - check ("imag(clog(0 - i0)) = -0", __imag__ result, -minus_zero); + check ("imag(clog(0 - i0)) = -0", __imag__ result, minus_zero); result = FUNC(clog) (BUILD_COMPLEX (minus_infty, plus_infty)); check_isinfp ("real(clog(-Inf + i Inf)) = +Inf", __real__ result); @@ -2566,10 +2624,10 @@ clog_test (void) check ("imag(clog(+Inf + i1)) = 0", __imag__ result, 0); result = FUNC(clog) (BUILD_COMPLEX (plus_infty, minus_zero)); check_isinfp ("real(clog(+Inf - i0)) = +Inf", __real__ result); - check ("imag(clog(+Inf - i0)) = -0", __imag__ result, -0); + check ("imag(clog(+Inf - i0)) = -0", __imag__ result, minus_zero); result = FUNC(clog) (BUILD_COMPLEX (plus_infty, -1)); check_isinfp ("real(clog(+Inf - i1)) = +Inf", __real__ result); - check ("imag(clog(+Inf - i1)) = -0", __imag__ result, -0); + check ("imag(clog(+Inf - i1)) = -0", __imag__ result, minus_zero); result = FUNC(clog) (BUILD_COMPLEX (plus_infty, nan_value)); check_isinfp ("real(clog(+Inf + i NaN)) = +Inf", __real__ result); @@ -2617,6 +2675,7 @@ clog_test (void) } +#if 0 static void csqrt_test (void) { @@ -2741,6 +2800,46 @@ csqrt_test (void) static void +rinttol_test (void) +{ + /* XXX this test is incomplete. We need to have a way to specifiy + the rounding method and test the critical cases. So far, only + unproblematic numbers are tested. */ + + check_long ("rinttol(0) = 0", 0.0, 0); + check_long ("rinttol(-0) = 0", minus_zero, 0); + check_long ("rinttol(0.2) = 0", 0.2, 0); + check_long ("rinttol(-0.2) = 0", -0.2, 0); + + check_long ("rinttol(1.4) = 1", 1.4, 1); + check_long ("rinttol(-1.4) = -1", -1.4, -1); + + check_long ("rinttol(8388600.3) = 8388600", 8388600.3, 8388600); + check_long ("rinttol(-8388600.3) = -8388600", -8388600.3, -8388600); +} + + +static void +rinttoll_test (void) +{ + /* XXX this test is incomplete. We need to have a way to specifiy + the rounding method and test the critical cases. So far, only + unproblematic numbers are tested. */ + + check_longlong ("rinttoll(0) = 0", 0.0, 0); + check_longlong ("rinttoll(-0) = 0", minus_zero, 0); + check_longlong ("rinttoll(0.2) = 0", 0.2, 0); + check_longlong ("rinttoll(-0.2) = 0", -0.2, 0); + + check_longlong ("rinttoll(1.4) = 1", 1.4, 1); + check_longlong ("rinttoll(-1.4) = -1", -1.4, -1); + + check_longlong ("rinttoll(8388600.3) = 8388600", 8388600.3, 8388600); + check_longlong ("rinttoll(-8388600.3) = -8388600", -8388600.3, -8388600); +} + + +static void inverse_func_pair_test (const char *test_name, mathfunc f1, mathfunc inverse, MATHTYPE x, MATHTYPE epsilon) @@ -3070,6 +3169,10 @@ main (int argc, char *argv[]) cexp_test (); csinh_test (); ccosh_test (); + clog_test (); + + rinttol_test (); + rinttoll_test (); identities (); inverse_functions (); diff --git a/math/math.h b/math/math.h index 4d88f06673..ce4f4867fa 100644 --- a/math/math.h +++ b/math/math.h @@ -163,13 +163,13 @@ enum /* Round X to nearest integral value according to current rounding direction. */ -extern long int rinttol __P ((double __x)); -extern long long int rinttoll __P ((double __x)); +extern long int rinttol __P ((long double __x)); +extern long long int rinttoll __P ((long double __x)); /* Round X to nearest integral value, rounding halfway cases away from zero. */ -extern long int roundtol __P ((double __x)); -extern long long int roundtoll __P ((double __x)); +extern long int roundtol __P ((long double __x)); +extern long long int roundtoll __P ((long double __x)); /* Comparison macros. */ |