X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fconvopt.c;h=4ac59bebddf2e78cd80bc31d7236d544a620b456;hb=c7dc950ac0cdd7d24acffb798b5867d0db5dd7c8;hp=30e94a66b0af8f92390b74d7e3ae1f0b16c3d516;hpb=d94a9ad489e5112b71d31a8a385c31b3f2dba8c7;p=libfirm

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index 30e94a66b..4ac59bebd 100644
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -54,7 +54,7 @@
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg);
 
-static inline int min(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)
@@ -107,9 +107,6 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 	}
 
 	if (get_irn_n_edges(node) > 1) {
-		if (is_Conv(node) && is_downconv(get_irn_mode(node), dest_mode)) {
-			return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
-		}
 		DB((dbg, LEVEL_3, "multi outs at %+F\n", node));
 		return 1;
 	}
@@ -142,10 +139,11 @@ int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 	}
 
 	costs = 0;
-	arity = get_irn_arity(node);
+	// The shift count does not participate in the conv optimisation
+	arity = is_Shl(node) ? 1 : get_irn_arity(node);
 	for (i = 0; i < arity; ++i) {
 		ir_node *pred = get_irn_n(node, i);
-		costs += min(get_conv_costs(pred, dest_mode), 1);
+		costs += imin(get_conv_costs(pred, dest_mode), 1);
 	}
 
 	return costs;
@@ -178,9 +176,6 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 	}
 
 	if (get_irn_n_edges(node) > 1) {
-		if (is_Conv(node) && is_downconv(get_irn_mode(node), dest_mode)) {
-			return conv_transform(get_Conv_op(node), dest_mode);
-		}
 		return place_conv(node, dest_mode);
 	}
 
@@ -192,7 +187,8 @@ ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 		return place_conv(node, dest_mode);
 	}
 
-	arity = get_irn_arity(node);
+	// The shift count does not participate in the conv optimisation
+	arity = is_Shl(node) ? 1 : get_irn_arity(node);
 	for (i = 0; i < arity; i++) {
 		ir_node *pred = get_irn_n(node, i);
 		ir_node *transformed;