X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fconvopt.c;h=7ea1e3a92cb0e8d98d662597e2dfb44664689b3e;hb=762b472fc81c73cf7a1b0041b8cd286b7206d79d;hp=696238e79edf099a88ecc78f7adf3e94ae479232;hpb=6730cf921d356d992d35526daf57f82af7ab0816;p=libfirm

diff --git a/ir/opt/convopt.c b/ir/opt/convopt.c
index 696238e79..7ea1e3a92 100644
--- a/ir/opt/convopt.c
+++ b/ir/opt/convopt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -47,6 +47,7 @@
 #include "irgmod.h"
 #include "irgopt.h"
 #include "irnode_t.h"
+#include "iropt_t.h"
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf.h"
@@ -58,7 +59,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg);
 
 static inline int imin(int a, int b) { return a < b ? a : b; }
 
-static bool is_optimizable_node(const ir_node *node)
+static bool is_optimizable_node(const ir_node *node, ir_mode *dest_mode)
 {
 	switch (get_irn_opcode(node)) {
 	case iro_Add:
@@ -69,15 +70,23 @@ static bool is_optimizable_node(const ir_node *node)
 	case iro_Not:
 	case iro_Or:
 	case iro_Phi:
-	case iro_Shl:
 	case iro_Sub:
 		return true;
+	case iro_Shl: {
+		int modulo_shift = get_mode_modulo_shift(dest_mode);
+		int old_shift    = get_mode_modulo_shift(get_irn_mode(node));
+		/* bail out if modulo shift changes */
+		if (modulo_shift != old_shift)
+			return false;
+		return true;
+	}
+
 	default:
 		return false;
 	}
 }
 
-static tarval* conv_const_tv(const ir_node* cnst, ir_mode* dest_mode)
+static ir_tarval* conv_const_tv(const ir_node* cnst, ir_mode* dest_mode)
 {
 	return tarval_convert_to(get_Const_tarval(cnst), dest_mode);
 }
@@ -93,8 +102,8 @@ static int is_downconv(ir_mode *src_mode, ir_mode *dest_mode)
 static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 {
 	ir_mode *mode = get_irn_mode(node);
-	size_t arity;
-	size_t i;
+	int arity;
+	int i;
 	int costs;
 
 	if (mode == dest_mode)
@@ -116,12 +125,16 @@ static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 		return 1;
 	}
 
+	if (ir_zero_when_converted(node, dest_mode)) {
+		return -1;
+	}
+
 #if 0 // TODO
 	/* Take the minimum of the conversion costs for Phi predecessors as only one
 	 * branch is actually executed at a time */
 	if (is_Phi(node)) {
-		size_t i;
-		size_t arity = get_Phi_n_preds(node);
+		int i;
+		int arity = get_Phi_n_preds(node);
 		int costs;
 
 		costs = get_conv_costs(get_Phi_pred(node, 0), dest_mode);
@@ -149,7 +162,7 @@ static int get_conv_costs(const ir_node *node, ir_mode *dest_mode)
 		return get_conv_costs(get_Conv_op(node), dest_mode) - 1;
 	}
 
-	if (!is_optimizable_node(node)) {
+	if (!is_optimizable_node(node, dest_mode)) {
 		return 1;
 	}
 
@@ -175,9 +188,9 @@ static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 {
 	ir_mode  *mode = get_irn_mode(node);
 	ir_graph *irg  = get_irn_irg(node);
-	size_t    arity;
-	size_t    conv_arity;
-	size_t    i;
+	int       arity;
+	int       conv_arity;
+	int       i;
 	ir_node  *new_node;
 	ir_node **ins;
 
@@ -186,7 +199,7 @@ static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 
 	if (is_Const(node)) {
 		/* TODO tarval module is incomplete and can't convert floats to ints */
-		tarval *tv = conv_const_tv(node, dest_mode);
+		ir_tarval *tv = conv_const_tv(node, dest_mode);
 		if (tv == tarval_bad) {
 			return place_conv(node, dest_mode);
 		} else {
@@ -218,7 +231,7 @@ static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
 		return conv_transform(get_Conv_op(node), dest_mode);
 	}
 
-	if (!is_optimizable_node(node)) {
+	if (!is_optimizable_node(node, dest_mode)) {
 		return place_conv(node, dest_mode);
 	}
 
@@ -262,7 +275,7 @@ static void conv_opt_walker(ir_node *node, void *data)
 	ir_mode *pred_mode;
 	ir_mode *mode;
 	int costs;
-	bool *changed = data;
+	bool *changed = (bool*)data;
 
 	if (!is_Conv(node))
 		return;
@@ -315,9 +328,6 @@ int conv_opt(ir_graph *irg)
 		invalidate |= changed;
 	} while (changed);
 
-	if (invalidate) {
-		set_irg_outs_inconsistent(irg);
-	}
 	return invalidate;
 }