X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeverify.c;h=52c824f3f95cc1c3ac3497613c2b009668a22e48;hb=3dceaf7b51dbe63c4588dc92e92f71ddbfe32e9c;hp=7e18c11c14a6943e7cf401b91afb7ebb1705907d;hpb=429d687f06baeeb63d04750f846d39e55fb62343;p=libfirm

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index 7e18c11c1..52c824f3f 100644
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -122,7 +122,7 @@ int be_verify_register_pressure(const be_irg_t *birg,
                                 ir_graph *irg) {
 	be_verify_register_pressure_env_t env;
 
-	env.lv                  = be_liveness(birg);
+	env.lv                  = be_liveness(irg);
 	env.irg                 = irg;
 	env.cls                 = cls;
 	env.registers_available = env.cls->n_regs - be_put_ignore_regs(birg, env.cls, NULL);
@@ -284,31 +284,28 @@ static void verify_schedule_walker(ir_node *block, void *data) {
 
 static int should_be_scheduled(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;
-
 	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(node) & arch_irn_flags_ignore)
-		return -1;
+	if (get_irn_mode(node) != mode_T) {
+		if (arch_irn_is_ignore(node))
+			return -1;
+	}
 
 	return 1;
 }
@@ -771,7 +768,7 @@ static void value_used(ir_node *node) {
 		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];
@@ -794,7 +791,7 @@ static void value_def(ir_node *node)
 		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];
@@ -872,7 +869,7 @@ static void verify_block_register_allocation(ir_node *block, void *data) {
 int be_verify_register_allocation(const be_irg_t *birg) {
 	arch_env      = be_get_birg_arch_env(birg);
 	irg           = be_get_birg_irg(birg);
-	lv            = be_liveness(birg);
+	lv            = be_liveness(irg);
 	problem_found = 0;
 
 	be_liveness_assure_sets(lv);