Added strict_flag to new_r/rd_Conv(). Fixed strict Convs for irio.

[libfirm] / ir / opt / convopt.c

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index 09b5cd7..cab0f41 100644 (file)
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.c
@@ -36,9 +36,7 @@
  * TODO: * try to optimize cmp modes
  *       * decide when it is useful to move the convs through phis
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "iroptimize.h"
 
@@ -54,7 +52,7 @@
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg);
 
-static INLINE int imin(int a, int b) { return a < b ? a : b; }
+static inline int imin(int a, int b) { return a < b ? a : b; }
 
 static
 int is_optimizable_node(const ir_node *node)
@@ -117,10 +115,6 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
                return 1;
        }
 
-       if (is_Conv(node) && is_downconv(mode, dest_mode)) {
-               return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
-       }
-
 #if 0 // TODO
        /* Take the minimum of the conversion costs for Phi predecessors as only one
         * branch is actually executed at a time */
@@ -140,7 +134,15 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
        }
 #endif
 
-       if (!mode_is_int(mode) || !is_optimizable_node(node)) {
+       if (!is_downconv(mode, dest_mode)) {
+               return 1;
+       }
+
+       if (is_Conv(node)) {
+               return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
+       }
+
+       if (!is_optimizable_node(node)) {
                return 1;
        }
 
@@ -158,7 +160,7 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 static ir_node *place_conv(ir_node *node, ir_mode *dest_mode)
 {
        ir_node *block = get_nodes_block(node);
-       ir_node *conv = new_r_Conv(current_ir_graph, block, node, dest_mode);
+       ir_node *conv = new_r_Conv(current_ir_graph, block, node, dest_mode, 0);
        return conv;
 }
 
@@ -178,7 +180,7 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
                if (tv == tarval_bad) {
                        return place_conv(node, dest_mode);
                } else {
-                       return new_Const(dest_mode, tv);
+                       return new_Const(tv);
                }
        }
 
@@ -192,11 +194,15 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
                return place_conv(node, dest_mode);
        }
 
-       if (is_Conv(node) && is_downconv(mode, dest_mode)) {
+       if (!is_downconv(mode, dest_mode)) {
+               return place_conv(node, dest_mode);
+       }
+
+       if (is_Conv(node)) {
                return conv_transform(get_Conv_op(node), dest_mode);
        }
 
-       if (!mode_is_int(mode) || !is_optimizable_node(node)) {
+       if (!is_optimizable_node(node)) {
                return place_conv(node, dest_mode);
        }