X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessaconstr.c;h=bf9549764fd7a6a810ecd3c2232742faa891c3bf;hb=63e8a062a48c91aa36429576c648624f88dcfe35;hp=f849b3bc0f505fa01cc897c35039b6c7f317113e;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/be/bessaconstr.c b/ir/be/bessaconstr.c
index f849b3bc0..bf9549764 100644
--- a/ir/be/bessaconstr.c
+++ b/ir/be/bessaconstr.c
@@ -23,7 +23,6 @@
  * @author      Sebastian Hack, Daniel Grund, Matthias Braun, Christian Wuerdig,
  *              Sebastian Buchwald
  * @date        04.05.2005
- * @version     $Id$
  *
  * The problem: Given a value and a set of "copies" that are known to
  * represent the same abstract value, rewire all usages of the original value
@@ -69,7 +68,7 @@
 
 #include "ircons.h"
 #include "iredges_t.h"
-#include "irphase_t.h"
+#include "statev_t.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -77,9 +76,9 @@ static ir_node *search_def_end_of_block(be_ssa_construction_env_t *env,
                                         ir_node *block);
 
 struct constr_info {
-	bool is_definition;
-	bool is_use;
-	bool already_processed;
+	bool is_definition     : 1;
+	bool is_use            : 1;
+	bool already_processed : 1;
 	union {
 		/* Since we only consider scheduled nodes,
 		 * this points to the real definition (e.g. a Proj). */
@@ -87,7 +86,7 @@ struct constr_info {
 
 		/* Last definition of a block. */
 		ir_node *last_definition;
-	};
+	} u;
 };
 
 typedef struct constr_info constr_info;
@@ -95,41 +94,53 @@ typedef struct constr_info constr_info;
 /**
  * @return Whether the block contains a definition.
  */
-static inline bool has_definition(be_ssa_construction_env_t *env, ir_node *block)
+static bool has_definition(const ir_node *block)
 {
-	(void)env;
-
 	return irn_visited(block);
 }
 
+static constr_info *get_or_set_info(be_ssa_construction_env_t *env,
+                                    const ir_node *node)
+{
+	constr_info *info = ir_nodemap_get(constr_info, &env->infos, node);
+	if (info == NULL) {
+		info = OALLOCZ(&env->obst, constr_info);
+		ir_nodemap_insert(&env->infos, node, info);
+	}
+	return info;
+}
+
+static constr_info *get_info(const be_ssa_construction_env_t *env,
+                             const ir_node *node)
+{
+	return ir_nodemap_get(constr_info, &env->infos, node);
+}
+
 /**
  * @return Whether the block contains a use.
  */
 static inline bool has_use(be_ssa_construction_env_t *env, ir_node *block)
 {
-	constr_info *info = phase_get_or_set_irn_data(env->phase, block);
-
+	constr_info *info = get_or_set_info(env, block);
 	return info->is_use;
 }
 
 /**
  * @return Whether the node is a definition.
  */
-static inline bool is_definition(be_ssa_construction_env_t *env, ir_node *node)
+static bool is_definition(be_ssa_construction_env_t *env, ir_node *node)
 {
-	constr_info *info = phase_get_irn_data(env->phase, node);
-
-	return info && info->is_definition;
+	constr_info *info = get_info(env, node);
+	return info != NULL && info->is_definition;
 }
 
 /**
  * @return Whether the node is a use.
  */
-static inline bool is_use(const be_ssa_construction_env_t *env, ir_node *node)
+static bool is_use(const be_ssa_construction_env_t *env, ir_node *node)
 {
-	constr_info *info = phase_get_irn_data(env->phase, node);
-
-	return info && info->is_use;
+	constr_info *info = get_info(env, node);
+	return info != NULL && info->is_use;
 }
 
 /**
@@ -138,36 +149,33 @@ static inline bool is_use(const be_ssa_construction_env_t *env, ir_node *node)
 static void introduce_definition(be_ssa_construction_env_t *env, ir_node *def)
 {
 	ir_node     *block      = get_nodes_block(def);
-	ir_phase    *phase      = env->phase;
-	constr_info *def_info   = phase_get_or_set_irn_data(phase, def);
+	constr_info *def_info   = get_or_set_info(env, def);
 	ir_node     *skip       = skip_Proj(def);
-	constr_info *skip_info  = phase_get_or_set_irn_data(phase, skip);
-	constr_info *block_info = phase_get_or_set_irn_data(phase, block);
+	constr_info *skip_info  = get_or_set_info(env, skip);
+	constr_info *block_info = get_or_set_info(env, block);
 
 	DBG((dbg, LEVEL_2, "\tintroducing definition %+F in %+F\n", def, block));
 
 	def_info->is_definition = true;
 
 	skip_info->is_definition = true;
-	skip_info->definition    = def;
+	skip_info->u.definition  = def;
 
 	// Set the last definition if we only introduce one definition for the block
-	if (has_definition(env, block)) {
+	if (has_definition(block)) {
 		assert(!block_info->already_processed);
-		block_info->last_definition = NULL;
-	}
-	else {
+		block_info->u.last_definition = NULL;
+	} else {
 		mark_irn_visited(block);
-		block_info->last_definition = def;
+		block_info->u.last_definition = def;
 	}
 }
 
 static void introduce_use(be_ssa_construction_env_t *env, ir_node *use)
 {
 	ir_node     *block      = get_nodes_block(use);
-	ir_phase    *phase      = env->phase;
-	constr_info *info       = phase_get_or_set_irn_data(phase, use);
-	constr_info *block_info = phase_get_or_set_irn_data(phase, block);
+	constr_info *info       = get_or_set_info(env, use);
+	constr_info *block_info = get_or_set_info(env, block);
 
 	DBG((dbg, LEVEL_2, "\tintroducing use %+F in %+F\n", use, block));
 
@@ -183,7 +191,7 @@ static void introduce_use(be_ssa_construction_env_t *env, ir_node *use)
  * frontier to the block itself.
  */
 static void mark_iterated_dominance_frontiers(
-		const be_ssa_construction_env_t *env)
+                                           const be_ssa_construction_env_t *env)
 {
 	stat_ev_cnt_decl(blocks);
 	DBG((dbg, LEVEL_3, "Dominance Frontier:"));
@@ -191,7 +199,7 @@ static void mark_iterated_dominance_frontiers(
 	while (!waitq_empty(env->worklist)) {
 		int i;
 		ir_node  *block    = (ir_node*)waitq_get(env->worklist);
-		ir_node **domfront = be_get_dominance_frontier(env->domfronts, block);
+		ir_node **domfront = ir_get_dominance_frontier(block);
 		int domfront_len = ARR_LEN(domfront);
 
 		for (i = 0; i < domfront_len; ++i) {
@@ -238,11 +246,9 @@ static ir_node *insert_dummy_phi(be_ssa_construction_env_t *env, ir_node *block)
 	for (i = 0; i < n_preds; ++i) {
 		ins[i] = dummy;
 	}
-	phi = be_new_Phi(block, n_preds, ins, env->mode, env->phi_cls);
+	phi = be_new_Phi(block, n_preds, ins, env->mode, env->phi_req);
 	sched_add_after(block, phi);
-	if (env->new_phis != NULL) {
-		ARR_APP1(ir_node*, env->new_phis, phi);
-	}
+	ARR_APP1(ir_node*, env->new_phis, phi);
 
 	DBG((dbg, LEVEL_2, "\tcreating phi %+F in %+F\n", phi, block));
 	introduce_definition(env, phi);
@@ -271,7 +277,7 @@ static ir_node *get_def_at_idom(be_ssa_construction_env_t *env, ir_node *block)
  */
 static void set_operands(be_ssa_construction_env_t *env, ir_node *use, ir_node *def)
 {
-	constr_info *info  = phase_get_irn_data(env->phase, use);
+	constr_info *info  = get_info(env, use);
 	int          arity = get_irn_arity(use);
 	int          i;
 
@@ -292,11 +298,10 @@ static void set_operands(be_ssa_construction_env_t *env, ir_node *use, ir_node *
  */
 static void process_block(be_ssa_construction_env_t *env, ir_node *block)
 {
-	ir_node     *node;
 	ir_node     *def        = NULL;
-	constr_info *block_info = phase_get_or_set_irn_data(env->phase, block);
+	constr_info *block_info = get_or_set_info(env, block);
 
-	assert(has_definition(env, block));
+	assert(has_definition(block));
 	assert(!block_info->already_processed && "Block already processed");
 
 	DBG((dbg, LEVEL_3, "\tprocessing block  %+F\n", block));
@@ -319,14 +324,14 @@ static void process_block(be_ssa_construction_env_t *env, ir_node *block)
 		}
 
 		if (is_definition(env, node)) {
-			constr_info *info = phase_get_irn_data(env->phase, node);
-			def = info->definition;
+			constr_info *info = get_info(env, node);
+			def = info->u.definition;
 			DBG((dbg, LEVEL_3, "\t...found definition %+F\n", def));
 		}
 	}
 
 	block_info->already_processed = true;
-	block_info->last_definition   = def;
+	block_info->u.last_definition = def;
 }
 
 /**
@@ -335,48 +340,43 @@ static void process_block(be_ssa_construction_env_t *env, ir_node *block)
 static ir_node *search_def_end_of_block(be_ssa_construction_env_t *env,
                                         ir_node *block)
 {
-	constr_info *block_info      = phase_get_or_set_irn_data(env->phase, block);
-	ir_node     *last_definition = block_info->last_definition;
+	constr_info *block_info      = get_or_set_info(env, block);
+	ir_node     *last_definition = block_info->u.last_definition;
 
 	if (last_definition != NULL)
 		return last_definition;
 
-	if (has_definition(env, block)) {
+	if (has_definition(block)) {
 		if (has_use(env, block)) {
 			if (!block_info->already_processed) {
 				process_block(env, block);
 			}
 		}
 		else {
-			ir_node *def = NULL;
-
 			/* Search the last definition of the block. */
 			sched_foreach_reverse(block, def) {
 				if (is_definition(env, def)) {
-					constr_info *info = phase_get_irn_data(env->phase, def);
-					def = info->definition;
-					DBG((dbg, LEVEL_3, "\t...found definition %+F\n", def));
-
+					constr_info *info = get_info(env, def);
+					DBG((dbg, LEVEL_3, "\t...found definition %+F\n", info->u.definition));
+					block_info->u.last_definition = info->u.definition;
 					break;
 				}
 			}
 
-			assert(def && "No definition found");
-
-			block_info->last_definition = def;
+			assert(block_info->u.last_definition && "No definition found");
 		}
 
-		return block_info->last_definition;
+		return block_info->u.last_definition;
 	} else if (Block_block_visited(block)) {
 		ir_node *phi = insert_dummy_phi(env, block);
 
-		block_info->last_definition = phi;
+		block_info->u.last_definition = phi;
 
 		return phi;
 	} else {
 		ir_node *def = get_def_at_idom(env, block);
 
-		block_info->last_definition = def;
+		block_info->u.last_definition = def;
 
 		return def;
 	}
@@ -388,12 +388,12 @@ static ir_node *search_def_end_of_block(be_ssa_construction_env_t *env,
 static void search_def_at_block(be_ssa_construction_env_t *env, ir_node *use)
 {
 	ir_node     *block      = get_nodes_block(use);
-	constr_info *block_info = phase_get_or_set_irn_data(env->phase, block);
+	constr_info *block_info = get_or_set_info(env, block);
 
 	if (block_info->already_processed)
 		return;
 
-	if (has_definition(env, block)) {
+	if (has_definition(block)) {
 		process_block(env, block);
 	} else if (Block_block_visited(block)) {
 		ir_node *phi = insert_dummy_phi(env, block);
@@ -406,38 +406,27 @@ static void search_def_at_block(be_ssa_construction_env_t *env, ir_node *use)
 	}
 }
 
-static void *init_constr_info(ir_phase *phase, const ir_node *node)
-{
-	constr_info *info = phase_alloc(phase, sizeof(constr_info));
-	(void)node;
-
-	info->is_definition     = false;
-	info->is_use            = false;
-	info->already_processed = false;
-	info->definition        = NULL;
-
-	return info;
-}
-
 void be_ssa_construction_init(be_ssa_construction_env_t *env, ir_graph *irg)
 {
 	ir_node *sb   = get_irg_start_block(irg);
 	int n_blocks  = get_Block_dom_max_subtree_pre_num(sb);
 
-	stat_ev_ctx_push_fobj("bessaconstr", irg);
+	stat_ev_ctx_push_fmt("bessaconstr", "%+F", irg);
 	stat_ev_tim_push();
 
 	(void) n_blocks;
 	stat_ev_dbl("bessaconstr_n_blocks", n_blocks);
 
 	memset(env, 0, sizeof(env[0]));
-	be_assure_dom_front(irg);
 
 	env->irg       = irg;
-	env->domfronts = be_get_irg_dom_front(irg);
 	env->new_phis  = NEW_ARR_F(ir_node*, 0);
 	env->worklist  = new_waitq();
-	env->phase     = new_phase(irg, init_constr_info);
+	ir_nodemap_init(&env->infos, irg);
+	obstack_init(&env->obst);
+
+	assure_irg_properties(env->irg,
+	                      IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE_FRONTIERS);
 
 	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED
 			| IR_RESOURCE_BLOCK_VISITED | IR_RESOURCE_IRN_LINK);
@@ -453,7 +442,8 @@ void be_ssa_construction_init(be_ssa_construction_env_t *env, ir_graph *irg)
 void be_ssa_construction_destroy(be_ssa_construction_env_t *env)
 {
 	stat_ev_int("bessaconstr_phis", ARR_LEN(env->new_phis));
-	phase_free(env->phase);
+	obstack_free(&env->obst, NULL);
+	ir_nodemap_destroy(&env->infos);
 	del_waitq(env->worklist);
 	DEL_ARR_F(env->new_phis);
 
@@ -464,6 +454,24 @@ void be_ssa_construction_destroy(be_ssa_construction_env_t *env)
 	stat_ev_ctx_pop("bessaconstr");
 }
 
+static void determine_phi_req(be_ssa_construction_env_t *env, ir_node *value)
+{
+	const arch_register_req_t *req   = arch_get_irn_register_req(value);
+	env->mode = get_irn_mode(value);
+	if (req->width == 1) {
+		env->phi_req = req->cls->class_req;
+	} else {
+		/* construct a new register req... */
+		ir_graph            *irg     = get_irn_irg(value);
+		struct obstack      *obst    = be_get_be_obst(irg);
+		arch_register_req_t *new_req = OALLOCZ(obst, arch_register_req_t);
+		new_req->cls   = req->cls;
+		new_req->type  = req->type & arch_register_req_type_aligned;
+		new_req->width = req->width;
+		env->phi_req = new_req;
+	}
+}
+
 void be_ssa_construction_add_copy(be_ssa_construction_env_t *env,
                                   ir_node *copy)
 {
@@ -472,15 +480,14 @@ void be_ssa_construction_add_copy(be_ssa_construction_env_t *env,
 	assert(env->iterated_domfront_calculated == 0);
 
 	if (env->mode == NULL) {
-		env->mode    = get_irn_mode(copy);
-		env->phi_cls = arch_get_irn_reg_class_out(copy);
+		determine_phi_req(env, copy);
 	} else {
 		assert(env->mode == get_irn_mode(copy));
 	}
 
 	block = get_nodes_block(copy);
 
-	if (!has_definition(env, block)) {
+	if (!has_definition(block)) {
 		waitq_put(env->worklist, block);
 	}
 	introduce_definition(env, copy);
@@ -494,8 +501,7 @@ void be_ssa_construction_add_copies(be_ssa_construction_env_t *env,
 	assert(env->iterated_domfront_calculated == 0);
 
 	if (env->mode == NULL) {
-		env->mode    = get_irn_mode(copies[0]);
-		env->phi_cls = arch_get_irn_reg_class_out(copies[0]);
+		determine_phi_req(env, copies[0]);
 	}
 
 	for (i = 0; i < copies_len; ++i) {
@@ -503,7 +509,7 @@ void be_ssa_construction_add_copies(be_ssa_construction_env_t *env,
 		ir_node *block = get_nodes_block(copy);
 
 		assert(env->mode == get_irn_mode(copy));
-		if (!has_definition(env, block)) {
+		if (!has_definition(block)) {
 			waitq_put(env->worklist, block);
 		}
 		introduce_definition(env, copy);
@@ -528,7 +534,7 @@ ir_node **be_ssa_construction_get_new_phis(be_ssa_construction_env_t *env)
  */
 static void fix_phi_arguments(be_ssa_construction_env_t *env, ir_node *phi)
 {
-	constr_info *info    = phase_get_irn_data(env->phase, phi);
+	constr_info *info    = get_info(env, phi);
 	ir_node     *block   = get_nodes_block(phi);
 	int          i;
 	int          n_preds = get_Block_n_cfgpreds(block);
@@ -570,12 +576,11 @@ void be_ssa_construction_fix_users_array(be_ssa_construction_env_t *env,
 	stat_ev_tim_push();
 
 	for (i = 0; i < nodes_len; ++i) {
-		const ir_edge_t *edge, *next;
 		ir_node *value = nodes[i];
 		DBG((dbg, LEVEL_3, "\tfixing users of %+F\n", value));
 		introduce_definition(env, value);
 
-		foreach_out_edge_safe(value, edge, next) {
+		foreach_out_edge_safe(value, edge) {
 			ir_node *use   = get_edge_src_irn(edge);
 
 			if (env->ignore_uses != NULL &&
@@ -593,7 +598,7 @@ void be_ssa_construction_fix_users_array(be_ssa_construction_env_t *env,
 
 	while (!waitq_empty(env->worklist)) {
 		ir_node     *use  = (ir_node *)waitq_get(env->worklist);
-		constr_info *info = phase_get_irn_data(env->phase, use);
+		constr_info *info = get_info(env, use);
 
 		if (info->already_processed)
 			continue;
@@ -637,7 +642,7 @@ void be_ssa_construction_update_liveness_phis(be_ssa_construction_env_t *env,
 	be_timer_pop(T_SSA_CONSTR);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_ssaconstr);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_ssaconstr)
 void be_init_ssaconstr(void)
 {
 	FIRM_DBG_REGISTER(dbg, "firm.be.ssaconstr");