about summary refs log tree commit diff
path: root/sysdeps/libm-ieee754
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/libm-ieee754')
-rw-r--r--sysdeps/libm-ieee754/s_cacoshf.c15
-rw-r--r--sysdeps/libm-ieee754/s_catan.c2
-rw-r--r--sysdeps/libm-ieee754/s_catanf.c2
-rw-r--r--sysdeps/libm-ieee754/s_catanh.c8
-rw-r--r--sysdeps/libm-ieee754/s_catanhf.c8
-rw-r--r--sysdeps/libm-ieee754/s_catanhl.c8
-rw-r--r--sysdeps/libm-ieee754/s_catanl.c2
-rw-r--r--sysdeps/libm-ieee754/s_clog10.c2
-rw-r--r--sysdeps/libm-ieee754/s_clog10f.c2
-rw-r--r--sysdeps/libm-ieee754/s_clog10l.c4
10 files changed, 34 insertions, 19 deletions
diff --git a/sysdeps/libm-ieee754/s_cacoshf.c b/sysdeps/libm-ieee754/s_cacoshf.c
index bcfebea123..6aa33e5a48 100644
--- a/sysdeps/libm-ieee754/s_cacoshf.c
+++ b/sysdeps/libm-ieee754/s_cacoshf.c
@@ -21,6 +21,7 @@
 #include <complex.h>
 #include <math.h>
 
+#include "math_private.h"
 
 __complex__ float
 __cacoshf (__complex__ float x)
@@ -66,6 +67,7 @@ __cacoshf (__complex__ float x)
     }
   else
     {
+#if 1
       __complex__ float y;
 
       __real__ y = (__real__ x - __imag__ x) * (__real__ x + __imag__ x) - 1.0;
@@ -77,6 +79,19 @@ __cacoshf (__complex__ float x)
       __imag__ y += __imag__ x;
 
       res = __clogf (y);
+#else
+      float re2 = __real__ x * __real__ x;
+      float im2 = __imag__ x * __imag__ x;
+      float sq = re2 - im2 - 1.0;
+      float ro = __ieee754_sqrtf (sq * sq + 4 * re2 * im2);
+      float a = __ieee754_sqrtf ((sq + ro) / 2.0);
+      float b = __ieee754_sqrtf ((-sq + ro) / 2.0);
+
+      __real__ res = 0.5 * __ieee754_logf (re2 + __real__ x * 2 * a
+					   + im2 + __imag__ x * 2 * b
+					   + ro);
+      __imag__ res = __ieee754_atan2f (__imag__ x + b, __real__ x + a);
+#endif
     }
 
   return res;
diff --git a/sysdeps/libm-ieee754/s_catan.c b/sysdeps/libm-ieee754/s_catan.c
index bab87e95a8..a3fc9ad3e8 100644
--- a/sysdeps/libm-ieee754/s_catan.c
+++ b/sysdeps/libm-ieee754/s_catan.c
@@ -69,7 +69,7 @@ __catan (__complex__ double x)
 
       den = 1 - r2 - __imag__ x * __imag__ x;
 
-      __real__ res = 0.5 * __atan ((2.0 * __real__ x) / den);
+      __real__ res = 0.5 * __ieee754_atan2 (2.0 * __real__ x, den);
 
       num = __imag__ x + 1.0;
       num = r2 + num * num;
diff --git a/sysdeps/libm-ieee754/s_catanf.c b/sysdeps/libm-ieee754/s_catanf.c
index 92bdac9ec8..18881cd6c9 100644
--- a/sysdeps/libm-ieee754/s_catanf.c
+++ b/sysdeps/libm-ieee754/s_catanf.c
@@ -69,7 +69,7 @@ __catanf (__complex__ float x)
 
       den = 1 - r2 - __imag__ x * __imag__ x;
 
-      __real__ res = 0.5 * __atanf ((2.0 * __real__ x) / den);
+      __real__ res = 0.5 * __ieee754_atan2f (2.0 * __real__ x, den);
 
       num = __imag__ x + 1.0;
       num = r2 + num * num;
diff --git a/sysdeps/libm-ieee754/s_catanh.c b/sysdeps/libm-ieee754/s_catanh.c
index 6c4b10e3db..0cb852a069 100644
--- a/sysdeps/libm-ieee754/s_catanh.c
+++ b/sysdeps/libm-ieee754/s_catanh.c
@@ -62,17 +62,17 @@ __catanh (__complex__ double x)
 
       i2 = __imag__ x * __imag__ x;
 
-      num = 1.0 - __real__ x;
+      num = 1.0 + __real__ x;
       num = i2 + num * num;
 
-      den = 1.0 + __real__ x;
+      den = 1.0 - __real__ x;
       den = i2 + den * den;
 
-      __real__ res = 0.25 * __ieee754_log (num / den);
+      __real__ res = 0.25 * (__ieee754_log (num) - __ieee754_log (den));
 
       den = 1 - __real__ x * __real__ x - i2;
 
-      __imag__ res = 0.5 * __atan ((2.0 * __imag__ x) / den);
+      __imag__ res = 0.5 * __ieee754_atan2 (2.0 * __imag__ x, den);
     }
 
   return res;
diff --git a/sysdeps/libm-ieee754/s_catanhf.c b/sysdeps/libm-ieee754/s_catanhf.c
index 5d195be905..ac0ed17edb 100644
--- a/sysdeps/libm-ieee754/s_catanhf.c
+++ b/sysdeps/libm-ieee754/s_catanhf.c
@@ -62,17 +62,17 @@ __catanhf (__complex__ float x)
 
       i2 = __imag__ x * __imag__ x;
 
-      num = 1.0 - __real__ x;
+      num = 1.0 + __real__ x;
       num = i2 + num * num;
 
-      den = 1.0 + __real__ x;
+      den = 1.0 - __real__ x;
       den = i2 + den * den;
 
-      __real__ res = 0.25 * __ieee754_logf (num / den);
+      __real__ res = 0.25 * (__ieee754_logf (num) - __ieee754_logf (den));
 
       den = 1 - __real__ x * __real__ x - i2;
 
-      __imag__ res = 0.5 * __atanf ((2.0 * __imag__ x) / den);
+      __imag__ res = 0.5 * __ieee754_atan2f (2.0 * __imag__ x, den);
     }
 
   return res;
diff --git a/sysdeps/libm-ieee754/s_catanhl.c b/sysdeps/libm-ieee754/s_catanhl.c
index d8396a7961..693799639a 100644
--- a/sysdeps/libm-ieee754/s_catanhl.c
+++ b/sysdeps/libm-ieee754/s_catanhl.c
@@ -62,17 +62,17 @@ __catanhl (__complex__ long double x)
 
       i2 = __imag__ x * __imag__ x;
 
-      num = 1.0 - __real__ x;
+      num = 1.0 + __real__ x;
       num = i2 + num * num;
 
-      den = 1.0 + __real__ x;
+      den = 1.0 - __real__ x;
       den = i2 + den * den;
 
-      __real__ res = 0.25 * __ieee754_logl (num / den);
+      __real__ res = 0.25 * (__ieee754_logl (num) - __ieee754_logl (den));
 
       den = 1 - __real__ x * __real__ x - i2;
 
-      __imag__ res = 0.5 * __atanl ((2.0 * __imag__ x) / den);
+      __imag__ res = 0.5 * __ieee754_atan2l (2.0 * __imag__ x, den);
     }
 
   return res;
diff --git a/sysdeps/libm-ieee754/s_catanl.c b/sysdeps/libm-ieee754/s_catanl.c
index 2fd8a4fa08..1da7c6c008 100644
--- a/sysdeps/libm-ieee754/s_catanl.c
+++ b/sysdeps/libm-ieee754/s_catanl.c
@@ -69,7 +69,7 @@ __catanl (__complex__ long double x)
 
       den = 1 - r2 - __imag__ x * __imag__ x;
 
-      __real__ res = 0.5 * __atanl ((2.0 * __real__ x) / den);
+      __real__ res = 0.5 * __ieee754_atan2l (2.0 * __real__ x, den);
 
       num = __imag__ x + 1.0;
       num = r2 + num * num;
diff --git a/sysdeps/libm-ieee754/s_clog10.c b/sysdeps/libm-ieee754/s_clog10.c
index 5a9de75733..7b2e474b8f 100644
--- a/sysdeps/libm-ieee754/s_clog10.c
+++ b/sysdeps/libm-ieee754/s_clog10.c
@@ -44,7 +44,7 @@ __clog10 (__complex__ double x)
       /* Neither real nor imaginary part is NaN.  */
       __real__ result = __ieee754_log10 (__ieee754_hypot (__real__ x,
 							  __imag__ x));
-      __imag__ result = __ieee754_atan2 (__imag__ x, __real__ x);
+      __imag__ result = M_LOG10E * __ieee754_atan2 (__imag__ x, __real__ x);
     }
   else
     {
diff --git a/sysdeps/libm-ieee754/s_clog10f.c b/sysdeps/libm-ieee754/s_clog10f.c
index 4e2fa83edf..bc4094b8ba 100644
--- a/sysdeps/libm-ieee754/s_clog10f.c
+++ b/sysdeps/libm-ieee754/s_clog10f.c
@@ -44,7 +44,7 @@ __clog10f (__complex__ float x)
       /* Neither real nor imaginary part is NaN.  */
       __real__ result = __ieee754_log10f (__ieee754_hypotf (__real__ x,
 							    __imag__ x));
-      __imag__ result = __ieee754_atan2f (__imag__ x, __real__ x);
+      __imag__ result = M_LOG10E * __ieee754_atan2f (__imag__ x, __real__ x);
     }
   else
     {
diff --git a/sysdeps/libm-ieee754/s_clog10l.c b/sysdeps/libm-ieee754/s_clog10l.c
index bf7d394c42..70940f6863 100644
--- a/sysdeps/libm-ieee754/s_clog10l.c
+++ b/sysdeps/libm-ieee754/s_clog10l.c
@@ -1,4 +1,4 @@
-/* Compute complex natural logarithm.
+/* Compute complex base 10 logarithm.
    Copyright (C) 1997 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -44,7 +44,7 @@ __clog10l (__complex__ long double x)
       /* Neither real nor imaginary part is NaN.  */
       __real__ result = __ieee754_log10l (__ieee754_hypotl (__real__ x,
 							    __imag__ x));
-      __imag__ result = __ieee754_atan2l (__imag__ x, __real__ x);
+      __imag__ result = M_LOG10E * __ieee754_atan2l (__imag__ x, __real__ x);
     }
   else
     {