This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH: Add tgmath.h
- From: Matt Austern <austern at apple dot com>
- To: GCC Patches <gcc-patches at gcc dot gnu dot org>
- Date: Fri, 13 Aug 2004 14:35:57 -0700
- Subject: PATCH: Add tgmath.h
tgmath.h is not tied closely to the C library, but it is tied closely
to a particular compiler. (There's no way to write it in portable C.)
So we should be providing it, instead of expecting every C library
implementer to provide their own. Here it is!
The tests are minimal, but at least they're enough to make sure that
the file gets installed correctly and doesn't have gross syntax errors.
OK to commit to mainline?
--Matt
Index: gcc/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ChangeLog,v
retrieving revision 2.4902
diff -c -p -r2.4902 ChangeLog
*** gcc/ChangeLog 13 Aug 2004 21:13:46 -0000 2.4902
--- gcc/ChangeLog 13 Aug 2004 21:31:55 -0000
***************
*** 1,3 ****
--- 1,8 ----
+ 2004-08-13 Matt Austern <austern@apple.com>
+
+ * ginclude/tgmath.h: New file.
+ * Makefile.in (USER_H): Add tgmath.h
+
2004-08-13 Roger Sayle <roger@eyesopen.com>
David Billinghurst <David.Billinghurst@riotinto.com>
Index: gcc/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1345
diff -c -p -r1.1345 Makefile.in
*** gcc/Makefile.in 13 Aug 2004 19:11:28 -0000 1.1345
--- gcc/Makefile.in 13 Aug 2004 21:31:56 -0000
*************** USER_H = $(srcdir)/ginclude/float.h \
*** 304,309 ****
--- 304,310 ----
$(srcdir)/ginclude/stdarg.h \
$(srcdir)/ginclude/stdbool.h \
$(srcdir)/ginclude/stddef.h \
+ $(srcdir)/ginclude/tgmath.h \
$(srcdir)/ginclude/varargs.h \
$(srcdir)/unwind.h \
$(EXTRA_HEADERS)
Index: gcc/ginclude/tgmath.h
===================================================================
RCS file: gcc/ginclude/tgmath.h
diff -N gcc/ginclude/tgmath.h
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- gcc/ginclude/tgmath.h 13 Aug 2004 21:31:57 -0000
***************
*** 0 ****
--- 1,174 ----
+ /* Copyright (C) 2004
+ Free Software Foundation, Inc.
+
+ This file is part of GCC.
+
+ GCC is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ GCC is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING. If not, write to
+ the Free Software Foundation, 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+ /* As a special exception, if you include this header file into source
+ files compiled by GCC, this header file does not by itself cause
+ the resulting executable to be covered by the GNU General Public
+ License. This exception does not however invalidate any other
+ reasons why the executable file might be covered by the GNU General
+ Public License. */
+
+ /*
+ * ISO C Standard: 7.22 Type-generic math <tgmath.h>
+ */
+
+ #ifndef _TGMATH_H
+ #define _TGMATH_H
+
+ #include <math.h>
+
+ #ifndef __cplusplus
+ #include <complex.h>
+
+ /* Naming convention: generic macros are defining using
+ __TGMATH_CPLX*, __TGMATH_REAL*, and __TGMATH_CPLX_ONLY. _CPLX
+ means the generic argument(s) may be real or complex, _REAL means
+ real only, _CPLX means complex only. If there is no suffix, we are
+ defining a function of one generic argument. If the suffix is _n
+ it is a function of n generic arguments. If the suffix is _m_n it
+ is a function of n arguments, the first m of which are generic. We
+ only define these macros for values of n and/or m that are needed.
*/
+
+ /* The general rules for generic macros are given in 7.22 paragraphs
1 and 2.
+ If any generic parameter is complex, we use a complex version.
Otherwise
+ we use a real version. If the real part of any generic parameter
is long
+ double, we use the long double version. Otherwise if the real
part of any
+ generic paramter is double or of integer type, we use the double
version.
+ Otherwise we use the float version. */
+
+ #define __tg_cplx(expr) \
+ __builtin_classify_type(expr) == 9
+
+ #define __tg_ldbl(expr) \
+ __builtin_types_compatible_p(__typeof__(expr), long double)
+
+ #define __tg_dbl(expr) \
+ (__builtin_types_compatible_p(__typeof__(expr), double) \
+ || __builtin_classify_type(expr) == 1)
+
+ #define __tg_choose(x,f,d,l) \
+ __builtin_choose_expr(__tg_ldbl(x), l, \
+ __builtin_choose_expr(__tg_dbl(x), d, \
+ f))
+
+ #define __tg_choose_2(x,y,f,d,l)
\
+ __builtin_choose_expr(__tg_ldbl(x) || __tg_ldbl(y), l,
\
+ __builtin_choose_expr(__tg_dbl(x) ||
__tg_dbl(y), d, \
+ f))
+
+ #define __tg_choose_3(x,y,z,f,d,l)
\
+ __builtin_choose_expr(__tg_ldbl(x) || __tg_ldbl(y) ||
__tg_ldbl(z), l, \
+ __builtin_choose_expr(__tg_dbl(x) ||
__tg_dbl(y) \
+ || __tg_dbl(z), d,
\
+ f))
+
+ #define __TGMATH_CPLX(z,R,C)
\
+ __builtin_choose_expr (__tg_cplx(z),
\
+ __tg_choose (__real__(z), C##f(z), (C)(z),
C##l(z)), \
+ __tg_choose (z, R##f(z), (R)(z), R##l(z)))
+
+ #define __TGMATH_CPLX_2(z1,z2,R,C)
\
+ __builtin_choose_expr (__tg_cplx(z1) || __tg_cplx(z2),
\
+ __tg_choose_2 (__real__(z1), __real__(z2),
\
+ C##f(z1,z2), (C)(z1,z2),
C##l(z1,z2)), \
+ __tg_choose_2 (z1, z2,
\
+ R##f(z1,z2), (R)(z1,z2),
R##l(z1,z2)))
+
+ #define __TGMATH_REAL(x,R) \
+ __tg_choose (x, R##f(x), (R)(x), R##l(x))
+ #define __TGMATH_REAL_2(x,y,R) \
+ __tg_choose_2 (x, y, R##f(x,y), (R)(x,y), R##l(x,y))
+ #define __TGMATH_REAL_3(x,y,z,R) \
+ __tg_choose_3 (x, y, z, R##f(x,y,z), (R)(x,y,z), R##l(x,y,z))
+ #define __TGMATH_REAL_1_2(x,y,R) \
+ __tg_choose (x, R##f(x,y), (R)(x,y), R##l(x,y))
+ #define __TGMATH_REAL_2_3(x,y,z,R) \
+ __tg_choose_2 (x, y, R##f(x,y,z), (R)(x,y,z), R##l(x,y,z))
+ #define __TGMATH_CPLX_ONLY(z,C) \
+ __tg_choose (__real__(z), C##f(z), (C)(z), C##l(z))
+
+ /* Functions defined in both <math.h> and <complex.h> (7.22p4) */
+ #define acos(z) __TGMATH_CPLX(z, acos, cacos)
+ #define asin(z) __TGMATH_CPLX(z, asin, casin)
+ #define atan(z) __TGMATH_CPLX(z, atan, catan)
+ #define acosh(z) __TGMATH_CPLX(z, acosh, cacosh)
+ #define asinh(z) __TGMATH_CPLX(z, asinh, casinh)
+ #define atanh(z) __TGMATH_CPLX(z, atanh, catanh)
+ #define cos(z) __TGMATH_CPLX(z, cos, ccos)
+ #define sin(z) __TGMATH_CPLX(z, sin, csin)
+ #define tan(z) __TGMATH_CPLX(z, tan, ctan)
+ #define cosh(z) __TGMATH_CPLX(z, cosh, ccosh)
+ #define sinh(z) __TGMATH_CPLX(z, sinh, csinh)
+ #define tanh(z) __TGMATH_CPLX(z, tanh, ctanh)
+ #define exp(z) __TGMATH_CPLX(z, exp, cexp)
+ #define log(z) __TGMATH_CPLX(z, log, clog)
+ #define pow(z1,z2) __TGMATH_CPLX_2(z1, z2, pow, cpow)
+ #define sqrt(z) __TGMATH_CPLX(z, sqrt, csqrt)
+ #define fabs(z) __TGMATH_CPLX(z, fabs, cfabs)
+
+ /* Functions defined in <math.h> only (7.22p5) */
+ #define atan2(x,y) __TGMATH_REAL_2(x, y, atan2)
+ #define cbrt(x) __TGMATH_REAL(x, cbrt)
+ #define ceil(x) __TGMATH_REAL(x, ceil)
+ #define copysign(x,y) __TGMATH_REAL_2(x, y, copysign)
+ #define erf(x) __TGMATH_REAL(x, erf)
+ #define erfc(x) __TGMATH_REAL(x, erfc)
+ #define exp2(x) __TGMATH_REAL(x, exp2)
+ #define expm1(x) __TGMATH_REAL(x, expm1)
+ #define fdim(x) __TGMATH_REAL(x, fdim)
+ #define floor(x) __TGMATH_REAL(x, floor)
+ #define fma(x,y,z) __TGMATH_REAL_3(x, y, z, fma)
+ #define fmax(x,y) __TGMATH_REAL_2(x, y, fmax)
+ #define fmin(x,y) __TGMATH_REAL_2(x, y, fmin)
+ #define fmod(x,y) __TGMATH_REAL_2(x, y, fmod)
+ #define frexp(x,y) __TGMATH_REAL_1_2(x, y, frexp)
+ #define hypot(x,y) __TGMATH_REAL(x, y, hypot)
+ #define ilogb(x) __TGMATH_REAL(x, ilogb)
+ #define ldexp(x,y) __TGMATH_REAL_1_2(x, y, ldexp)
+ #define lgamma(x) __TGMATH_REAL(x, lgamma)
+ #define llrint(x) __TGMATH_REAL(x, llrint)
+ #define llround(x) __TGMATH_REAL(x, llround)
+ #define log10(x) __TGMATH_REAL(x, log10)
+ #define log1p(x) __TGMATH_REAL(x, log1p)
+ #define log2(x) __TGMATH_REAL(x, log2)
+ #define logb(x) __TGMATH_REAL(x, logb)
+ #define lrint(x) __TGMATH_REAL(x, lrint)
+ #define lround(x) __TGMATH_REAL(x, lround)
+ #define nearbyint(x) __TGMATH_REAL(x, nearbyint)
+ #define nextafter(x,y) __TGMATH_REAL_2(x, y, nextafter)
+ #define nexttoward(x,y) __TGMATH_REAL_1_2(x, nexttoward)
+ #define remainder(x,y) __TGMATH_REAL(x, y, remainder)
+ #define remquo(x,y,z) __TGMATH_REAL_2_3(x, y, z, remquo)
+ #define rint(x) __TGMATH_REAL(x, rint)
+ #define round(x) __TGMATH_REAL(x, round)
+ #define scalbn(x,y) __TGMATH_REAL_2(x, y, scalbn)
+ #define scalbln(x,y) __TGMATH_REAL_2(x, y, scalbln)
+ #define tgamma(x) __TGMATH_REAL(x, tgamma)
+ #define trunc(x) __TGMATH_REAL(x, trunc)
+
+ /* Functions defined in <complex.h> only (7.22p6) */
+ #define carg(z) __TGMATH_CPLX_ONLY(z, carg)
+ #define cimag(z) __TGMATH_CPLX_ONLY(z, cimag)
+ #define conj(z) __TGMATH_CPLX_ONLY(z, conj)
+ #define cproj(z) __TGMATH_CPLX_ONLY(z, cproj)
+ #define creal(z) __TGMATH_CPLX_ONLY(z, creal)
+
+ #endif /* __cplusplus */
+ #endif /* _TGMATH_H */
Index: gcc/testsuite/ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/ChangeLog,v
retrieving revision 1.4134
diff -c -p -r1.4134 ChangeLog
*** gcc/testsuite/ChangeLog 13 Aug 2004 21:11:21 -0000 1.4134
--- gcc/testsuite/ChangeLog 13 Aug 2004 21:32:01 -0000
***************
*** 1,3 ****
--- 1,10 ----
+ 2004-08-13 Matt Austern <austern@apple.com>
+
+ * gcc.dg/c99-tgmath-1.c: New test.
+ * gcc.dg/c99-tgmath-2.c: New test.
+ * gcc.dg/c99-tgmath-3.c: New test.
+ * gcc.dg/c99-tgmath-4.c: New test.
+
2004-08-13 Janis Johnson <janis187@us.ibm.com>
* g++.dg/ext/altivec-2.C: Revert previous changes and don't execute.
Index: gcc/testsuite/gcc.dg/c99-tgmath-1.c
===================================================================
RCS file: gcc/testsuite/gcc.dg/c99-tgmath-1.c
diff -N gcc/testsuite/gcc.dg/c99-tgmath-1.c
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- gcc/testsuite/gcc.dg/c99-tgmath-1.c 13 Aug 2004 21:32:04 -0000
***************
*** 0 ****
--- 1,247 ----
+ /* Test for <tgmath.h> in C99. */
+ /* Origin: Matt Austern <austern@apple.com>
+ /* { dg-do preprocess } */
+ /* { dg-options "-std=iso9899:1999" } */
+
+ /* Test that tgmath defines the macros it's supposed to. */
+ #include <tgmath.h>
+
+ #ifndef acos
+ #error acos undefined
+ #endif
+
+ #ifndef asin
+ #error asin undefined
+ #endif
+
+ #ifndef atan
+ #error atan undefined
+ #endif
+
+ #ifndef acosh
+ #error acosh undefined
+ #endif
+
+ #ifndef asinh
+ #error asinh undefined
+ #endif
+
+ #ifndef atanh
+ #error atanh undefined
+ #endif
+
+ #ifndef cos
+ #error cos undefined
+ #endif
+
+ #ifndef sin
+ #error sin undefined
+ #endif
+
+ #ifndef tan
+ #error tan undefined
+ #endif
+
+ #ifndef cosh
+ #error cosh undefined
+ #endif
+
+ #ifndef sinh
+ #error sinh undefined
+ #endif
+
+ #ifndef tanh
+ #error tanh undefined
+ #endif
+
+ #ifndef exp
+ #error exp undefined
+ #endif
+
+ #ifndef log
+ #error log undefined
+ #endif
+
+ #ifndef pow
+ #error pow undefined
+ #endif
+
+ #ifndef sqrt
+ #error sqrt undefined
+ #endif
+
+ #ifndef fabs
+ #error fabs undefined
+ #endif
+
+ #ifndef atan2
+ #error atan2 undefined
+ #endif
+
+ #ifndef cbrt
+ #error cbrt undefined
+ #endif
+
+ #ifndef ceil
+ #error ceil undefined
+ #endif
+
+ #ifndef copysign
+ #error copysign undefined
+ #endif
+
+ #ifndef erf
+ #error erf undefined
+ #endif
+
+ #ifndef erfc
+ #error erfc undefined
+ #endif
+
+ #ifndef exp2
+ #error exp2 undefined
+ #endif
+
+ #ifndef expm1
+ #error expm1 undefined
+ #endif
+
+ #ifndef fdim
+ #error fdim undefined
+ #endif
+
+ #ifndef floor
+ #error floor undefined
+ #endif
+
+ #ifndef fma
+ #error fma undefined
+ #endif
+
+ #ifndef fmax
+ #error fmax undefined
+ #endif
+
+ #ifndef fmin
+ #error fmin undefined
+ #endif
+
+ #ifndef fmod
+ #error fmod undefined
+ #endif
+
+ #ifndef frexp
+ #error frexp undefined
+ #endif
+
+ #ifndef hypot
+ #error hypot undefined
+ #endif
+
+ #ifndef ilogb
+ #error ilogb undefined
+ #endif
+
+ #ifndef ldexp
+ #error ldexp undefined
+ #endif
+
+ #ifndef lgamma
+ #error lgamma undefined
+ #endif
+
+ #ifndef llrint
+ #error llrint undefined
+ #endif
+
+ #ifndef llround
+ #error llround undefined
+ #endif
+
+ #ifndef log10
+ #error log10 undefined
+ #endif
+
+ #ifndef log1p
+ #error log1p undefined
+ #endif
+
+ #ifndef log2
+ #error log2 undefined
+ #endif
+
+ #ifndef logb
+ #error logb undefined
+ #endif
+
+ #ifndef lrint
+ #error lrint undefined
+ #endif
+
+ #ifndef lround
+ #error lround undefined
+ #endif
+
+ #ifndef nearbyint
+ #error nearbyint undefined
+ #endif
+
+ #ifndef nextafter
+ #error nextafter undefined
+ #endif
+
+ #ifndef nexttoward
+ #error nexttoward undefined
+ #endif
+
+ #ifndef remainder
+ #error remainder undefined
+ #endif
+
+ #ifndef remquo
+ #error remquo undefined
+ #endif
+
+ #ifndef rint
+ #error rint undefined
+ #endif
+
+ #ifndef round
+ #error round undefined
+ #endif
+
+ #ifndef scalbn
+ #error scalbn undefined
+ #endif
+
+ #ifndef scalbln
+ #error scalbln undefined
+ #endif
+
+ #ifndef tgamma
+ #error tgamma undefined
+ #endif
+
+ #ifndef trunc
+ #error trunc undefined
+ #endif
+
+ #ifndef carg
+ #error carg undefined
+ #endif
+
+ #ifndef cimag
+ #error cimag undefined
+ #endif
+
+ #ifndef conj
+ #error conj undefined
+ #endif
+
+ #ifndef cproj
+ #error cproj undefined
+ #endif
+
+ #ifndef creal
+ #error creal undefined
+ #endif
Index: gcc/testsuite/gcc.dg/c99-tgmath-2.c
===================================================================
RCS file: gcc/testsuite/gcc.dg/c99-tgmath-2.c
diff -N gcc/testsuite/gcc.dg/c99-tgmath-2.c
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- gcc/testsuite/gcc.dg/c99-tgmath-2.c 13 Aug 2004 21:32:04 -0000
***************
*** 0 ****
--- 1,14 ----
+ /* Test for <tgmath.h> in C99. */
+ /* Origin: Matt Austern <austern@apple.com>
+ /* { dg-do compile } */
+ /* { dg-options "-std=iso9899:1999" } */
+
+ /* Test that invoking type-generic sin on a float invokes sinf. */
+ #include <tgmath.h>
+
+ float foo(float x)
+ {
+ return sin(x);
+ }
+
+ /* {dg-final {scan-assembler "sinf" } } */
Index: gcc/testsuite/gcc.dg/c99-tgmath-3.c
===================================================================
RCS file: gcc/testsuite/gcc.dg/c99-tgmath-3.c
diff -N gcc/testsuite/gcc.dg/c99-tgmath-3.c
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- gcc/testsuite/gcc.dg/c99-tgmath-3.c 13 Aug 2004 21:32:04 -0000
***************
*** 0 ****
--- 1,14 ----
+ /* Test for <tgmath.h> in C99. */
+ /* Origin: Matt Austern <austern@apple.com>
+ /* { dg-do compile } */
+ /* { dg-options "-std=iso9899:1999" } */
+
+ /* Test that invoking type-generic exp on a complex invokes cexp. */
+ #include <tgmath.h>
+
+ complex double foo(complex double x)
+ {
+ return exp(x);
+ }
+
+ /* {dg-final {scan-assembler "cexp" } } */
Index: gcc/testsuite/gcc.dg/c99-tgmath-4.c
===================================================================
RCS file: gcc/testsuite/gcc.dg/c99-tgmath-4.c
diff -N gcc/testsuite/gcc.dg/c99-tgmath-4.c
*** /dev/null 1 Jan 1970 00:00:00 -0000
--- gcc/testsuite/gcc.dg/c99-tgmath-4.c 13 Aug 2004 21:32:04 -0000
***************
*** 0 ****
--- 1,14 ----
+ /* Test for <tgmath.h> in C99. */
+ /* Origin: Matt Austern <austern@apple.com>
+ /* { dg-do compile } */
+ /* { dg-options "-std=iso9899:1999" } */
+
+ /* Test that invoking type-generic pow on complex float invokes
cpowf. */
+ #include <tgmath.h>
+
+ complex double foo(complex float x, float y)
+ {
+ return pow(x, y);
+ }
+
+ /* {dg-final {scan-assembler "cpowf" } } */