X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fopt%2Fconvopt.c;h=cfee6ee5cc88794d80ab81c4c36cc78f5e4bbe85;hb=384fa74b40e75d771ad513a58886c546b42d67f8;hp=e9fd907b67f4996949ceae362692f30dba6bcd12;hpb=1d49ae6fe1cec06c75baceec6315efc2ecabea93;p=libfirm

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index e9fd907b6..cfee6ee5c 100644
--- 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)
@@ -87,7 +85,7 @@ int is_downconv(ir_mode *src_mode, ir_mode *dest_mode)
 	return
 		mode_is_int(src_mode) &&
 		mode_is_int(dest_mode) &&
-		get_mode_size_bits(dest_mode) < get_mode_size_bits(src_mode);
+		get_mode_size_bits(dest_mode) <= get_mode_size_bits(src_mode);
 }
 
 static
@@ -107,7 +105,7 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 	}
 
 	if (is_Conv(node) &&
-			is_downconv(get_irn_mode(node), dest_mode) &&
+			is_downconv(mode, dest_mode) &&
 			get_irn_mode(get_Conv_op(node)) == dest_mode) {
 		return -1;
 	}
@@ -117,10 +115,6 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 		return 1;
 	}
 
-	if (is_Conv(node) && is_downconv(get_irn_mode(node), 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,6 +134,14 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 	}
 #endif
 
+	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;
 	}
@@ -165,10 +167,11 @@ static ir_node *place_conv(ir_node *node, ir_mode *dest_mode)
 static
 ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 {
-	size_t arity;
-	size_t i;
+	ir_mode *mode = get_irn_mode(node);
+	size_t   arity;
+	size_t   i;
 
-	if (get_irn_mode(node) == dest_mode)
+	if (mode == dest_mode)
 		return node;
 
 	if (is_Const(node)) {
@@ -177,12 +180,12 @@ 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);
 		}
 	}
 
 	if (is_Conv(node) &&
-			is_downconv(get_irn_mode(node), dest_mode) &&
+			is_downconv(mode, dest_mode) &&
 			get_irn_mode(get_Conv_op(node)) == dest_mode) {
 		return get_Conv_op(node);
 	}
@@ -191,7 +194,11 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 		return place_conv(node, dest_mode);
 	}
 
-	if (is_Conv(node) && is_downconv(get_irn_mode(node), 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);
 	}
 
@@ -273,7 +280,7 @@ void conv_opt_walker(ir_node *node, void *data)
 	}
 }
 
-void conv_opt(ir_graph *irg)
+int conv_opt(ir_graph *irg)
 {
 	char invalidate = 0;
 	FIRM_DBG_REGISTER(dbg, "firm.opt.conv");
@@ -291,4 +298,5 @@ void conv_opt(ir_graph *irg)
 	if (invalidate) {
 		set_irg_outs_inconsistent(irg);
 	}
+	return invalidate;
 }