X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=636e083a02c42724b0f728270615376fb4df5cfe;hb=0ada12ba1e11d8ff2e39e3183eb43c4783df2d91;hp=8af7c485dffa04c6c63235be665d9594c3ae29f4;hpb=e2fadf9cbf94bab8ef6352b38e2ec1610cf1e2ec;p=libfirm

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index 8af7c485d..636e083a0 100644
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -66,7 +66,7 @@ static void clear_link(ir_node *irn, void *data)
 static void collect_phis_walker(ir_node *irn, void *data)
 {
 	be_chordal_env_t *env = (be_chordal_env_t*)data;
-	if (is_Phi(irn) && has_reg_class(env, irn)) {
+	if (is_Phi(irn) && arch_irn_consider_in_reg_alloc(env->cls, irn)) {
 		ir_node *bl = get_nodes_block(irn);
 		set_irn_link(irn, get_irn_link(bl));
 		set_irn_link(bl, irn);
@@ -245,7 +245,6 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
 			DBG((dbg, LEVEL_1, "  for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
 
 			if (phi_reg == arg_reg
-					|| (arg_reg->type & arch_register_type_joker)
 					|| (arg_reg->type & arch_register_type_virtual)) {
 				/* Phi and arg have the same register, so pin and continue */
 				pin_irn(arg, phi_block);
@@ -320,14 +319,10 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
 				*/
 				ir_node *perm = get_Proj_pred(arg);
 				ir_node *dupl = be_new_Copy(arg_block, arg);
-				ir_node *ins;
 
 				set_irn_n(phi, i, dupl);
 				arch_set_irn_register(dupl, phi_reg);
-				/* skip the Perm's Projs and insert the copies behind. */
-				for (ins = sched_next(perm); is_Proj(ins); ins = sched_next(ins)) {
-				}
-				sched_add_before(ins, dupl);
+				sched_add_after(perm, dupl);
 				pin_irn(dupl, phi_block);
 				be_liveness_introduce(lv, dupl);
 				be_liveness_update(lv, arg);
@@ -389,8 +384,7 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data)
 		for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
 			ir_node                   *arg = get_irn_n(phi, i);
 			const arch_register_req_t *req = arch_get_irn_register_req(arg);
-
-			if (req->type & arch_register_req_type_ignore)
+			if (arch_register_req_is(req, ignore))
 				continue;
 
 			arg_reg = arch_get_irn_register(arg);