Make w_log1p type-generic

This patch converts the wrapper log1p (which set errno directly rather
than doing anything with __kernel_standard) to use the type-generic
template machinery, in the same way that has been done for ilogb.

Tested for powerpc64le, s390, and x86_64.
This commit is contained in:
Gabriel F. T. Gomes 2016-12-07 16:19:11 -02:00
parent 3038145ca2
commit 14348aaeff
7 changed files with 21 additions and 131 deletions

View File

@ -1,3 +1,15 @@
2016-12-14 Gabriel F. T. Gomes <gftg@linux.vnet.ibm.com>
* math/Makefile (gen-libm-calls): Add w_log1pF.
(libm-calls): Remove w_log1pF.
* math/w_log1p.c: Remove.
* math/w_log1pf.c: Likewise.
* math/w_log1pl.c: Likewise.
* math/w_log1p_template.c: New file with type-generic
implementation based on math/w_log1p.c.
* sysdeps/ieee754/ldbl-128ibm/w_log1pl.c: Remove.
* sysdeps/ieee754/ldbl-64-128/w_log1pl.c: Likewise.
2015-12-14 Wilco Dijkstra <wdijkstr@arm.com>
* string/rawmemchr.c (RAWMEMCHR): Use faster memchr/strlen.

View File

@ -52,7 +52,8 @@ gen-libm-calls = cargF conjF cimagF crealF cabsF s_cacosF \
k_casinhF s_csinhF k_casinhF s_csinhF s_catanhF s_catanF \
s_ctanF s_ctanhF s_cexpF s_clogF s_cprojF s_csqrtF \
s_cpowF s_clog10F s_fdimF s_nextdownF s_fmaxF s_fminF \
s_nanF s_iseqsigF s_canonicalizeF w_ilogbF w_llogbF
s_nanF s_iseqsigF s_canonicalizeF w_ilogbF w_llogbF \
w_log1pF
libm-calls = \
e_acosF e_acoshF e_asinF e_atan2F e_atanhF e_coshF e_expF e_fmodF \
@ -61,7 +62,7 @@ libm-calls = \
e_ilogbF \
k_cosF k_sinF k_tanF s_asinhF s_atanF s_cbrtF \
s_ceilF s_cosF s_erfF s_expm1F s_fabsF \
s_floorF s_log1pF w_log1pF s_logbF \
s_floorF s_log1pF s_logbF \
s_nextafterF s_nexttowardF s_rintF s_scalblnF w_scalblnF \
s_significandF s_sinF s_tanF s_tanhF w_acosF w_acoshF w_asinF \
w_atan2F w_atanhF w_coshF w_expF w_exp2F w_exp10F w_fmodF \

View File

@ -20,22 +20,17 @@
#include <math.h>
#include <math_private.h>
double
__w_log1p (double x)
FLOAT
M_DECL_FUNC (__w_log1p) (FLOAT x)
{
if (__glibc_unlikely (islessequal (x, -1.0)))
if (__glibc_unlikely (islessequal (x, M_LIT (-1.0))))
{
if (x == -1.0)
if (x == -1)
__set_errno (ERANGE);
else
__set_errno (EDOM);
}
return __log1p (x);
return M_SUF (__log1p) (x);
}
weak_alias (__w_log1p, log1p)
#ifdef NO_LONG_DOUBLE
strong_alias (__w_log1p, __log1pl)
weak_alias (__w_log1p, log1pl)
#endif
declare_mgen_alias (__w_log1p, log1p)

View File

@ -1,36 +0,0 @@
/* Wrapper for __log1pf that handles setting errno.
Copyright (C) 2015-2016 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
<http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <math.h>
#include <math_private.h>
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)

View File

@ -1,36 +0,0 @@
/* Wrapper for __log1pl that handles setting errno.
Copyright (C) 2015-2016 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
<http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <math.h>
#include <math_private.h>
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)

View File

@ -1,23 +0,0 @@
/* Wrapper for __log1pl that handles setting errno.
Copyright (C) 2015-2016 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
<http://www.gnu.org/licenses/>. */
#include <math_ldbl_opt.h>
#undef weak_alias
#define weak_alias(n,a)
#include <math/w_log1pl.c>
long_double_symbol (libm, __w_log1pl, log1pl);

View File

@ -1,23 +0,0 @@
/* Wrapper for __log1pl that handles setting errno.
Copyright (C) 2015-2016 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
<http://www.gnu.org/licenses/>. */
#include <math_ldbl_opt.h>
#undef weak_alias
#define weak_alias(n,a)
#include <math/w_log1pl.c>
long_double_symbol (libm, __w_log1pl, log1pl);