X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur2.c;h=8f257c005a2de4b41fbf6005d1cd2bd5cb4f2b60;hb=f2c2e45eb4e677fef5bf6a8e418b2a22441172d5;hp=fb40238855ae2c00ae0363a7aad656f9ef0985b1;hpb=d64ea79ebc6d41bc4253f6b6fd0a09582dce20eb;p=libfirm

diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c
index fb4023885..8f257c005 100644
--- a/ir/be/becopyheur2.c
+++ b/ir/be/becopyheur2.c
@@ -24,9 +24,7 @@
  * @date        14.04.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "lc_opts.h"
 #include "lc_opts_enum.h"
@@ -204,7 +202,7 @@ static void *co2_irn_init(ir_phase *ph, const ir_node *irn, void *data)
 	memset(ci, 0, size);
 	INIT_LIST_HEAD(&ci->changed_list);
 	ci->touched_next = env->touched;
-	ci->orig_col     = get_irn_col(env->co, irn);
+	ci->orig_col     = get_irn_col(irn);
 	env->touched     = ci;
 	ci->irn          = irn;
 	ci->aff          = a;
@@ -255,18 +253,18 @@ static col_t get_col(co2_t *env, const ir_node *irn)
 	return ci->tmp_fixed ? ci->tmp_col : ci->orig_col;
 }
 
-static INLINE int color_is_fix(co2_t *env, const ir_node *irn)
+static inline int color_is_fix(co2_t *env, const ir_node *irn)
 {
 	co2_irn_t *ci = get_co2_irn(env, irn);
 	return ci->fixed || ci->tmp_fixed;
 }
 
-static INLINE bitset_t *get_adm(co2_t *env, co2_irn_t *ci)
+static inline bitset_t *get_adm(co2_t *env, co2_irn_t *ci)
 {
 	if(ci->adm_cache == NULL) {
 		const arch_register_req_t *req;
 		ci->adm_cache = bitset_obstack_alloc(phase_obst(&env->ph), env->n_regs);
-		req = arch_get_register_req(ci->irn, BE_OUT_POS(0));
+		req = arch_get_register_req_out(ci->irn);
 
 		if(arch_register_req_is(req, limited)) {
 			int i, n;
@@ -286,19 +284,19 @@ static INLINE bitset_t *get_adm(co2_t *env, co2_irn_t *ci)
 	return ci->adm_cache;
 }
 
-static INLINE bitset_t *admissible_colors(co2_t *env, co2_irn_t *ci, bitset_t *bs)
+static inline bitset_t *admissible_colors(co2_t *env, co2_irn_t *ci, bitset_t *bs)
 {
 	bitset_copy(bs, get_adm(env, ci));
 	return bs;
 }
 
-static INLINE int is_color_admissible(co2_t *env, co2_irn_t *ci, col_t col)
+static inline int is_color_admissible(co2_t *env, co2_irn_t *ci, col_t col)
 {
 	bitset_t *bs = get_adm(env, ci);
 	return bitset_is_set(bs, col);
 }
 
-static INLINE int is_constrained(co2_t *env, co2_irn_t *ci)
+static inline int is_constrained(co2_t *env, co2_irn_t *ci)
 {
 	if(!ci->adm_cache)
 		get_adm(env, ci);
@@ -307,9 +305,7 @@ static INLINE int is_constrained(co2_t *env, co2_irn_t *ci)
 
 static void incur_constraint_costs(co2_t *env, const ir_node *irn, col_cost_pair_t *col_costs, int costs)
 {
-	const arch_register_req_t *req;
-
-	req = arch_get_register_req(irn, BE_OUT_POS(0));
+	const arch_register_req_t *req = arch_get_register_req_out(irn);
 
 	if (arch_register_req_is(req, limited)) {
 		unsigned n_regs   = env->co->cls->n_regs;
@@ -534,7 +530,7 @@ static int change_color_not(co2_t *env, const ir_node *irn, col_t not_col, struc
 	/* The node has the color it should not have _and_ has not been visited yet. */
 	if(!color_is_fix(env, irn)) {
 		int n_regs            = env->co->cls->n_regs;
-		col_cost_pair_t *csts = alloca(n_regs * sizeof(csts[0]));
+		col_cost_pair_t *csts = ALLOCAN(col_cost_pair_t, n_regs);
 
 		/* Get the costs for giving the node a specific color. */
 		determine_color_costs(env, ci, csts);
@@ -575,7 +571,7 @@ static int change_color_single(co2_t *env, const ir_node *irn, col_t tgt_col, st
 
 	if(!color_is_fix(env, irn) && is_color_admissible(env, ci, tgt_col)) {
 		int n_regs           = env->co->cls->n_regs;
-		col_cost_pair_t *seq = alloca(n_regs * sizeof(seq[0]));
+		col_cost_pair_t *seq = ALLOCAN(col_cost_pair_t, n_regs);
 
 		/* Get the costs for giving the node a specific color. */
 		single_color_cost(env, ci, tgt_col, seq);
@@ -700,7 +696,7 @@ static void unfix_subtree(co2_cloud_irn_t *ci)
 static int coalesce_top_down(co2_cloud_irn_t *ci, int child_nr, int depth)
 {
 	co2_t *env           = ci->cloud->env;
-	col_cost_pair_t *seq = alloca(env->n_regs * sizeof(seq[0]));
+	col_cost_pair_t *seq = ALLOCAN(col_cost_pair_t, env->n_regs);
 	int is_root          = ci->mst_parent == ci;
 	col_t parent_col     = is_root ? (col_t) -1 : get_col(env, ci->mst_parent->inh.irn);
 	int min_badness      = INT_MAX;
@@ -1096,12 +1092,11 @@ static void process(co2_t *env)
 
 static void writeback_colors(co2_t *env)
 {
-	const arch_env_t *aenv = env->co->aenv;
 	co2_irn_t *irn;
 
 	for(irn = env->touched; irn; irn = irn->touched_next) {
 		const arch_register_t *reg = arch_register_for_index(env->co->cls, irn->orig_col);
-		arch_set_irn_register(aenv, (ir_node *) irn->irn, reg);
+		arch_set_irn_register((ir_node*)irn->irn, reg);
 	}
 }
 
@@ -1117,7 +1112,7 @@ static void writeback_colors(co2_t *env)
 
 static const char *get_dot_color_name(size_t col)
 {
-	static const char *names[] = {
+	static const char *const names[] = {
 		"blue",
 		"red",
 		"green",
@@ -1156,9 +1151,8 @@ static const char *get_dot_color_name(size_t col)
 
 static const char *get_dot_shape_name(co2_irn_t *ci)
 {
-	const arch_register_req_t *req;
+	const arch_register_req_t *req = arch_get_register_req_out(ci->irn);
 
-	req = arch_get_register_req(ci->irn, BE_OUT_POS(0));
 	if(arch_register_req_is(req, limited))
 		return "diamond";
 
@@ -1179,8 +1173,9 @@ static void ifg_dump_graph_attr(FILE *f, void *self)
 
 static int ifg_is_dump_node(void *self, ir_node *irn)
 {
-	co2_t *env = self;
-	return !arch_irn_is(env->co->aenv, irn, ignore);
+	const arch_register_req_t *req = arch_get_register_req_out(irn);
+	(void)self;
+	return !(req->type & arch_register_req_type_ignore);
 }
 
 static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn)