fehler76: assertion when converting float constant to int
[libfirm] / ir / ir / iropt.c
index 4e1d6b5..7d25747 100644 (file)
@@ -1912,9 +1912,8 @@ static ir_node *transform_node_Add(ir_node *n) {
                return n;
 
        if (mode_is_num(mode)) {
-#if 0
                /* the following code leads to endless recursion when Mul are replaced by a simple instruction chain */
-               if (a == b && mode_is_int(mode)) {
+               if (!get_opt_arch_dep_running() && a == b && mode_is_int(mode)) {
                        ir_node *block = get_irn_n(n, -1);
 
                        n = new_rd_Mul(
@@ -1925,9 +1924,9 @@ static ir_node *transform_node_Add(ir_node *n) {
                                new_r_Const_long(current_ir_graph, block, mode, 2),
                                mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_A);
-               } else
-#endif
-               if (get_irn_op(a) == op_Minus) {
+                       return n;
+               }
+               if (is_Minus(a)) {
                        n = new_rd_Sub(
                                        get_irn_dbg_info(n),
                                        current_ir_graph,
@@ -1936,7 +1935,9 @@ static ir_node *transform_node_Add(ir_node *n) {
                                        get_Minus_op(a),
                                        mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
-               } else if (get_irn_op(b) == op_Minus) {
+                       return n;
+               }
+               if (is_Minus(b)) {
                        n = new_rd_Sub(
                                        get_irn_dbg_info(n),
                                        current_ir_graph,
@@ -1945,77 +1946,85 @@ static ir_node *transform_node_Add(ir_node *n) {
                                        get_Minus_op(b),
                                        mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
+                       return n;
                }
-               /* do NOT execute this code if reassociation is enabled, it does the inverse! */
-               else if (!get_opt_reassociation() && get_irn_op(a) == op_Mul) {
-                       ir_node *ma = get_Mul_left(a);
-                       ir_node *mb = get_Mul_right(a);
-
-                       if (b == ma) {
-                               ir_node *blk = get_irn_n(n, -1);
-                               n = new_rd_Mul(
-                                               get_irn_dbg_info(n), current_ir_graph, blk,
-                                               ma,
-                                               new_rd_Add(
-                                                       get_irn_dbg_info(n), current_ir_graph, blk,
-                                                       mb,
-                                                       new_r_Const_long(current_ir_graph, blk, mode, 1),
-                                                       mode),
-                                               mode);
-                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-                       } else if (b == mb) {
-                               ir_node *blk = get_irn_n(n, -1);
-                               n = new_rd_Mul(
-                                               get_irn_dbg_info(n), current_ir_graph, blk,
-                                               mb,
-                                               new_rd_Add(
+               if (! get_opt_reassociation()) {
+                       /* do NOT execute this code if reassociation is enabled, it does the inverse! */
+                       if (is_Mul(a)) {
+                               ir_node *ma = get_Mul_left(a);
+                               ir_node *mb = get_Mul_right(a);
+
+                               if (b == ma) {
+                                       ir_node *blk = get_irn_n(n, -1);
+                                       n = new_rd_Mul(
                                                        get_irn_dbg_info(n), current_ir_graph, blk,
                                                        ma,
-                                                       new_r_Const_long(current_ir_graph, blk, mode, 1),
-                                                       mode),
-                                               mode);
-                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-                       }
-               }
-               /* do NOT execute this code if reassociation is enabled, it does the inverse! */
-               else if (!get_opt_reassociation() && get_irn_op(b) == op_Mul) {
-                       ir_node *ma = get_Mul_left(b);
-                       ir_node *mb = get_Mul_right(b);
-
-                       if (a == ma) {
-                               ir_node *blk = get_irn_n(n, -1);
-                               n = new_rd_Mul(
-                                               get_irn_dbg_info(n), current_ir_graph, blk,
-                                               ma,
-                                               new_rd_Add(
+                                                       new_rd_Add(
+                                                               get_irn_dbg_info(n), current_ir_graph, blk,
+                                                               mb,
+                                                               new_r_Const_long(current_ir_graph, blk, mode, 1),
+                                                               mode),
+                                                       mode);
+                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
+                                       return n;
+                               } else if (b == mb) {
+                                       ir_node *blk = get_irn_n(n, -1);
+                                       n = new_rd_Mul(
                                                        get_irn_dbg_info(n), current_ir_graph, blk,
                                                        mb,
-                                                       new_r_Const_long(current_ir_graph, blk, mode, 1),
-                                                       mode),
-                                               mode);
-                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-                       } else if (a == mb) {
-                               ir_node *blk = get_irn_n(n, -1);
-                               n = new_rd_Mul(
-                                               get_irn_dbg_info(n), current_ir_graph, blk,
-                                               mb,
-                                               new_rd_Add(
+                                                       new_rd_Add(
+                                                               get_irn_dbg_info(n), current_ir_graph, blk,
+                                                               ma,
+                                                               new_r_Const_long(current_ir_graph, blk, mode, 1),
+                                                               mode),
+                                                       mode);
+                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
+                                       return n;
+                               }
+                       }
+                       if (is_Mul(b)) {
+                               ir_node *ma = get_Mul_left(b);
+                               ir_node *mb = get_Mul_right(b);
+
+                               if (a == ma) {
+                                       ir_node *blk = get_irn_n(n, -1);
+                                       n = new_rd_Mul(
                                                        get_irn_dbg_info(n), current_ir_graph, blk,
                                                        ma,
-                                                       new_r_Const_long(current_ir_graph, blk, mode, 1),
-                                                       mode),
-                                               mode);
-                               DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
+                                                       new_rd_Add(
+                                                               get_irn_dbg_info(n), current_ir_graph, blk,
+                                                               mb,
+                                                               new_r_Const_long(current_ir_graph, blk, mode, 1),
+                                                               mode),
+                                                       mode);
+                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
+                                       return n;
+                               }
+                               if (a == mb) {
+                                       ir_node *blk = get_irn_n(n, -1);
+                                       n = new_rd_Mul(
+                                                       get_irn_dbg_info(n), current_ir_graph, blk,
+                                                       mb,
+                                                       new_rd_Add(
+                                                               get_irn_dbg_info(n), current_ir_graph, blk,
+                                                               ma,
+                                                               new_r_Const_long(current_ir_graph, blk, mode, 1),
+                                                               mode),
+                                                       mode);
+                                       DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
+                                       return n;
+                               }
                        }
                }
                /* Here we rely on constants be on the RIGHT side */
-               else if (get_mode_arithmetic(mode) == irma_twos_complement &&
+               if (get_mode_arithmetic(mode) == irma_twos_complement &&
                         is_Not(a) && classify_Const(b) == CNST_ONE) {
                        /* ~x + 1 = -x */
                        ir_node *op = get_Not_op(a);
                        ir_node *blk = get_irn_n(n, -1);
                        n = new_rd_Minus(get_irn_dbg_info(n), current_ir_graph, blk, op, mode);
                        DBG_OPT_ALGSIM0(oldn, n, FS_OPT_NOT_PLUS_1);
+                       return n;
                }
        }
        return n;
@@ -4518,6 +4527,8 @@ ir_node *optimize_node(ir_node *n) {
        if (get_opt_constant_folding()) {
                /* neither constants nor Tuple values can be evaluated */
                if (iro != iro_Const && (get_irn_mode(n) != mode_T)) {
+                       unsigned fp_model = get_irg_fp_model(current_ir_graph);
+                       int old_fp_mode = tarval_enable_fp_ops((fp_model & fp_strict_algebraic) == 0);
                        /* try to evaluate */
                        tv = computed_value(n);
                        if (tv != tarval_bad) {
@@ -4555,8 +4566,10 @@ ir_node *optimize_node(ir_node *n) {
                                if (old_tp && get_type_mode(old_tp) == get_tarval_mode (tv))
                                        set_Const_type(nw, old_tp);
                                DBG_OPT_CSTEVAL(oldn, nw);
+                               tarval_enable_fp_ops(old_fp_mode);
                                return nw;
                        }
+                       tarval_enable_fp_ops(old_fp_mode);
                }
        }
 
@@ -4625,6 +4638,8 @@ ir_node *optimize_in_place_2(ir_node *n) {
        if (get_opt_constant_folding()) {
                /* neither constants nor Tuple values can be evaluated */
                if (iro != iro_Const && get_irn_mode(n) != mode_T) {
+                       unsigned fp_model = get_irg_fp_model(current_ir_graph);
+                       int old_fp_mode = tarval_enable_fp_ops((fp_model & fp_strict_algebraic) == 0);
                        /* try to evaluate */
                        tv = computed_value(n);
                        if (tv != tarval_bad) {
@@ -4644,8 +4659,10 @@ ir_node *optimize_in_place_2(ir_node *n) {
                                        set_Const_type(n, old_tp);
 
                                DBG_OPT_CSTEVAL(oldn, n);
+                               tarval_enable_fp_ops(old_fp_mode);
                                return n;
                        }
+                       tarval_enable_fp_ops(old_fp_mode);
                }
        }