X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelower.c;h=f2dd1d49e68ed9bbd55a1a56f04eb47dad4a460c;hb=af0b60cf42e54a163d0b83dbab2874ea020bdc0d;hp=42c887ea83a4b492f8b92fdf4716ab124b74ab89;hpb=07d8237a144da310a3910a0ed04768481e40fb84;p=libfirm

diff --git a/ir/be/belower.c b/ir/be/belower.c
index 42c887ea8..f2dd1d49e 100644
--- a/ir/be/belower.c
+++ b/ir/be/belower.c
@@ -178,14 +178,14 @@ static int get_pairidx_for_regidx(reg_pair_t *pairs, int n, int reg_idx, int in_
 	if (in_out) {
 		for (i = 0; i < n; i++) {
 			/* out register matches */
-			if (pairs[i].out_reg->index == reg_idx)
+			if ((int) pairs[i].out_reg->index == reg_idx)
 				return i;
 		}
 	}
 	else {
 		for (i = 0; i < n; i++) {
 			/* in register matches */
-			if (pairs[i].in_reg->index == reg_idx)
+			if ((int) pairs[i].in_reg->index == reg_idx)
 				return i;
 		}
 	}
@@ -754,20 +754,15 @@ static void melt_copykeeps(constraint_env_t *cenv) {
 				new_ck = be_new_CopyKeep(entry->cls, irg, get_nodes_block(ref), be_get_CopyKeep_op(ref), n_melt, new_ck_in, get_irn_mode(ref));
 #endif /* KEEP_ALIVE_COPYKEEP_HACK */
 
-				/* set register class for all keeped inputs */
+				/* set register class for all kept inputs */
 				for (j = 1; j <= n_melt; ++j)
 					be_node_set_reg_class(new_ck, j, entry->cls);
 
 				ir_nodeset_insert(&entry->copies, new_ck);
 
 				/* find scheduling point */
-				if (get_irn_mode(ref_mode_T) == mode_T) {
-					/* walk along the Projs */
-					for (sched_pt = sched_next(ref_mode_T); is_Proj(sched_pt) || be_is_Keep(sched_pt) || be_is_CopyKeep(sched_pt); sched_pt = sched_next(sched_pt))
-						/* just walk along the schedule until a non-Proj/Keep/CopyKeep node is found*/ ;
-				}
-				else {
-					sched_pt = ref_mode_T;
+				for (sched_pt = sched_next(ref_mode_T); be_is_Keep(sched_pt) || be_is_CopyKeep(sched_pt); sched_pt = sched_next(sched_pt)) {
+					/* just walk along the schedule until a non-Keep/CopyKeep node is found */
 				}
 
 				sched_add_before(sched_pt, new_ck);
@@ -894,8 +889,8 @@ static int push_through_perm(ir_node *perm, void *data)
 
 	int i, n;
 	const ir_edge_t *edge;
-	ir_node *last_proj, *irn;
-	const arch_register_class_t *cls;
+	ir_node *last_proj = NULL, *irn;
+	const arch_register_class_t *cls = NULL;
 
 	DBG((mod, LEVEL_1, "perm move %+F irg %+F\n", perm, irg));
 
@@ -929,8 +924,9 @@ found_front:
 	node = sched_prev(perm);
 	n_moved = 0;
 	while(!sched_is_begin(node)) {
-		int      input = -1;
-		ir_node *proj;
+		const arch_register_req_t *req;
+		int                        input = -1;
+		ir_node                   *proj;
 
 		foreach_out_edge(perm, edge) {
 			ir_node *out = get_edge_src_irn(edge);
@@ -949,6 +945,14 @@ found_front:
 			break;
 		if(arch_irn_is(aenv, node, modify_flags))
 			break;
+		if(is_Proj(node)) {
+			req = arch_get_register_req(aenv, get_Proj_pred(node),
+			                            -1 - get_Proj_proj(node));
+		} else {
+			req = arch_get_register_req(aenv, node, -1);
+		}
+		if(req->type != arch_register_req_type_normal)
+			break;
 		for(i = get_irn_arity(node) - 1; i >= 0; --i) {
 			ir_node *opop = get_irn_n(node, i);
 			if (arch_irn_consider_in_reg_alloc(aenv, cls, opop)) {