X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fopt_osr.c;h=6a3564aff256426d33980e52052652632708da5d;hb=4b734653b3f11a3182963369bb58980e4d5a62cb;hp=f7af05afb45fadda5d9290c329446c3f0c05f780;hpb=e8c648b13bff68494a19bb2a0e32a04f5f0cf40a;p=libfirm

diff --git a/ir/opt/opt_osr.c b/ir/opt/opt_osr.c
index f7af05afb..6a3564aff 100644
--- a/ir/opt/opt_osr.c
+++ b/ir/opt/opt_osr.c
@@ -28,9 +28,7 @@
  *  by Keith D. Cooper, L. Taylor Simpson, Christopher A. Vick.
  *  Extended version.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "adt/pdeq.h"
 #include "iroptimize.h"
@@ -52,7 +50,7 @@
 #include "irloop_t.h"
 #include "array.h"
 #include "firmstat.h"
-#include "xmalloc.h"
+#include "error.h"
 
 /** The debug handle. */
 DEBUG_ONLY(static firm_dbg_module_t *dbg;)
@@ -305,7 +303,7 @@ static ir_node *do_apply(ir_opcode code, dbg_info *db, ir_node *op1, ir_node *op
 		result = new_rd_Sub(db, irg, block, op1, op2, mode);
 		break;
 	default:
-		assert(0);
+		panic("Unsupported opcode");
 		result = NULL;
 	}
 	return result;
@@ -322,24 +320,25 @@ static ir_node *do_apply(ir_opcode code, dbg_info *db, ir_node *op1, ir_node *op
  *
  * @return the newly created node
  */
-static ir_node *apply(ir_node *orig, ir_node *op1, ir_node *op2, iv_env *env) {
+static ir_node *apply(ir_node *header, ir_node *orig, ir_node *op1, ir_node *op2, iv_env *env) {
 	ir_opcode code = get_irn_opcode(orig);
 	ir_node *result = search(code, op1, op2, env);
 
-	if (! result) {
+	if (result == NULL) {
 		dbg_info *db = get_irn_dbg_info(orig);
 		ir_node *op1_header = get_irn_ne(op1, env)->header;
 		ir_node *op2_header = get_irn_ne(op2, env)->header;
 
-		if (op1_header != NULL && is_rc(op2, op1_header)) {
+		if (op1_header == header && is_rc(op2, op1_header)) {
 			result = reduce(orig, op1, op2, env);
 		}
-		else if (op2_header != NULL && is_rc(op1, op2_header)) {
+		else if (op2_header == header && is_rc(op1, op2_header)) {
 			result = reduce(orig, op2, op1, env);
 		}
 		else {
 			result = do_apply(code, db, op1, op2, get_irn_mode(orig));
-			get_irn_ne(result, env)->header = NULL;		}
+			get_irn_ne(result, env)->header = NULL;
+		}
 	}
 	return result;
 }
@@ -359,7 +358,7 @@ static ir_node *reduce(ir_node *orig, ir_node *iv, ir_node *rc, iv_env *env) {
 	ir_opcode code = get_irn_opcode(orig);
 	ir_node *result = search(code, iv, rc, env);
 
-	if (! result) {
+	if (result == NULL) {
 		node_entry *e, *iv_e;
 		int i, n;
 		ir_mode *mode = get_irn_mode(orig);
@@ -390,7 +389,7 @@ static ir_node *reduce(ir_node *orig, ir_node *iv, ir_node *rc, iv_env *env) {
 			if (e->header == iv_e->header)
 				o = reduce(orig, o, rc, env);
 			else if (is_Phi(result) || code == iro_Mul)
-				o = apply(orig, o, rc, env);
+				o = apply(iv_e->header, orig, o, rc, env);
 			set_irn_n(result, i, o);
 		}
 	}
@@ -427,7 +426,7 @@ static void update_scc(ir_node *iv, node_entry *e, iv_env *env) {
 			node_entry *pe   = get_irn_ne(pred, env);
 
 			if (pe->header == header && pe->pscc == NULL) {
-				/* set the psc here to ensure that the node is NOT enqueued another time */
+				/* set the pscc here to ensure that the node is NOT enqueued another time */
 				pe->pscc = pscc;
 				waitq_put(wq, pred);
 			}
@@ -468,6 +467,7 @@ static int replace(ir_node *irn, ir_node *iv, ir_node *rc, iv_env *env) {
 	return 0;
 }
 
+#if 0
 /**
  * check if a given node is a mul with 2, 4, 8
  */
@@ -493,6 +493,7 @@ static int is_x86_shift_const(ir_node *mul) {
 	}
 	return 0;
 }
+#endif
 
 /**
  * Check if an IV represents a counter with constant limits.
@@ -661,11 +662,6 @@ static int check_replace(ir_node *irn, iv_env *env) {
 				if (! check_users_for_reg_pressure(iv, env))
 					return 0;
 			}
-			/* check for x86 constants */
-			if (env->flags & osr_flag_ignore_x86_shift)
-				if (is_x86_shift_const(irn))
-					return 0;
-
 			return replace(irn, iv, rc, env);
 		}
 		break;
@@ -941,7 +937,7 @@ static void dfs(ir_node *irn, iv_env *env)
 		for (i = 0; i < n; ++i) {
 			ir_node *pred = get_irn_n(irn, i);
 
-			if (irn_not_visited(pred))
+			if (!irn_visited(pred))
 				dfs(pred, env);
 		}
 	}
@@ -953,7 +949,7 @@ static void dfs(ir_node *irn, iv_env *env)
 		push(env, irn);
 
 		/* handle the block */
-		if (irn_not_visited(block))
+		if (!irn_visited(block))
 			dfs(block, env);
 
 		n = get_irn_arity(irn);
@@ -961,7 +957,7 @@ static void dfs(ir_node *irn, iv_env *env)
 			ir_node *pred = get_irn_n(irn, i);
 			node_entry *o = get_irn_ne(pred, env);
 
-			if (irn_not_visited(pred)) {
+			if (!irn_visited(pred)) {
 				dfs(pred, env);
 				node->low = MIN(node->low, o->low);
 			}
@@ -999,7 +995,7 @@ static void do_dfs(ir_graph *irg, iv_env *env) {
 	ir_node *end = get_irg_end(irg);
 	int i, n;
 
-	set_using_irn_visited(irg);
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
 
 	current_ir_graph = irg;
 	inc_irg_visited(irg);
@@ -1012,11 +1008,11 @@ static void do_dfs(ir_graph *irg, iv_env *env) {
 	for (i = 0; i < n; ++i) {
 		ir_node *ka = get_End_keepalive(end, i);
 
-		if (irn_not_visited(ka))
+		if (!irn_visited(ka))
 			dfs(ka, env);
 	}
 
-	clear_using_irn_visited(irg);
+	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
 	current_ir_graph = rem;
 }
@@ -1114,12 +1110,12 @@ static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
 			DB((dbg, LEVEL_4, " + %+F", tv_r));
 			break;
 		case iro_Sub:
-			tv      = tarval_sub(tv_l, tv_r);
-			tv_init = tarval_sub(tv_init, tv_r);
+			tv      = tarval_sub(tv_l, tv_r, NULL);
+			tv_init = tarval_sub(tv_init, tv_r, NULL);
 			DB((dbg, LEVEL_4, " - %+F", tv_r));
 			break;
 		default:
-			assert(0);
+			panic("Unsupported opcode");
 			tv = tarval_bad;
 		}
 
@@ -1127,7 +1123,7 @@ static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
 			tv = tarval_add(tv, tv_incr);
 		} else {
 			assert(pscc->code == iro_Sub);
-			tv = tarval_sub(tv, tv_incr);
+			tv = tarval_sub(tv, tv_incr, NULL);
 		}
 
 		tarval_set_integer_overflow_mode(ovmode);
@@ -1136,7 +1132,7 @@ static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
 			DB((dbg, LEVEL_4, " = OVERFLOW"));
 			return NULL;
 		}
-		return new_r_Const(current_ir_graph, get_irn_n(rc, -1), get_tarval_mode(tv), tv);
+		return new_Const(tv);
 	}
 	return do_apply(e->code, NULL, rc, e->rc, get_irn_mode(rc));
 }
@@ -1191,7 +1187,7 @@ static void do_lftr(ir_node *cmp, void *ctx) {
 	ir_node *iv, *rc;
 	ir_node *nleft = NULL, *nright = NULL;
 
-	if (get_irn_op(cmp) != op_Cmp)
+	if (!is_Cmp(cmp))
 		return;
 
 	left  = get_Cmp_left(cmp);
@@ -1299,7 +1295,8 @@ void opt_osr(ir_graph *irg, unsigned flags) {
 
 	if (env.replaced) {
 		/* try linear function test replacements */
-		lftr(irg, &env);
+		//lftr(irg, &env); // currently buggy :-(
+		(void) lftr;
 
 		set_irg_outs_inconsistent(irg);
 		DB((dbg, LEVEL_1, "Replacements: %u + %u (lftr)\n\n", env.replaced, env.lftr_replaced));