* Fix for BZ#10401: cproj broken
@ 2010-04-08 10:47 Andreas Jaeger
0 siblings, 0 replies; only message in thread
From: Andreas Jaeger @ 2010-04-08 10:47 UTC (permalink / raw)
To: libc-hacker
[-- Attachment #1: Type: Text/Plain, Size: 6396 bytes --]
Here's a fix for cproj, it is implemented the wrong way,
Andreas
2010-04-08 Andreas Jaeger <aj@suse.de>
[BZ #10401]
* math/s_cprojl.c (__cprojl): Fix implementation to follow C99
standard.
* math/s_cprojf.c (__cprojf): Likewise.
* math/s_cproj.c (__cproj): Likewise.
* sysdeps/ieee754/ldbl-128ibm/s_cprojl.c (__cprojl): Likewise.
* math/libm-test.inc (cproj_test): Fix test.
diff --git a/math/libm-test.inc b/math/libm-test.inc
index 260d3ec..6650b88 100644
--- a/math/libm-test.inc
+++ b/math/libm-test.inc
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997-2006, 2007, 2009 Free Software Foundation, Inc.
+/* Copyright (C) 1997-2006, 2007, 2009, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Andreas Jaeger <aj@suse.de>, 1997.
@@ -2087,7 +2087,7 @@ cproj_test (void)
TEST_c_c (cproj, minus_infty, minus_infty, plus_infty, minus_zero);
TEST_c_c (cproj, 1.0, 0.0, 1.0, 0.0);
- TEST_c_c (cproj, 2.0, 3.0, 0.2857142857142857142857142857142857L, 0.42857142857142857142857142857142855L);
+ TEST_c_c (cproj, 2.0, 3.0, 2.0, 3.0);
END (cproj, complex);
}
diff --git a/math/s_cproj.c b/math/s_cproj.c
index 8e7ca41..90e5eba 100644
--- a/math/s_cproj.c
+++ b/math/s_cproj.c
@@ -1,5 +1,5 @@
/* Compute projection of complex double value to Riemann sphere.
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -25,24 +25,19 @@
__complex__ double
__cproj (__complex__ double x)
{
- __complex__ double res;
-
if (isnan (__real__ x) && isnan (__imag__ x))
return x;
else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
+ __complex__ double res;
+
__real__ res = INFINITY;
__imag__ res = __copysign (0.0, __imag__ x);
- }
- else
- {
- double den = __real__ x * __real__ x + __imag__ x * __imag__ x + 1.0;
-
- __real__ res = (2.0 * __real__ x) / den;
- __imag__ res = (2.0 * __imag__ x) / den;
+
+ return res;
}
- return res;
+ return x;
}
weak_alias (__cproj, cproj)
#ifdef NO_LONG_DOUBLE
diff --git a/math/s_cprojf.c b/math/s_cprojf.c
index 83df13c..e7eacaf 100644
--- a/math/s_cprojf.c
+++ b/math/s_cprojf.c
@@ -1,5 +1,5 @@
/* Compute projection of complex float value to Riemann sphere.
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -25,24 +25,19 @@
__complex__ float
__cprojf (__complex__ float x)
{
- __complex__ float res;
-
if (isnan (__real__ x) && isnan (__imag__ x))
return x;
else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
+ __complex__ float res;
+
__real__ res = INFINITY;
__imag__ res = __copysignf (0.0, __imag__ x);
- }
- else
- {
- float den = __real__ x * __real__ x + __imag__ x * __imag__ x + 1.0;
- __real__ res = (2.0 * __real__ x) / den;
- __imag__ res = (2.0 * __imag__ x) / den;
+ return res;
}
- return res;
+ return x;
}
#ifndef __cprojf
weak_alias (__cprojf, cprojf)
diff --git a/math/s_cprojl.c b/math/s_cprojl.c
index c70cdc4..19c17a8 100644
--- a/math/s_cprojl.c
+++ b/math/s_cprojl.c
@@ -1,5 +1,5 @@
/* Compute projection of complex long double value to Riemann sphere.
- Copyright (C) 1997, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1997, 1999, 2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -25,24 +25,18 @@
__complex__ long double
__cprojl (__complex__ long double x)
{
- __complex__ long double res;
-
if (isnan (__real__ x) && isnan (__imag__ x))
return x;
else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
+ __complex__ long double res;
+
__real__ res = INFINITY;
__imag__ res = __copysignl (0.0, __imag__ x);
- }
- else
- {
- long double den = (__real__ x * __real__ x + __imag__ x * __imag__ x
- + 1.0);
- __real__ res = (2.0 * __real__ x) / den;
- __imag__ res = (2.0 * __imag__ x) / den;
+ return res;
}
- return res;
+ return x;
}
weak_alias (__cprojl, cprojl)
diff --git a/sysdeps/ieee754/ldbl-128ibm/s_cprojl.c b/sysdeps/ieee754/ldbl-128ibm/s_cprojl.c
index 2167db3..b2a09ae 100644
--- a/sysdeps/ieee754/ldbl-128ibm/s_cprojl.c
+++ b/sysdeps/ieee754/ldbl-128ibm/s_cprojl.c
@@ -1,5 +1,5 @@
/* Compute projection of complex long double value to Riemann sphere.
- Copyright (C) 1997,1999,2006 Free Software Foundation, Inc.
+ Copyright (C) 1997,1999,2006,2010 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
@@ -25,30 +25,18 @@
__complex__ long double
__cprojl (__complex__ long double x)
{
- __complex__ long double res;
-
if (isnan (__real__ x) && isnan (__imag__ x))
return x;
else if (!isfinite (__real__ x) || !isfinite (__imag__ x))
{
+ __complex__ long double res;
+
__real__ res = INFINITY;
__imag__ res = __copysignl (0.0, __imag__ x);
- }
- else
- {
- long double den = (__real__ x * __real__ x + __imag__ x * __imag__ x
- + 1.0);
-
- __real__ res = (2.0 * __real__ x) / den;
- __imag__ res = (2.0 * __imag__ x) / den;
- /* __gcc_qmul does not respect -0.0 so we need the following fixup. */
- if (__real__ x == 0.0)
- __real__ res = __real__ x;
- if (__imag__ x == 0.0)
- __imag__ res = __imag__ x;
+ return res;
}
- return res;
+ return x;
}
long_double_symbol (libm, __cprojl, cprojl);
--
Andreas Jaeger, Program Manager openSUSE, aj@{novell.com,opensuse.org}
Twitter: jaegerandi | Identica: jaegerandi
SUSE LINUX Products GmbH, GF: Markus Rex, HRB 16746 (AG Nürnberg)
Maxfeldstr. 5, 90409 Nürnberg, Germany
GPG fingerprint = 93A3 365E CE47 B889 DF7F FED1 389A 563C C272 A126
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 190 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-04-08 10:47 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-08 10:47 Fix for BZ#10401: cproj broken Andreas Jaeger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).