diff options
author | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2005-10-03 07:22:20 +0000 |
---|---|---|
committer | François-Xavier Coudert <fxcoudert@gcc.gnu.org> | 2005-10-03 07:22:20 +0000 |
commit | 644cb69f803dc904c271885272e70f032ce56a97 (patch) | |
tree | 8bb857b1bc8bb03e3ba5509a8bba4513942fff4a /gcc/fortran/trans-decl.c | |
parent | 41a182c62d6314c2c3c138ebe358da485691f1b7 (diff) | |
download | gcc-644cb69f803dc904c271885272e70f032ce56a97.zip gcc-644cb69f803dc904c271885272e70f032ce56a97.tar.gz gcc-644cb69f803dc904c271885272e70f032ce56a97.tar.bz2 |
re PR libfortran/19308 (I/O library should support more real and integer kinds)
PR libfortran/19308
PR fortran/20120
PR libfortran/22437
* Makefile.am: Add generated files for large real and integers
kinds. Add a rule to create the kinds.inc c99_protos.inc files.
Use kinds.inc to preprocess Fortran generated files.
* libgfortran.h: Add macro definitions for GFC_INTEGER_16_HUGE,
GFC_REAL_10_HUGE and GFC_REAL_16_HUGE. Add types gfc_array_i16,
gfc_array_r10, gfc_array_r16, gfc_array_c10, gfc_array_c16,
gfc_array_l16.
* mk-kinds-h.sh: Define macros HAVE_GFC_LOGICAL_* and
HAVE_GFC_COMPLEX_* when these types are available.
* intrinsics/ishftc.c (ishftc16): New function for GFC_INTEGER_16.
* m4/all.m4, m4/any.m4, m4/count.m4, m4/cshift1.m4, m4/dotprod.m4,
m4/dotprodc.m4, m4/dotprodl.m4, m4/eoshift1.m4, m4/eoshift3.m4,
m4/exponent.m4, m4/fraction.m4, m4/in_pack.m4, m4/in_unpack.m4,
m4/matmul.m4, m4/matmull.m4, m4/maxloc0.m4, m4/maxloc1.m4,
m4/maxval.m4, m4/minloc0.m4, m4/minloc1.m4, m4/minval.m4, m4/mtype.m4,
m4/nearest.m4, m4/pow.m4, m4/product.m4, m4/reshape.m4,
m4/set_exponent.m4, m4/shape.m4, m4/specific.m4, m4/specific2.m4,
m4/sum.m4, m4/transpose.m4: Protect generated functions with
appropriate "#if defined (HAVE_GFC_type_kind)" preprocessor directives.
* Makefile.in: Regenerate.
* all files in generated/: Regenerate.
* f95-lang.c (DO_DEFINE_MATH_BUILTIN): Add support for long
double builtin function.
(gfc_init_builtin_functions): Add mfunc_longdouble,
mfunc_clongdouble and func_clongdouble_longdouble trees. Build
them for round, trunc, cabs, copysign and pow functions.
* iresolve.c (gfc_resolve_reshape, gfc_resolve_transpose): Add
case for kind 10 and 16.
* trans-decl.c: Add trees for cpowl10, cpowl16, ishftc16,
exponent10 and exponent16.
(gfc_build_intrinsic_function_decls): Build nodes for int16,
real10, real16, complex10 and complex16 types. Build all possible
combinations for function _gfortran_pow_?n_?n. Build function
calls cpowl10, cpowl16, ishftc16, exponent10 and exponent16.
* trans-expr.c (gfc_conv_power_op): Add case for integer(16),
real(10) and real(16).
* trans-intrinsic.c: Add suppport for long double builtin
functions in BUILT_IN_FUNCTION, LIBM_FUNCTION and LIBF_FUNCTION
macros.
(gfc_conv_intrinsic_aint): Add case for integer(16), real(10) and
real(16) kinds.
(gfc_build_intrinsic_lib_fndecls): Add support for real10_decl
and real16_decl in library functions.
(gfc_get_intrinsic_lib_fndecl): Add cases for real and complex
kinds 10 and 16.
(gfc_conv_intrinsic_exponent): Add cases for real(10) and real(16)
kinds.
(gfc_conv_intrinsic_sign): Likewise.
(gfc_conv_intrinsic_ishftc): Add case for integer(16) kind.
* trans-types.c (gfc_get_int_type, gfc_get_real_type,
gfc_get_complex_type, gfc_get_logical_type): Doesn't error out in
the case of kinds not available.
* trans.h: Declare trees for cpowl10, cpowl16, ishftc16,
exponent10 and exponent16.
* gfortran.dg/large_real_kind_2.F90: New test.
* gfortran.dg/large_integer_kind_2.f90: New test.
From-SVN: r104889
Diffstat (limited to 'gcc/fortran/trans-decl.c')
-rw-r--r-- | gcc/fortran/trans-decl.c | 116 |
1 files changed, 87 insertions, 29 deletions
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 73e02f0..3f656dd 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -94,13 +94,18 @@ tree gfor_fndecl_associated; /* Math functions. Many other math functions are handled in trans-intrinsic.c. */ -gfc_powdecl_list gfor_fndecl_math_powi[3][2]; +gfc_powdecl_list gfor_fndecl_math_powi[4][3]; tree gfor_fndecl_math_cpowf; tree gfor_fndecl_math_cpow; +tree gfor_fndecl_math_cpowl10; +tree gfor_fndecl_math_cpowl16; tree gfor_fndecl_math_ishftc4; tree gfor_fndecl_math_ishftc8; +tree gfor_fndecl_math_ishftc16; tree gfor_fndecl_math_exponent4; tree gfor_fndecl_math_exponent8; +tree gfor_fndecl_math_exponent10; +tree gfor_fndecl_math_exponent16; /* String functions. */ @@ -1691,11 +1696,16 @@ gfc_build_intrinsic_function_decls (void) { tree gfc_int4_type_node = gfc_get_int_type (4); tree gfc_int8_type_node = gfc_get_int_type (8); + tree gfc_int16_type_node = gfc_get_int_type (16); tree gfc_logical4_type_node = gfc_get_logical_type (4); tree gfc_real4_type_node = gfc_get_real_type (4); tree gfc_real8_type_node = gfc_get_real_type (8); + tree gfc_real10_type_node = gfc_get_real_type (10); + tree gfc_real16_type_node = gfc_get_real_type (16); tree gfc_complex4_type_node = gfc_get_complex_type (4); tree gfc_complex8_type_node = gfc_get_complex_type (8); + tree gfc_complex10_type_node = gfc_get_complex_type (10); + tree gfc_complex16_type_node = gfc_get_complex_type (16); /* String functions. */ gfor_fndecl_copy_string = @@ -1793,37 +1803,56 @@ gfc_build_intrinsic_function_decls (void) /* Power functions. */ { - tree type; - tree itype; - int kind; - int ikind; - static int kinds[2] = {4, 8}; - char name[PREFIX_LEN + 10]; /* _gfortran_pow_?n_?n */ - - for (ikind=0; ikind < 2; ikind++) + tree ctype, rtype, itype, jtype; + int rkind, ikind, jkind; +#define NIKINDS 3 +#define NRKINDS 4 + static int ikinds[NIKINDS] = {4, 8, 16}; + static int rkinds[NRKINDS] = {4, 8, 10, 16}; + char name[PREFIX_LEN + 12]; /* _gfortran_pow_?n_?n */ + + for (ikind=0; ikind < NIKINDS; ikind++) { - itype = gfc_get_int_type (kinds[ikind]); - for (kind = 0; kind < 2; kind ++) + itype = gfc_get_int_type (ikinds[ikind]); + + for (jkind=0; jkind < NIKINDS; jkind++) + { + jtype = gfc_get_int_type (ikinds[jkind]); + if (itype && jtype) + { + sprintf(name, PREFIX("pow_i%d_i%d"), ikinds[ikind], + ikinds[jkind]); + gfor_fndecl_math_powi[jkind][ikind].integer = + gfc_build_library_function_decl (get_identifier (name), + jtype, 2, jtype, itype); + } + } + + for (rkind = 0; rkind < NRKINDS; rkind ++) { - type = gfc_get_int_type (kinds[kind]); - sprintf(name, PREFIX("pow_i%d_i%d"), kinds[kind], kinds[ikind]); - gfor_fndecl_math_powi[kind][ikind].integer = - gfc_build_library_function_decl (get_identifier (name), - type, 2, type, itype); - - type = gfc_get_real_type (kinds[kind]); - sprintf(name, PREFIX("pow_r%d_i%d"), kinds[kind], kinds[ikind]); - gfor_fndecl_math_powi[kind][ikind].real = - gfc_build_library_function_decl (get_identifier (name), - type, 2, type, itype); - - type = gfc_get_complex_type (kinds[kind]); - sprintf(name, PREFIX("pow_c%d_i%d"), kinds[kind], kinds[ikind]); - gfor_fndecl_math_powi[kind][ikind].cmplx = - gfc_build_library_function_decl (get_identifier (name), - type, 2, type, itype); + rtype = gfc_get_real_type (rkinds[rkind]); + if (rtype && itype) + { + sprintf(name, PREFIX("pow_r%d_i%d"), rkinds[rkind], + ikinds[ikind]); + gfor_fndecl_math_powi[rkind][ikind].real = + gfc_build_library_function_decl (get_identifier (name), + rtype, 2, rtype, itype); + } + + ctype = gfc_get_complex_type (rkinds[rkind]); + if (ctype && itype) + { + sprintf(name, PREFIX("pow_c%d_i%d"), rkinds[rkind], + ikinds[ikind]); + gfor_fndecl_math_powi[rkind][ikind].cmplx = + gfc_build_library_function_decl (get_identifier (name), + ctype, 2,ctype, itype); + } } } +#undef NIKINDS +#undef NRKINDS } gfor_fndecl_math_cpowf = @@ -1834,6 +1863,17 @@ gfc_build_intrinsic_function_decls (void) gfc_build_library_function_decl (get_identifier ("cpow"), gfc_complex8_type_node, 1, gfc_complex8_type_node); + if (gfc_complex10_type_node) + gfor_fndecl_math_cpowl10 = + gfc_build_library_function_decl (get_identifier ("cpowl"), + gfc_complex10_type_node, 1, + gfc_complex10_type_node); + if (gfc_complex16_type_node) + gfor_fndecl_math_cpowl16 = + gfc_build_library_function_decl (get_identifier ("cpowl"), + gfc_complex16_type_node, 1, + gfc_complex16_type_node); + gfor_fndecl_math_ishftc4 = gfc_build_library_function_decl (get_identifier (PREFIX("ishftc4")), gfc_int4_type_node, @@ -1843,7 +1883,15 @@ gfc_build_intrinsic_function_decls (void) gfc_build_library_function_decl (get_identifier (PREFIX("ishftc8")), gfc_int8_type_node, 3, gfc_int8_type_node, - gfc_int8_type_node, gfc_int8_type_node); + gfc_int4_type_node, gfc_int4_type_node); + if (gfc_int16_type_node) + gfor_fndecl_math_ishftc16 = + gfc_build_library_function_decl (get_identifier (PREFIX("ishftc16")), + gfc_int16_type_node, 3, + gfc_int16_type_node, + gfc_int4_type_node, + gfc_int4_type_node); + gfor_fndecl_math_exponent4 = gfc_build_library_function_decl (get_identifier (PREFIX("exponent_r4")), gfc_int4_type_node, @@ -1852,6 +1900,16 @@ gfc_build_intrinsic_function_decls (void) gfc_build_library_function_decl (get_identifier (PREFIX("exponent_r8")), gfc_int4_type_node, 1, gfc_real8_type_node); + if (gfc_real10_type_node) + gfor_fndecl_math_exponent10 = + gfc_build_library_function_decl (get_identifier (PREFIX("exponent_r10")), + gfc_int4_type_node, 1, + gfc_real10_type_node); + if (gfc_real16_type_node) + gfor_fndecl_math_exponent16 = + gfc_build_library_function_decl (get_identifier (PREFIX("exponent_r16")), + gfc_int4_type_node, 1, + gfc_real16_type_node); /* Other functions. */ gfor_fndecl_size0 = |