X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fconvopt.c;h=09b5cd7a8f260b60fbdb1489d7274a57357a5a38;hb=45ecc187cee7107c83c1f9618a1e1e586df73644;hp=e9fd907b67f4996949ceae362692f30dba6bcd12;hpb=1d49ae6fe1cec06c75baceec6315efc2ecabea93;p=libfirm

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index e9fd907b6..09b5cd7a8 100644
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.c
@@ -87,7 +87,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 +107,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,7 +117,7 @@ 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)) {
+	if (is_Conv(node) && is_downconv(mode, dest_mode)) {
 		return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
 	}
 
@@ -140,7 +140,7 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 	}
 #endif
 
-	if (!is_optimizable_node(node)) {
+	if (!mode_is_int(mode) || !is_optimizable_node(node)) {
 		return 1;
 	}
 
@@ -165,10 +165,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)) {
@@ -182,7 +183,7 @@ ir_node *conv_transform(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 get_Conv_op(node);
 	}
@@ -191,11 +192,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_Conv(node) && is_downconv(mode, dest_mode)) {
 		return conv_transform(get_Conv_op(node), dest_mode);
 	}
 
-	if (!is_optimizable_node(node)) {
+	if (!mode_is_int(mode) || !is_optimizable_node(node)) {
 		return place_conv(node, dest_mode);
 	}
 
@@ -273,7 +274,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 +292,5 @@ void conv_opt(ir_graph *irg)
 	if (invalidate) {
 		set_irg_outs_inconsistent(irg);
 	}
+	return invalidate;
 }