X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeverify.c;h=c49be922df824f76b2f46b1d1c078ad20fe9b99a;hb=2799d7aec7b0f52d8f10ad5c7a88e31d4dbc8b1b;hp=d5422c17d2941143636b8096604abe15ca833e22;hpb=7c767284b8f554996788212eb30709bb949710c4;p=libfirm

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index d5422c17d..c49be922d 100644
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -24,9 +24,7 @@
  * @date        05.05.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -53,7 +51,6 @@ static int my_values_interfere(const ir_node *a, const ir_node *b);
 typedef struct be_verify_register_pressure_env_t_ {
 	ir_graph                    *irg;                 /**< the irg to verify */
 	 be_lv_t                    *lv;                  /**< Liveness information. */
-	const arch_env_t            *arch_env;            /**< an architecture environment */
 	const arch_register_class_t *cls;                 /**< the register class to check for */
 	int                         registers_available;  /**< number of available registers */
 	int                         problem_found;        /**< flag indicating if a problem was found */
@@ -85,7 +82,7 @@ static void verify_liveness_walker(ir_node *block, void *data) {
 	/* collect register pressure info, start with end of a block */
 	// ir_fprintf(stderr, "liveness check %+F\n", block);
 	ir_nodeset_init(&live_nodes);
-	be_liveness_end_of_block(env->lv, env->arch_env, env->cls, block,
+	be_liveness_end_of_block(env->lv, env->cls, block,
 	                         &live_nodes);
 
 	// print_living_values(stderr, &live_nodes);
@@ -102,7 +99,7 @@ static void verify_liveness_walker(ir_node *block, void *data) {
 			break;
 
 		// print_living_values(stderr, &live_nodes);
-		be_liveness_transfer(env->arch_env, env->cls, irn, &live_nodes);
+		be_liveness_transfer(env->cls, irn, &live_nodes);
 
 		pressure = ir_nodeset_size(&live_nodes);
 
@@ -127,7 +124,6 @@ int be_verify_register_pressure(const be_irg_t *birg,
 
 	env.lv                  = be_liveness(birg);
 	env.irg                 = irg;
-	env.arch_env            = birg->main_env->arch_env;
 	env.cls                 = cls;
 	env.registers_available = env.cls->n_regs - be_put_ignore_regs(birg, env.cls, NULL);
 	env.problem_found       = 0;
@@ -149,7 +145,6 @@ typedef struct be_verify_schedule_env_t_ {
 	int      problem_found;     /**< flags indicating if there was a problem */
 	bitset_t *scheduled;        /**< bitset of scheduled nodes */
 	ir_graph *irg;              /**< the irg to check */
-	const arch_env_t *arch_env; /**< the arch_env */
 } be_verify_schedule_env_t;
 
 /**
@@ -287,32 +282,30 @@ static void verify_schedule_walker(ir_node *block, void *data) {
 	}
 }
 
-static int should_be_scheduled(be_verify_schedule_env_t *env, ir_node *node) {
-	if(is_Block(node))
-		return -1;
-
-	if(is_Proj(node))
-		return 0;
-
-	if(get_irn_mode(node) == mode_M) {
-		if(is_Phi(node) || is_Sync(node) || is_Pin(node))
-			return 0;
-	}
-	if(be_is_Keep(node) && get_irn_opcode(get_nodes_block(node)) == iro_Bad)
-		return 0;
-
+static int should_be_scheduled(ir_node *node)
+{
 	switch(get_irn_opcode(node)) {
+	case iro_Bad:
+	case iro_Block:
 	case iro_End:
 	case iro_NoMem:
-	case iro_Bad:
+	case iro_Pin:
+	case iro_Proj:
+	case iro_Sync:
 	case iro_Unknown:
 		return 0;
+	case iro_Phi:
+		if (get_irn_mode(node) == mode_M)
+			return 0;
+		break;
 	default:
 		break;
 	}
 
-	if(arch_irn_get_flags(env->arch_env, node) & arch_irn_flags_ignore)
-		return -1;
+	if (get_irn_mode(node) != mode_T) {
+		if (arch_irn_is_ignore(node))
+			return -1;
+	}
 
 	return 1;
 }
@@ -322,7 +315,7 @@ static void check_schedule(ir_node *node, void *data) {
 	int should_be;
 	int scheduled;
 
-	should_be = should_be_scheduled(env, node);
+	should_be = should_be_scheduled(node);
 	if(should_be == -1)
 		return;
 
@@ -345,7 +338,6 @@ int be_verify_schedule(const be_irg_t *birg)
 	env.problem_found = 0;
 	env.irg           = be_get_birg_irg(birg);
 	env.scheduled     = bitset_alloca(get_irg_last_idx(env.irg));
-	env.arch_env      = birg->main_env->arch_env;
 
 	irg_block_walk_graph(env.irg, verify_schedule_walker, NULL, &env);
 	/* check if all nodes are scheduled */
@@ -366,11 +358,10 @@ typedef struct _spill_t {
 } spill_t;
 
 typedef struct {
-	const arch_env_t *arch_env;
-	ir_graph *irg;
-	set *spills;
-	ir_node **reloads;
-	int problem_found;
+	ir_graph  *irg;
+	set       *spills;
+	ir_node  **reloads;
+	int        problem_found;
 } be_verify_spillslots_env_t;
 
 static int cmp_spill(const void* d1, const void* d2, size_t size) {
@@ -550,11 +541,12 @@ static void collect_spills_walker(ir_node *node, void *data) {
 	}
 }
 
-static void check_spillslot_interference(be_verify_spillslots_env_t *env) {
-	int spillcount = set_count(env->spills);
-	spill_t **spills = alloca(spillcount * sizeof(spills[0]));
-	spill_t *spill;
-	int i;
+static void check_spillslot_interference(be_verify_spillslots_env_t *env)
+{
+	int       spillcount = set_count(env->spills);
+	spill_t **spills     = ALLOCAN(spill_t*, spillcount);
+	spill_t  *spill;
+	int       i;
 
 	for(spill = set_first(env->spills), i = 0; spill != NULL; spill = set_next(env->spills), ++i) {
 		spills[i] = spill;
@@ -598,11 +590,10 @@ static void check_lonely_spills(ir_node *node, void *data) {
 	}
 }
 
-int be_verify_spillslots(const arch_env_t *arch_env, ir_graph *irg)
+int be_verify_spillslots(ir_graph *irg)
 {
 	be_verify_spillslots_env_t env;
 
-	env.arch_env = arch_env;
 	env.irg = irg;
 	env.spills = new_set(cmp_spill, 10);
 	env.reloads = NEW_ARR_F(ir_node*, 0);
@@ -704,13 +695,13 @@ static void check_register_constraints(ir_node *node)
 	int                   i, arity;
 
 	/* verify output register */
-	if (arch_get_irn_reg_class(node, -1) != NULL) {
+	if (arch_get_irn_reg_class_out(node) != NULL) {
 		reg = arch_get_irn_register(node);
 		if (reg == NULL) {
 			ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have a register assigned\n",
 					node, get_nodes_block(node), get_irg_dump_name(irg));
 			problem_found = 1;
-		} else if (!arch_register_type_is(reg, joker) && !arch_reg_is_allocatable(node, -1, reg)) {
+		} else if (!arch_register_type_is(reg, joker) && !arch_reg_out_is_allocatable(node, reg)) {
 			ir_fprintf(stderr, "Verify warning: Register %s assigned as output of %+F not allowed (register constraint) in block %+F(%s)\n",
 					reg->name, node, get_nodes_block(node), get_irg_dump_name(irg));
 			problem_found = 1;
@@ -773,11 +764,11 @@ static void value_used(ir_node *node) {
 	const arch_register_t *reg;
 	ir_node               *reg_node;
 
-	if (arch_get_irn_reg_class(node, -1) != regclass)
+	if (arch_get_irn_reg_class_out(node) != regclass)
 		return;
 
 	reg = arch_get_irn_register(node);
-	if (reg->type & arch_register_type_virtual)
+	if (reg == NULL || reg->type & arch_register_type_virtual)
 		return;
 
 	reg_node = registers[reg->index];
@@ -796,11 +787,11 @@ static void value_def(ir_node *node)
 	const arch_register_t *reg;
 	ir_node               *reg_node;
 
-	if (arch_get_irn_reg_class(node, -1) != regclass)
+	if (arch_get_irn_reg_class_out(node) != regclass)
 		return;
 
 	reg = arch_get_irn_register(node);
-	if (reg->type & arch_register_type_virtual)
+	if (reg == NULL || reg->type & arch_register_type_virtual)
 		return;
 
 	reg_node = registers[reg->index];
@@ -827,8 +818,7 @@ static void verify_block_register_allocation(ir_node *block, void *data) {
 		assert(lv->nodes && "live sets must be computed");
 
 		n_regs    = arch_register_class_n_regs(regclass);
-		registers = alloca(n_regs * sizeof(registers[0]));
-		memset(registers, 0, n_regs * sizeof(registers[0]));
+		registers = ALLOCANZ(ir_node*, n_regs);
 
 		be_lv_foreach(lv, block, be_lv_state_end, idx) {
 			ir_node *node = be_lv_get_irn(lv, block, idx);