X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=77cf75c534798797a7ad045bf55f66f3d88aa559;hb=8974b94349462d835b33ad4f896d1821986458bd;hp=c0f66b6831473285cb89796df14968303047ca67;hpb=3c2f7c0c9e0bff5d97a973bc224579922bb7df81;p=libfirm

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index c0f66b683..77cf75c53 100644
--- a/ir/be/bessadestr.c
+++ b/ir/be/bessadestr.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -46,7 +46,6 @@
 #include "belive_t.h"
 #include "benode_t.h"
 #include "besched_t.h"
-#include "benodesets.h"
 #include "bestatevent.h"
 #include "beirg_t.h"
 #include "beintlive_t.h"
@@ -62,6 +61,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 #define is_curr_reg_class(irn)  (get_reg_cls(p) == chordal_env->cls)
 
 static void clear_link(ir_node *irn, void *data) {
+	(void) data;
 	set_irn_link(irn, NULL);
 }
 
@@ -96,6 +96,8 @@ typedef struct {
 static int cmp_perm_proj(const void *a, const void *b, size_t n) {
 	const perm_proj_t *p = a;
 	const perm_proj_t *q = b;
+	(void) n;
+
 	return !(p->arg == q->arg);
 }
 
@@ -136,9 +138,12 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 		 * register class by construction.
 		 */
 		for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
-			perm_proj_t templ;
-			ir_node *arg     = get_irn_n(phi, i);
-			unsigned hash    = nodeset_hash(arg);
+			ir_node     *arg  = get_irn_n(phi, i);
+			unsigned     hash = hash_irn(arg);
+			perm_proj_t  templ;
+
+			if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+				continue;
 
 			templ.arg  = arg;
 			pp         = set_find(arg_set, &templ, sizeof(templ), hash);
@@ -169,7 +174,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 			perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in);
 			be_stat_ev("phi_perm", n_projs);
 
-			insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env);
+			insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, &chordal_env->birg->main_env->arch_env);
 			sched_add_after(insert_after, perm);
 
 			/*
@@ -183,7 +188,6 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 				pp->proj = proj;
 				assert(get_reg(pp->arg));
 				set_reg(proj, get_reg(pp->arg));
-				sched_add_after(insert_after, proj);
 				insert_after = proj;
 				DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", get_reg(pp->arg)->name, pp->arg, pp->proj));
 			}
@@ -195,7 +199,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 				perm_proj_t templ;
 
 				templ.arg = get_irn_n(phi, i);
-				pp        = set_find(arg_set, &templ, sizeof(templ), nodeset_hash(templ.arg));
+				pp        = set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg));
 
 				/* If not found, it was an interfering argument */
 				if (pp) {
@@ -252,6 +256,9 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 			arg_block = get_Block_cfgpred_block(phi_block, i);
 			arg_reg   = get_reg(arg);
 
+			if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+				continue;
+
 			assert(arg_reg && "Register must be set while placing perms");
 
 			DBG((dbg, LEVEL_1, "  for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name));
@@ -281,7 +288,7 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 
 				set_irn_n(phi, i, dupl);
 				set_reg(dupl, phi_reg);
-				sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env), dupl);
+				sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, &chordal_env->birg->main_env->arch_env), dupl);
 				pin_irn(dupl, phi_block);
 				be_liveness_introduce(lv, dupl);
 				be_liveness_update(lv, arg);
@@ -381,7 +388,7 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) {
 
 	FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
 
-	be_liveness_assure_sets(lv);
+	be_liveness_invalidate(lv);
 
 	/* create a map for fast lookup of perms: block --> perm */
 	irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env);
@@ -425,6 +432,9 @@ 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);
 
+			if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+				continue;
+
 			arg_reg = get_reg(arg);
 
 			if (phi_reg != arg_reg) {