X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcombo.c;h=94c116b74d17875f516e1204f277eda3ade69c65;hb=b7b24e372a1338ecd5eb26bdd285a8cbe7b1fec9;hp=d48e8490a601e49458499567619f70ba391d3734;hpb=154104ce2ac7983a5d0ba7239254de9fc4d0144d;p=libfirm

diff --git a/ir/opt/combo.c b/ir/opt/combo.c
index d48e8490a..94c116b74 100644
--- a/ir/opt/combo.c
+++ b/ir/opt/combo.c
@@ -845,7 +845,7 @@ static void add_to_cprop(node_t *y, environment_t *env)
 	irn = y->node;
 	if (get_irn_mode(irn) == mode_T) {
 		/* mode_T nodes always produce tarval_bottom, so we must explicitly
-		   add it's Proj's to get constant evaluation to work */
+		 * add its Projs to get constant evaluation to work */
 		int i;
 
 		for (i = get_irn_n_outs(irn) - 1; i >= 0; --i) {
@@ -1813,7 +1813,7 @@ static void split_by(partition_t *X, environment_t *env)
 	dump_partition("split_by", X);
 
 	if (X->n_leader == 1) {
-		/* we have only one leader, no need to split, just check it's type */
+		/* we have only one leader, no need to split, just check its type */
 		node_t *x = get_first_node(X);
 		X->type_is_T_or_C = x->type.tv == tarval_top || is_con(x->type);
 		return;
@@ -2235,44 +2235,12 @@ static void compute_Eor(node_t *node)
  */
 static void compute_Cmp(node_t *node)
 {
-	ir_node        *cmp  = node->node;
-	node_t         *l    = get_irn_node(get_Cmp_left(cmp));
-	node_t         *r    = get_irn_node(get_Cmp_right(cmp));
-	lattice_elem_t a     = l->type;
-	lattice_elem_t b     = r->type;
-	ir_mode        *mode = get_irn_mode(get_Cmp_left(cmp));
-
-	if (a.tv == tarval_top || b.tv == tarval_top) {
-		node->type.tv = tarval_top;
-	} else if (r->part == l->part) {
-		/* both nodes congruent, we can probably do something */
-		if (mode_is_float(mode)) {
-			/* beware of NaN's */
-			node->type.tv = tarval_bottom;
-		} else {
-			node->type.tv = tarval_b_true;
-		}
-	} else if (is_con(a) && is_con(b)) {
-		node->type.tv = tarval_b_true;
-	} else {
-		node->type.tv = tarval_bottom;
-	}
-}  /* compute_Cmp */
-
-/**
- * (Re-)compute the type for a Proj(Cmp).
- *
- * @param node  the node
- * @param cond  the predecessor Cmp node
- */
-static void compute_Proj_Cmp(node_t *node, ir_node *cmp)
-{
-	ir_node        *proj = node->node;
-	node_t         *l    = get_irn_node(get_Cmp_left(cmp));
-	node_t         *r    = get_irn_node(get_Cmp_right(cmp));
-	lattice_elem_t a     = l->type;
-	lattice_elem_t b     = r->type;
-	pn_Cmp         pnc   = get_Proj_pn_cmp(proj);
+	ir_node        *cmp     = node->node;
+	node_t         *l       = get_irn_node(get_Cmp_left(cmp));
+	node_t         *r       = get_irn_node(get_Cmp_right(cmp));
+	lattice_elem_t a        = l->type;
+	lattice_elem_t b        = r->type;
+	ir_relation    relation = get_Cmp_relation(cmp);
 	ir_tarval      *tv;
 
 	if (a.tv == tarval_top || b.tv == tarval_top) {
@@ -2287,7 +2255,7 @@ static void compute_Proj_Cmp(node_t *node, ir_node *cmp)
 	 *  consistent with compute_Cmp, so don't do anything for floats)
 	 */
 	} else if (r->part == l->part && !mode_is_float(get_irn_mode(l->node))) {
-		tv = pnc & pn_Cmp_Eq ? tarval_b_true : tarval_b_false;
+		tv = relation & ir_relation_equal ? tarval_b_true : tarval_b_false;
 
 		/* if the node was ONCE evaluated by all constants, but now
 		   this breaks AND we get from the argument partitions a different
@@ -2299,7 +2267,7 @@ static void compute_Proj_Cmp(node_t *node, ir_node *cmp)
 	} else {
 		node->type.tv = tarval_bottom;
 	}
-}  /* compute_Proj_Cmp */
+}
 
 /**
  * (Re-)compute the type for a Proj(Cond).
@@ -2469,28 +2437,23 @@ static void compute_Proj(node_t *node)
 		/* mode M is always bottom */
 		node->type.tv = tarval_bottom;
 		return;
+	} else if (mode == mode_X) {
+		/* handle mode_X nodes */
+		switch (get_irn_opcode(pred)) {
+		case iro_Start:
+			/* the Proj_X from the Start is always reachable.
+			   However this is already handled at the top. */
+			node->type.tv = tarval_reachable;
+			return;
+		case iro_Cond:
+			compute_Proj_Cond(node, pred);
+			return;
+		default:
+			break;
+		}
 	}
-	if (mode != mode_X) {
-		if (is_Cmp(pred))
-			compute_Proj_Cmp(node, pred);
-		else
-			default_compute(node);
-		return;
-	}
-	/* handle mode_X nodes */
 
-	switch (get_irn_opcode(pred)) {
-	case iro_Start:
-		/* the Proj_X from the Start is always reachable.
-		   However this is already handled at the top. */
-		node->type.tv = tarval_reachable;
-		break;
-	case iro_Cond:
-		compute_Proj_Cond(node, pred);
-		break;
-	default:
-		default_compute(node);
-	}
+	default_compute(node);
 }  /* compute_Proj */
 
 /**
@@ -2503,7 +2466,7 @@ static void compute_Confirm(node_t *node)
 	ir_node *confirm = node->node;
 	node_t  *pred = get_irn_node(get_Confirm_value(confirm));
 
-	if (get_Confirm_cmp(confirm) == pn_Cmp_Eq) {
+	if (get_Confirm_relation(confirm) == ir_relation_equal) {
 		node_t *bound = get_irn_node(get_Confirm_bound(confirm));
 
 		if (is_con(bound->type)) {