X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fcombo.c;h=29b210cda9c937587e4d72119a22a577b73f5f45;hb=6c7c7c010b4f0c9fc87ba4f740fe60ac93ef5724;hp=9ddf1450d2d7b72c36db641fff02e92f8b2cfc0f;hpb=f44b4b1268e91fedfa29f670189b8ca84866bb9a;p=libfirm

diff --git a/ir/opt/combo.c b/ir/opt/combo.c
index 9ddf1450d..29b210cda 100644
--- a/ir/opt/combo.c
+++ b/ir/opt/combo.c
@@ -288,7 +288,7 @@ static void check_opcode(const partition_t *Z) {
 				key.u.intVal = get_Conv_strict(irn);
 				break;
 			case iro_Div:
-				key.u.intVal = is_Div_remainderless(irn);
+				key.u.intVal = get_Div_no_remainder(irn);
 				break;
 			case iro_Block:
 				key.u.block = irn;
@@ -319,7 +319,7 @@ static void check_opcode(const partition_t *Z) {
 				assert(key.u.intVal == get_Conv_strict(irn));
 				break;
 			case iro_Div:
-				assert(key.u.intVal == is_Div_remainderless(irn));
+				assert(key.u.intVal == get_Div_no_remainder(irn));
 				break;
 			case iro_Block:
 				assert(key.u.block == irn);
@@ -1673,7 +1673,7 @@ static void *lambda_opcode(const node_t *node, environment_t *env) {
 		key.u.intVal = get_Conv_strict(irn);
 		break;
 	case iro_Div:
-		key.u.intVal = is_Div_remainderless(irn);
+		key.u.intVal = get_Div_no_remainder(irn);
 		break;
 	case iro_Block:
 		/*
@@ -2376,7 +2376,7 @@ static void compute_Proj_Cond(node_t *node, ir_node *cond) {
 			node->type.tv = tarval_reachable;
 		} else if (selector->type.tv == tarval_top) {
 			if (tarval_UNKNOWN == tarval_top &&
-			    pnc == get_Cond_defaultProj(cond)) {
+			    pnc == get_Cond_default_proj(cond)) {
 				/* a switch based of Top is always "default" */
 				node->type.tv = tarval_reachable;
 			} else {
@@ -2384,7 +2384,7 @@ static void compute_Proj_Cond(node_t *node, ir_node *cond) {
 			}
 		} else {
 			long value = get_tarval_long(selector->type.tv);
-			if (pnc == get_Cond_defaultProj(cond)) {
+			if (pnc == get_Cond_default_proj(cond)) {
 				/* default switch, have to check ALL other cases */
 				int i;
 
@@ -3140,7 +3140,7 @@ static void exchange_leader(ir_node *irn, ir_node *leader) {
 		ir_node  *block = get_nodes_block(leader);
 		dbg_info *dbg   = get_irn_dbg_info(irn);
 
-		leader = new_rd_Conv(dbg, current_ir_graph, block, leader, mode, 0);
+		leader = new_rd_Conv(dbg, current_ir_graph, block, leader, mode);
 	}
 	exchange(irn, leader);
 }  /* exchange_leader */