X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Ffortran%2Ftrans-stmt.c;h=d0af66e60b46b4081621f41c2298fa50885dd437;hp=cdc8dc6c6694b826bcd6b946a2b8b993401c3069;hb=9915365eaddf007c2fff0945552fbd69c4597968;hpb=c2f47e150f3c68a813f92460462c2e70155f2c67 diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index cdc8dc6c669..d0af66e60b4 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -809,22 +809,22 @@ gfc_trans_simple_do (gfc_code * code, stmtblock_t *pblock, tree dovar, to: [evaluate loop bounds and step] - count = (to + step - from) / step; + empty = (step > 0 ? to < from : to > from); + countm1 = (to - from) / step; dovar = from; + if (empty) goto exit_label; for (;;) { body; cycle_label: dovar += step - count--; - if (count <=0) goto exit_label; + countm1--; + if (countm1 ==0) goto exit_label; } exit_label: - TODO: Large loop counts - The code above assumes the loop count fits into a signed integer kind, - i.e. Does not work for loop counts > 2^31 for integer(kind=4) variables - We must support the full range. */ + countm1 is an unsigned integer. It is equal to the loop count minus one, + because the loop count itself can overflow. */ tree gfc_trans_do (gfc_code * code) @@ -834,13 +834,15 @@ gfc_trans_do (gfc_code * code) tree from; tree to; tree step; - tree count; - tree count_one; + tree empty; + tree countm1; tree type; + tree utype; tree cond; tree cycle_label; tree exit_label; tree tmp; + tree pos_step; stmtblock_t block; stmtblock_t body; @@ -874,48 +876,59 @@ gfc_trans_do (gfc_code * code) || tree_int_cst_equal (step, integer_minus_one_node))) return gfc_trans_simple_do (code, &block, dovar, from, to, step); - /* Initialize loop count. This code is executed before we enter the - loop body. We generate: count = (to + step - from) / step. */ + /* We need a special check for empty loops: + empty = (step > 0 ? to < from : to > from); */ + pos_step = fold_build2 (GT_EXPR, boolean_type_node, step, + fold_convert (type, integer_zero_node)); + empty = fold_build3 (COND_EXPR, boolean_type_node, pos_step, + fold_build2 (LT_EXPR, boolean_type_node, to, from), + fold_build2 (GT_EXPR, boolean_type_node, to, from)); - tmp = fold_build2 (MINUS_EXPR, type, step, from); - tmp = fold_build2 (PLUS_EXPR, type, to, tmp); + /* Initialize loop count. This code is executed before we enter the + loop body. We generate: countm1 = abs(to - from) / abs(step). */ if (TREE_CODE (type) == INTEGER_TYPE) { - tmp = fold_build2 (TRUNC_DIV_EXPR, type, tmp, step); - count = gfc_create_var (type, "count"); + tree ustep; + + utype = unsigned_type_for (type); + + /* tmp = abs(to - from) / abs(step) */ + ustep = fold_convert (utype, fold_build1 (ABS_EXPR, type, step)); + tmp = fold_build3 (COND_EXPR, type, pos_step, + fold_build2 (MINUS_EXPR, type, to, from), + fold_build2 (MINUS_EXPR, type, from, to)); + tmp = fold_build2 (TRUNC_DIV_EXPR, utype, fold_convert (utype, tmp), + ustep); } else { /* TODO: We could use the same width as the real type. This would probably cause more problems that it solves when we implement "long double" types. */ + utype = unsigned_type_for (gfc_array_index_type); + tmp = fold_build2 (MINUS_EXPR, type, to, from); tmp = fold_build2 (RDIV_EXPR, type, tmp, step); - tmp = fold_build1 (FIX_TRUNC_EXPR, gfc_array_index_type, tmp); - count = gfc_create_var (gfc_array_index_type, "count"); + tmp = fold_build1 (FIX_TRUNC_EXPR, utype, tmp); } - gfc_add_modify_expr (&block, count, tmp); + countm1 = gfc_create_var (utype, "countm1"); + gfc_add_modify_expr (&block, countm1, tmp); - count_one = build_int_cst (TREE_TYPE (count), 1); + /* Cycle and exit statements are implemented with gotos. */ + cycle_label = gfc_build_label_decl (NULL_TREE); + exit_label = gfc_build_label_decl (NULL_TREE); + TREE_USED (exit_label) = 1; /* Initialize the DO variable: dovar = from. */ gfc_add_modify_expr (&block, dovar, from); + /* If the loop is empty, go directly to the exit label. */ + tmp = fold_build3 (COND_EXPR, void_type_node, empty, + build1_v (GOTO_EXPR, exit_label), build_empty_stmt ()); + gfc_add_expr_to_block (&block, tmp); + /* Loop body. */ gfc_start_block (&body); - /* Cycle and exit statements are implemented with gotos. */ - cycle_label = gfc_build_label_decl (NULL_TREE); - exit_label = gfc_build_label_decl (NULL_TREE); - - /* Start with the loop condition. Loop until count <= 0. */ - cond = fold_build2 (LE_EXPR, boolean_type_node, count, - build_int_cst (TREE_TYPE (count), 0)); - tmp = build1_v (GOTO_EXPR, exit_label); - TREE_USED (exit_label) = 1; - tmp = fold_build3 (COND_EXPR, void_type_node, - cond, tmp, build_empty_stmt ()); - gfc_add_expr_to_block (&body, tmp); - /* Put these labels where they can be found later. We put the labels in a TREE_LIST node (because TREE_CHAIN is already used). cycle_label goes in TREE_PURPOSE (backend_decl), exit @@ -934,13 +947,21 @@ gfc_trans_do (gfc_code * code) gfc_add_expr_to_block (&body, tmp); } + /* End with the loop condition. Loop until countm1 == 0. */ + cond = fold_build2 (EQ_EXPR, boolean_type_node, countm1, + build_int_cst (utype, 0)); + tmp = build1_v (GOTO_EXPR, exit_label); + tmp = fold_build3 (COND_EXPR, void_type_node, + cond, tmp, build_empty_stmt ()); + gfc_add_expr_to_block (&body, tmp); + /* Increment the loop variable. */ tmp = build2 (PLUS_EXPR, type, dovar, step); gfc_add_modify_expr (&body, dovar, tmp); /* Decrement the loop count. */ - tmp = build2 (MINUS_EXPR, TREE_TYPE (count), count, count_one); - gfc_add_modify_expr (&body, count, tmp); + tmp = build2 (MINUS_EXPR, utype, countm1, build_int_cst (utype, 1)); + gfc_add_modify_expr (&body, countm1, tmp); /* End of loop body. */ tmp = gfc_finish_block (&body); @@ -1691,14 +1712,7 @@ gfc_do_allocate (tree bytesize, tree size, tree * pdata, stmtblock_t * pblock, tmpvar = gfc_create_var (build_pointer_type (type), "temp"); *pdata = convert (pvoid_type_node, tmpvar); - if (gfc_index_integer_kind == 4) - tmp = gfor_fndecl_internal_malloc; - else if (gfc_index_integer_kind == 8) - tmp = gfor_fndecl_internal_malloc64; - else - gcc_unreachable (); - tmp = build_call_expr (tmp, 1, bytesize); - tmp = convert (TREE_TYPE (tmpvar), tmp); + tmp = gfc_call_malloc (pblock, TREE_TYPE (tmpvar), bytesize); gfc_add_modify_expr (pblock, tmpvar, tmp); } return tmpvar; @@ -2209,7 +2223,7 @@ gfc_trans_assign_need_temp (gfc_expr * expr1, gfc_expr * expr2, if (ptemp1) { /* Free the temporary. */ - tmp = build_call_expr (gfor_fndecl_internal_free, 1, ptemp1); + tmp = gfc_call_free (ptemp1); gfc_add_expr_to_block (block, tmp); } } @@ -2367,7 +2381,7 @@ gfc_trans_pointer_assign_need_temp (gfc_expr * expr1, gfc_expr * expr2, /* Free the temporary. */ if (ptemp1) { - tmp = build_call_expr (gfor_fndecl_internal_free, 1, ptemp1); + tmp = gfc_call_free (ptemp1); gfc_add_expr_to_block (block, tmp); } } @@ -2702,7 +2716,7 @@ gfc_trans_forall_1 (gfc_code * code, forall_info * nested_forall_info) if (pmask) { /* Free the temporary for the mask. */ - tmp = build_call_expr (gfor_fndecl_internal_free, 1, pmask); + tmp = gfc_call_free (pmask); gfc_add_expr_to_block (&block, tmp); } if (maskindex) @@ -3299,14 +3313,14 @@ gfc_trans_where_2 (gfc_code * code, tree mask, bool invert, /* If we allocated a pending mask array, deallocate it now. */ if (ppmask) { - tmp = build_call_expr (gfor_fndecl_internal_free, 1, ppmask); + tmp = gfc_call_free (ppmask); gfc_add_expr_to_block (block, tmp); } /* If we allocated a current mask array, deallocate it now. */ if (pcmask) { - tmp = build_call_expr (gfor_fndecl_internal_free, 1, pcmask); + tmp = gfc_call_free (pcmask); gfc_add_expr_to_block (block, tmp); } }