From patchwork Thu Dec 15 19:34:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Gabriel F. T. Gomes" X-Patchwork-Id: 706214 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tfkDR5M4kz9t0v for ; Fri, 16 Dec 2016 06:35:03 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="rOmqE0Vp"; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; q=dns; s= default; b=Gqx3R158P6Yq5rxBlihM9c87WXQEMdPX4njzzxEr7xJP/P755nsWY XXCjxpvQI3XOzK+dKk2RXkZPO42DrnD2FlMWB/fxUKtoLLUvhagg4yc1XtVQDjMP ODrXDBagLIvTO1Of8BsWDa3kqQBRQQZYL1nC1J5lgDUeLbVNdE5sbQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:subject:date:message-id; s=default; bh=Q401O2UJgCI3MFENYN7nSwKCWnM=; b=rOmqE0VpEl91KdDYq8aR8d7+Jq+t mvthHvDoD/Hji8poFtmy1H3+oQMEX2SLd/6CWwPyBc/0uUppKsuPGPPcWVEBwocb nga7Wr4akoQIAuECUT67Vd9xBVPgivWE7LuSeMo3i8wXWvKakO9p6uwyXDGiFO41 BU9Ac+NvqFSR1QY= Received: (qmail 10004 invoked by alias); 15 Dec 2016 19:34:56 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 9990 invoked by uid 89); 15 Dec 2016 19:34:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=4.8 required=5.0 tests=BAYES_50, KAM_STOCKTIP, RP_MATCHES_RCVD, SPF_PASS autolearn=no version=3.3.2 spammy=1, 41, lesser, e_fmodF, s_rintf X-HELO: mail.gftg.com.br From: "Gabriel F. T. Gomes" To: libc-alpha@sourceware.org Subject: [PATCH] Make w_scalbln type-generic Date: Thu, 15 Dec 2016 17:34:36 -0200 Message-Id: <1481830476-12837-1-git-send-email-gftg@linux.vnet.ibm.com> This patch converts the wrapper scalbln (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 ldexp. Tested for powerpc64le, s390, and x86_64. 2016-12-09 Gabriel F. T. Gomes * math/Makefile (gen-libm-calls): Remove w_scalblnF. (libm-calls): Add w_scalblnF. * math/w_scalbln.c: Remove. * math/w_scalblnf.c: Likewise. * math/w_scalblnl.c: Likewise. * math/w_scalbln_template.c: New file with type-generic implementation based on math/w_scalbln.c. * sysdeps/ieee754/ldbl-128ibm/w_scalblnl.c: Remove. * sysdeps/ieee754/ldbl-64-128/w_scalblnl.c: Use new template. --- math/Makefile | 4 ++-- math/w_scalbln.c | 40 ------------------------------- math/w_scalbln_template.c | 41 ++++++++++++++++++++++++++++++++ math/w_scalblnf.c | 36 ---------------------------- math/w_scalblnl.c | 36 ---------------------------- sysdeps/ieee754/ldbl-128ibm/w_scalblnl.c | 23 ------------------ sysdeps/ieee754/ldbl-64-128/w_scalblnl.c | 7 +++--- 7 files changed, 46 insertions(+), 141 deletions(-) delete mode 100644 math/w_scalbln.c create mode 100644 math/w_scalbln_template.c delete mode 100644 math/w_scalblnf.c delete mode 100644 math/w_scalblnl.c delete mode 100644 sysdeps/ieee754/ldbl-128ibm/w_scalblnl.c diff --git a/math/Makefile b/math/Makefile index 50ce418..f731c7d 100644 --- a/math/Makefile +++ b/math/Makefile @@ -53,7 +53,7 @@ gen-libm-calls = cargF conjF cimagF crealF cabsF s_cacosF \ 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 \ - w_log1pF + w_log1pF w_scalblnF libm-calls = \ e_acosF e_acoshF e_asinF e_atan2F e_atanhF e_coshF e_expF e_fmodF \ @@ -63,7 +63,7 @@ libm-calls = \ 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 s_logbF \ - s_nextafterF s_nexttowardF s_rintF s_scalblnF w_scalblnF \ + s_nextafterF s_nexttowardF s_rintF s_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 \ w_tgammaF w_hypotF w_j0F w_j1F w_jnF w_lgammaF w_lgammaF_r \ diff --git a/math/w_scalbln.c b/math/w_scalbln.c deleted file mode 100644 index bcc3319..0000000 --- a/math/w_scalbln.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Wrapper for __scalbln handles setting errno. - Copyright (C) 2014-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 - . */ - -#include -#include -#include - -double -__w_scalbln (double x, long int n) -{ - if (!isfinite (x) || x == 0.0) - return x + x; - - x = __scalbln (x, n); - - if (!isfinite (x) || x == 0.0) - __set_errno (ERANGE); - - return x; -} -weak_alias (__w_scalbln, scalbln) - -#ifdef NO_LONG_DOUBLE -weak_alias (__w_scalbln, scalblnl) -#endif diff --git a/math/w_scalbln_template.c b/math/w_scalbln_template.c new file mode 100644 index 0000000..7497c35 --- /dev/null +++ b/math/w_scalbln_template.c @@ -0,0 +1,41 @@ +/* Wrapper for __scalbln handles setting errno. + Copyright (C) 2014-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 + . */ + +#include +#include +#include + +FLOAT +M_DECL_FUNC (__w_scalbln) (FLOAT x, long int n) +{ + if (!isfinite (x) || x == 0.0) + return x + x; + + x = M_SUF (__scalbln) (x, n); + + if (!isfinite (x) || x == 0.0) + __set_errno (ERANGE); + + return x; +} + +/* Define strong_alias to nothing because we don't want + declare_mgen_alias to create a strong alias for scalblnl. */ +#undef strong_alias +#define strong_alias(name, alias_name) +declare_mgen_alias (__w_scalbln, scalbln) diff --git a/math/w_scalblnf.c b/math/w_scalblnf.c deleted file mode 100644 index 2a0b237..0000000 --- a/math/w_scalblnf.c +++ /dev/null @@ -1,36 +0,0 @@ -/* Wrapper for __scalblnf handles setting errno. - Copyright (C) 2014-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 - . */ - -#include -#include -#include - -float -__w_scalblnf (float x, long int n) -{ - if (!isfinite (x) || x == 0.0f) - return x + x; - - x = __scalblnf (x, n); - - if (!isfinite (x) || x == 0.0f) - __set_errno (ERANGE); - - return x; -} -weak_alias (__w_scalblnf, scalblnf) diff --git a/math/w_scalblnl.c b/math/w_scalblnl.c deleted file mode 100644 index 8ee8130..0000000 --- a/math/w_scalblnl.c +++ /dev/null @@ -1,36 +0,0 @@ -/* Wrapper for __scalblnl handles setting errno. - Copyright (C) 2014-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 - . */ - -#include -#include -#include - -long double -__w_scalblnl (long double x, long int n) -{ - if (!isfinite (x) || x == 0.0L) - return x + x; - - x = __scalblnl (x, n); - - if (!isfinite (x) || x == 0.0L) - __set_errno (ERANGE); - - return x; -} -weak_alias (__w_scalblnl, scalblnl) diff --git a/sysdeps/ieee754/ldbl-128ibm/w_scalblnl.c b/sysdeps/ieee754/ldbl-128ibm/w_scalblnl.c deleted file mode 100644 index 7e73c9a..0000000 --- a/sysdeps/ieee754/ldbl-128ibm/w_scalblnl.c +++ /dev/null @@ -1,23 +0,0 @@ -/* Wrapper for __scalblnl handles setting errno. - Copyright (C) 2014-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 - . */ - -#include -#undef weak_alias -#define weak_alias(name, alias) -#include -long_double_symbol (libm, __w_scalblnl, scalblnl); diff --git a/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c b/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c index 05d4dfe..de21087 100644 --- a/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c +++ b/sysdeps/ieee754/ldbl-64-128/w_scalblnl.c @@ -16,10 +16,9 @@ License along with the GNU C Library; if not, see . */ -#include -#undef weak_alias -#define weak_alias(name, alias) -#include +#define declare_mgen_alias(from, to) +#include +#include #if IS_IN (libm) long_double_symbol (libm, __w_scalblnl, scalblnl); #else