X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firopt.c;h=4fc0169aa03e8ecfbbd4038809d7cbc981c15fbd;hb=203717b8dd44597fb10c126b33a28528a2432e9c;hp=d12ed01a9a73ab81a0ad97780fa0551bf66f4706;hpb=0acb7d2b481592f9053e8f3667fcc691736d13a7;p=libfirm

diff --git a/ir/ir/iropt.c b/ir/ir/iropt.c
index d12ed01a9..4fc0169aa 100644
--- a/ir/ir/iropt.c
+++ b/ir/ir/iropt.c
@@ -1771,8 +1771,12 @@ static ir_node *apply_binop_on_2_phis(ir_node *a, ir_node *b, tarval *(*eval)(ta
 	void     **res;
 	ir_node  *pred;
 	ir_graph *irg;
-	int      i, n = get_irn_arity(a);
+	int      i, n;
 
+	if (get_nodes_block(a) != get_nodes_block(b))
+      return NULL;
+
+	n = get_irn_arity(a);
 	NEW_ARR_A(void *, res, n);
 
 	for (i = 0; i < n; ++i) {
@@ -2023,74 +2027,6 @@ static ir_node *transform_node_Add(ir_node *n) {
 			DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_A_MINUS_B);
 			return n;
 		}
-		if (! is_reassoc_running()) {
-			/* do NOT execute this code if reassociation is enabled, it does the inverse! */
-			if (is_Mul(a)) {
-				ir_node *ma = get_Mul_left(a);
-				ir_node *mb = get_Mul_right(a);
-
-				if (b == ma) {
-					ir_node *blk = get_irn_n(n, -1);
-					n = new_rd_Mul(
-							get_irn_dbg_info(n), current_ir_graph, blk,
-							ma,
-							new_rd_Add(
-								get_irn_dbg_info(n), current_ir_graph, blk,
-								mb,
-								new_r_Const_long(current_ir_graph, blk, mode, 1),
-								mode),
-							mode);
-					DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-					return n;
-				} else if (b == mb) {
-					ir_node *blk = get_irn_n(n, -1);
-					n = new_rd_Mul(
-							get_irn_dbg_info(n), current_ir_graph, blk,
-							mb,
-							new_rd_Add(
-								get_irn_dbg_info(n), current_ir_graph, blk,
-								ma,
-								new_r_Const_long(current_ir_graph, blk, mode, 1),
-								mode),
-							mode);
-					DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-					return n;
-				}
-			}
-			if (is_Mul(b)) {
-				ir_node *ma = get_Mul_left(b);
-				ir_node *mb = get_Mul_right(b);
-
-				if (a == ma) {
-					ir_node *blk = get_irn_n(n, -1);
-					n = new_rd_Mul(
-							get_irn_dbg_info(n), current_ir_graph, blk,
-							ma,
-							new_rd_Add(
-								get_irn_dbg_info(n), current_ir_graph, blk,
-								mb,
-								new_r_Const_long(current_ir_graph, blk, mode, 1),
-								mode),
-							mode);
-					DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-					return n;
-				}
-				if (a == mb) {
-					ir_node *blk = get_irn_n(n, -1);
-					n = new_rd_Mul(
-							get_irn_dbg_info(n), current_ir_graph, blk,
-							mb,
-							new_rd_Add(
-								get_irn_dbg_info(n), current_ir_graph, blk,
-								ma,
-								new_r_Const_long(current_ir_graph, blk, mode, 1),
-								mode),
-							mode);
-					DBG_OPT_ALGSIM0(oldn, n, FS_OPT_ADD_MUL_A_X_A);
-					return n;
-				}
-			}
-		}
 		if (get_mode_arithmetic(mode) == irma_twos_complement) {
 			/* Here we rely on constants be on the RIGHT side */
 			if (is_Not(a)) {
@@ -2307,16 +2243,16 @@ restart:
 
 		if (mode == get_irn_mode(b)) {
 			ir_mode *ma, *mb;
-
-			a = get_Conv_op(a);
-			b = get_Conv_op(b);
+			ir_node *op_a = get_Conv_op(a);
+			ir_node *op_b = get_Conv_op(b);
 
 			/* check if it's allowed to skip the conv */
-			ma = get_irn_mode(a);
-			mb = get_irn_mode(b);
+			ma = get_irn_mode(op_a);
+			mb = get_irn_mode(op_b);
 
 			if (mode_is_reference(ma) && mode_is_reference(mb)) {
 				/* SubInt(ConvInt(aP), ConvInt(bP)) -> SubInt(aP,bP) */
+				a = op_a; b = op_b;
 				set_Sub_left(n, a);
 				set_Sub_right(n, b);
 
@@ -2747,7 +2683,7 @@ static ir_node *transform_node_DivMod(ir_node *n) {
 	else if (is_Const(a) && is_const_Phi(b)) {
 		/* check for Div(Const, Phi) */
 		va = apply_binop_on_phi(b, get_Const_tarval(a), tarval_div, mode, 1);
-		va = apply_binop_on_phi(b, get_Const_tarval(a), tarval_mod, mode, 1);
+		vb = apply_binop_on_phi(b, get_Const_tarval(a), tarval_mod, mode, 1);
 		if (va && vb) {
 			DBG_OPT_ALGSIM0(n, va, FS_OPT_CONST_PHI);
 			DBG_OPT_ALGSIM0(n, vb, FS_OPT_CONST_PHI);
@@ -3001,7 +2937,8 @@ static ir_node *transform_bitwise_distributive(ir_node *n,
 		ir_node *b_left  = get_binop_left(b);
 		ir_node *b_right = get_binop_right(b);
 		ir_node *c       = NULL;
-		ir_node *op1, *op2;
+		ir_node *op1     = NULL;
+		ir_node *op2     = NULL;
 
 		if (is_op_commutative(op)) {
 			if (a_left == b_left) {
@@ -4731,6 +4668,12 @@ static ir_node *transform_node_Conv(ir_node *n) {
 			return c;
 		}
 	}
+
+	if (is_Unknown(a)) { /* Conv_A(Unknown_B) -> Unknown_A */
+		ir_mode *mode = get_irn_mode(n);
+		return new_r_Unknown(current_ir_graph, mode);
+	}
+
 	return n;
 }  /* transform_node_Conv */