Print this page
11210 libm should be cstyle(1ONBLD) clean

*** 16,28 **** --- 16,30 ---- * fields enclosed by brackets "[]" replaced with your own identifying * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END */ + /* * Copyright 2011 Nexenta Systems, Inc. All rights reserved. */ + /* * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */
*** 33,51 **** #if defined(__i386) && !defined(__amd64) extern int __swapRP(int); #endif ! static const float ! pi_2 = 1.570796326794896558e+00F, zero = 0.0F, half = 0.5F, two = 2.0F, one = 1.0F; fcomplex ! catanf(fcomplex z) { fcomplex ans; float x, y, ax, ay, t; double dx, dy, dt; int hx, hy, ix, iy; --- 35,53 ---- #if defined(__i386) && !defined(__amd64) extern int __swapRP(int); #endif ! static const float pi_2 = 1.570796326794896558e+00F, zero = 0.0F, half = 0.5F, two = 2.0F, one = 1.0F; fcomplex ! catanf(fcomplex z) ! { fcomplex ans; float x, y, ax, ay, t; double dx, dy, dt; int hx, hy, ix, iy;
*** 62,71 **** --- 64,74 ---- if (ix == 0x7f800000) { F_RE(ans) = pi_2; F_IM(ans) = zero; } else { F_RE(ans) = x * x; + if (iy == 0 || iy == 0x7f800000) F_IM(ans) = zero; else F_IM(ans) = (fabsf(y) - ay) / (fabsf(y) - ay); }
*** 76,98 **** } else { F_RE(ans) = (fabsf(x) - ax) / (fabsf(x) - ax); F_IM(ans) = y * y; } } else if (ix == 0) { ! /* INDENT OFF */ /* * x = 0 * 1 1 * A = --- * atan2(2x, 1-x*x-y*y) = --- atan2(0,1-|y|) * 2 2 * * 1 [ (y+1)*(y+1) ] 1 2 1 2y * B = - log [ ----------- ] = - log (1+ ---) or - log(1+ ----) * 4 [ (y-1)*(y-1) ] 2 y-1 2 1-y */ ! /* INDENT ON */ t = one - ay; if (iy == 0x3f800000) { /* y=1: catan(0,1)=(0,+inf) with 1/0 signal */ F_IM(ans) = ay / ax; F_RE(ans) = zero; } else if (iy > 0x3f800000) { /* y>1 */ --- 79,102 ---- } else { F_RE(ans) = (fabsf(x) - ax) / (fabsf(x) - ax); F_IM(ans) = y * y; } } else if (ix == 0) { ! /* BEGIN CSTYLED */ /* * x = 0 * 1 1 * A = --- * atan2(2x, 1-x*x-y*y) = --- atan2(0,1-|y|) * 2 2 * * 1 [ (y+1)*(y+1) ] 1 2 1 2y * B = - log [ ----------- ] = - log (1+ ---) or - log(1+ ----) * 4 [ (y-1)*(y-1) ] 2 y-1 2 1-y */ ! /* END CSTYLED */ t = one - ay; + if (iy == 0x3f800000) { /* y=1: catan(0,1)=(0,+inf) with 1/0 signal */ F_IM(ans) = ay / ax; F_RE(ans) = zero; } else if (iy > 0x3f800000) { /* y>1 */
*** 101,138 **** } else { /* y<1 */ F_IM(ans) = half * log1pf((ay + ay) / t); F_RE(ans) = zero; } } else { ! /* INDENT OFF */ /* * use double precision x,y * 1 * A = --- * atan2(2x, 1-x*x-y*y) * 2 * * 1 [ x*x+(y+1)*(y+1) ] 1 4y * B = - log [ --------------- ] = - log (1+ -----------------) * 4 [ x*x+(y-1)*(y-1) ] 4 x*x + (y-1)*(y-1) */ ! /* INDENT ON */ #if defined(__i386) && !defined(__amd64) int rp = __swapRP(fp_extended); #endif dx = (double)ax; dy = (double)ay; ! F_RE(ans) = (float)(0.5 * atan2(dx + dx, ! 1.0 - dx * dx - dy * dy)); dt = dy - 1.0; ! F_IM(ans) = (float)(0.25 * log1p(4.0 * dy / ! (dx * dx + dt * dt))); #if defined(__i386) && !defined(__amd64) if (rp != fp_extended) (void) __swapRP(rp); #endif } if (hx < 0) F_RE(ans) = -F_RE(ans); if (hy < 0) F_IM(ans) = -F_IM(ans); return (ans); } --- 105,147 ---- } else { /* y<1 */ F_IM(ans) = half * log1pf((ay + ay) / t); F_RE(ans) = zero; } } else { ! /* BEGIN CSTYLED */ /* * use double precision x,y * 1 * A = --- * atan2(2x, 1-x*x-y*y) * 2 * * 1 [ x*x+(y+1)*(y+1) ] 1 4y * B = - log [ --------------- ] = - log (1+ -----------------) * 4 [ x*x+(y-1)*(y-1) ] 4 x*x + (y-1)*(y-1) */ ! /* END CSTYLED */ ! #if defined(__i386) && !defined(__amd64) int rp = __swapRP(fp_extended); #endif dx = (double)ax; dy = (double)ay; ! F_RE(ans) = (float)(0.5 * atan2(dx + dx, 1.0 - dx * dx - dy * ! dy)); dt = dy - 1.0; ! F_IM(ans) = (float)(0.25 * log1p(4.0 * dy / (dx * dx + dt * ! dt))); ! #if defined(__i386) && !defined(__amd64) if (rp != fp_extended) (void) __swapRP(rp); #endif } + if (hx < 0) F_RE(ans) = -F_RE(ans); + if (hy < 0) F_IM(ans) = -F_IM(ans); + return (ans); }