From f00faa4a43706d85ad8d4d2c970d3f52f0f63bfb Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Thu, 9 Jun 2016 18:04:30 +0000 Subject: [PATCH] Fix i386/x86_64 log2l (sNaN) (bug 20235). The i386/x86_64 versions of log2l return sNaN for sNaN input. This patch fixes them to add NaN inputs to themselves so that qNaN is returned in this case. Tested for x86_64 and x86. [BZ #20235] * sysdeps/i386/fpu/e_log2l.S (__ieee754_log2l): Add NaN input to itself. * sysdeps/x86_64/fpu/e_log2l.S (__ieee754_log2l): Likewise. * math/libm-test.inc (log2_test_data): Add sNaN tests. --- ChangeLog | 6 ++++++ math/libm-test.inc | 2 ++ sysdeps/i386/fpu/e_log2l.S | 1 + sysdeps/x86_64/fpu/e_log2l.S | 1 + 4 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 81192ce5b8..c0a32785e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2016-06-09 Joseph Myers + [BZ #20235] + * sysdeps/i386/fpu/e_log2l.S (__ieee754_log2l): Add NaN input to + itself. + * sysdeps/x86_64/fpu/e_log2l.S (__ieee754_log2l): Likewise. + * math/libm-test.inc (log2_test_data): Add sNaN tests. + [BZ #20234] * sysdeps/ieee754/ldbl-128ibm/s_log1pl.c (__log1pl): Add positive infinity or NaN input to itself. diff --git a/math/libm-test.inc b/math/libm-test.inc index 4371c4ca7b..2df6f29a34 100644 --- a/math/libm-test.inc +++ b/math/libm-test.inc @@ -9076,6 +9076,8 @@ static const struct test_f_f_data log2_test_data[] = TEST_f_f (log2, plus_infty, plus_infty, ERRNO_UNCHANGED), TEST_f_f (log2, qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), TEST_f_f (log2, -qnan_value, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED), + TEST_f_f (log2, snan_value, qnan_value, INVALID_EXCEPTION), + TEST_f_f (log2, -snan_value, qnan_value, INVALID_EXCEPTION), AUTO_TESTS_f_f (log2), }; diff --git a/sysdeps/i386/fpu/e_log2l.S b/sysdeps/i386/fpu/e_log2l.S index 0f5f7e5789..73e62ea908 100644 --- a/sysdeps/i386/fpu/e_log2l.S +++ b/sysdeps/i386/fpu/e_log2l.S @@ -64,6 +64,7 @@ ENTRY(__ieee754_log2l) 3: jp 4b // in case x is ±Inf fstp %st(1) fstp %st(1) + fadd %st(0) ret END (__ieee754_log2l) strong_alias (__ieee754_log2l, __log2l_finite) diff --git a/sysdeps/x86_64/fpu/e_log2l.S b/sysdeps/x86_64/fpu/e_log2l.S index a063255ddd..023ec29164 100644 --- a/sysdeps/x86_64/fpu/e_log2l.S +++ b/sysdeps/x86_64/fpu/e_log2l.S @@ -63,6 +63,7 @@ ENTRY(__ieee754_log2l) jnz 4b // in case x is ±Inf fstp %st(1) fstp %st(1) + fadd %st(0) ret END (__ieee754_log2l) -- 2.43.5