From de8aadd52c97f9a04d5e8709b16dc5baf9292a09 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Mon, 13 Apr 2015 21:16:56 +0200 Subject: Set errno for log1p on pole/domain error. According to bug 6792, errno is not set to ERANGE/EDOM by calling log1p/log1pf/log1pl with x = -1 or x < -1. This patch adds a wrapper which sets errno in those cases and returns the value of the existing __log1p function. The log1p is now an alias to the wrapper function instead of __log1p. The files in sysdeps are reflecting these changes. The ia64 implementation sets errno by itself, thus the wrapper-file is empty. The libm-test is adjusted for log1p-tests to check errno. [BZ #6792] * math/w_log1p.c: New file. * math/w_log1pf.c: Likewise. * math/w_log1pl.c: Likewise. * math/Makefile (libm-calls): Add w_log1p. * math/s_log1pl.c (log1pl): Remove weak_alias. * sysdeps/i386/fpu/s_log1p.S (log1p): Likewise. * sysdeps/i386/fpu/s_log1pf.S (log1pf): Likewise. * sysdeps/i386/fpu/s_log1pl.S (log1pl): Likewise. * sysdeps/x86_64/fpu/s_log1pl.S (log1pl): Likewise. * sysdeps/ieee754/dbl-64/s_log1p.c (log1p): Likewise. [NO_LONG_DOUBLE] (log1pl): Likewise. * sysdeps/ieee754/flt-32/s_log1pf.c (log1pf): Likewise. * sysdeps/ieee754/ldbl-128/s_log1pl.c (log1pl): Likewise. * sysdeps/ieee754/ldbl-64-128/s_log1pl.c (log1p): Remove long_double_symbol. * sysdeps/ieee754/ldbl-128ibm/s_log1pl.c (log1pl): Likewise. * sysdeps/ieee754/ldbl-64-128/w_log1pl.c: New file. * sysdeps/ieee754/ldbl-128ibm/w_log1pl.c: Likewise. * sysdeps/m68k/m680x0/fpu/s_log1p.c: Define empty weak_alias to remove weak_alias for corresponding log1p function. * sysdeps/m68k/m680x0/fpu/s_log1pf.c: Likewise. * sysdeps/m68k/m680x0/fpu/s_log1pl.c: Likewise. * sysdeps/ia64/fpu/w_log1p.c: New file. * sysdeps/ia64/fpu/w_log1pf.c: Likewise. * sysdeps/ia64/fpu/w_log1pl.c: Likewise. * math/libm-test.inc (log1p_test_data): Add errno expectations. --- math/Makefile | 2 +- math/libm-test.inc | 8 ++++---- math/s_log1pl.c | 1 - math/w_log1p.c | 41 +++++++++++++++++++++++++++++++++++++++++ math/w_log1pf.c | 36 ++++++++++++++++++++++++++++++++++++ math/w_log1pl.c | 36 ++++++++++++++++++++++++++++++++++++ 6 files changed, 118 insertions(+), 6 deletions(-) create mode 100644 math/w_log1p.c create mode 100644 math/w_log1pf.c create mode 100644 math/w_log1pl.c (limited to 'math') diff --git a/math/Makefile b/math/Makefile index 3904e41..1537b5a 100644 --- a/math/Makefile +++ b/math/Makefile @@ -47,7 +47,7 @@ libm-calls = e_acos e_acosh e_asin e_atan2 e_atanh e_cosh e_exp e_fmod \ e_ilogb \ k_cos k_rem_pio2 k_sin k_tan s_asinh s_atan s_cbrt \ s_ceil s_cos s_erf s_expm1 s_fabs \ - s_floor s_log1p s_logb \ + s_floor s_log1p w_log1p s_logb \ s_nextafter s_nexttoward s_rint s_scalbln w_scalbln \ s_significand s_sin s_tan s_tanh w_acos w_acosh w_asin \ w_atan2 w_atanh w_cosh w_drem w_exp w_exp2 w_exp10 w_fmod \ diff --git a/math/libm-test.inc b/math/libm-test.inc index 7acd29b..5d7f5a2 100644 --- a/math/libm-test.inc +++ b/math/libm-test.inc @@ -7798,10 +7798,10 @@ log10_test (void) static const struct test_f_f_data log1p_test_data[] = { - TEST_f_f (log1p, -1, minus_infty, DIVIDE_BY_ZERO_EXCEPTION), - TEST_f_f (log1p, -2, qnan_value, INVALID_EXCEPTION), - TEST_f_f (log1p, -max_value, qnan_value, INVALID_EXCEPTION), - TEST_f_f (log1p, minus_infty, qnan_value, INVALID_EXCEPTION), + TEST_f_f (log1p, -1, minus_infty, DIVIDE_BY_ZERO_EXCEPTION|ERRNO_ERANGE), + TEST_f_f (log1p, -2, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM), + TEST_f_f (log1p, -max_value, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM), + TEST_f_f (log1p, minus_infty, qnan_value, INVALID_EXCEPTION|ERRNO_EDOM), TEST_f_f (log1p, plus_infty, plus_infty), TEST_f_f (log1p, qnan_value, qnan_value, NO_INEXACT_EXCEPTION), diff --git a/math/s_log1pl.c b/math/s_log1pl.c index 9e51ce2..a216fb3 100644 --- a/math/s_log1pl.c +++ b/math/s_log1pl.c @@ -9,6 +9,5 @@ __log1pl (long double x) __set_errno (ENOSYS); return 0.0; } -weak_alias (__log1pl, log1pl) stub_warning (log1pl) diff --git a/math/w_log1p.c b/math/w_log1p.c new file mode 100644 index 0000000..28b621b --- /dev/null +++ b/math/w_log1p.c @@ -0,0 +1,41 @@ +/* Wrapper for __log1p that handles setting errno. + Copyright (C) 2015 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 + . */ + +#include +#include +#include + +double +__w_log1p (double x) +{ + if (__glibc_unlikely (islessequal (x, -1.0))) + { + if (x == -1.0) + __set_errno (ERANGE); + else + __set_errno (EDOM); + } + + return __log1p (x); +} +weak_alias (__w_log1p, log1p) + +#ifdef NO_LONG_DOUBLE +strong_alias (__w_log1p, __log1pl) +weak_alias (__w_log1p, log1pl) +#endif diff --git a/math/w_log1pf.c b/math/w_log1pf.c new file mode 100644 index 0000000..80510b9 --- /dev/null +++ b/math/w_log1pf.c @@ -0,0 +1,36 @@ +/* Wrapper for __log1pf that handles setting errno. + Copyright (C) 2015 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 + . */ + +#include +#include +#include + +float +__w_log1pf (float x) +{ + if (__glibc_unlikely (islessequal (x, -1.0f))) + { + if (x == -1.0f) + __set_errno (ERANGE); + else + __set_errno (EDOM); + } + + return __log1pf (x); +} +weak_alias (__w_log1pf, log1pf) diff --git a/math/w_log1pl.c b/math/w_log1pl.c new file mode 100644 index 0000000..056fe07 --- /dev/null +++ b/math/w_log1pl.c @@ -0,0 +1,36 @@ +/* Wrapper for __log1pl that handles setting errno. + Copyright (C) 2015 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 + . */ + +#include +#include +#include + +long double +__w_log1pl (long double x) +{ + if (__glibc_unlikely (islessequal (x, -1.0L))) + { + if (x == -1.0L) + __set_errno (ERANGE); + else + __set_errno (EDOM); + } + + return __log1pl (x); +} +weak_alias (__w_log1pl, log1pl) -- cgit v1.1