X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=d98f34ae6a447756ecc9b1ca3fce950bcf33ad75;hb=4eccff9cdc2a5e114606e8b83745f1339c83c932;hp=d4a52d0b92c64fe1aea5d1612d7218e5c9972bce;hpb=5057c4b3b6c48dc75dee684cd172ce4cfed00da7;p=libfirm

diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c
index d4a52d0b9..d98f34ae6 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.
  *
@@ -24,9 +24,9 @@
  * @date        25.05.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
+
+#include "bessadestr.h"
 
 #include "debug.h"
 #include "set.h"
@@ -42,26 +42,18 @@
 #include "be_t.h"
 #include "beutil.h"
 #include "bechordal_t.h"
-#include "bearch_t.h"
+#include "bearch.h"
 #include "belive_t.h"
-#include "benode_t.h"
-#include "besched_t.h"
-#include "benodesets.h"
+#include "benode.h"
+#include "besched.h"
 #include "bestatevent.h"
-#include "beirg_t.h"
+#include "beirg.h"
 #include "beintlive_t.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-#define get_chordal_arch(ce) ((ce)->birg->main_env->arch_env)
-#define get_reg(irn) arch_get_irn_register(get_chordal_arch(chordal_env), irn)
-#define set_reg(irn, reg) arch_set_irn_register(get_chordal_arch(chordal_env), irn, reg)
-
-#define is_Perm(irn)            (arch_irn_class_is(arch_env, irn, perm))
-#define get_reg_cls(irn)        (arch_get_irn_reg_class(arch_env, irn, -1))
-#define is_curr_reg_class(irn)  (get_reg_cls(p) == chordal_env->cls)
-
-static void clear_link(ir_node *irn, void *data) {
+static void clear_link(ir_node *irn, void *data)
+{
 	(void) data;
 	set_irn_link(irn, NULL);
 }
@@ -72,7 +64,8 @@ static void clear_link(ir_node *irn, void *data) {
  *  - have the current register class
  * The list is rooted at get_irn_link(BB).
  */
-static void collect_phis_walker(ir_node *irn, void *data) {
+static void collect_phis_walker(ir_node *irn, void *data)
+{
 	be_chordal_env_t *env = data;
 	if (is_Phi(irn) && chordal_has_class(env, irn)) {
 		ir_node *bl = get_nodes_block(irn);
@@ -94,7 +87,8 @@ typedef struct {
 	ir_node *proj; /**< The proj created for @p arg. */
 } perm_proj_t;
 
-static int cmp_perm_proj(const void *a, const void *b, size_t n) {
+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;
@@ -110,22 +104,22 @@ typedef struct insert_all_perms_env_t {
 /**
  * Insert Perms in all predecessors of a block containing a phi
  */
-static void insert_all_perms_walker(ir_node *bl, void *data) {
+static void insert_all_perms_walker(ir_node *bl, void *data)
+{
 	insert_all_perms_env_t *env = data;
 	be_chordal_env_t *chordal_env = env->chordal_env;
 	pmap *perm_map = env->perm_map;
-	ir_graph *irg = chordal_env->irg;
-	be_lv_t *lv = chordal_env->birg->lv;
+	be_lv_t *lv = be_get_irg_liveness(chordal_env->irg);
 	int i, n;
 
 	assert(is_Block(bl));
 
 	/* If the link flag is NULL, this block has no phis. */
-	if(!get_irn_link(bl))
+	if (!get_irn_link(bl))
 		return;
 
 	/* Look at all predecessors of the phi block */
-	for(i = 0, n = get_irn_arity(bl); i < n; ++i) {
+	for (i = 0, n = get_irn_arity(bl); i < n; ++i) {
 		ir_node *phi, *perm, *insert_after, **in;
 		perm_proj_t *pp;
 		set *arg_set     = new_set(cmp_perm_proj, chordal_env->cls->n_regs);
@@ -138,14 +132,12 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 		 * Note that all phis in the list are in the same
 		 * 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);
-
-			if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
-				continue;
+		for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+			ir_node                   *arg = get_irn_n(phi, i);
+			unsigned                   hash;
+			perm_proj_t                templ;
 
+			hash = hash_irn(arg);
 			templ.arg  = arg;
 			pp         = set_find(arg_set, &templ, sizeof(templ), hash);
 
@@ -154,9 +146,9 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 			 * create one. The only restriction is, that the phi argument
 			 * may not be live in at the current block, since this argument
 			 * interferes with the phi and must thus not be member of a
-			 * Perm. A copy will be inserted for this argument alter on.
+			 * Perm. A copy will be inserted for this argument later on.
 			 */
-			if(!pp && !be_is_live_in(lv, bl, arg)) {
+			if (!pp && !be_is_live_in(lv, bl, arg)) {
 				templ.pos = n_projs++;
 				set_insert(arg_set, &templ, sizeof(templ), hash);
 			}
@@ -168,14 +160,14 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 			 * Create a new Perm with the arguments just collected
 			 * above in the arg_set and insert it into the schedule.
 			 */
-			in = xmalloc(n_projs * sizeof(in[0]));
-			for(pp = set_first(arg_set); pp; pp = set_next(arg_set))
+			in = XMALLOCN(ir_node*, n_projs);
+			for (pp = set_first(arg_set); pp; pp = set_next(arg_set))
 				in[pp->pos] = pp->arg;
 
-			perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in);
+			perm = be_new_Perm(chordal_env->cls, 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, NULL);
 			sched_add_after(insert_after, perm);
 
 			/*
@@ -184,23 +176,23 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
 			 * arguments to the projs (new phi arguments).
 			 */
 			insert_after = perm;
-			for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) {
-				ir_node *proj = new_r_Proj(irg, pred_bl, perm, get_irn_mode(pp->arg), pp->pos);
+			for (pp = set_first(arg_set); pp; pp = set_next(arg_set)) {
+				ir_node *proj = new_r_Proj(perm, get_irn_mode(pp->arg), pp->pos);
 				pp->proj = proj;
-				assert(get_reg(pp->arg));
-				set_reg(proj, get_reg(pp->arg));
+				assert(arch_get_irn_register(pp->arg));
+				arch_set_irn_register(proj, arch_get_irn_register(pp->arg));
 				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));
+				DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", arch_get_irn_register(pp->arg)->name, pp->arg, pp->proj));
 			}
 
 			/*
 			 * Set the phi nodes to their new arguments: The Projs of the Perm
 			 */
-			for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
+			for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
 				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) {
@@ -233,38 +225,45 @@ static void insert_all_perms_walker(ir_node *bl, void *data) {
  * Adjusts the register allocation for the (new) phi-operands
  * and insert duplicates iff necessary.
  */
-static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
+static void set_regs_or_place_dupls_walker(ir_node *bl, void *data)
+{
 	be_chordal_env_t *chordal_env = data;
-	be_lv_t *lv = chordal_env->birg->lv;
+	be_lv_t *lv = be_get_irg_liveness(chordal_env->irg);
 	ir_node *phi;
 
 	/* Consider all phis of this block */
 	for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
-		int i, max;
-		ir_node *arg, *phi_block, *arg_block;
-		const arch_register_t *phi_reg, *arg_reg;
-		const arch_register_class_t *cls;
+		ir_node                     *phi_block = get_nodes_block(phi);
+		const arch_register_t       *phi_reg   = arch_get_irn_register(phi);
+		const arch_register_class_t *cls       = phi_reg->reg_class;
+		int                          max;
+		int                          i;
 
 		assert(is_Phi(phi) && "Can only handle phi-destruction :)");
 
-		phi_block = get_nodes_block(phi);
-		phi_reg   = get_reg(phi);
-		cls       = arch_get_irn_reg_class(get_chordal_arch(chordal_env), phi, -1);
-
 		/* process all arguments of the phi */
 		for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
-			arg       = get_irn_n(phi, i);
-			arg_block = get_Block_cfgpred_block(phi_block, i);
-			arg_reg   = get_reg(arg);
+			ir_node                   *arg = get_irn_n(phi, i);
+			const arch_register_t     *arg_reg;
+			ir_node                   *arg_block;
 
-			if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
-				continue;
+			arg_block = get_Block_cfgpred_block(phi_block, i);
+			arg_reg   = arch_get_irn_register(arg);
 
 			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));
 
-			if (values_interfere(chordal_env->birg, phi, arg)) {
+			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);
+				DBG((dbg, LEVEL_1, "      arg has same reg: pin %+F(%s)\n", arg, arch_get_irn_register(arg)->name));
+				continue;
+			}
+
+			if (be_values_interfere(lv, phi, arg)) {
 				/*
 					Insert a duplicate in arguments block,
 					make it the new phi arg,
@@ -272,38 +271,18 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 					insert it into schedule,
 					pin it
 				*/
-				ir_node *dupl  = be_new_Copy(cls, chordal_env->irg, arg_block, arg);
-
-				/* this is commented out because it will fail in case of unknown float */
-#if 0
-				ir_mode *m_phi = get_irn_mode(phi), *m_dupl = get_irn_mode(dupl);
-
-				/*
-					Conv signed <-> unsigned is killed on ia32
-					check for: (both int OR both float) AND equal mode sizes
-				*/
-				assert(((mode_is_int(m_phi) && mode_is_int(m_dupl)) ||
-					(mode_is_float(m_phi) && mode_is_float(m_dupl))) &&
-					(get_mode_size_bits(m_phi) == get_mode_size_bits(m_dupl)));
-#endif /* if 0 */
+				ir_node *dupl  = be_new_Copy(cls, arg_block, arg);
 
 				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);
+				arch_set_irn_register(dupl, phi_reg);
+				sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, NULL), dupl);
 				pin_irn(dupl, phi_block);
 				be_liveness_introduce(lv, dupl);
 				be_liveness_update(lv, arg);
-				DBG((dbg, LEVEL_1, "    they do interfere: insert %+F(%s)\n", dupl, get_reg(dupl)->name));
+				DBG((dbg, LEVEL_1, "    they do interfere: insert %+F(%s)\n", dupl, arch_get_irn_register(dupl)->name));
 				continue; /* with next argument */
 			}
 
-			if (phi_reg == arg_reg) {
-				/* Phi and arg have the same register, so pin and continue */
-				pin_irn(arg, phi_block);
-				DBG((dbg, LEVEL_1, "      arg has same reg: pin %+F(%s)\n", arg, get_reg(arg)->name));
-				continue;
-			}
-
 			DBG((dbg, LEVEL_1, "    they do not interfere\n"));
 			assert(is_Proj(arg));
 			/*
@@ -319,14 +298,14 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 
 				DBG((dbg, LEVEL_1, "      searching for phi with same arg having args register\n"));
 
-				for(other_phi = get_irn_link(phi_block); other_phi; other_phi = get_irn_link(other_phi)) {
+				for (other_phi = get_irn_link(phi_block); other_phi; other_phi = get_irn_link(other_phi)) {
 
 					assert(is_Phi(other_phi)                               &&
 						get_nodes_block(phi) == get_nodes_block(other_phi) &&
 						"link fields are screwed up");
 
-					if (get_irn_n(other_phi, i) == arg && get_reg(other_phi) == arg_reg) {
-						DBG((dbg, LEVEL_1, "        found %+F(%s)\n", other_phi, get_reg(other_phi)->name));
+					if (get_irn_n(other_phi, i) == arg && arch_get_irn_register(other_phi) == arg_reg) {
+						DBG((dbg, LEVEL_1, "        found %+F(%s)\n", other_phi, arch_get_irn_register(other_phi)->name));
 						pin_irn(arg, phi_block);
 						break;
 					}
@@ -341,56 +320,43 @@ static void	set_regs_or_place_dupls_walker(ir_node *bl, void *data) {
 					insert it into schedule,
 					pin it
 				*/
-				ir_node *perm     = get_Proj_pred(arg);
-				ir_node *dupl     = be_new_Copy(cls, chordal_env->irg, arg_block, arg);
+				ir_node *perm = get_Proj_pred(arg);
+				ir_node *dupl = be_new_Copy(cls, arg_block, arg);
 				ir_node *ins;
 
-				/* this is commented out because it will fail in case of unknown float */
-#if 0
-				ir_mode *m_phi    = get_irn_mode(phi);
-				ir_mode *m_dupl   = get_irn_mode(dupl);
-
-				/*
-					Conv signed <-> unsigned is killed on ia32
-					check for: (both int OR both float) AND equal mode sizes
-				*/
-				assert(((mode_is_int(m_phi) && mode_is_int(m_dupl)) ||
-					(mode_is_float(m_phi) && mode_is_float(m_dupl))) &&
-					(get_mode_size_bits(m_phi) == get_mode_size_bits(m_dupl)));
-#endif /* if 0 */
-
 				set_irn_n(phi, i, dupl);
-				set_reg(dupl, phi_reg);
+				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));
+				for (ins = sched_next(perm); is_Proj(ins); ins = sched_next(ins)) {
+				}
 				sched_add_before(ins, dupl);
 				pin_irn(dupl, phi_block);
 				be_liveness_introduce(lv, dupl);
 				be_liveness_update(lv, arg);
-				DBG((dbg, LEVEL_1, "      arg is pinned: insert %+F(%s)\n", dupl, get_reg(dupl)->name));
+				DBG((dbg, LEVEL_1, "      arg is pinned: insert %+F(%s)\n", dupl, arch_get_irn_register(dupl)->name));
 			} else {
 				/*
 					No other phi has the same color (else arg would have been pinned),
 					so just set the register and pin
 				*/
-				set_reg(arg, phi_reg);
+				arch_set_irn_register(arg, phi_reg);
 				pin_irn(arg, phi_block);
-				DBG((dbg, LEVEL_1, "      arg is not pinned: so pin %+F(%s)\n", arg, get_reg(arg)->name));
+				DBG((dbg, LEVEL_1, "      arg is not pinned: so pin %+F(%s)\n", arg, arch_get_irn_register(arg)->name));
 			}
 		}
 	}
 }
 
-void be_ssa_destruction(be_chordal_env_t *chordal_env) {
+void be_ssa_destruction(be_chordal_env_t *chordal_env)
+{
 	insert_all_perms_env_t insert_perms_env;
-	pmap *perm_map = pmap_create();
-	ir_graph *irg  = chordal_env->irg;
-	be_lv_t *lv    = be_assure_liveness(chordal_env->birg);
+	pmap     *perm_map = pmap_create();
+	ir_graph *irg      = chordal_env->irg;
+	be_lv_t  *lv       = be_assure_liveness(irg);
 
 	FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr");
 
 	be_liveness_invalidate(lv);
-	be_liveness_assure_sets(lv);
 
 	/* create a map for fast lookup of perms: block --> perm */
 	irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env);
@@ -405,39 +371,41 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) {
 	be_liveness_invalidate(lv);
 
 	if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
-		be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched);
+		dump_ir_graph(irg, "ssa_destr_perms_placed");
 
 	be_liveness_assure_chk(lv);
 
 	DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n"));
 	irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env);
 
-	/* TODO: unfortunaltely updating doesn't work yet. */
+	/* TODO: unfortunately updating doesn't work yet. */
 	be_liveness_invalidate(lv);
 
 	if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR)
-		be_dump(irg, "-ssa_destr_regs_set", dump_ir_block_graph_sched);
+		dump_ir_graph(irg, "ssa_destr_regs_set");
 
 	pmap_destroy(perm_map);
 }
 
-static void ssa_destruction_check_walker(ir_node *bl, void *data) {
-	be_chordal_env_t *chordal_env = data;
+static void ssa_destruction_check_walker(ir_node *bl, void *data)
+{
 	ir_node *phi;
 	int i, max;
+	(void)data;
 
 	for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) {
 		const arch_register_t *phi_reg, *arg_reg;
 
-		phi_reg = get_reg(phi);
+		phi_reg = arch_get_irn_register(phi);
 		/* iterate over all args of phi */
 		for (i = 0, max = get_irn_arity(phi); i < max; ++i) {
-			ir_node *arg = get_irn_n(phi, i);
+			ir_node                   *arg = get_irn_n(phi, i);
+			const arch_register_req_t *req = arch_get_register_req_out(arg);
 
-			if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore))
+			if (req->type & arch_register_req_type_ignore)
 				continue;
 
-			arg_reg = get_reg(arg);
+			arg_reg = arch_get_irn_register(arg);
 
 			if (phi_reg != arg_reg) {
 				DBG((dbg, 0, "Error: Registers of %+F and %+F differ: %s %s\n", phi, arg, phi_reg->name, arg_reg->name));
@@ -452,6 +420,7 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) {
 	}
 }
 
-void be_ssa_destruction_check(be_chordal_env_t *chordal_env) {
-	irg_block_walk_graph(chordal_env->irg, ssa_destruction_check_walker, NULL, chordal_env);
+void be_ssa_destruction_check(be_chordal_env_t *chordal_env)
+{
+	irg_block_walk_graph(chordal_env->irg, ssa_destruction_check_walker, NULL, NULL);
 }