From patchwork Fri Jul 1 20:13:59 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: 643211 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 3rh71c3Q8Sz9sxR for ; Sat, 2 Jul 2016 06:15:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b=vSHqK6Er; 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=qls5O9pO W+LFif6/lRmlNfUKwkSzDWJDPZS9hd4P7WRmaElF0Xk9MnTb5X1bhku90iEL2ZT2 4X33P/Ehh+FymDPS5Tqmadd+hkLh6L1FuVSZqmd7ikYdZsSudbQDVVGr1xKRC6jU krasjOFeZ2akz+WjVu9um3/sCC/qwdlUNYk= 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=Db3+rLyKIvWe8N GE/nTNUXNeU04=; b=vSHqK6ErpF2rjQ0+BuXDZUfDSskErABrkEsTVYRLf+n8Wm 8IuZa+rLpDOWoO4BNbMjpJmf6LLWZ0aLw8pglCaAO/M0WMMwCszEuo1YTv36UjYt w/f82auuZ/754PdTOY0RfUHK/QXwb2XDMalSK3HlBcoobVrLZVg5jI1vu6JAA= Received: (qmail 108529 invoked by alias); 1 Jul 2016 20:14:27 -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 108423 invoked by uid 89); 1 Jul 2016 20:14:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=0.5 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=__nanl, icls, fp_zero, FP_ZERO X-HELO: mx0a-001b2d01.pphosted.com X-IBM-Helo: d03dlp03.boulder.ibm.com X-IBM-MailFrom: murphyp@linux.vnet.ibm.com From: "Paul E. Murphy" To: libc-alpha@sourceware.org Subject: [PATCHv2 02/11] Unify drift between _Complex function type variants Date: Fri, 1 Jul 2016 15:13:59 -0500 In-Reply-To: References: In-Reply-To: References: X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16070120-0004-0000-0000-00000FD2C6AF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16070120-0005-0000-0000-000076B51747 Message-Id: X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-07-01_05:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=1 spamscore=1 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=1 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1607010201 While trying to convert the _Complex function wrappers into a single generic implementation, a few minor variations between identical versions emerged. * s_ccoshf.c (__ccoshf): Remove FE_INVALID check, and remove __glibc_likely hint from FP_INFINITE check. * s_csinhf.c (__csinhf): Likewise. * s_ccoshl.c (__ccoshl): Remove __glibc_likely hint from FP_INFINITE check. * s_csinhl.c (__csinhl): Likewise. --- math/s_ccoshf.c | 4 +--- math/s_ccoshl.c | 2 +- math/s_csinhf.c | 4 +--- math/s_csinhl.c | 4 +--- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/math/s_ccoshf.c b/math/s_ccoshf.c index 610a749..d572b76 100644 --- a/math/s_ccoshf.c +++ b/math/s_ccoshf.c @@ -94,7 +94,7 @@ __ccoshf (__complex__ float x) feraiseexcept (FE_INVALID); } } - else if (__glibc_likely (rcls == FP_INFINITE)) + else if (rcls == FP_INFINITE) { /* Real part is infinite. */ if (__glibc_likely (icls > FP_ZERO)) @@ -128,10 +128,8 @@ __ccoshf (__complex__ float x) __real__ retval = HUGE_VALF; __imag__ retval = __nanf ("") + __nanf (""); -#ifdef FE_INVALID if (icls == FP_INFINITE) feraiseexcept (FE_INVALID); -#endif } } else diff --git a/math/s_ccoshl.c b/math/s_ccoshl.c index 680da3a..d38f0aa 100644 --- a/math/s_ccoshl.c +++ b/math/s_ccoshl.c @@ -94,7 +94,7 @@ __ccoshl (__complex__ long double x) feraiseexcept (FE_INVALID); } } - else if (__glibc_likely (rcls == FP_INFINITE)) + else if (rcls == FP_INFINITE) { /* Real part is infinite. */ if (__glibc_likely (icls > FP_ZERO)) diff --git a/math/s_csinhf.c b/math/s_csinhf.c index a0458cf..36b42ca 100644 --- a/math/s_csinhf.c +++ b/math/s_csinhf.c @@ -111,7 +111,7 @@ __csinhf (__complex__ float x) } } } - else if (__glibc_likely (rcls == FP_INFINITE)) + else if (rcls == FP_INFINITE) { /* Real part is infinite. */ if (__glibc_likely (icls > FP_ZERO)) @@ -147,10 +147,8 @@ __csinhf (__complex__ float x) __real__ retval = HUGE_VALF; __imag__ retval = __nanf ("") + __nanf (""); -#ifdef FE_INVALID if (icls == FP_INFINITE) feraiseexcept (FE_INVALID); -#endif } } else diff --git a/math/s_csinhl.c b/math/s_csinhl.c index d7f03fa..c231d7b 100644 --- a/math/s_csinhl.c +++ b/math/s_csinhl.c @@ -111,7 +111,7 @@ __csinhl (__complex__ long double x) } } } - else if (__glibc_likely (rcls == FP_INFINITE)) + else if (rcls == FP_INFINITE) { /* Real part is infinite. */ if (__glibc_likely (icls > FP_ZERO)) @@ -147,10 +147,8 @@ __csinhl (__complex__ long double x) __real__ retval = HUGE_VALL; __imag__ retval = __nanl ("") + __nanl (""); -#ifdef FE_INVALID if (icls == FP_INFINITE) feraiseexcept (FE_INVALID); -#endif } } else