X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=gcc%2Fconvert.c;h=5680c39df2025d623a93db489c5c21b33cb9b92a;hb=effc6d53bf4679c50afb6658402c655013d59971;hp=970b05cd37476845e6f7ec5f62399a0ffff26e33;hpb=4070745f3e4ba2049ee164b06b5418e35d4c2a40;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/convert.c b/gcc/convert.c index 970b05cd374..5680c39df20 100644 --- a/gcc/convert.c +++ b/gcc/convert.c @@ -1,6 +1,6 @@ -/* Utility routines for data type conversion for GNU C. - Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1997, - 1998 Free Software Foundation, Inc. +/* Utility routines for data type conversion for GCC. + Copyright (C) 1987, 1988, 1991, 1992, 1993, 1994, 1995, 1997, 1998, + 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of GCC. @@ -16,8 +16,8 @@ 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. */ +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ /* These routines are somewhat language-independent utility function @@ -25,27 +25,24 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "tree.h" #include "flags.h" #include "convert.h" #include "toplev.h" #include "langhooks.h" - +#include "real.h" /* Convert EXPR to some pointer or reference type TYPE. EXPR must be pointer, reference, integer, enumeral, or literal zero; in other cases error is called. */ tree -convert_to_pointer (type, expr) - tree type, expr; +convert_to_pointer (tree type, tree expr) { if (integer_zerop (expr)) - { - expr = build_int_2 (0, 0); - TREE_TYPE (expr) = type; - return expr; - } + return build_int_cst (type, 0); switch (TREE_CODE (TREE_TYPE (expr))) { @@ -57,13 +54,12 @@ convert_to_pointer (type, expr) case ENUMERAL_TYPE: case BOOLEAN_TYPE: case CHAR_TYPE: - if (TYPE_PRECISION (TREE_TYPE (expr)) == POINTER_SIZE) - return build1 (CONVERT_EXPR, type, expr); + if (TYPE_PRECISION (TREE_TYPE (expr)) != POINTER_SIZE) + expr = fold_build1 (NOP_EXPR, + lang_hooks.types.type_for_size (POINTER_SIZE, 0), + expr); + return fold_build1 (CONVERT_EXPR, type, expr); - return - convert_to_pointer (type, - convert ((*lang_hooks.types.type_for_size) - (POINTER_SIZE, 0), expr)); default: error ("cannot convert to a pointer type"); @@ -71,15 +67,221 @@ convert_to_pointer (type, expr) } } +/* Avoid any floating point extensions from EXP. */ +tree +strip_float_extensions (tree exp) +{ + tree sub, expt, subt; + + /* For floating point constant look up the narrowest type that can hold + it properly and handle it like (type)(narrowest_type)constant. + This way we can optimize for instance a=a*2.0 where "a" is float + but 2.0 is double constant. */ + if (TREE_CODE (exp) == REAL_CST) + { + REAL_VALUE_TYPE orig; + tree type = NULL; + + orig = TREE_REAL_CST (exp); + if (TYPE_PRECISION (TREE_TYPE (exp)) > TYPE_PRECISION (float_type_node) + && exact_real_truncate (TYPE_MODE (float_type_node), &orig)) + type = float_type_node; + else if (TYPE_PRECISION (TREE_TYPE (exp)) + > TYPE_PRECISION (double_type_node) + && exact_real_truncate (TYPE_MODE (double_type_node), &orig)) + type = double_type_node; + if (type) + return build_real (type, real_value_truncate (TYPE_MODE (type), orig)); + } + + if (TREE_CODE (exp) != NOP_EXPR + && TREE_CODE (exp) != CONVERT_EXPR) + return exp; + + sub = TREE_OPERAND (exp, 0); + subt = TREE_TYPE (sub); + expt = TREE_TYPE (exp); + + if (!FLOAT_TYPE_P (subt)) + return exp; + + if (TYPE_PRECISION (subt) > TYPE_PRECISION (expt)) + return exp; + + return strip_float_extensions (sub); +} + + /* Convert EXPR to some floating-point type TYPE. EXPR must be float, integer, or enumeral; in other cases error is called. */ tree -convert_to_real (type, expr) - tree type, expr; +convert_to_real (tree type, tree expr) { + enum built_in_function fcode = builtin_mathfn_code (expr); + tree itype = TREE_TYPE (expr); + + /* Disable until we figure out how to decide whether the functions are + present in runtime. */ + /* Convert (float)sqrt((double)x) where x is float into sqrtf(x) */ + if (optimize + && (TYPE_MODE (type) == TYPE_MODE (double_type_node) + || TYPE_MODE (type) == TYPE_MODE (float_type_node))) + { + switch (fcode) + { +#define CASE_MATHFN(FN) case BUILT_IN_##FN: case BUILT_IN_##FN##L: + CASE_MATHFN (ACOS) + CASE_MATHFN (ACOSH) + CASE_MATHFN (ASIN) + CASE_MATHFN (ASINH) + CASE_MATHFN (ATAN) + CASE_MATHFN (ATANH) + CASE_MATHFN (CBRT) + CASE_MATHFN (COS) + CASE_MATHFN (COSH) + CASE_MATHFN (ERF) + CASE_MATHFN (ERFC) + CASE_MATHFN (EXP) + CASE_MATHFN (EXP10) + CASE_MATHFN (EXP2) + CASE_MATHFN (EXPM1) + CASE_MATHFN (FABS) + CASE_MATHFN (GAMMA) + CASE_MATHFN (J0) + CASE_MATHFN (J1) + CASE_MATHFN (LGAMMA) + CASE_MATHFN (LOG) + CASE_MATHFN (LOG10) + CASE_MATHFN (LOG1P) + CASE_MATHFN (LOG2) + CASE_MATHFN (LOGB) + CASE_MATHFN (POW10) + CASE_MATHFN (SIN) + CASE_MATHFN (SINH) + CASE_MATHFN (SQRT) + CASE_MATHFN (TAN) + CASE_MATHFN (TANH) + CASE_MATHFN (TGAMMA) + CASE_MATHFN (Y0) + CASE_MATHFN (Y1) +#undef CASE_MATHFN + { + tree arg0 = strip_float_extensions (TREE_VALUE (TREE_OPERAND (expr, 1))); + tree newtype = type; + + /* We have (outertype)sqrt((innertype)x). Choose the wider mode from + the both as the safe type for operation. */ + if (TYPE_PRECISION (TREE_TYPE (arg0)) > TYPE_PRECISION (type)) + newtype = TREE_TYPE (arg0); + + /* Be careful about integer to fp conversions. + These may overflow still. */ + if (FLOAT_TYPE_P (TREE_TYPE (arg0)) + && TYPE_PRECISION (newtype) < TYPE_PRECISION (itype) + && (TYPE_MODE (newtype) == TYPE_MODE (double_type_node) + || TYPE_MODE (newtype) == TYPE_MODE (float_type_node))) + { + tree arglist; + tree fn = mathfn_built_in (newtype, fcode); + + if (fn) + { + arglist = build_tree_list (NULL_TREE, fold (convert_to_real (newtype, arg0))); + expr = build_function_call_expr (fn, arglist); + if (newtype == type) + return expr; + } + } + } + default: + break; + } + } + if (optimize + && (((fcode == BUILT_IN_FLOORL + || fcode == BUILT_IN_CEILL + || fcode == BUILT_IN_ROUNDL + || fcode == BUILT_IN_RINTL + || fcode == BUILT_IN_TRUNCL + || fcode == BUILT_IN_NEARBYINTL) + && (TYPE_MODE (type) == TYPE_MODE (double_type_node) + || TYPE_MODE (type) == TYPE_MODE (float_type_node))) + || ((fcode == BUILT_IN_FLOOR + || fcode == BUILT_IN_CEIL + || fcode == BUILT_IN_ROUND + || fcode == BUILT_IN_RINT + || fcode == BUILT_IN_TRUNC + || fcode == BUILT_IN_NEARBYINT) + && (TYPE_MODE (type) == TYPE_MODE (float_type_node))))) + { + tree fn = mathfn_built_in (type, fcode); + + if (fn) + { + tree arg + = strip_float_extensions (TREE_VALUE (TREE_OPERAND (expr, 1))); + + /* Make sure (type)arg0 is an extension, otherwise we could end up + changing (float)floor(double d) into floorf((float)d), which is + incorrect because (float)d uses round-to-nearest and can round + up to the next integer. */ + if (TYPE_PRECISION (type) >= TYPE_PRECISION (TREE_TYPE (arg))) + return + build_function_call_expr (fn, + build_tree_list (NULL_TREE, + fold (convert_to_real (type, arg)))); + } + } + + /* Propagate the cast into the operation. */ + if (itype != type && FLOAT_TYPE_P (type)) + switch (TREE_CODE (expr)) + { + /* Convert (float)-x into -(float)x. This is always safe. */ + case ABS_EXPR: + case NEGATE_EXPR: + if (TYPE_PRECISION (type) < TYPE_PRECISION (TREE_TYPE (expr))) + return build1 (TREE_CODE (expr), type, + fold (convert_to_real (type, + TREE_OPERAND (expr, 0)))); + break; + /* Convert (outertype)((innertype0)a+(innertype1)b) + into ((newtype)a+(newtype)b) where newtype + is the widest mode from all of these. */ + case PLUS_EXPR: + case MINUS_EXPR: + case MULT_EXPR: + case RDIV_EXPR: + { + tree arg0 = strip_float_extensions (TREE_OPERAND (expr, 0)); + tree arg1 = strip_float_extensions (TREE_OPERAND (expr, 1)); + + if (FLOAT_TYPE_P (TREE_TYPE (arg0)) + && FLOAT_TYPE_P (TREE_TYPE (arg1))) + { + tree newtype = type; + if (TYPE_PRECISION (TREE_TYPE (arg0)) > TYPE_PRECISION (newtype)) + newtype = TREE_TYPE (arg0); + if (TYPE_PRECISION (TREE_TYPE (arg1)) > TYPE_PRECISION (newtype)) + newtype = TREE_TYPE (arg1); + if (TYPE_PRECISION (newtype) < TYPE_PRECISION (itype)) + { + expr = build2 (TREE_CODE (expr), newtype, + fold (convert_to_real (newtype, arg0)), + fold (convert_to_real (newtype, arg1))); + if (newtype == type) + return expr; + } + } + } + break; + default: + break; + } + switch (TREE_CODE (TREE_TYPE (expr))) { case REAL_TYPE: @@ -94,8 +296,8 @@ convert_to_real (type, expr) case COMPLEX_TYPE: return convert (type, - fold (build1 (REALPART_EXPR, - TREE_TYPE (TREE_TYPE (expr)), expr))); + fold_build1 (REALPART_EXPR, + TREE_TYPE (TREE_TYPE (expr)), expr)); case POINTER_TYPE: case REFERENCE_TYPE: @@ -117,8 +319,7 @@ convert_to_real (type, expr) not in use in any existing structure. */ tree -convert_to_integer (type, expr) - tree type, expr; +convert_to_integer (tree type, tree expr) { enum tree_code ex_form = TREE_CODE (expr); tree intype = TREE_TYPE (expr); @@ -133,46 +334,104 @@ convert_to_integer (type, expr) return error_mark_node; } + /* Convert e.g. (long)round(d) -> lround(d). */ + /* If we're converting to char, we may encounter differing behavior + between converting from double->char vs double->long->char. + We're in "undefined" territory but we prefer to be conservative, + so only proceed in "unsafe" math mode. */ + if (optimize + && (flag_unsafe_math_optimizations + || (long_integer_type_node + && outprec >= TYPE_PRECISION (long_integer_type_node)))) + { + tree s_expr = strip_float_extensions (expr); + tree s_intype = TREE_TYPE (s_expr); + const enum built_in_function fcode = builtin_mathfn_code (s_expr); + tree fn = 0; + + switch (fcode) + { + case BUILT_IN_CEIL: case BUILT_IN_CEILF: case BUILT_IN_CEILL: + /* Only convert in ISO C99 mode. */ + if (!TARGET_C99_FUNCTIONS) + break; + if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (long_long_integer_type_node)) + fn = mathfn_built_in (s_intype, BUILT_IN_LLCEIL); + else + fn = mathfn_built_in (s_intype, BUILT_IN_LCEIL); + break; + + case BUILT_IN_FLOOR: case BUILT_IN_FLOORF: case BUILT_IN_FLOORL: + /* Only convert in ISO C99 mode. */ + if (!TARGET_C99_FUNCTIONS) + break; + if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (long_long_integer_type_node)) + fn = mathfn_built_in (s_intype, BUILT_IN_LLFLOOR); + else + fn = mathfn_built_in (s_intype, BUILT_IN_LFLOOR); + break; + + case BUILT_IN_ROUND: case BUILT_IN_ROUNDF: case BUILT_IN_ROUNDL: + if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (long_long_integer_type_node)) + fn = mathfn_built_in (s_intype, BUILT_IN_LLROUND); + else + fn = mathfn_built_in (s_intype, BUILT_IN_LROUND); + break; + + case BUILT_IN_RINT: case BUILT_IN_RINTF: case BUILT_IN_RINTL: + /* Only convert rint* if we can ignore math exceptions. */ + if (flag_trapping_math) + break; + /* ... Fall through ... */ + case BUILT_IN_NEARBYINT: case BUILT_IN_NEARBYINTF: case BUILT_IN_NEARBYINTL: + if (TYPE_MAIN_VARIANT (type) == TYPE_MAIN_VARIANT (long_long_integer_type_node)) + fn = mathfn_built_in (s_intype, BUILT_IN_LLRINT); + else + fn = mathfn_built_in (s_intype, BUILT_IN_LRINT); + break; + + case BUILT_IN_TRUNC: case BUILT_IN_TRUNCF: case BUILT_IN_TRUNCL: + { + tree arglist = TREE_OPERAND (s_expr, 1); + return convert_to_integer (type, TREE_VALUE (arglist)); + } + + default: + break; + } + + if (fn) + { + tree arglist = TREE_OPERAND (s_expr, 1); + tree newexpr = build_function_call_expr (fn, arglist); + return convert_to_integer (type, newexpr); + } + } + switch (TREE_CODE (intype)) { case POINTER_TYPE: case REFERENCE_TYPE: if (integer_zerop (expr)) - expr = integer_zero_node; - else - expr = fold (build1 (CONVERT_EXPR, (*lang_hooks.types.type_for_size) - (POINTER_SIZE, 0), expr)); + return build_int_cst (type, 0); - return convert_to_integer (type, expr); + /* Convert to an unsigned integer of the correct width first, + and from there widen/truncate to the required type. */ + expr = fold_build1 (CONVERT_EXPR, + lang_hooks.types.type_for_size (POINTER_SIZE, 0), + expr); + return fold_build1 (NOP_EXPR, type, expr); case INTEGER_TYPE: case ENUMERAL_TYPE: case BOOLEAN_TYPE: case CHAR_TYPE: /* If this is a logical operation, which just returns 0 or 1, we can - change the type of the expression. For some logical operations, - we must also change the types of the operands to maintain type - correctness. */ + change the type of the expression. */ - if (TREE_CODE_CLASS (ex_form) == '<') + if (TREE_CODE_CLASS (ex_form) == tcc_comparison) { - TREE_TYPE (expr) = type; - return expr; - } - - else if (ex_form == TRUTH_AND_EXPR || ex_form == TRUTH_ANDIF_EXPR - || ex_form == TRUTH_OR_EXPR || ex_form == TRUTH_ORIF_EXPR - || ex_form == TRUTH_XOR_EXPR) - { - TREE_OPERAND (expr, 0) = convert (type, TREE_OPERAND (expr, 0)); - TREE_OPERAND (expr, 1) = convert (type, TREE_OPERAND (expr, 1)); - TREE_TYPE (expr) = type; - return expr; - } - - else if (ex_form == TRUTH_NOT_EXPR) - { - TREE_OPERAND (expr, 0) = convert (type, TREE_OPERAND (expr, 0)); + expr = copy_node (expr); TREE_TYPE (expr) = type; return expr; } @@ -182,7 +441,27 @@ convert_to_integer (type, expr) we are truncating EXPR. */ else if (outprec >= inprec) - return build1 (NOP_EXPR, type, expr); + { + enum tree_code code; + + /* If the precision of the EXPR's type is K bits and the + destination mode has more bits, and the sign is changing, + it is not safe to use a NOP_EXPR. For example, suppose + that EXPR's type is a 3-bit unsigned integer type, the + TYPE is a 3-bit signed integer type, and the machine mode + for the types is 8-bit QImode. In that case, the + conversion necessitates an explicit sign-extension. In + the signed-to-unsigned case the high-order bits have to + be cleared. */ + if (TYPE_UNSIGNED (type) != TYPE_UNSIGNED (TREE_TYPE (expr)) + && (TYPE_PRECISION (TREE_TYPE (expr)) + != GET_MODE_BITSIZE (TYPE_MODE (TREE_TYPE (expr))))) + code = CONVERT_EXPR; + else + code = NOP_EXPR; + + return fold_build1 (code, type, expr); + } /* If TYPE is an enumeral type or a type with a precision less than the number of bits in its mode, do the conversion to the @@ -191,8 +470,8 @@ convert_to_integer (type, expr) else if (TREE_CODE (type) == ENUMERAL_TYPE || outprec != GET_MODE_BITSIZE (TYPE_MODE (type))) return build1 (NOP_EXPR, type, - convert ((*lang_hooks.types.type_for_mode) - (TYPE_MODE (type), TREE_UNSIGNED (type)), + convert (lang_hooks.types.type_for_mode + (TYPE_MODE (type), TYPE_UNSIGNED (type)), expr)); /* Here detect when we can distribute the truncation down past some @@ -229,9 +508,11 @@ convert_to_integer (type, expr) case LSHIFT_EXPR: /* We can pass truncation down through left shifting - when the shift count is a nonnegative constant. */ + when the shift count is a nonnegative constant and + the target type is unsigned. */ if (TREE_CODE (TREE_OPERAND (expr, 1)) == INTEGER_CST && tree_int_cst_sgn (TREE_OPERAND (expr, 1)) >= 0 + && TYPE_UNSIGNED (type) && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST) { /* If shift count is less than the width of the truncated type, @@ -252,7 +533,7 @@ convert_to_integer (type, expr) /* If the original expression had side-effects, we must preserve it. */ if (TREE_SIDE_EFFECTS (expr)) - return build (COMPOUND_EXPR, type, expr, t); + return build2 (COMPOUND_EXPR, type, expr, t); else return t; } @@ -273,8 +554,8 @@ convert_to_integer (type, expr) && outprec >= TYPE_PRECISION (TREE_TYPE (arg1)) /* If signedness of arg0 and arg1 don't match, we can't necessarily find a type to compare them in. */ - && (TREE_UNSIGNED (TREE_TYPE (arg0)) - == TREE_UNSIGNED (TREE_TYPE (arg1)))) + && (TYPE_UNSIGNED (TREE_TYPE (arg0)) + == TYPE_UNSIGNED (TREE_TYPE (arg1)))) goto trunc1; break; } @@ -284,7 +565,6 @@ convert_to_integer (type, expr) case BIT_AND_EXPR: case BIT_IOR_EXPR: case BIT_XOR_EXPR: - case BIT_ANDTC_EXPR: trunc1: { tree arg0 = get_unwidened (TREE_OPERAND (expr, 0), type); @@ -302,8 +582,8 @@ convert_to_integer (type, expr) /* Can't do arithmetic in enumeral types so use an integer type that will hold the values. */ if (TREE_CODE (typex) == ENUMERAL_TYPE) - typex = (*lang_hooks.types.type_for_size) - (TYPE_PRECISION (typex), TREE_UNSIGNED (typex)); + typex = lang_hooks.types.type_for_size + (TYPE_PRECISION (typex), TYPE_UNSIGNED (typex)); /* But now perhaps TYPEX is as wide as INPREC. In that case, do nothing special here. @@ -313,20 +593,29 @@ convert_to_integer (type, expr) /* Don't do unsigned arithmetic where signed was wanted, or vice versa. Exception: if both of the original operands were - unsigned then can safely do the work as unsigned. + unsigned then we can safely do the work as unsigned. + Exception: shift operations take their type solely + from the first argument. + Exception: the LSHIFT_EXPR case above requires that + we perform this operation unsigned lest we produce + signed-overflow undefinedness. And we may need to do it as unsigned if we truncate to the original size. */ - if (TREE_UNSIGNED (TREE_TYPE (expr)) - || (TREE_UNSIGNED (TREE_TYPE (arg0)) - && TREE_UNSIGNED (TREE_TYPE (arg1)))) - typex = (*lang_hooks.types.unsigned_type) (typex); + if (TYPE_UNSIGNED (TREE_TYPE (expr)) + || (TYPE_UNSIGNED (TREE_TYPE (arg0)) + && (TYPE_UNSIGNED (TREE_TYPE (arg1)) + || ex_form == LSHIFT_EXPR + || ex_form == RSHIFT_EXPR + || ex_form == LROTATE_EXPR + || ex_form == RROTATE_EXPR)) + || ex_form == LSHIFT_EXPR) + typex = lang_hooks.types.unsigned_type (typex); else - typex = (*lang_hooks.types.signed_type) (typex); + typex = lang_hooks.types.signed_type (typex); return convert (type, - fold (build (ex_form, typex, + fold_build2 (ex_form, typex, convert (typex, arg0), - convert (typex, arg1), - 0))); + convert (typex, arg1))); } } } @@ -337,33 +626,27 @@ convert_to_integer (type, expr) /* This is not correct for ABS_EXPR, since we must test the sign before truncation. */ { - tree typex = type; - - /* Can't do arithmetic in enumeral types - so use an integer type that will hold the values. */ - if (TREE_CODE (typex) == ENUMERAL_TYPE) - typex = (*lang_hooks.types.type_for_size) - (TYPE_PRECISION (typex), TREE_UNSIGNED (typex)); - - /* But now perhaps TYPEX is as wide as INPREC. - In that case, do nothing special here. - (Otherwise would recurse infinitely in convert. */ - if (TYPE_PRECISION (typex) != inprec) - { - /* Don't do unsigned arithmetic where signed was wanted, - or vice versa. */ - if (TREE_UNSIGNED (TREE_TYPE (expr))) - typex = (*lang_hooks.types.unsigned_type) (typex); - else - typex = (*lang_hooks.types.signed_type) (typex); - return convert (type, - fold (build1 (ex_form, typex, - convert (typex, - TREE_OPERAND (expr, 0))))); - } + tree typex; + + /* Don't do unsigned arithmetic where signed was wanted, + or vice versa. */ + if (TYPE_UNSIGNED (TREE_TYPE (expr))) + typex = lang_hooks.types.unsigned_type (type); + else + typex = lang_hooks.types.signed_type (type); + return convert (type, + fold_build1 (ex_form, typex, + convert (typex, + TREE_OPERAND (expr, 0)))); } case NOP_EXPR: + /* Don't introduce a + "can't convert between vector values of different size" error. */ + if (TREE_CODE (TREE_TYPE (TREE_OPERAND (expr, 0))) == VECTOR_TYPE + && (GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (TREE_OPERAND (expr, 0)))) + != GET_MODE_SIZE (TYPE_MODE (type)))) + break; /* If truncating after truncating, might as well do all at once. If truncating after extending, we may get rid of wasted work. */ return convert (type, get_unwidened (TREE_OPERAND (expr, 0), type)); @@ -371,32 +654,31 @@ convert_to_integer (type, expr) case COND_EXPR: /* It is sometimes worthwhile to push the narrowing down through the conditional and never loses. */ - return fold (build (COND_EXPR, type, TREE_OPERAND (expr, 0), - convert (type, TREE_OPERAND (expr, 1)), - convert (type, TREE_OPERAND (expr, 2)))); + return fold_build3 (COND_EXPR, type, TREE_OPERAND (expr, 0), + convert (type, TREE_OPERAND (expr, 1)), + convert (type, TREE_OPERAND (expr, 2))); default: break; } - return build1 (NOP_EXPR, type, expr); + return build1 (CONVERT_EXPR, type, expr); case REAL_TYPE: return build1 (FIX_TRUNC_EXPR, type, expr); case COMPLEX_TYPE: return convert (type, - fold (build1 (REALPART_EXPR, - TREE_TYPE (TREE_TYPE (expr)), expr))); + fold_build1 (REALPART_EXPR, + TREE_TYPE (TREE_TYPE (expr)), expr)); case VECTOR_TYPE: - if (GET_MODE_SIZE (TYPE_MODE (type)) - != GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (expr)))) + if (!tree_int_cst_equal (TYPE_SIZE (type), TYPE_SIZE (TREE_TYPE (expr)))) { error ("can't convert between vector values of different size"); return error_mark_node; } - return build1 (NOP_EXPR, type, expr); + return build1 (VIEW_CONVERT_EXPR, type, expr); default: error ("aggregate value used where an integer was expected"); @@ -407,11 +689,10 @@ convert_to_integer (type, expr) /* Convert EXPR to the complex type TYPE in the usual ways. */ tree -convert_to_complex (type, expr) - tree type, expr; +convert_to_complex (tree type, tree expr) { tree subtype = TREE_TYPE (type); - + switch (TREE_CODE (TREE_TYPE (expr))) { case REAL_TYPE: @@ -419,8 +700,8 @@ convert_to_complex (type, expr) case ENUMERAL_TYPE: case BOOLEAN_TYPE: case CHAR_TYPE: - return build (COMPLEX_EXPR, type, convert (subtype, expr), - convert (subtype, integer_zero_node)); + return build2 (COMPLEX_EXPR, type, convert (subtype, expr), + convert (subtype, integer_zero_node)); case COMPLEX_TYPE: { @@ -429,23 +710,22 @@ convert_to_complex (type, expr) if (TYPE_MAIN_VARIANT (elt_type) == TYPE_MAIN_VARIANT (subtype)) return expr; else if (TREE_CODE (expr) == COMPLEX_EXPR) - return fold (build (COMPLEX_EXPR, - type, + return fold_build2 (COMPLEX_EXPR, type, convert (subtype, TREE_OPERAND (expr, 0)), - convert (subtype, TREE_OPERAND (expr, 1)))); + convert (subtype, TREE_OPERAND (expr, 1))); else { expr = save_expr (expr); return - fold (build (COMPLEX_EXPR, - type, convert (subtype, - fold (build1 (REALPART_EXPR, - TREE_TYPE (TREE_TYPE (expr)), - expr))), + fold_build2 (COMPLEX_EXPR, type, + convert (subtype, + fold_build1 (REALPART_EXPR, + TREE_TYPE (TREE_TYPE (expr)), + expr)), convert (subtype, - fold (build1 (IMAGPART_EXPR, - TREE_TYPE (TREE_TYPE (expr)), - expr))))); + fold_build1 (IMAGPART_EXPR, + TREE_TYPE (TREE_TYPE (expr)), + expr))); } } @@ -463,23 +743,21 @@ convert_to_complex (type, expr) /* Convert EXPR to the vector type TYPE in the usual ways. */ tree -convert_to_vector (type, expr) - tree type, expr; +convert_to_vector (tree type, tree expr) { switch (TREE_CODE (TREE_TYPE (expr))) { case INTEGER_TYPE: case VECTOR_TYPE: - if (GET_MODE_SIZE (TYPE_MODE (type)) - != GET_MODE_SIZE (TYPE_MODE (TREE_TYPE (expr)))) + if (!tree_int_cst_equal (TYPE_SIZE (type), TYPE_SIZE (TREE_TYPE (expr)))) { error ("can't convert between vector values of different size"); return error_mark_node; } - return build1 (NOP_EXPR, type, expr); + return build1 (VIEW_CONVERT_EXPR, type, expr); default: error ("can't convert value to a vector"); - return convert_to_vector (type, integer_zero_node); + return error_mark_node; } }