Fix ldexp, scalbn, scalbln for sNaN input (bug 20225).

The wrapper implementations of ldexp / scalbn / scalbln
(architecture-independent), and their float / long double variants,
return sNaN for sNaN input.  This patch fixes them to add relevant
arguments to themselves so that qNaN is returned in this case.

Tested for x86_64 and x86.

	[BZ #20225]
	* math/s_ldexp.c (__ldexp): Add non-finite or zero argument to
	itself.
	* math/s_ldexpf.c (__ldexpf): Likewise.
	* math/s_ldexpl.c (__ldexpl): Likewise.
	* math/w_scalbln.c (__w_scalbln): Likewise.
	* math/w_scalblnf.c (__w_scalblnf): Likewise.
	* math/w_scalblnl.c (__w_scalblnl): Likewise.
	* math/libm-test.inc (scalbn_test_data): Add sNaN tests.
	(scalbln_test_data): Likewise.
This commit is contained in:
Joseph Myers 2016-06-08 21:32:57 +00:00
parent 40720ec9f9
commit 9946e7a949
8 changed files with 21 additions and 6 deletions

View File

@ -1,5 +1,16 @@
2016-06-08 Joseph Myers <joseph@codesourcery.com>
[BZ #20225]
* math/s_ldexp.c (__ldexp): Add non-finite or zero argument to
itself.
* math/s_ldexpf.c (__ldexpf): Likewise.
* math/s_ldexpl.c (__ldexpl): Likewise.
* math/w_scalbln.c (__w_scalbln): Likewise.
* math/w_scalblnf.c (__w_scalblnf): Likewise.
* math/w_scalblnl.c (__w_scalblnl): Likewise.
* math/libm-test.inc (scalbn_test_data): Add sNaN tests.
(scalbln_test_data): Likewise.
[BZ #20224]
* sysdeps/i386/fpu/s_cbrtl.S (__cbrtl): Add non-finite or zero
argument to itself.

View File

@ -11117,6 +11117,8 @@ static const struct test_fi_f_data scalbn_test_data[] =
TEST_fi_f (scalbn, minus_infty, 1, minus_infty, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
TEST_fi_f (scalbn, qnan_value, 1, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
TEST_fi_f (scalbn, -qnan_value, 1, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
TEST_fi_f (scalbn, snan_value, 1, qnan_value, NO_INEXACT_EXCEPTION|INVALID_EXCEPTION),
TEST_fi_f (scalbn, -snan_value, 1, qnan_value, NO_INEXACT_EXCEPTION|INVALID_EXCEPTION),
TEST_fi_f (scalbn, 0.8L, 4, 12.8L, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
TEST_fi_f (scalbn, -0.854375L, 5, -27.34L, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
@ -11199,6 +11201,8 @@ static const struct test_fl_f_data scalbln_test_data[] =
TEST_fl_f (scalbln, minus_infty, 1, minus_infty, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
TEST_fl_f (scalbln, qnan_value, 1, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
TEST_fl_f (scalbln, -qnan_value, 1, qnan_value, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
TEST_fl_f (scalbln, snan_value, 1, qnan_value, NO_INEXACT_EXCEPTION|INVALID_EXCEPTION),
TEST_fl_f (scalbln, -snan_value, 1, qnan_value, NO_INEXACT_EXCEPTION|INVALID_EXCEPTION),
TEST_fl_f (scalbln, 0.8L, 4, 12.8L, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),
TEST_fl_f (scalbln, -0.854375L, 5, -27.34L, NO_INEXACT_EXCEPTION|ERRNO_UNCHANGED),

View File

@ -20,7 +20,7 @@ static char rcsid[] = "$NetBSD: s_ldexp.c,v 1.6 1995/05/10 20:47:40 jtc Exp $";
double __ldexp(double value, int exp)
{
if(!isfinite(value)||value==0.0) return value;
if(!isfinite(value)||value==0.0) return value + value;
value = __scalbn(value,exp);
if(!isfinite(value)||value==0.0) __set_errno (ERANGE);
return value;

View File

@ -23,7 +23,7 @@ static char rcsid[] = "$NetBSD: s_ldexpf.c,v 1.3 1995/05/10 20:47:42 jtc Exp $";
float __ldexpf(float value, int exp)
{
if(!isfinite(value)||value==(float)0.0) return value;
if(!isfinite(value)||value==(float)0.0) return value + value;
value = __scalbnf(value,exp);
if(!isfinite(value)||value==(float)0.0) __set_errno (ERANGE);
return value;

View File

@ -24,7 +24,7 @@ static char rcsid[] = "$NetBSD: $";
long double __ldexpl(long double value, int exp)
{
if(!isfinite(value)||value==0.0) return value;
if(!isfinite(value)||value==0.0) return value + value;
value = __scalbnl(value,exp);
if(!isfinite(value)||value==0.0) __set_errno (ERANGE);
return value;

View File

@ -24,7 +24,7 @@ double
__w_scalbln (double x, long int n)
{
if (!isfinite (x) || x == 0.0)
return x;
return x + x;
x = __scalbln (x, n);

View File

@ -24,7 +24,7 @@ float
__w_scalblnf (float x, long int n)
{
if (!isfinite (x) || x == 0.0f)
return x;
return x + x;
x = __scalblnf (x, n);

View File

@ -24,7 +24,7 @@ long double
__w_scalblnl (long double x, long int n)
{
if (!isfinite (x) || x == 0.0L)
return x;
return x + x;
x = __scalblnl (x, n);