From fa12b26b661e096786094626306fd95ff506ac20 Mon Sep 17 00:00:00 2001 From: das Date: Sat, 14 Mar 2009 18:24:15 +0000 Subject: [PATCH] Eliminate __real__ and __imag__ gccisms. --- lib/msun/src/math_private.h | 45 +++++++++++++++++++++++++++---------- lib/msun/src/s_cimag.c | 4 +++- lib/msun/src/s_cimagf.c | 4 +++- lib/msun/src/s_cimagl.c | 4 +++- 4 files changed, 42 insertions(+), 15 deletions(-) diff --git a/lib/msun/src/math_private.h b/lib/msun/src/math_private.h index 46d65cce247..49553db4f26 100644 --- a/lib/msun/src/math_private.h +++ b/lib/msun/src/math_private.h @@ -190,6 +190,27 @@ do { \ void _scan_nan(uint32_t *__words, int __num_words, const char *__s); #ifdef _COMPLEX_H + +/* + * C99 specifies that complex numbers have the same representation as + * an array of two elements, where the first element is the real part + * and the second element is the imaginary part. + */ +typedef union { + float complex f; + float a[2]; +} float_complex; +typedef union { + double complex f; + double a[2]; +} double_complex; +typedef union { + long double complex f; + long double a[2]; +} long_double_complex; +#define REALPART(z) ((z).a[0]) +#define IMAGPART(z) ((z).a[1]) + /* * Inline functions that can be used to construct complex values. * @@ -203,31 +224,31 @@ void _scan_nan(uint32_t *__words, int __num_words, const char *__s); static __inline float complex cpackf(float x, float y) { - float complex z; + float_complex z; - __real__ z = x; - __imag__ z = y; - return (z); + REALPART(z) = x; + IMAGPART(z) = y; + return (z.f); } static __inline double complex cpack(double x, double y) { - double complex z; + double_complex z; - __real__ z = x; - __imag__ z = y; - return (z); + REALPART(z) = x; + IMAGPART(z) = y; + return (z.f); } static __inline long double complex cpackl(long double x, long double y) { - long double complex z; + long_double_complex z; - __real__ z = x; - __imag__ z = y; - return (z); + REALPART(z) = x; + IMAGPART(z) = y; + return (z.f); } #endif /* _COMPLEX_H */ diff --git a/lib/msun/src/s_cimag.c b/lib/msun/src/s_cimag.c index aa25423123c..cbf6720bdd8 100644 --- a/lib/msun/src/s_cimag.c +++ b/lib/msun/src/s_cimag.c @@ -27,10 +27,12 @@ */ #include +#include "math_private.h" double cimag(double complex z) { + const double_complex z1 = { .f = z }; - return (__imag__ z); + return (IMAGPART(z1)); } diff --git a/lib/msun/src/s_cimagf.c b/lib/msun/src/s_cimagf.c index 6bd00d9cce6..4e483a2a7f7 100644 --- a/lib/msun/src/s_cimagf.c +++ b/lib/msun/src/s_cimagf.c @@ -27,10 +27,12 @@ */ #include +#include "math_private.h" float cimagf(float complex z) { + const float_complex z1 = { .f = z }; - return (__imag__ z); + return (IMAGPART(z1)); } diff --git a/lib/msun/src/s_cimagl.c b/lib/msun/src/s_cimagl.c index 581f4430e59..c50e967b73e 100644 --- a/lib/msun/src/s_cimagl.c +++ b/lib/msun/src/s_cimagl.c @@ -27,10 +27,12 @@ */ #include +#include "math_private.h" long double cimagl(long double complex z) { + const long_double_complex z1 = { .f = z }; - return (__imag__ z); + return (IMAGPART(z1)); } -- 2.45.0