From patchwork Tue Aug 16 20:21:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Paul E. Murphy" X-Patchwork-Id: 659821 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 3sDP140BX6z9t1b for ; Wed, 17 Aug 2016 06:22:31 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=EbrpCk58; 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:in-reply-to:references :in-reply-to:references:message-id; q=dns; s=default; b=vppmp7w6 u4btmj/L1nfsOERRRUI/lEEVz3lh8V1YFscq+GTolrcdHtRXynL7Io8UlruB4q3c D6+u9ysurMLX3/69ClJG1+IGeoM2b4OTH+eaR8zkCOiKR1McwztotYB7tY/yQpjT Ia0DN52leIW6gEN9E38tAlYdwoVbiybEFXg= 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:in-reply-to:references :in-reply-to:references:message-id; s=default; bh=ujReHAFlLk3rgz 8GA39fqAvsx3c=; b=EbrpCk588HIPHLU+4EET87uGruX4x1ZtYx+8QUwmv29kin VOZznT+BkkS37M44Nga5uAoNEW5p3TxsCgB3+ZRPOkO8Fu8QD75mzRJ8/o2q2e+R eJPWDKEnLbV4fSgY566fVYhmOFdqrbpEQn7dynRn9KVKTXS2Tf3RlBOUDMxhQ= Received: (qmail 77102 invoked by alias); 16 Aug 2016 20:21:44 -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 76950 invoked by uid 89); 16 Aug 2016 20:21:43 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=1.4 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_DNSWL_LOW, RCVD_IN_SEMBACKSCATTER autolearn=no version=3.3.2 spammy=1997, 10f, 1.0f, 20f X-HELO: mx0a-001b2d01.pphosted.com X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: murphyp@linux.vnet.ibm.com From: "Paul E. Murphy" To: libc-alpha@sourceware.org Subject: [PATCHv2 3/9] Convert _Complex cosine functions to generated code Date: Tue, 16 Aug 2016 15:21:17 -0500 In-Reply-To: References: In-Reply-To: References: X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16081620-0024-0000-0000-00001456D7C2 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005605; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000181; SDB=6.00745581; UDB=6.00351405; IPR=6.00518130; BA=6.00004662; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012353; XFM=3.00000011; UTC=2016-08-16 20:21:30 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16081620-0025-0000-0000-0000439C7AD0 Message-Id: <4efcc32b0224922b2be0dbb23d8568dbd1e94472.1471377663.git.murphyp@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-08-16_12:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=4 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608160231 This is fairly straight fowards. m68k overrides are updated to use the framework, and thus are simplified a bit. * math/Makefile (libm-gen-calls): Move s_cacos, s_cacosh, s_ccos, s_ccosh from ... (libm-calls): Remove above. * math/s_cacos.c: Refactor into b_cacos.c * math/s_cacosh.c: Refactor into b_cacosh.c * math/s_ccos.c: Refactor into b_ccos.c * math/s_ccosh.c: Refactor into b_ccosh.c * math/s_cacos_template.c: Update using type-generic macros. * math/s_cacosh_template.c: Likewise * math/s_ccos_template.c: Likewise * math/s_ccosh_template.c: Likwise * math/s_cacosf.c: Removed * math/s_cacos.c: Removed * math/s_cacosl.c: Removed * math/s_cacoshf.c: Removed * math/s_cacosh.c: Removed * math/s_cacoshl.c: Removed * math/s_ccosf.c: Removed * math/s_ccos.c: Removed * math/s_ccosl.c: Removed * math/s_ccoshf.c: Removed * math/s_ccosh.c: Removed * math/s_ccoshl.c: Removed * sysdeps/ieee754/ldbl-opt/s_cacoshl.c: Removed * sysdeps/ieee754/ldbl-opt/s_cacosl.c: Removed * sysdeps/ieee754/ldbl-opt/s_ccos.c: Removed * sysdeps/ieee754/ldbl-opt/s_ccosh.c: Removed * sysdeps/ieee754/ldbl-opt/s_ccoshl.c: Removed * sysdeps/ieee754/ldbl-opt/s_ccosl.c: Removed * sysdeps/m68k/m680x0/fpu/s_ccosh.c: Refactor into * sysdeps/m68k/m680x0/fpu/s_ccosh_template.c: New file * sysdeps/m68k/m680x0/fpu/s_ccoshf.c: Removed * sysdeps/m68k/m680x0/fpu/s_ccoshl.c: Removed * sysdeps/alpha/fpu/s_cacosf.c: Update to use template file. * sysdeps/alpha/fpu/s_cacoshf.c: Likewise * sysdeps/alpha/fpu/s_ccosf.c: Likewise * sysdeps/alpha/fpu/s_ccoshf.c: Likewise --- math/Makefile | 9 +- math/s_cacos.c | 58 -------- math/s_cacos_template.c | 29 ++-- math/s_cacosf.c | 56 -------- math/s_cacosh.c | 94 ------------- math/s_cacosh_template.c | 50 +++---- math/s_cacoshf.c | 92 ------------- math/s_cacoshl.c | 90 ------------- math/s_cacosl.c | 54 -------- math/s_ccos.c | 40 ------ math/s_ccos_template.c | 20 +-- math/s_ccosf.c | 38 ------ math/s_ccosh.c | 147 --------------------- math/s_ccosh_template.c | 77 +++++------ math/s_ccoshf.c | 145 -------------------- math/s_ccoshl.c | 143 -------------------- math/s_ccosl.c | 36 ----- sysdeps/alpha/fpu/s_cacosf.c | 11 +- sysdeps/alpha/fpu/s_cacoshf.c | 10 +- sysdeps/alpha/fpu/s_ccosf.c | 12 +- sysdeps/alpha/fpu/s_ccoshf.c | 12 +- sysdeps/ieee754/ldbl-opt/s_cacos.c | 6 - sysdeps/ieee754/ldbl-opt/s_cacosh.c | 6 - sysdeps/ieee754/ldbl-opt/s_cacoshl.c | 6 - sysdeps/ieee754/ldbl-opt/s_cacosl.c | 6 - sysdeps/ieee754/ldbl-opt/s_ccos.c | 6 - sysdeps/ieee754/ldbl-opt/s_ccosh.c | 6 - sysdeps/ieee754/ldbl-opt/s_ccoshl.c | 6 - sysdeps/ieee754/ldbl-opt/s_ccosl.c | 6 - .../m680x0/fpu/{s_ccosh.c => s_ccosh_template.c} | 18 +-- sysdeps/m68k/m680x0/fpu/s_ccoshf.c | 3 - sysdeps/m68k/m680x0/fpu/s_ccoshl.c | 3 - 32 files changed, 133 insertions(+), 1162 deletions(-) delete mode 100644 math/s_cacos.c delete mode 100644 math/s_cacosf.c delete mode 100644 math/s_cacosh.c delete mode 100644 math/s_cacoshf.c delete mode 100644 math/s_cacoshl.c delete mode 100644 math/s_cacosl.c delete mode 100644 math/s_ccos.c delete mode 100644 math/s_ccosf.c delete mode 100644 math/s_ccosh.c delete mode 100644 math/s_ccoshf.c delete mode 100644 math/s_ccoshl.c delete mode 100644 math/s_ccosl.c delete mode 100644 sysdeps/ieee754/ldbl-opt/s_cacos.c delete mode 100644 sysdeps/ieee754/ldbl-opt/s_cacosh.c delete mode 100644 sysdeps/ieee754/ldbl-opt/s_cacoshl.c delete mode 100644 sysdeps/ieee754/ldbl-opt/s_cacosl.c delete mode 100644 sysdeps/ieee754/ldbl-opt/s_ccos.c delete mode 100644 sysdeps/ieee754/ldbl-opt/s_ccosh.c delete mode 100644 sysdeps/ieee754/ldbl-opt/s_ccoshl.c delete mode 100644 sysdeps/ieee754/ldbl-opt/s_ccosl.c rename sysdeps/m68k/m680x0/fpu/{s_ccosh.c => s_ccosh_template.c} (87%) delete mode 100644 sysdeps/m68k/m680x0/fpu/s_ccoshf.c delete mode 100644 sysdeps/m68k/m680x0/fpu/s_ccoshl.c diff --git a/math/Makefile b/math/Makefile index 2ff1405..e02b430 100644 --- a/math/Makefile +++ b/math/Makefile @@ -45,7 +45,8 @@ libm-support = s_lib_version s_matherr s_signgam \ # Wrappers for these functions generated per type using a file named # _template.c and the appropriate math-type-macros-.h. -gen-libm-calls = cargF conjF cimagF crealF cabsF +gen-libm-calls = cargF conjF cimagF crealF cabsF s_cacosF \ + s_cacoshF s_ccosF s_ccoshF libm-calls = \ e_acosF e_acoshF e_asinF e_atan2F e_atanhF e_coshF e_expF e_fmodF \ @@ -63,9 +64,9 @@ libm-calls = \ w_ilogbF \ s_fpclassifyF s_fmaxF s_fminF s_fdimF s_nanF s_truncF \ s_remquoF e_log2F e_exp2F s_roundF s_nearbyintF s_sincosF \ - s_cexpF s_csinhF s_ccoshF s_clogF \ - s_catanF s_casinF s_ccosF s_csinF s_ctanF s_ctanhF s_cacosF \ - s_casinhF s_cacoshF s_catanhF s_csqrtF s_cpowF s_cprojF s_clog10F \ + s_cexpF s_csinhF s_clogF \ + s_catanF s_casinF s_csinF s_ctanF s_ctanhF \ + s_casinhF s_catanhF s_csqrtF s_cpowF s_cprojF s_clog10F \ s_fmaF s_lrintF s_llrintF s_lroundF s_llroundF e_exp10F w_log2F \ s_issignalingF $(calls:s_%=m_%) x2y2m1F k_casinhF \ gamma_productF lgamma_negF lgamma_productF \ diff --git a/math/s_cacos.c b/math/s_cacos.c deleted file mode 100644 index 234b122..0000000 --- a/math/s_cacos.c +++ /dev/null @@ -1,58 +0,0 @@ -/* Return cosine of complex double value. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 - -__complex__ double -__cacos (__complex__ double x) -{ - __complex__ double y; - __complex__ double res; - int rcls = fpclassify (__real__ x); - int icls = fpclassify (__imag__ x); - - if (rcls <= FP_INFINITE || icls <= FP_INFINITE - || (rcls == FP_ZERO && icls == FP_ZERO)) - { - y = __casin (x); - - __real__ res = (double) M_PI_2 - __real__ y; - if (__real__ res == 0.0) - __real__ res = 0.0; - __imag__ res = -__imag__ y; - } - else - { - __real__ y = -__imag__ x; - __imag__ y = __real__ x; - - y = __kernel_casinh (y, 1); - - __real__ res = __imag__ y; - __imag__ res = __real__ y; - } - - return res; -} -weak_alias (__cacos, cacos) -#ifdef NO_LONG_DOUBLE -strong_alias (__cacos, __cacosl) -weak_alias (__cacos, cacosl) -#endif diff --git a/math/s_cacos_template.c b/math/s_cacos_template.c index 234b122..6494a1f 100644 --- a/math/s_cacos_template.c +++ b/math/s_cacos_template.c @@ -1,4 +1,4 @@ -/* Return cosine of complex double value. +/* Return cosine of a complex type. Copyright (C) 1997-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -20,22 +20,22 @@ #include #include -__complex__ double -__cacos (__complex__ double x) +CFLOAT +M_DECL_FUNC (__cacos) (CFLOAT x) { - __complex__ double y; - __complex__ double res; + CFLOAT y; + CFLOAT res; int rcls = fpclassify (__real__ x); int icls = fpclassify (__imag__ x); if (rcls <= FP_INFINITE || icls <= FP_INFINITE || (rcls == FP_ZERO && icls == FP_ZERO)) { - y = __casin (x); + y = M_SUF (__casin) (x); - __real__ res = (double) M_PI_2 - __real__ y; - if (__real__ res == 0.0) - __real__ res = 0.0; + __real__ res = (FLOAT) M_MLIT (M_PI_2) - __real__ y; + if (__real__ res == 0) + __real__ res = 0; __imag__ res = -__imag__ y; } else @@ -43,7 +43,7 @@ __cacos (__complex__ double x) __real__ y = -__imag__ x; __imag__ y = __real__ x; - y = __kernel_casinh (y, 1); + y = M_SUF (__kernel_casinh) (y, 1); __real__ res = __imag__ y; __imag__ res = __real__ y; @@ -51,8 +51,9 @@ __cacos (__complex__ double x) return res; } -weak_alias (__cacos, cacos) -#ifdef NO_LONG_DOUBLE -strong_alias (__cacos, __cacosl) -weak_alias (__cacos, cacosl) + +declare_mgen_alias (__cacos, cacos); + +#if M_LIBM_NEED_COMPAT (carg) +declare_mgen_libm_compat (__cacos, cacos) #endif diff --git a/math/s_cacosf.c b/math/s_cacosf.c deleted file mode 100644 index ab52392..0000000 --- a/math/s_cacosf.c +++ /dev/null @@ -1,56 +0,0 @@ -/* Return cosine of complex float value. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 - -__complex__ float -__cacosf (__complex__ float x) -{ - __complex__ float y; - __complex__ float res; - int rcls = fpclassify (__real__ x); - int icls = fpclassify (__imag__ x); - - if (rcls <= FP_INFINITE || icls <= FP_INFINITE - || (rcls == FP_ZERO && icls == FP_ZERO)) - { - y = __casinf (x); - - __real__ res = (float) M_PI_2 - __real__ y; - if (__real__ res == 0.0f) - __real__ res = 0.0f; - __imag__ res = -__imag__ y; - } - else - { - __real__ y = -__imag__ x; - __imag__ y = __real__ x; - - y = __kernel_casinhf (y, 1); - - __real__ res = __imag__ y; - __imag__ res = __real__ y; - } - - return res; -} -#ifndef __cacosf -weak_alias (__cacosf, cacosf) -#endif diff --git a/math/s_cacosh.c b/math/s_cacosh.c deleted file mode 100644 index 20bf215..0000000 --- a/math/s_cacosh.c +++ /dev/null @@ -1,94 +0,0 @@ -/* Return arc hyperbole cosine for double value. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 - - -__complex__ double -__cacosh (__complex__ double x) -{ - __complex__ double res; - int rcls = fpclassify (__real__ x); - int icls = fpclassify (__imag__ x); - - if (rcls <= FP_INFINITE || icls <= FP_INFINITE) - { - if (icls == FP_INFINITE) - { - __real__ res = HUGE_VAL; - - if (rcls == FP_NAN) - __imag__ res = __nan (""); - else - __imag__ res = __copysign ((rcls == FP_INFINITE - ? (__real__ x < 0.0 - ? M_PI - M_PI_4 : M_PI_4) - : M_PI_2), __imag__ x); - } - else if (rcls == FP_INFINITE) - { - __real__ res = HUGE_VAL; - - if (icls >= FP_ZERO) - __imag__ res = __copysign (signbit (__real__ x) ? M_PI : 0.0, - __imag__ x); - else - __imag__ res = __nan (""); - } - else - { - __real__ res = __nan (""); - __imag__ res = __nan (""); - } - } - else if (rcls == FP_ZERO && icls == FP_ZERO) - { - __real__ res = 0.0; - __imag__ res = __copysign (M_PI_2, __imag__ x); - } - else - { - __complex__ double y; - - __real__ y = -__imag__ x; - __imag__ y = __real__ x; - - y = __kernel_casinh (y, 1); - - if (signbit (__imag__ x)) - { - __real__ res = __real__ y; - __imag__ res = -__imag__ y; - } - else - { - __real__ res = -__real__ y; - __imag__ res = __imag__ y; - } - } - - return res; -} -weak_alias (__cacosh, cacosh) -#ifdef NO_LONG_DOUBLE -strong_alias (__cacosh, __cacoshl) -weak_alias (__cacosh, cacoshl) -#endif diff --git a/math/s_cacosh_template.c b/math/s_cacosh_template.c index 20bf215..50d5ef6 100644 --- a/math/s_cacosh_template.c +++ b/math/s_cacosh_template.c @@ -1,4 +1,4 @@ -/* Return arc hyperbole cosine for double value. +/* Return arc hyperbolic cosine for a complex type. Copyright (C) 1997-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -22,10 +22,10 @@ #include -__complex__ double -__cacosh (__complex__ double x) +CFLOAT +M_DECL_FUNC (__cacosh) (CFLOAT x) { - __complex__ double res; + CFLOAT res; int rcls = fpclassify (__real__ x); int icls = fpclassify (__imag__ x); @@ -33,45 +33,46 @@ __cacosh (__complex__ double x) { if (icls == FP_INFINITE) { - __real__ res = HUGE_VAL; + __real__ res = M_HUGE_VAL; if (rcls == FP_NAN) - __imag__ res = __nan (""); + __imag__ res = M_NAN; else - __imag__ res = __copysign ((rcls == FP_INFINITE - ? (__real__ x < 0.0 - ? M_PI - M_PI_4 : M_PI_4) - : M_PI_2), __imag__ x); + __imag__ res = M_COPYSIGN ((rcls == FP_INFINITE + ? (__real__ x < 0 + ? M_MLIT (M_PI) - M_MLIT (M_PI_4) + : M_MLIT (M_PI_4)) + : M_MLIT (M_PI_2)), __imag__ x); } else if (rcls == FP_INFINITE) { - __real__ res = HUGE_VAL; + __real__ res = M_HUGE_VAL; if (icls >= FP_ZERO) - __imag__ res = __copysign (signbit (__real__ x) ? M_PI : 0.0, - __imag__ x); + __imag__ res = M_COPYSIGN + (signbit (__real__ x) ? M_MLIT (M_PI) : 0, __imag__ x); else - __imag__ res = __nan (""); + __imag__ res = M_NAN; } else { - __real__ res = __nan (""); - __imag__ res = __nan (""); + __real__ res = M_NAN; + __imag__ res = M_NAN; } } else if (rcls == FP_ZERO && icls == FP_ZERO) { - __real__ res = 0.0; - __imag__ res = __copysign (M_PI_2, __imag__ x); + __real__ res = 0; + __imag__ res = M_COPYSIGN (M_MLIT (M_PI_2), __imag__ x); } else { - __complex__ double y; + CFLOAT y; __real__ y = -__imag__ x; __imag__ y = __real__ x; - y = __kernel_casinh (y, 1); + y = M_SUF (__kernel_casinh) (y, 1); if (signbit (__imag__ x)) { @@ -87,8 +88,9 @@ __cacosh (__complex__ double x) return res; } -weak_alias (__cacosh, cacosh) -#ifdef NO_LONG_DOUBLE -strong_alias (__cacosh, __cacoshl) -weak_alias (__cacosh, cacoshl) + +declare_mgen_alias (__cacosh, cacosh) + +#if M_LIBM_NEED_COMPAT (cacosh) +declare_mgen_libm_compat (__cacosh, cacosh) #endif diff --git a/math/s_cacoshf.c b/math/s_cacoshf.c deleted file mode 100644 index f1a1369..0000000 --- a/math/s_cacoshf.c +++ /dev/null @@ -1,92 +0,0 @@ -/* Return arc hyperbole cosine for float value. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 - -__complex__ float -__cacoshf (__complex__ float x) -{ - __complex__ float res; - int rcls = fpclassify (__real__ x); - int icls = fpclassify (__imag__ x); - - if (rcls <= FP_INFINITE || icls <= FP_INFINITE) - { - if (icls == FP_INFINITE) - { - __real__ res = HUGE_VALF; - - if (rcls == FP_NAN) - __imag__ res = __nanf (""); - else - __imag__ res = __copysignf ((rcls == FP_INFINITE - ? (__real__ x < 0.0 - ? M_PI - M_PI_4 : M_PI_4) - : M_PI_2), __imag__ x); - } - else if (rcls == FP_INFINITE) - { - __real__ res = HUGE_VALF; - - if (icls >= FP_ZERO) - __imag__ res = __copysignf (signbit (__real__ x) ? M_PI : 0.0, - __imag__ x); - else - __imag__ res = __nanf (""); - } - else - { - __real__ res = __nanf (""); - __imag__ res = __nanf (""); - } - } - else if (rcls == FP_ZERO && icls == FP_ZERO) - { - __real__ res = 0.0; - __imag__ res = __copysignf (M_PI_2, __imag__ x); - } - else - { - __complex__ float y; - - __real__ y = -__imag__ x; - __imag__ y = __real__ x; - - y = __kernel_casinhf (y, 1); - - if (signbit (__imag__ x)) - { - __real__ res = __real__ y; - __imag__ res = -__imag__ y; - } - else - { - __real__ res = -__real__ y; - __imag__ res = __imag__ y; - } - } - - return res; -} -#ifndef __cacoshf -weak_alias (__cacoshf, cacoshf) -#endif diff --git a/math/s_cacoshl.c b/math/s_cacoshl.c deleted file mode 100644 index c512c2a..0000000 --- a/math/s_cacoshl.c +++ /dev/null @@ -1,90 +0,0 @@ -/* Return arc hyperbole cosine for long double value. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 - - -__complex__ long double -__cacoshl (__complex__ long double x) -{ - __complex__ long double res; - int rcls = fpclassify (__real__ x); - int icls = fpclassify (__imag__ x); - - if (rcls <= FP_INFINITE || icls <= FP_INFINITE) - { - if (icls == FP_INFINITE) - { - __real__ res = HUGE_VALL; - - if (rcls == FP_NAN) - __imag__ res = __nanl (""); - else - __imag__ res = __copysignl ((rcls == FP_INFINITE - ? (__real__ x < 0.0 - ? M_PIl - M_PI_4l : M_PI_4l) - : M_PI_2l), __imag__ x); - } - else if (rcls == FP_INFINITE) - { - __real__ res = HUGE_VALL; - - if (icls >= FP_ZERO) - __imag__ res = __copysignl (signbit (__real__ x) ? M_PIl : 0.0, - __imag__ x); - else - __imag__ res = __nanl (""); - } - else - { - __real__ res = __nanl (""); - __imag__ res = __nanl (""); - } - } - else if (rcls == FP_ZERO && icls == FP_ZERO) - { - __real__ res = 0.0; - __imag__ res = __copysignl (M_PI_2l, __imag__ x); - } - else - { - __complex__ long double y; - - __real__ y = -__imag__ x; - __imag__ y = __real__ x; - - y = __kernel_casinhl (y, 1); - - if (signbit (__imag__ x)) - { - __real__ res = __real__ y; - __imag__ res = -__imag__ y; - } - else - { - __real__ res = -__real__ y; - __imag__ res = __imag__ y; - } - } - - return res; -} -weak_alias (__cacoshl, cacoshl) diff --git a/math/s_cacosl.c b/math/s_cacosl.c deleted file mode 100644 index 3385887..0000000 --- a/math/s_cacosl.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Return cosine of complex long double value. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 - -__complex__ long double -__cacosl (__complex__ long double x) -{ - __complex__ long double y; - __complex__ long double res; - int rcls = fpclassify (__real__ x); - int icls = fpclassify (__imag__ x); - - if (rcls <= FP_INFINITE || icls <= FP_INFINITE - || (rcls == FP_ZERO && icls == FP_ZERO)) - { - y = __casinl (x); - - __real__ res = M_PI_2l - __real__ y; - if (__real__ res == 0.0L) - __real__ res = 0.0L; - __imag__ res = -__imag__ y; - } - else - { - __real__ y = -__imag__ x; - __imag__ y = __real__ x; - - y = __kernel_casinhl (y, 1); - - __real__ res = __imag__ y; - __imag__ res = __real__ y; - } - - return res; -} -weak_alias (__cacosl, cacosl) diff --git a/math/s_ccos.c b/math/s_ccos.c deleted file mode 100644 index e484551..0000000 --- a/math/s_ccos.c +++ /dev/null @@ -1,40 +0,0 @@ -/* Return cosine of complex double value. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 -#include - - -__complex__ double -__ccos (__complex__ double x) -{ - __complex__ double y; - - __real__ y = -__imag__ x; - __imag__ y = __real__ x; - - return __ccosh (y); -} -weak_alias (__ccos, ccos) -#ifdef NO_LONG_DOUBLE -strong_alias (__ccos, __ccosl) -weak_alias (__ccos, ccosl) -#endif diff --git a/math/s_ccos_template.c b/math/s_ccos_template.c index e484551..becaa2d 100644 --- a/math/s_ccos_template.c +++ b/math/s_ccos_template.c @@ -1,4 +1,4 @@ -/* Return cosine of complex double value. +/* Return cosine of complex float type. Copyright (C) 1997-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -22,19 +22,19 @@ #include #include - -__complex__ double -__ccos (__complex__ double x) +CFLOAT +M_DECL_FUNC (__ccos) (CFLOAT x) { - __complex__ double y; + CFLOAT y; __real__ y = -__imag__ x; __imag__ y = __real__ x; - return __ccosh (y); + return M_SUF (__ccosh) (y); } -weak_alias (__ccos, ccos) -#ifdef NO_LONG_DOUBLE -strong_alias (__ccos, __ccosl) -weak_alias (__ccos, ccosl) + +declare_mgen_alias (__ccos, ccos); + +#if M_LIBM_NEED_COMPAT (carg) +declare_mgen_libm_compat (__ccos, ccos) #endif diff --git a/math/s_ccosf.c b/math/s_ccosf.c deleted file mode 100644 index c7da3fe..0000000 --- a/math/s_ccosf.c +++ /dev/null @@ -1,38 +0,0 @@ -/* Return cosine of complex float value. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 -#include - - -__complex__ float -__ccosf (__complex__ float x) -{ - __complex__ float y; - - __real__ y = -__imag__ x; - __imag__ y = __real__ x; - - return __ccoshf (y); -} -#ifndef __ccosf -weak_alias (__ccosf, ccosf) -#endif diff --git a/math/s_ccosh.c b/math/s_ccosh.c deleted file mode 100644 index 4c2f300..0000000 --- a/math/s_ccosh.c +++ /dev/null @@ -1,147 +0,0 @@ -/* Complex cosine hyperbole function for double. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 -#include -#include - -__complex__ double -__ccosh (__complex__ double x) -{ - __complex__ double retval; - int rcls = fpclassify (__real__ x); - int icls = fpclassify (__imag__ x); - - if (__glibc_likely (rcls >= FP_ZERO)) - { - /* Real part is finite. */ - if (__glibc_likely (icls >= FP_ZERO)) - { - /* Imaginary part is finite. */ - const int t = (int) ((DBL_MAX_EXP - 1) * M_LN2); - double sinix, cosix; - - if (__glibc_likely (fabs (__imag__ x) > DBL_MIN)) - { - __sincos (__imag__ x, &sinix, &cosix); - } - else - { - sinix = __imag__ x; - cosix = 1.0; - } - - if (fabs (__real__ x) > t) - { - double exp_t = __ieee754_exp (t); - double rx = fabs (__real__ x); - if (signbit (__real__ x)) - sinix = -sinix; - rx -= t; - sinix *= exp_t / 2.0; - cosix *= exp_t / 2.0; - if (rx > t) - { - rx -= t; - sinix *= exp_t; - cosix *= exp_t; - } - if (rx > t) - { - /* Overflow (original real part of x > 3t). */ - __real__ retval = DBL_MAX * cosix; - __imag__ retval = DBL_MAX * sinix; - } - else - { - double exp_val = __ieee754_exp (rx); - __real__ retval = exp_val * cosix; - __imag__ retval = exp_val * sinix; - } - } - else - { - __real__ retval = __ieee754_cosh (__real__ x) * cosix; - __imag__ retval = __ieee754_sinh (__real__ x) * sinix; - } - - math_check_force_underflow_complex (retval); - } - else - { - __imag__ retval = __real__ x == 0.0 ? 0.0 : __nan (""); - __real__ retval = __nan ("") + __nan (""); - - if (icls == FP_INFINITE) - feraiseexcept (FE_INVALID); - } - } - else if (rcls == FP_INFINITE) - { - /* Real part is infinite. */ - if (__glibc_likely (icls > FP_ZERO)) - { - /* Imaginary part is finite. */ - double sinix, cosix; - - if (__glibc_likely (fabs (__imag__ x) > DBL_MIN)) - { - __sincos (__imag__ x, &sinix, &cosix); - } - else - { - sinix = __imag__ x; - cosix = 1.0; - } - - __real__ retval = __copysign (HUGE_VAL, cosix); - __imag__ retval = (__copysign (HUGE_VAL, sinix) - * __copysign (1.0, __real__ x)); - } - else if (icls == FP_ZERO) - { - /* Imaginary part is 0.0. */ - __real__ retval = HUGE_VAL; - __imag__ retval = __imag__ x * __copysign (1.0, __real__ x); - } - else - { - /* The addition raises the invalid exception. */ - __real__ retval = HUGE_VAL; - __imag__ retval = __nan ("") + __nan (""); - - if (icls == FP_INFINITE) - feraiseexcept (FE_INVALID); - } - } - else - { - __real__ retval = __nan (""); - __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nan (""); - } - - return retval; -} -weak_alias (__ccosh, ccosh) -#ifdef NO_LONG_DOUBLE -strong_alias (__ccosh, __ccoshl) -weak_alias (__ccosh, ccoshl) -#endif diff --git a/math/s_ccosh_template.c b/math/s_ccosh_template.c index 4c2f300..68de41d 100644 --- a/math/s_ccosh_template.c +++ b/math/s_ccosh_template.c @@ -1,4 +1,4 @@ -/* Complex cosine hyperbole function for double. +/* Complex cosine hyperbolic function for float types. Copyright (C) 1997-2016 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1997. @@ -23,10 +23,10 @@ #include #include -__complex__ double -__ccosh (__complex__ double x) +CFLOAT +M_DECL_FUNC (__ccosh) (CFLOAT x) { - __complex__ double retval; + CFLOAT retval; int rcls = fpclassify (__real__ x); int icls = fpclassify (__imag__ x); @@ -36,28 +36,28 @@ __ccosh (__complex__ double x) if (__glibc_likely (icls >= FP_ZERO)) { /* Imaginary part is finite. */ - const int t = (int) ((DBL_MAX_EXP - 1) * M_LN2); - double sinix, cosix; + const int t = (int) ((M_MAX_EXP - 1) * M_MLIT (M_LN2)); + FLOAT sinix, cosix; - if (__glibc_likely (fabs (__imag__ x) > DBL_MIN)) + if (__glibc_likely (M_FABS (__imag__ x) > M_MIN)) { - __sincos (__imag__ x, &sinix, &cosix); + M_SINCOS (__imag__ x, &sinix, &cosix); } else { sinix = __imag__ x; - cosix = 1.0; + cosix = 1; } - if (fabs (__real__ x) > t) + if (M_FABS (__real__ x) > t) { - double exp_t = __ieee754_exp (t); - double rx = fabs (__real__ x); + FLOAT exp_t = M_EXP (t); + FLOAT rx = M_FABS (__real__ x); if (signbit (__real__ x)) sinix = -sinix; rx -= t; - sinix *= exp_t / 2.0; - cosix *= exp_t / 2.0; + sinix *= exp_t / 2; + cosix *= exp_t / 2; if (rx > t) { rx -= t; @@ -67,28 +67,28 @@ __ccosh (__complex__ double x) if (rx > t) { /* Overflow (original real part of x > 3t). */ - __real__ retval = DBL_MAX * cosix; - __imag__ retval = DBL_MAX * sinix; + __real__ retval = M_MAX * cosix; + __imag__ retval = M_MAX * sinix; } else { - double exp_val = __ieee754_exp (rx); + FLOAT exp_val = M_EXP (rx); __real__ retval = exp_val * cosix; __imag__ retval = exp_val * sinix; } } else { - __real__ retval = __ieee754_cosh (__real__ x) * cosix; - __imag__ retval = __ieee754_sinh (__real__ x) * sinix; + __real__ retval = M_COSH (__real__ x) * cosix; + __imag__ retval = M_SINH (__real__ x) * sinix; } math_check_force_underflow_complex (retval); } else { - __imag__ retval = __real__ x == 0.0 ? 0.0 : __nan (""); - __real__ retval = __nan ("") + __nan (""); + __imag__ retval = __real__ x == 0 ? 0 : M_NAN; + __real__ retval = M_NAN + M_NAN; if (icls == FP_INFINITE) feraiseexcept (FE_INVALID); @@ -100,33 +100,33 @@ __ccosh (__complex__ double x) if (__glibc_likely (icls > FP_ZERO)) { /* Imaginary part is finite. */ - double sinix, cosix; + FLOAT sinix, cosix; - if (__glibc_likely (fabs (__imag__ x) > DBL_MIN)) + if (__glibc_likely (M_FABS (__imag__ x) > M_MIN)) { - __sincos (__imag__ x, &sinix, &cosix); + M_SINCOS (__imag__ x, &sinix, &cosix); } else { sinix = __imag__ x; - cosix = 1.0; + cosix = 1; } - __real__ retval = __copysign (HUGE_VAL, cosix); - __imag__ retval = (__copysign (HUGE_VAL, sinix) - * __copysign (1.0, __real__ x)); + __real__ retval = M_COPYSIGN (M_HUGE_VAL, cosix); + __imag__ retval = (M_COPYSIGN (M_HUGE_VAL, sinix) + * M_COPYSIGN (1, __real__ x)); } else if (icls == FP_ZERO) { /* Imaginary part is 0.0. */ - __real__ retval = HUGE_VAL; - __imag__ retval = __imag__ x * __copysign (1.0, __real__ x); + __real__ retval = M_HUGE_VAL; + __imag__ retval = __imag__ x * M_COPYSIGN (1, __real__ x); } else { /* The addition raises the invalid exception. */ - __real__ retval = HUGE_VAL; - __imag__ retval = __nan ("") + __nan (""); + __real__ retval = M_HUGE_VAL; + __imag__ retval = M_NAN + M_NAN; if (icls == FP_INFINITE) feraiseexcept (FE_INVALID); @@ -134,14 +134,15 @@ __ccosh (__complex__ double x) } else { - __real__ retval = __nan (""); - __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nan (""); + __real__ retval = M_NAN; + __imag__ retval = __imag__ x == 0 ? __imag__ x : M_NAN; } return retval; } -weak_alias (__ccosh, ccosh) -#ifdef NO_LONG_DOUBLE -strong_alias (__ccosh, __ccoshl) -weak_alias (__ccosh, ccoshl) + +declare_mgen_alias (__ccosh, ccosh); + +#if M_LIBM_NEED_COMPAT (carg) +declare_mgen_libm_compat (__ccosh, ccosh) #endif diff --git a/math/s_ccoshf.c b/math/s_ccoshf.c deleted file mode 100644 index d572b76..0000000 --- a/math/s_ccoshf.c +++ /dev/null @@ -1,145 +0,0 @@ -/* Complex cosine hyperbole function for float. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 -#include -#include - -__complex__ float -__ccoshf (__complex__ float x) -{ - __complex__ float retval; - int rcls = fpclassify (__real__ x); - int icls = fpclassify (__imag__ x); - - if (__glibc_likely (rcls >= FP_ZERO)) - { - /* Real part is finite. */ - if (__glibc_likely (icls >= FP_ZERO)) - { - /* Imaginary part is finite. */ - const int t = (int) ((FLT_MAX_EXP - 1) * M_LN2); - float sinix, cosix; - - if (__glibc_likely (fabsf (__imag__ x) > FLT_MIN)) - { - __sincosf (__imag__ x, &sinix, &cosix); - } - else - { - sinix = __imag__ x; - cosix = 1.0f; - } - - if (fabsf (__real__ x) > t) - { - float exp_t = __ieee754_expf (t); - float rx = fabsf (__real__ x); - if (signbit (__real__ x)) - sinix = -sinix; - rx -= t; - sinix *= exp_t / 2.0f; - cosix *= exp_t / 2.0f; - if (rx > t) - { - rx -= t; - sinix *= exp_t; - cosix *= exp_t; - } - if (rx > t) - { - /* Overflow (original real part of x > 3t). */ - __real__ retval = FLT_MAX * cosix; - __imag__ retval = FLT_MAX * sinix; - } - else - { - float exp_val = __ieee754_expf (rx); - __real__ retval = exp_val * cosix; - __imag__ retval = exp_val * sinix; - } - } - else - { - __real__ retval = __ieee754_coshf (__real__ x) * cosix; - __imag__ retval = __ieee754_sinhf (__real__ x) * sinix; - } - - math_check_force_underflow_complex (retval); - } - else - { - __imag__ retval = __real__ x == 0.0 ? 0.0 : __nanf (""); - __real__ retval = __nanf (""); - - if (icls == FP_INFINITE) - feraiseexcept (FE_INVALID); - } - } - else if (rcls == FP_INFINITE) - { - /* Real part is infinite. */ - if (__glibc_likely (icls > FP_ZERO)) - { - /* Imaginary part is finite. */ - float sinix, cosix; - - if (__glibc_likely (fabsf (__imag__ x) > FLT_MIN)) - { - __sincosf (__imag__ x, &sinix, &cosix); - } - else - { - sinix = __imag__ x; - cosix = 1.0f; - } - - __real__ retval = __copysignf (HUGE_VALF, cosix); - __imag__ retval = (__copysignf (HUGE_VALF, sinix) - * __copysignf (1.0, __real__ x)); - } - else if (icls == FP_ZERO) - { - /* Imaginary part is 0.0. */ - __real__ retval = HUGE_VALF; - __imag__ retval = __imag__ x * __copysignf (1.0, __real__ x); - } - else - { - /* The addition raises the invalid exception. */ - __real__ retval = HUGE_VALF; - __imag__ retval = __nanf ("") + __nanf (""); - - if (icls == FP_INFINITE) - feraiseexcept (FE_INVALID); - } - } - else - { - __real__ retval = __nanf (""); - __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nanf (""); - } - - return retval; -} -#ifndef __ccoshf -weak_alias (__ccoshf, ccoshf) -#endif diff --git a/math/s_ccoshl.c b/math/s_ccoshl.c deleted file mode 100644 index d38f0aa..0000000 --- a/math/s_ccoshl.c +++ /dev/null @@ -1,143 +0,0 @@ -/* Complex cosine hyperbole function for long double. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 -#include -#include - -__complex__ long double -__ccoshl (__complex__ long double x) -{ - __complex__ long double retval; - int rcls = fpclassify (__real__ x); - int icls = fpclassify (__imag__ x); - - if (__glibc_likely (rcls >= FP_ZERO)) - { - /* Real part is finite. */ - if (__glibc_likely (icls >= FP_ZERO)) - { - /* Imaginary part is finite. */ - const int t = (int) ((LDBL_MAX_EXP - 1) * M_LN2l); - long double sinix, cosix; - - if (__glibc_likely (fabsl (__imag__ x) > LDBL_MIN)) - { - __sincosl (__imag__ x, &sinix, &cosix); - } - else - { - sinix = __imag__ x; - cosix = 1.0; - } - - if (fabsl (__real__ x) > t) - { - long double exp_t = __ieee754_expl (t); - long double rx = fabsl (__real__ x); - if (signbit (__real__ x)) - sinix = -sinix; - rx -= t; - sinix *= exp_t / 2.0L; - cosix *= exp_t / 2.0L; - if (rx > t) - { - rx -= t; - sinix *= exp_t; - cosix *= exp_t; - } - if (rx > t) - { - /* Overflow (original real part of x > 3t). */ - __real__ retval = LDBL_MAX * cosix; - __imag__ retval = LDBL_MAX * sinix; - } - else - { - long double exp_val = __ieee754_expl (rx); - __real__ retval = exp_val * cosix; - __imag__ retval = exp_val * sinix; - } - } - else - { - __real__ retval = __ieee754_coshl (__real__ x) * cosix; - __imag__ retval = __ieee754_sinhl (__real__ x) * sinix; - } - - math_check_force_underflow_complex (retval); - } - else - { - __imag__ retval = __real__ x == 0.0 ? 0.0 : __nanl (""); - __real__ retval = __nanl ("") + __nanl (""); - - if (icls == FP_INFINITE) - feraiseexcept (FE_INVALID); - } - } - else if (rcls == FP_INFINITE) - { - /* Real part is infinite. */ - if (__glibc_likely (icls > FP_ZERO)) - { - /* Imaginary part is finite. */ - long double sinix, cosix; - - if (__glibc_likely (fabsl (__imag__ x) > LDBL_MIN)) - { - __sincosl (__imag__ x, &sinix, &cosix); - } - else - { - sinix = __imag__ x; - cosix = 1.0; - } - - __real__ retval = __copysignl (HUGE_VALL, cosix); - __imag__ retval = (__copysignl (HUGE_VALL, sinix) - * __copysignl (1.0, __real__ x)); - } - else if (icls == FP_ZERO) - { - /* Imaginary part is 0.0. */ - __real__ retval = HUGE_VALL; - __imag__ retval = __imag__ x * __copysignl (1.0, __real__ x); - } - else - { - /* The addition raises the invalid exception. */ - __real__ retval = HUGE_VALL; - __imag__ retval = __nanl ("") + __nanl (""); - - if (icls == FP_INFINITE) - feraiseexcept (FE_INVALID); - } - } - else - { - __real__ retval = __nanl (""); - __imag__ retval = __imag__ x == 0.0 ? __imag__ x : __nanl (""); - } - - return retval; -} -weak_alias (__ccoshl, ccoshl) diff --git a/math/s_ccosl.c b/math/s_ccosl.c deleted file mode 100644 index 9e98114..0000000 --- a/math/s_ccosl.c +++ /dev/null @@ -1,36 +0,0 @@ -/* Return cosine of complex long double value. - Copyright (C) 1997-2016 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - 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 -#include - - -__complex__ long double -__ccosl (__complex__ long double x) -{ - __complex__ long double y; - - __real__ y = -__imag__ x; - __imag__ y = __real__ x; - - return __ccoshl (y); -} -weak_alias (__ccosl, ccosl) diff --git a/sysdeps/alpha/fpu/s_cacosf.c b/sysdeps/alpha/fpu/s_cacosf.c index 25e21bb..d98ff9c 100644 --- a/sysdeps/alpha/fpu/s_cacosf.c +++ b/sysdeps/alpha/fpu/s_cacosf.c @@ -24,11 +24,18 @@ #undef __cacosf #undef cacosf -#define __cacosf internal_cacosf static _Complex float internal_cacosf (_Complex float x); -#include +#define M_DECL_FUNC(f) internal_cacosf +#include + +/* Disable any aliasing from base template. */ +#undef declare_mgen_alias +#define declare_mgen_alias(__to, __from) + +#include + #include "cfloat-compat.h" #undef __cacosf diff --git a/sysdeps/alpha/fpu/s_cacoshf.c b/sysdeps/alpha/fpu/s_cacoshf.c index 43b6542..06b422f 100644 --- a/sysdeps/alpha/fpu/s_cacoshf.c +++ b/sysdeps/alpha/fpu/s_cacoshf.c @@ -24,11 +24,17 @@ #undef __cacoshf #undef cacoshf -#define __cacoshf internal_cacoshf static _Complex float internal_cacoshf (_Complex float x); -#include +#define M_DECL_FUNC(f) internal_cacoshf +#include + +/* Disable any aliasing from base template. */ +#undef declare_mgen_alias +#define declare_mgen_alias(__to, __from) + +#include #include "cfloat-compat.h" #undef __cacoshf diff --git a/sysdeps/alpha/fpu/s_ccosf.c b/sysdeps/alpha/fpu/s_ccosf.c index 886be62..2e7d4a2 100644 --- a/sysdeps/alpha/fpu/s_ccosf.c +++ b/sysdeps/alpha/fpu/s_ccosf.c @@ -24,14 +24,18 @@ #undef __ccosf #undef ccosf -#define __ccosf internal_ccosf static _Complex float internal_ccosf (_Complex float x); -#include -#include "cfloat-compat.h" +#define M_DECL_FUNC(f) internal_ccosf +#include -#undef __ccosf +/* Disable any aliasing from base template. */ +#undef declare_mgen_alias +#define declare_mgen_alias(__to, __from) + +#include +#include "cfloat-compat.h" c1_cfloat_rettype __c1_ccosf (c1_cfloat_decl (x)) diff --git a/sysdeps/alpha/fpu/s_ccoshf.c b/sysdeps/alpha/fpu/s_ccoshf.c index 16f49de..e5de040 100644 --- a/sysdeps/alpha/fpu/s_ccoshf.c +++ b/sysdeps/alpha/fpu/s_ccoshf.c @@ -24,14 +24,18 @@ #undef __ccoshf #undef ccoshf -#define __ccoshf internal_ccoshf static _Complex float internal_ccoshf (_Complex float x); -#include -#include "cfloat-compat.h" +#define M_DECL_FUNC(f) internal_ccoshf +#include -#undef __ccoshf +/* Disable any aliasing from base template. */ +#undef declare_mgen_alias +#define declare_mgen_alias(__to, __from) + +#include +#include "cfloat-compat.h" c1_cfloat_rettype __c1_ccoshf (c1_cfloat_decl (x)) diff --git a/sysdeps/ieee754/ldbl-opt/s_cacos.c b/sysdeps/ieee754/ldbl-opt/s_cacos.c deleted file mode 100644 index db90a9e..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_cacos.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#include -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) -compat_symbol (libm, __cacos, cacosl, GLIBC_2_1); -#endif diff --git a/sysdeps/ieee754/ldbl-opt/s_cacosh.c b/sysdeps/ieee754/ldbl-opt/s_cacosh.c deleted file mode 100644 index e68049d..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_cacosh.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#include -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) -compat_symbol (libm, __cacosh, cacoshl, GLIBC_2_1); -#endif diff --git a/sysdeps/ieee754/ldbl-opt/s_cacoshl.c b/sysdeps/ieee754/ldbl-opt/s_cacoshl.c deleted file mode 100644 index ed4a299..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_cacoshl.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#undef weak_alias -#define weak_alias(n,a) -#include -long_double_symbol (libm, __cacoshl, cacoshl); diff --git a/sysdeps/ieee754/ldbl-opt/s_cacosl.c b/sysdeps/ieee754/ldbl-opt/s_cacosl.c deleted file mode 100644 index 9b84005..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_cacosl.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#undef weak_alias -#define weak_alias(n,a) -#include -long_double_symbol (libm, __cacosl, cacosl); diff --git a/sysdeps/ieee754/ldbl-opt/s_ccos.c b/sysdeps/ieee754/ldbl-opt/s_ccos.c deleted file mode 100644 index 2c43c7f..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_ccos.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#include -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) -compat_symbol (libm, __ccos, ccosl, GLIBC_2_1); -#endif diff --git a/sysdeps/ieee754/ldbl-opt/s_ccosh.c b/sysdeps/ieee754/ldbl-opt/s_ccosh.c deleted file mode 100644 index 3753cd5..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_ccosh.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#include -#if LONG_DOUBLE_COMPAT(libm, GLIBC_2_1) -compat_symbol (libm, __ccosh, ccoshl, GLIBC_2_1); -#endif diff --git a/sysdeps/ieee754/ldbl-opt/s_ccoshl.c b/sysdeps/ieee754/ldbl-opt/s_ccoshl.c deleted file mode 100644 index 9f0c1e1..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_ccoshl.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#undef weak_alias -#define weak_alias(n,a) -#include -long_double_symbol (libm, __ccoshl, ccoshl); diff --git a/sysdeps/ieee754/ldbl-opt/s_ccosl.c b/sysdeps/ieee754/ldbl-opt/s_ccosl.c deleted file mode 100644 index e93e805..0000000 --- a/sysdeps/ieee754/ldbl-opt/s_ccosl.c +++ /dev/null @@ -1,6 +0,0 @@ -#include -#include -#undef weak_alias -#define weak_alias(n,a) -#include -long_double_symbol (libm, __ccosl, ccosl); diff --git a/sysdeps/m68k/m680x0/fpu/s_ccosh.c b/sysdeps/m68k/m680x0/fpu/s_ccosh_template.c similarity index 87% rename from sysdeps/m68k/m680x0/fpu/s_ccosh.c rename to sysdeps/m68k/m680x0/fpu/s_ccosh_template.c index 47a4fb0..83b449e 100644 --- a/sysdeps/m68k/m680x0/fpu/s_ccosh.c +++ b/sysdeps/m68k/m680x0/fpu/s_ccosh_template.c @@ -21,27 +21,19 @@ #include #include "mathimpl.h" -#ifndef SUFF -#define SUFF -#endif -#ifndef float_type -#define float_type double -#endif - -#define CONCATX(a,b) __CONCAT(a,b) -#define s(name) CONCATX(name,SUFF) +#define s(name) M_SUF (name) #define m81(func) __m81_u(s(func)) -__complex__ float_type -s(__ccosh) (__complex__ float_type x) +CFLOAT +s(__ccosh) (CFLOAT x) { - __complex__ float_type retval; + CFLOAT retval; unsigned long ix_cond = __m81_test (__imag__ x); if ((ix_cond & (__M81_COND_INF|__M81_COND_NAN)) == 0) { /* Imaginary part is finite. */ - float_type sin_ix, cos_ix; + FLOAT sin_ix, cos_ix; __asm ("fsincos%.x %2,%1:%0" : "=f" (sin_ix), "=f" (cos_ix) : "f" (__imag__ x)); diff --git a/sysdeps/m68k/m680x0/fpu/s_ccoshf.c b/sysdeps/m68k/m680x0/fpu/s_ccoshf.c deleted file mode 100644 index 3c8e7c7..0000000 --- a/sysdeps/m68k/m680x0/fpu/s_ccoshf.c +++ /dev/null @@ -1,3 +0,0 @@ -#define SUFF f -#define float_type float -#include diff --git a/sysdeps/m68k/m680x0/fpu/s_ccoshl.c b/sysdeps/m68k/m680x0/fpu/s_ccoshl.c deleted file mode 100644 index 772d578..0000000 --- a/sysdeps/m68k/m680x0/fpu/s_ccoshl.c +++ /dev/null @@ -1,3 +0,0 @@ -#define SUFF l -#define float_type long double -#include