X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firverify.c;h=40dfb8fdd5f10a713d1ac5074bb0fb65e5f1492a;hb=c386867ba33d1ad72fbd62ea3c095be220c92e1e;hp=18d91d2ab95924da0613ffd1b4ddcc6c14bc25e7;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c
index 18d91d2ab..40dfb8fdd 100644
--- a/ir/ir/irverify.c
+++ b/ir/ir/irverify.c
@@ -36,6 +36,7 @@
 #include "irouts.h"
 #include "irflag_t.h"
 #include "irpass_t.h"
+#include "irnodeset.h"
 
 /** if this flag is set, verify entity types in Load & Store nodes */
 static int verify_entities = 0;
@@ -68,7 +69,7 @@ static ir_graph *last_irg_error = NULL;
  *
  * @param node  the node caused the failure
  */
-static void show_entity_failure(ir_node *node)
+static void show_entity_failure(const ir_node *node)
 {
 	ir_graph *irg = get_irn_irg(node);
 
@@ -106,7 +107,7 @@ static const char *get_irn_modename(const ir_node *node)
 /**
  * Prints a failure for a Node
  */
-static void show_node_failure(ir_node *n)
+static void show_node_failure(const ir_node *n)
 {
 	show_entity_failure(n);
 	fprintf(stderr, "  node %ld %s%s\n" ,
@@ -118,7 +119,7 @@ static void show_node_failure(ir_node *n)
 /**
  * Prints a failure message for a binop
  */
-static void show_binop_failure(ir_node *n, const char *text)
+static void show_binop_failure(const ir_node *n, const char *text)
 {
 	ir_node *left  = get_binop_left(n);
 	ir_node *right = get_binop_right(n);
@@ -135,7 +136,7 @@ static void show_binop_failure(ir_node *n, const char *text)
 /**
  * Prints a failure message for an unop
  */
-static void show_unop_failure(ir_node *n, const char *text)
+static void show_unop_failure(const ir_node *n, const char *text)
 {
 	ir_node *op  = get_unop_op(n);
 
@@ -150,7 +151,7 @@ static void show_unop_failure(ir_node *n, const char *text)
 /**
  * Prints a failure message for an op with 3 operands
  */
-static void show_triop_failure(ir_node *n, const char *text)
+static void show_triop_failure(const ir_node *n, const char *text)
 {
 	ir_node *op0  = get_irn_n(n, 0);
 	ir_node *op1  = get_irn_n(n, 1);
@@ -169,7 +170,7 @@ static void show_triop_failure(ir_node *n, const char *text)
 /**
  * Prints a failure message for a proj
  */
-static void show_proj_failure(ir_node *n)
+static void show_proj_failure(const ir_node *n)
 {
 	ir_node *op  = get_Proj_pred(n);
 	int proj     = get_Proj_proj(n);
@@ -184,7 +185,7 @@ static void show_proj_failure(ir_node *n)
 /**
  * Prints a failure message for a proj from Start
  */
-static void show_proj_mode_failure(ir_node *n, ir_type *ty)
+static void show_proj_mode_failure(const ir_node *n, ir_type *ty)
 {
 	long proj  = get_Proj_proj(n);
 	ir_mode *m = get_type_mode(ty);
@@ -203,7 +204,7 @@ static void show_proj_mode_failure(ir_node *n, ir_type *ty)
 /**
  * Prints a failure message for a proj
  */
-static void show_proj_failure_ent(ir_node *n, ir_entity *ent)
+static void show_proj_failure_ent(const ir_node *n, ir_entity *ent)
 {
 	ir_node *op  = get_Proj_pred(n);
 	int proj     = get_Proj_proj(n);
@@ -223,7 +224,7 @@ static void show_proj_failure_ent(ir_node *n, ir_entity *ent)
 /**
  * Show a node and a graph
  */
-static void show_node_on_graph(ir_graph *irg, ir_node *n)
+static void show_node_on_graph(const ir_graph *irg, const ir_node *n)
 {
 	ir_fprintf(stderr, "\nFIRM: irn_verify_irg() of %+F, node %+F\n", irg, n);
 }
@@ -231,7 +232,7 @@ static void show_node_on_graph(ir_graph *irg, ir_node *n)
 /**
  * Show call parameters
  */
-static void show_call_param(ir_node *n, ir_type *mt)
+static void show_call_param(const ir_node *n, ir_type *mt)
 {
 	size_t i;
 	char type_name[256];
@@ -253,7 +254,8 @@ static void show_call_param(ir_node *n, ir_type *mt)
 /**
  * Show return modes
  */
-static void show_return_modes(ir_graph *irg, ir_node *n, ir_type *mt, int i)
+static void show_return_modes(const ir_graph *irg, const ir_node *n,
+                              ir_type *mt, int i)
 {
 	ir_entity *ent = get_irg_entity(irg);
 
@@ -268,7 +270,7 @@ static void show_return_modes(ir_graph *irg, ir_node *n, ir_type *mt, int i)
 /**
  * Show return number of results
  */
-static void show_return_nres(ir_graph *irg, ir_node *n, ir_type *mt)
+static void show_return_nres(const ir_graph *irg, const ir_node *n, ir_type *mt)
 {
 	ir_entity *ent = get_irg_entity(irg);
 
@@ -282,7 +284,7 @@ static void show_return_nres(ir_graph *irg, ir_node *n, ir_type *mt)
 /**
  * Show Phi input
  */
-static void show_phi_failure(ir_node *phi, ir_node *pred, int pos)
+static void show_phi_failure(const ir_node *phi, const ir_node *pred, int pos)
 {
 	(void) pos;
 	show_entity_failure(phi);
@@ -294,7 +296,7 @@ static void show_phi_failure(ir_node *phi, ir_node *pred, int pos)
 /**
  * Show Phi inputs
  */
-static void show_phi_inputs(ir_node *phi, ir_node *block)
+static void show_phi_inputs(const ir_node *phi, const ir_node *block)
 {
 	show_entity_failure(phi);
 	fprintf(stderr, "  Phi node %ld has %d inputs, its Block %ld has %d\n",
@@ -309,7 +311,7 @@ static void show_phi_inputs(ir_node *phi, ir_node *block)
  *
  * @param ptr  the node representing the address
  */
-static ir_entity *get_ptr_entity(ir_node *ptr)
+static ir_entity *get_ptr_entity(const ir_node *ptr)
 {
 	if (is_Sel(ptr)) {
 		return get_Sel_entity(ptr);
@@ -322,11 +324,10 @@ static ir_entity *get_ptr_entity(ir_node *ptr)
 /**
  * verify a Proj(Start) node
  */
-static int verify_node_Proj_Start(ir_node *n, ir_node *p)
+static int verify_node_Proj_Start(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
 	long proj     = get_Proj_proj(p);
-	(void) n;
 
 	ASSERT_AND_RET_DBG(
 		(
@@ -344,31 +345,39 @@ static int verify_node_Proj_Start(ir_node *n, ir_node *p)
 /**
  * verify a Proj(Cond) node
  */
-static int verify_node_Proj_Cond(ir_node *pred, ir_node *p)
+static int verify_node_Proj_Cond(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
-	long proj     = get_Proj_proj(p);
+	long     proj = get_Proj_proj(p);
 
 	ASSERT_AND_RET_DBG(
-		(
-			(proj >= 0 && mode == mode_X && get_irn_mode(get_Cond_selector(pred)) == mode_b) ||   /* compare */
-			(mode == mode_X && mode_is_int(get_irn_mode(get_Cond_selector(pred)))) ||             /* switch */
-			is_Bad(get_Cond_selector(pred))                                                       /* rare */
-		),
+		mode == mode_X && (proj == pn_Cond_false || proj == pn_Cond_true),
 		"wrong Proj from Cond", 0,
 		show_proj_failure(p);
 	);
 	return 1;
 }
 
+static int verify_node_Proj_Switch(const ir_node *p)
+{
+	ir_mode *mode = get_irn_mode(p);
+	long     pn   = get_Proj_proj(p);
+	ir_node *pred = get_Proj_pred(p);
+	ASSERT_AND_RET_DBG(
+		mode == mode_X && (pn >= 0 && pn < (long)get_Switch_n_outs(pred)),
+		"wrong Proj from Switch", 0,
+		show_proj_failure(p);
+	);
+	return 1;
+}
+
 /**
  * verify a Proj(Raise) node
  */
-static int verify_node_Proj_Raise(ir_node *n, ir_node *p)
+static int verify_node_Proj_Raise(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
 	long proj     = get_Proj_proj(p);
-	(void) n;
 
 	ASSERT_AND_RET_DBG(
 		((proj == pn_Raise_X && mode == mode_X) || (proj == pn_Raise_M && mode == mode_M)),
@@ -381,11 +390,10 @@ static int verify_node_Proj_Raise(ir_node *n, ir_node *p)
 /**
  * verify a Proj(InstOf) node
  */
-static int verify_node_Proj_InstOf(ir_node *n, ir_node *p)
+static int verify_node_Proj_InstOf(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
 	long proj     = get_Proj_proj(p);
-	(void) n;
 
 	ASSERT_AND_RET_DBG(
 		(
@@ -403,9 +411,10 @@ static int verify_node_Proj_InstOf(ir_node *n, ir_node *p)
 /**
  * verify a Proj(Call) node
  */
-static int verify_node_Proj_Call(ir_node *n, ir_node *p)
+static int verify_node_Proj_Call(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
+	ir_node *n    = get_Proj_pred(p);
 	long proj     = get_Proj_proj(p);
 
 	ASSERT_AND_RET_DBG(
@@ -433,9 +442,10 @@ static int verify_node_Proj_Call(ir_node *n, ir_node *p)
 /**
  * verify a Proj(Div) node
  */
-static int verify_node_Proj_Div(ir_node *n, ir_node *p)
+static int verify_node_Proj_Div(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
+	ir_node *n    = get_Proj_pred(p);
 	long proj     = get_Proj_proj(p);
 
 	ASSERT_AND_RET_DBG(
@@ -466,9 +476,10 @@ static int verify_node_Proj_Div(ir_node *n, ir_node *p)
 /**
  * verify a Proj(Mod) node
  */
-static int verify_node_Proj_Mod(ir_node *n, ir_node *p)
+static int verify_node_Proj_Mod(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
+	ir_node *n    = get_Proj_pred(p);
 	long proj     = get_Proj_proj(p);
 
 	ASSERT_AND_RET_DBG(
@@ -499,9 +510,10 @@ static int verify_node_Proj_Mod(ir_node *n, ir_node *p)
 /**
  * verify a Proj(Load) node
  */
-static int verify_node_Proj_Load(ir_node *n, ir_node *p)
+static int verify_node_Proj_Load(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
+	ir_node *n    = get_Proj_pred(p);
 	long proj     = get_Proj_proj(p);
 
 	if (proj == pn_Load_res) {
@@ -551,9 +563,10 @@ static int verify_node_Proj_Load(ir_node *n, ir_node *p)
 /**
  * verify a Proj(Store) node
  */
-static int verify_node_Proj_Store(ir_node *n, ir_node *p)
+static int verify_node_Proj_Store(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
+	ir_node *n    = get_Proj_pred(p);
 	long proj     = get_Proj_proj(p);
 
 	ASSERT_AND_RET_DBG(
@@ -580,11 +593,10 @@ static int verify_node_Proj_Store(ir_node *n, ir_node *p)
 /**
  * verify a Proj(Alloc) node
  */
-static int verify_node_Proj_Alloc(ir_node *n, ir_node *p)
+static int verify_node_Proj_Alloc(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
 	long proj     = get_Proj_proj(p);
-	(void) n;
 
 	ASSERT_AND_RET_DBG(
 		(
@@ -602,9 +614,10 @@ static int verify_node_Proj_Alloc(ir_node *n, ir_node *p)
 /**
  * verify a Proj(Proj) node
  */
-static int verify_node_Proj_Proj(ir_node *pred, ir_node *p)
+static int verify_node_Proj_Proj(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
+	ir_node *pred = get_Proj_pred(p);
 	long proj     = get_Proj_proj(p);
 	long nr       = get_Proj_proj(pred);
 	ir_type *mt; /* A method type */
@@ -661,10 +674,6 @@ static int verify_node_Proj_Proj(ir_node *pred, ir_node *p)
 		/* We don't test */
 		break;
 
-	case iro_Bad:
-		/* hmm, optimization did not remove it */
-		break;
-
 	default:
 		/* ASSERT_AND_RET(0, "Unknown opcode", 0); */
 		break;
@@ -675,9 +684,8 @@ static int verify_node_Proj_Proj(ir_node *pred, ir_node *p)
 /**
  * verify a Proj(Tuple) node
  */
-static int verify_node_Proj_Tuple(ir_node *n, ir_node *p)
+static int verify_node_Proj_Tuple(const ir_node *p)
 {
-	(void) n;
 	(void) p;
 	/* We don't test */
 	return 1;
@@ -686,9 +694,10 @@ static int verify_node_Proj_Tuple(ir_node *n, ir_node *p)
 /**
  * verify a Proj(CopyB) node
  */
-static int verify_node_Proj_CopyB(ir_node *n, ir_node *p)
+static int verify_node_Proj_CopyB(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
+	ir_node *n    = get_Proj_pred(p);
 	long proj     = get_Proj_proj(p);
 
 	ASSERT_AND_RET_DBG(
@@ -714,14 +723,12 @@ static int verify_node_Proj_CopyB(ir_node *n, ir_node *p)
 /**
  * verify a Proj(Bound) node
  */
-static int verify_node_Proj_Bound(ir_node *n, ir_node *p)
+static int verify_node_Proj_Bound(const ir_node *p)
 {
 	ir_mode *mode = get_irn_mode(p);
+	ir_node *n    = get_Proj_pred(p);
 	long proj     = get_Proj_proj(p);
 
-	/* ignore Bound checks of Bad */
-	if (is_Bad(get_Bound_index(n)))
-		return 1;
 	ASSERT_AND_RET_DBG(
 		(
 			(proj == pn_Bound_M         && mode == mode_M) ||
@@ -735,11 +742,23 @@ static int verify_node_Proj_Bound(ir_node *n, ir_node *p)
 	return 1;
 }
 
+static int verify_node_Proj_fragile(const ir_node *node)
+{
+	ir_node *pred             = get_Proj_pred(node);
+	int      throws_exception = ir_throws_exception(pred);
+	ASSERT_AND_RET((!is_x_except_Proj(node) || throws_exception)
+	    && (!is_x_regular_Proj(node) || throws_exception),
+	    "X_except und X_regular Proj only allowed when throws_exception is set",
+	    0);
+	return 1;
+}
+
 /**
  * verify a Proj node
  */
-static int verify_node_Proj(ir_node *p, ir_graph *irg)
+static int verify_node_Proj(const ir_node *p)
 {
+	ir_graph *irg = get_irn_irg(p);
 	ir_node *pred;
 	ir_op *op;
 
@@ -747,10 +766,15 @@ static int verify_node_Proj(ir_node *p, ir_graph *irg)
 	ASSERT_AND_RET(get_irn_mode(pred) == mode_T, "mode of a 'projed' node is not Tuple", 0);
 	ASSERT_AND_RET(get_irg_pinned(irg) == op_pin_state_floats || get_nodes_block(pred) == get_nodes_block(p), "Proj must be in same block as its predecessor", 0);
 
-	op = get_irn_op(pred);
+	if (is_fragile_op(pred)) {
+		int res = verify_node_Proj_fragile(p);
+		if (res != 1)
+			return res;
+	}
 
+	op = get_irn_op(pred);
 	if (op->ops.verify_proj_node)
-		return op->ops.verify_proj_node(pred, p);
+		return op->ops.verify_proj_node(p);
 
 	/* all went ok */
 	return 1;
@@ -759,22 +783,24 @@ static int verify_node_Proj(ir_node *p, ir_graph *irg)
 /**
  * verify a Block node
  */
-static int verify_node_Block(ir_node *n, ir_graph *irg)
+static int verify_node_Block(const ir_node *n)
 {
+	ir_graph *irg = get_irn_irg(n);
 	int i;
 
 	for (i = get_Block_n_cfgpreds(n) - 1; i >= 0; --i) {
-		ir_node *pred = get_Block_cfgpred(n, i);
-		ASSERT_AND_RET(
-			is_Bad(pred) || (get_irn_mode(pred) == mode_X),
+		ir_node *pred         = get_Block_cfgpred(n, i);
+		ir_node *skipped_pred = skip_Proj(skip_Tuple(pred));
+		ASSERT_AND_RET(get_irn_mode(pred) == mode_X,
 			"Block node must have a mode_X predecessor", 0);
+		ASSERT_AND_RET(is_cfop(skipped_pred) || is_Bad(skipped_pred), "Block predecessor must be a cfop (or Bad)", 0);
 	}
 
 	if (n == get_irg_start_block(irg)) {
 		ASSERT_AND_RET(get_Block_n_cfgpreds(n) == 0, "Start Block node", 0);
 	}
 
-	if (n == get_irg_end_block(irg) && get_irg_phase_state(irg) != phase_backend)
+	if (n == get_irg_end_block(irg) && get_irg_phase_state(irg) != phase_backend) {
 		/* End block may only have Return, Raise or fragile ops as preds. */
 		for (i = get_Block_n_cfgpreds(n) - 1; i >= 0; --i) {
 			ir_node *pred =  skip_Proj(get_Block_cfgpred(n, i));
@@ -789,18 +815,18 @@ static int verify_node_Block(ir_node *n, ir_graph *irg)
 				),
 				"End Block node", 0);
 		}
-		/*  irg attr must == graph we are in. */
-		ASSERT_AND_RET(((get_irn_irg(n) && get_irn_irg(n) == irg)), "Block node has wrong irg attribute", 0);
-		return 1;
+	}
+	/*  irg attr must == graph we are in. */
+	ASSERT_AND_RET(((get_irn_irg(n) && get_irn_irg(n) == irg)), "Block node has wrong irg attribute", 0);
+	return 1;
 }
 
 /**
  * verify a Start node
  */
-static int verify_node_Start(ir_node *n, ir_graph *irg)
+static int verify_node_Start(const ir_node *n)
 {
 	ir_mode *mymode = get_irn_mode(n);
-	(void) irg;
 
 	ASSERT_AND_RET(
 		/* Start: BB --> X x M x ref x data1 x ... x datan x ref */
@@ -812,10 +838,9 @@ static int verify_node_Start(ir_node *n, ir_graph *irg)
 /**
  * verify a Jmp node
  */
-static int verify_node_Jmp(ir_node *n, ir_graph *irg)
+static int verify_node_Jmp(const ir_node *n)
 {
 	ir_mode *mymode = get_irn_mode(n);
-	(void) irg;
 
 	ASSERT_AND_RET(
 		/* Jmp: BB --> X */
@@ -827,11 +852,10 @@ static int verify_node_Jmp(ir_node *n, ir_graph *irg)
 /**
  * verify an IJmp node
  */
-static int verify_node_IJmp(ir_node *n, ir_graph *irg)
+static int verify_node_IJmp(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_IJmp_target(n));
-	(void) irg;
 
 	ASSERT_AND_RET(
 		/* IJmp: BB x ref --> X */
@@ -843,32 +867,65 @@ static int verify_node_IJmp(ir_node *n, ir_graph *irg)
 /**
  * verify a Cond node
  */
-static int verify_node_Cond(ir_node *n, ir_graph *irg)
+static int verify_node_Cond(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Cond_selector(n));
-	(void) irg;
 
-	ASSERT_AND_RET(
-		/* Cond: BB x b --> X x X */
-		(op1mode == mode_b ||
-		/* Cond: BB x int --> X^n */
-		mode_is_int(op1mode) ),  "Cond node", 0
-		);
+	ASSERT_AND_RET(op1mode == mode_b, "Cond operand not mode_b", 0);
 	ASSERT_AND_RET(mymode == mode_T, "Cond mode is not a tuple", 0);
+	return 1;
+}
+
+static int verify_switch_table(const ir_node *n)
+{
+	const ir_switch_table *table     = get_Switch_table(n);
+	size_t                 n_entries = ir_switch_table_get_n_entries(table);
+	unsigned               n_outs    = get_Switch_n_outs(n);
+	ir_node               *selector  = get_Switch_selector(n);
+	ir_mode               *mode      = get_irn_mode(selector);
+	size_t                 e;
+
+	for (e = 0; e < n_entries; ++e) {
+		const ir_switch_table_entry *entry
+			= ir_switch_table_get_entry_const(table, e);
+		if (entry->pn == 0)
+			continue;
+		ASSERT_AND_RET(entry->min != NULL && entry->max != NULL,
+		               "switch table entry without min+max value", 0);
+		ASSERT_AND_RET(get_tarval_mode(entry->min) == mode &&
+		               get_tarval_mode(entry->max) == mode,
+		               "switch table entry with wrong modes", 0);
+		ASSERT_AND_RET(tarval_cmp(entry->min, entry->max) != ir_relation_greater,
+		               "switch table entry without min+max value", 0);
+		ASSERT_AND_RET(entry->pn >= 0 && entry->pn < (long)n_outs,
+					   "switch table entry with invalid proj number", 0);
+	}
+	return 1;
+}
+
+static int verify_node_Switch(const ir_node *n)
+{
+	ir_mode *mymode  = get_irn_mode(n);
+	ir_mode *op1mode = get_irn_mode(get_Switch_selector(n));
+	if (!verify_switch_table(n))
+		return 0;
 
+	ASSERT_AND_RET(mode_is_int(op1mode), "Switch operand not integer", 0);
+	ASSERT_AND_RET(mymode == mode_T, "Switch mode is not a tuple", 0);
 	return 1;
 }
 
 /**
  * verify a Return node
  */
-static int verify_node_Return(ir_node *n, ir_graph *irg)
+static int verify_node_Return(const ir_node *n)
 {
-	int i;
-	ir_mode *mymode   = get_irn_mode(n);
-	ir_mode *mem_mode = get_irn_mode(get_Return_mem(n));
-	ir_type *mt;
+	ir_graph *irg      = get_irn_irg(n);
+	ir_mode  *mymode   = get_irn_mode(n);
+	ir_mode  *mem_mode = get_irn_mode(get_Return_mem(n));
+	ir_type  *mt;
+	int       i;
 
 	/* Return: BB x M x data1 x ... x datan --> X */
 
@@ -908,12 +965,11 @@ static int verify_node_Return(ir_node *n, ir_graph *irg)
 /**
  * verify a Raise node
  */
-static int verify_node_Raise(ir_node *n, ir_graph *irg)
+static int verify_node_Raise(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Raise_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Raise_exo_ptr(n));
-	(void) irg;
 
 	ASSERT_AND_RET(
 		/* Sel: BB x M x ref --> X x M */
@@ -926,10 +982,9 @@ static int verify_node_Raise(ir_node *n, ir_graph *irg)
 /**
  * verify a Const node
  */
-static int verify_node_Const(ir_node *n, ir_graph *irg)
+static int verify_node_Const(const ir_node *n)
 {
 	ir_mode *mymode = get_irn_mode(n);
-	(void) irg;
 
 	ASSERT_AND_RET(
 		/* Const: BB --> data */
@@ -948,10 +1003,9 @@ static int verify_node_Const(ir_node *n, ir_graph *irg)
 /**
  * verify a SymConst node
  */
-static int verify_node_SymConst(ir_node *n, ir_graph *irg)
+static int verify_node_SymConst(const ir_node *n)
 {
 	ir_mode *mymode = get_irn_mode(n);
-	(void) irg;
 
 	ASSERT_AND_RET(
 		/* SymConst: BB --> int*/
@@ -965,37 +1019,35 @@ static int verify_node_SymConst(ir_node *n, ir_graph *irg)
 /**
  * verify a Sel node
  */
-static int verify_node_Sel(ir_node *n, ir_graph *irg)
+static int verify_node_Sel(const ir_node *n)
 {
 	int i;
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Sel_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Sel_ptr(n));
 	ir_entity *ent;
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* Sel: BB x M x ref x int^n --> ref */
 		(op1mode == mode_M && op2mode == mymode && mode_is_reference(mymode)),
-		"Sel node", 0, show_node_failure(n)
+		"Sel node", 0, show_node_failure(n);
 	);
 
 	for (i = get_Sel_n_indexs(n) - 1; i >= 0; --i) {
-		ASSERT_AND_RET_DBG(mode_is_int(get_irn_mode(get_Sel_index(n, i))), "Sel node", 0, show_node_failure(n));
+		ASSERT_AND_RET_DBG(mode_is_int(get_irn_mode(get_Sel_index(n, i))), "Sel node", 0, show_node_failure(n););
 	}
 	ent = get_Sel_entity(n);
-	ASSERT_AND_RET_DBG(ent, "Sel node with empty entity", 0, show_node_failure(n));
+	ASSERT_AND_RET_DBG(ent, "Sel node with empty entity", 0, show_node_failure(n););
 	return 1;
 }
 
 /**
  * verify an InstOf node
  */
-static int verify_node_InstOf(ir_node *n, ir_graph *irg)
+static int verify_node_InstOf(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_InstOf_obj(n));
-	(void) irg;
 
 	ASSERT_AND_RET(mode_T == mymode, "mode of Instof is not a tuple", 0);
 	ASSERT_AND_RET(mode_is_data(op1mode), "Instof not on data", 0);
@@ -1005,7 +1057,7 @@ static int verify_node_InstOf(ir_node *n, ir_graph *irg)
 /**
  * Check if the pinned state is right.
  */
-static int verify_right_pinned(ir_node *n)
+static int verify_right_pinned(const ir_node *n)
 {
 	ir_node *mem;
 
@@ -1022,15 +1074,15 @@ static int verify_right_pinned(ir_node *n)
 /**
  * verify a Call node
  */
-static int verify_node_Call(ir_node *n, ir_graph *irg)
+static int verify_node_Call(const ir_node *n)
 {
-	ir_mode *mymode  = get_irn_mode(n);
-	ir_mode *op1mode = get_irn_mode(get_Call_mem(n));
-	ir_mode *op2mode = get_irn_mode(get_Call_ptr(n));
-	ir_type *mt;
-	size_t i;
-	size_t n_params;
-	(void) irg;
+	ir_graph *irg     = get_irn_irg(n);
+	ir_mode  *mymode  = get_irn_mode(n);
+	ir_mode  *op1mode = get_irn_mode(get_Call_mem(n));
+	ir_mode  *op2mode = get_irn_mode(get_Call_ptr(n));
+	ir_type  *mt;
+	size_t    i;
+	size_t    n_params;
 
 	/* Call: BB x M x ref x data1 x ... x datan
 	--> M x datan+1 x ... x data n+m */
@@ -1091,25 +1143,17 @@ static int verify_node_Call(ir_node *n, ir_graph *irg)
 		}
 	}
 
-#if 0
-	if (Call_has_callees(n)) {
-		for (i = 0; i < get_Call_n_callees(n); i++) {
-			ASSERT_AND_RET(is_entity(get_Call_callee(n, i)), "callee array must contain entities.", 0);
-		}
-	}
-#endif
 	return 1;
 }
 
 /**
  * verify an Add node
  */
-static int verify_node_Add(ir_node *n, ir_graph *irg)
+static int verify_node_Add(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Add_left(n));
 	ir_mode *op2mode = get_irn_mode(get_Add_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		(
@@ -1131,12 +1175,11 @@ static int verify_node_Add(ir_node *n, ir_graph *irg)
 /**
  * verify a Sub node
  */
-static int verify_node_Sub(ir_node *n, ir_graph *irg)
+static int verify_node_Sub(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Sub_left(n));
 	ir_mode *op2mode = get_irn_mode(get_Sub_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		(
@@ -1158,11 +1201,10 @@ static int verify_node_Sub(ir_node *n, ir_graph *irg)
 /**
  * verify a Minus node
  */
-static int verify_node_Minus(ir_node *n, ir_graph *irg)
+static int verify_node_Minus(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Minus_op(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* Minus: BB x num --> num */
@@ -1175,12 +1217,11 @@ static int verify_node_Minus(ir_node *n, ir_graph *irg)
 /**
  * verify a Mul node
  */
-static int verify_node_Mul(ir_node *n, ir_graph *irg)
+static int verify_node_Mul(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Mul_left(n));
 	ir_mode *op2mode = get_irn_mode(get_Mul_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		(
@@ -1200,12 +1241,11 @@ static int verify_node_Mul(ir_node *n, ir_graph *irg)
 /**
  * verify a Mulh node
  */
-static int verify_node_Mulh(ir_node *n, ir_graph *irg)
+static int verify_node_Mulh(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Mulh_left(n));
 	ir_mode *op2mode = get_irn_mode(get_Mulh_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		(
@@ -1221,13 +1261,12 @@ static int verify_node_Mulh(ir_node *n, ir_graph *irg)
 /**
  * verify a Div node
  */
-static int verify_node_Div(ir_node *n, ir_graph *irg)
+static int verify_node_Div(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Div_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Div_left(n));
 	ir_mode *op3mode = get_irn_mode(get_Div_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET(
 		/* Div: BB x M x data x data --> M x X x data */
@@ -1243,13 +1282,12 @@ static int verify_node_Div(ir_node *n, ir_graph *irg)
 /**
  * verify a Mod node
  */
-static int verify_node_Mod(ir_node *n, ir_graph *irg)
+static int verify_node_Mod(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Mod_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Mod_left(n));
 	ir_mode *op3mode = get_irn_mode(get_Mod_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET(
 		/* Mod: BB x M x int x int --> M x X x int */
@@ -1265,12 +1303,11 @@ static int verify_node_Mod(ir_node *n, ir_graph *irg)
 /**
  * verify a logical And, Or, Eor node
  */
-static int verify_node_Logic(ir_node *n, ir_graph *irg)
+static int verify_node_Logic(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_binop_left(n));
 	ir_mode *op2mode = get_irn_mode(get_binop_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* And or Or or Eor: BB x int x int --> int */
@@ -1283,18 +1320,28 @@ static int verify_node_Logic(ir_node *n, ir_graph *irg)
 	return 1;
 }
 
-#define verify_node_And   verify_node_Logic
-#define verify_node_Or    verify_node_Logic
-#define verify_node_Eor   verify_node_Logic
+static int verify_node_And(const ir_node *n)
+{
+	return verify_node_Logic(n);
+}
+
+static int verify_node_Or(const ir_node *n)
+{
+	return verify_node_Logic(n);
+}
+
+static int verify_node_Eor(const ir_node *n)
+{
+	return verify_node_Logic(n);
+}
 
 /**
  * verify a Not node
  */
-static int verify_node_Not(ir_node *n, ir_graph *irg)
+static int verify_node_Not(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Not_op(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* Not: BB x int --> int */
@@ -1309,12 +1356,11 @@ static int verify_node_Not(ir_node *n, ir_graph *irg)
 /**
  * verify a Cmp node
  */
-static int verify_node_Cmp(ir_node *n, ir_graph *irg)
+static int verify_node_Cmp(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Cmp_left(n));
 	ir_mode *op2mode = get_irn_mode(get_Cmp_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* Cmp: BB x datab x datab --> b16 */
@@ -1330,12 +1376,11 @@ static int verify_node_Cmp(ir_node *n, ir_graph *irg)
 /**
  * verify a Shift node
  */
-static int verify_node_Shift(ir_node *n, ir_graph *irg)
+static int verify_node_Shift(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_binop_left(n));
 	ir_mode *op2mode = get_irn_mode(get_binop_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* Shl, Shr or Shrs: BB x int x int_u --> int */
@@ -1349,19 +1394,29 @@ static int verify_node_Shift(ir_node *n, ir_graph *irg)
 	return 1;
 }
 
-#define verify_node_Shl   verify_node_Shift
-#define verify_node_Shr   verify_node_Shift
-#define verify_node_Shrs  verify_node_Shift
+static int verify_node_Shl(const ir_node *n)
+{
+	return verify_node_Shift(n);
+}
+
+static int verify_node_Shr(const ir_node *n)
+{
+	return verify_node_Shift(n);
+}
+
+static int verify_node_Shrs(const ir_node *n)
+{
+	return verify_node_Shift(n);
+}
 
 /**
  * verify a Rotl node
  */
-static int verify_node_Rotl(ir_node *n, ir_graph *irg)
+static int verify_node_Rotl(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Rotl_left(n));
 	ir_mode *op2mode = get_irn_mode(get_Rotl_right(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* Rotl: BB x int x int --> int */
@@ -1377,15 +1432,12 @@ static int verify_node_Rotl(ir_node *n, ir_graph *irg)
 /**
  * verify a Conv node
  */
-static int verify_node_Conv(ir_node *n, ir_graph *irg)
+static int verify_node_Conv(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Conv_op(n));
-	(void) irg;
 
-	ASSERT_AND_RET_DBG(
-		is_irg_state(irg, IR_GRAPH_STATE_BCONV_ALLOWED) ||
-		(mode_is_datab(op1mode) && mode_is_data(mymode)),
+	ASSERT_AND_RET_DBG(mode_is_datab(op1mode) && mode_is_data(mymode),
 		"Conv node", 0,
 		show_unop_failure(n, "/* Conv: BB x datab --> data */");
 	);
@@ -1395,11 +1447,10 @@ static int verify_node_Conv(ir_node *n, ir_graph *irg)
 /**
  * verify a Cast node
  */
-static int verify_node_Cast(ir_node *n, ir_graph *irg)
+static int verify_node_Cast(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Cast_op(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* Conv: BB x datab1 --> datab2 */
@@ -1413,12 +1464,11 @@ static int verify_node_Cast(ir_node *n, ir_graph *irg)
 /**
  * verify a Phi node
  */
-static int verify_node_Phi(ir_node *n, ir_graph *irg)
+static int verify_node_Phi(const ir_node *n)
 {
 	ir_mode *mymode = get_irn_mode(n);
 	ir_node *block  = get_nodes_block(n);
 	int i;
-	(void) irg;
 
 	/* a Phi node MUST have the same number of inputs as its block
 	 * Exception is a phi with 0 inputs which is used when (re)constructing the
@@ -1434,52 +1484,24 @@ static int verify_node_Phi(ir_node *n, ir_graph *irg)
 	/* Phi: BB x dataM^n --> dataM */
 	for (i = get_Phi_n_preds(n) - 1; i >= 0; --i) {
 		ir_node *pred = get_Phi_pred(n, i);
-		if (!is_Bad(pred)) {
-			ASSERT_AND_RET_DBG(
-				get_irn_mode(pred) == mymode,
-				"Phi node", 0,
-				show_phi_failure(n, pred, i);
-			);
-		}
+		ASSERT_AND_RET_DBG(get_irn_mode(pred) == mymode,
+		                   "Phi node", 0, show_phi_failure(n, pred, i);
+		);
 	}
 	ASSERT_AND_RET(mode_is_dataM(mymode) || mymode == mode_b, "Phi node", 0 );
 
-	if (mymode == mode_M) {
-		for (i = get_Phi_n_preds(n) - 1; i >= 0; --i) {
-			int j;
-			ir_node *pred_i = get_Phi_pred(n, i);
-
-			if (is_Bad(pred_i))
-				continue;
-			for (j = i - 1; j >= 0; --j) {
-				ir_node *pred_j = get_Phi_pred(n, j);
-
-				if (is_Bad(pred_j))
-					continue;
-#if 0
-				/* currently this checks fails for blocks with exception
-				   outputs (and these are NOT basic blocks).  So it is disabled yet. */
-				ASSERT_AND_RET_DBG(
-					(pred_i == pred_j) || (get_irn_n(pred_i, -1) != get_irn_n(pred_j, -1)),
-					"At least two different PhiM predecessors are in the same block",
-					0,
-					ir_printf("%+F and %+F of %+F are in %+F\n", pred_i, pred_j, n, get_irn_n(pred_i, -1))
-				);
-#endif
-			}
-		}
-	}
 	return 1;
 }
 
 /**
  * verify a Load node
  */
-static int verify_node_Load(ir_node *n, ir_graph *irg)
+static int verify_node_Load(const ir_node *n)
 {
-	ir_mode *mymode  = get_irn_mode(n);
-	ir_mode *op1mode = get_irn_mode(get_Load_mem(n));
-	ir_mode *op2mode = get_irn_mode(get_Load_ptr(n));
+	ir_graph *irg     = get_irn_irg(n);
+	ir_mode  *mymode  = get_irn_mode(n);
+	ir_mode  *op1mode = get_irn_mode(get_Load_mem(n));
+	ir_mode  *op2mode = get_irn_mode(get_Load_ptr(n));
 
 	ASSERT_AND_RET(op1mode == mode_M, "Load node", 0);
 	if (get_irg_phase_state(irg) != phase_backend) {
@@ -1508,8 +1530,9 @@ static int verify_node_Load(ir_node *n, ir_graph *irg)
 /**
  * verify a Store node
  */
-static int verify_node_Store(ir_node *n, ir_graph *irg)
+static int verify_node_Store(const ir_node *n)
 {
+	ir_graph  *irg = get_irn_irg(n);
 	ir_entity *target;
 
 	ir_mode *mymode  = get_irn_mode(n);
@@ -1540,12 +1563,11 @@ static int verify_node_Store(ir_node *n, ir_graph *irg)
 /**
  * verify an Alloc node
  */
-static int verify_node_Alloc(ir_node *n, ir_graph *irg)
+static int verify_node_Alloc(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Alloc_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Alloc_count(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* Alloc: BB x M x int_u --> M x X x ref */
@@ -1562,13 +1584,12 @@ static int verify_node_Alloc(ir_node *n, ir_graph *irg)
 /**
  * verify a Free node
  */
-static int verify_node_Free(ir_node *n, ir_graph *irg)
+static int verify_node_Free(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Free_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Free_ptr(n));
-	ir_mode *op3mode = get_irn_mode(get_Free_size(n));
-	(void) irg;
+	ir_mode *op3mode = get_irn_mode(get_Free_count(n));
 
 	ASSERT_AND_RET_DBG(
 		/* Free: BB x M x ref x int_u --> M */
@@ -1585,16 +1606,15 @@ static int verify_node_Free(ir_node *n, ir_graph *irg)
 /**
  * verify a Sync node
  */
-static int verify_node_Sync(ir_node *n, ir_graph *irg)
+static int verify_node_Sync(const ir_node *n)
 {
 	int i;
 	ir_mode *mymode  = get_irn_mode(n);
-	(void) irg;
 
 	/* Sync: BB x M^n --> M */
 	for (i = get_Sync_n_preds(n) - 1; i >= 0; --i) {
 		ASSERT_AND_RET( get_irn_mode(get_Sync_pred(n, i)) == mode_M, "Sync node", 0 );
-	};
+	}
 	ASSERT_AND_RET( mymode == mode_M, "Sync node", 0 );
 	return 1;
 }
@@ -1602,12 +1622,11 @@ static int verify_node_Sync(ir_node *n, ir_graph *irg)
 /**
  * verify a Confirm node
  */
-static int verify_node_Confirm(ir_node *n, ir_graph *irg)
+static int verify_node_Confirm(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Confirm_value(n));
 	ir_mode *op2mode = get_irn_mode(get_Confirm_bound(n));
-	(void) irg;
 
 	ASSERT_AND_RET_DBG(
 		/* Confirm: BB x T x T --> T */
@@ -1622,13 +1641,12 @@ static int verify_node_Confirm(ir_node *n, ir_graph *irg)
 /**
  * verify a Mux node
  */
-static int verify_node_Mux(ir_node *n, ir_graph *irg)
+static int verify_node_Mux(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Mux_sel(n));
 	ir_mode *op2mode = get_irn_mode(get_Mux_true(n));
 	ir_mode *op3mode = get_irn_mode(get_Mux_false(n));
-	(void) irg;
 
 	ASSERT_AND_RET(
 		/* Mux: BB x b x datab x datab --> datab */
@@ -1644,13 +1662,14 @@ static int verify_node_Mux(ir_node *n, ir_graph *irg)
 /**
  * verify a CopyB node
  */
-static int verify_node_CopyB(ir_node *n, ir_graph *irg)
+static int verify_node_CopyB(const ir_node *n)
 {
-	ir_mode *mymode  = get_irn_mode(n);
-	ir_mode *op1mode = get_irn_mode(get_CopyB_mem(n));
-	ir_mode *op2mode = get_irn_mode(get_CopyB_dst(n));
-	ir_mode *op3mode = get_irn_mode(get_CopyB_src(n));
-	ir_type *t = get_CopyB_type(n);
+	ir_graph *irg     = get_irn_irg(n);
+	ir_mode  *mymode  = get_irn_mode(n);
+	ir_mode  *op1mode = get_irn_mode(get_CopyB_mem(n));
+	ir_mode  *op2mode = get_irn_mode(get_CopyB_dst(n));
+	ir_mode  *op3mode = get_irn_mode(get_CopyB_src(n));
+	ir_type  *t = get_CopyB_type(n);
 
 	/* CopyB: BB x M x ref x ref --> M x X */
 	ASSERT_AND_RET(mymode == mode_T && op1mode == mode_M, "CopyB node", 0);
@@ -1672,14 +1691,13 @@ static int verify_node_CopyB(ir_node *n, ir_graph *irg)
 /**
  * verify a Bound node
  */
-static int verify_node_Bound(ir_node *n, ir_graph *irg)
+static int verify_node_Bound(const ir_node *n)
 {
 	ir_mode *mymode  = get_irn_mode(n);
 	ir_mode *op1mode = get_irn_mode(get_Bound_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Bound_index(n));
 	ir_mode *op3mode = get_irn_mode(get_Bound_lower(n));
 	ir_mode *op4mode = get_irn_mode(get_Bound_upper(n));
-	(void) irg;
 
 	/* Bound: BB x M x int x int x int --> M x X */
 	ASSERT_AND_RET(
@@ -1700,7 +1718,7 @@ static int verify_node_Bound(ir_node *n, ir_graph *irg)
  *
  * @return non-zero on success, 0 on dominance error
  */
-static int check_dominance_for_node(ir_node *use)
+static int check_dominance_for_node(const ir_node *use)
 {
 	/* This won't work for blocks and the end node */
 	if (!is_Block(use) && !is_End(use) && !is_Anchor(use)) {
@@ -1708,20 +1726,23 @@ static int check_dominance_for_node(ir_node *use)
 		ir_node *bl = get_nodes_block(use);
 
 		for (i = get_irn_arity(use) - 1; i >= 0; --i) {
-			ir_node *def    = get_irn_n(use, i);
-			ir_node *def_bl = get_nodes_block(def);
-			ir_node *use_bl = bl;
+			ir_node  *def    = get_irn_n(use, i);
+			ir_node  *def_bl = get_nodes_block(def);
+			ir_node  *use_bl = bl;
 			ir_graph *irg;
 
-			/* ignore dead definition blocks, will be removed */
-			if (is_Block_dead(def_bl) || get_Block_dom_depth(def_bl) == -1)
+			/* we have no dominance relation for unreachable blocks, so we can't
+			 * check the dominance property there */
+			if (!is_Block(def_bl) || get_Block_dom_depth(def_bl) == -1)
 				continue;
 
-			if (is_Phi(use))
+			if (is_Phi(use)) {
+				if (is_Bad(def))
+					continue;
 				use_bl = get_Block_cfgpred_block(bl, i);
+			}
 
-			/* ignore dead use blocks, will be removed */
-			if (is_Block_dead(use_bl) || get_Block_dom_depth(use_bl) == -1)
+			if (!is_Block(use_bl) || get_Block_dom_depth(use_bl) == -1)
 				continue;
 
 			irg = get_irn_irg(use);
@@ -1739,9 +1760,8 @@ static int check_dominance_for_node(ir_node *use)
 }
 
 /* Tests the modes of n and its predecessors. */
-int irn_verify_irg(ir_node *n, ir_graph *irg)
+int irn_verify_irg(const ir_node *n, ir_graph *irg)
 {
-	int i;
 	ir_op *op;
 
 	if (!get_node_verification_mode())
@@ -1767,37 +1787,36 @@ int irn_verify_irg(ir_node *n, ir_graph *irg)
 		unsigned idx           = get_irn_idx(n);
 		ir_node *node_from_map = get_idx_irn(irg, idx);
 		ASSERT_AND_RET_DBG(node_from_map == n, "Node index and index map entry differ", 0,
-			ir_printf("node %+F node in map %+F(%p)\n", n, node_from_map, node_from_map));
+			ir_printf("node %+F node in map %+F(%p)\n", n, node_from_map, node_from_map);
+		);
 	}
 
 	op = get_irn_op(n);
 
-	/* We don't want to test nodes whose predecessors are Bad,
-	   as we would have to special case that for each operation. */
-	if (op != op_Phi && op != op_Block) {
-		for (i = get_irn_arity(n) - 1; i >= 0; --i) {
-			if (is_Bad(get_irn_n(n, i)))
-				return 1;
-		}
-	}
-
-	if (_get_op_pinned(op) >= op_pin_state_exc_pinned) {
+	if (get_op_pinned(op) >= op_pin_state_exc_pinned) {
 		op_pin_state state = get_irn_pinned(n);
 		ASSERT_AND_RET_DBG(
 			state == op_pin_state_floats ||
 			state == op_pin_state_pinned,
 			"invalid pin state", 0,
-			ir_printf("node %+F", n));
+			ir_printf("node %+F", n);
+		);
+	} else if (!is_Block(n) && is_irn_pinned_in_irg(n)
+	           && is_irg_state(irg, IR_GRAPH_STATE_NO_BADS)) {
+		ASSERT_AND_RET_DBG(is_Block(get_nodes_block(n)) || is_Anchor(n),
+				"block input is not a block", 0,
+				ir_printf("node %+F", n);
+		);
 	}
 
 	if (op->ops.verify_node)
-		return op->ops.verify_node(n, irg);
+		return op->ops.verify_node(n);
 
 	/* All went ok */
 	return 1;
 }
 
-int irn_verify(ir_node *n)
+int irn_verify(const ir_node *n)
 {
 #ifdef DEBUG_libfirm
 	return irn_verify_irg(n, get_irn_irg(n));
@@ -1837,6 +1856,178 @@ static void verify_wrap_ssa(ir_node *node, void *env)
 
 #endif /* DEBUG_libfirm */
 
+typedef struct check_cfg_env_t {
+	pmap *branch_nodes; /**< map blocks to their branching nodes,
+	                         map mode_X nodes to the blocks they branch to */
+	int   res;
+	ir_nodeset_t reachable_blocks;
+	ir_nodeset_t kept_nodes;
+	ir_nodeset_t true_projs;
+	ir_nodeset_t false_projs;
+} check_cfg_env_t;
+
+static int check_block_cfg(const ir_node *block, check_cfg_env_t *env)
+{
+	pmap *branch_nodes;
+	int   n_cfgpreds;
+	int   i;
+
+	ASSERT_AND_RET_DBG(ir_nodeset_contains(&env->reachable_blocks, block),
+	                   "Block is not reachable by blockwalker (endless loop with no kept block?)", 0,
+	                   ir_printf("block %+F\n", block);
+	);
+
+	n_cfgpreds   = get_Block_n_cfgpreds(block);
+	branch_nodes = env->branch_nodes;
+	for (i = 0; i < n_cfgpreds; ++i) {
+		/* check that each mode_X node is only connected
+		 * to 1 user */
+		ir_node *branch = get_Block_cfgpred(block, i);
+		ir_node *former_dest;
+		ir_node *former_branch;
+		ir_node *branch_proj;
+		ir_node *branch_block;
+		branch = skip_Tuple(branch);
+		if (is_Bad(branch))
+			continue;
+		former_dest = pmap_get(branch_nodes, branch);
+		ASSERT_AND_RET_DBG(former_dest==NULL || is_unknown_jump(skip_Proj(branch)),
+						   "Multiple users on mode_X node", 0,
+						   ir_printf("node %+F\n", branch);
+		);
+		pmap_insert(branch_nodes, branch, (void*)block);
+
+		/* check that there's only 1 branching instruction in each block */
+		branch_block = get_nodes_block(branch);
+		branch_proj  = branch;
+		if (is_Proj(branch)) {
+			branch = skip_Proj(branch);
+		}
+		former_branch = pmap_get(branch_nodes, branch_block);
+
+		ASSERT_AND_RET_DBG(former_branch == NULL || former_branch == branch,
+						   "Multiple branching nodes in a block", 0,
+						   ir_printf("nodes %+F,%+F in block %+F\n",
+									 branch, former_branch, branch_block);
+		);
+		pmap_insert(branch_nodes, branch_block, branch);
+
+		if (is_Cond(branch)) {
+			long pn = get_Proj_proj(branch_proj);
+			if (pn == pn_Cond_true)
+				ir_nodeset_insert(&env->true_projs, branch);
+			if (pn == pn_Cond_false)
+				ir_nodeset_insert(&env->false_projs, branch);
+		} else if (is_Switch(branch)) {
+			long pn = get_Proj_proj(branch_proj);
+			if (pn == pn_Switch_default)
+				ir_nodeset_insert(&env->true_projs, branch);
+		}
+	}
+
+	return 1;
+}
+
+static void check_cfg_walk_func(ir_node *node, void *data)
+{
+	check_cfg_env_t *env = (check_cfg_env_t*)data;
+	if (!is_Block(node))
+		return;
+	env->res &= check_block_cfg(node, env);
+}
+
+static int verify_block_branch(const ir_node *block, check_cfg_env_t *env)
+{
+	ir_node *branch = pmap_get(env->branch_nodes, block);
+	ASSERT_AND_RET_DBG(branch != NULL
+	                   || ir_nodeset_contains(&env->kept_nodes, block)
+	                   || block == get_irg_end_block(get_irn_irg(block)),
+	                   "block contains no cfop", 0,
+	                   ir_printf("block %+F\n", block);
+	);
+	return 1;
+}
+
+static int verify_cond_projs(const ir_node *cond, check_cfg_env_t *env)
+{
+	ASSERT_AND_RET_DBG(ir_nodeset_contains(&env->true_projs, cond),
+					   "Cond node lacks true proj", 0,
+					   ir_printf("Cond %+F\n", cond);
+	);
+	ASSERT_AND_RET_DBG(ir_nodeset_contains(&env->false_projs, cond),
+					   "Cond node lacks false proj", 0,
+					   ir_printf("Cond %+F\n", cond);
+	);
+	return 1;
+}
+
+static int verify_switch_projs(const ir_node *sw, check_cfg_env_t *env)
+{
+	ASSERT_AND_RET_DBG(ir_nodeset_contains(&env->true_projs, sw),
+					   "Switch node lacks default Proj", 0,
+					   ir_printf("Switch %+F\n", sw);
+	);
+	return 1;
+}
+
+static void assert_branch(ir_node *node, void *data)
+{
+	check_cfg_env_t *env = (check_cfg_env_t*)data;
+	if (is_Block(node)) {
+		env->res &= verify_block_branch(node, env);
+	} else if (is_Cond(node)) {
+		env->res &= verify_cond_projs(node, env);
+	} else if (is_Switch(node)) {
+		env->res &= verify_switch_projs(node, env);
+	}
+}
+
+static void collect_reachable_blocks(ir_node *block, void *data)
+{
+	ir_nodeset_t *reachable_blocks = (ir_nodeset_t*) data;
+	ir_nodeset_insert(reachable_blocks, block);
+}
+
+/**
+ * Checks CFG well-formedness
+ */
+static int check_cfg(ir_graph *irg)
+{
+	check_cfg_env_t env;
+	env.branch_nodes = pmap_create(); /**< map blocks to branch nodes */
+	env.res          = 1;
+	ir_nodeset_init(&env.reachable_blocks);
+	ir_nodeset_init(&env.true_projs);
+	ir_nodeset_init(&env.false_projs);
+
+	irg_block_walk_graph(irg, collect_reachable_blocks, NULL,
+	                     &env.reachable_blocks);
+
+	/* note that we do not use irg_walk_block because it will miss these
+	 * invalid blocks without a jump instruction which we want to detect
+	 * here */
+	irg_walk_graph(irg, check_cfg_walk_func, NULL, &env);
+
+	ir_nodeset_init(&env.kept_nodes);
+	{
+		ir_node *end   = get_irg_end(irg);
+		int      arity = get_irn_arity(end);
+		int      i;
+		for (i = 0; i < arity; ++i) {
+			ir_node *n = get_irn_n(end, i);
+			ir_nodeset_insert(&env.kept_nodes, n);
+		}
+	}
+	irg_walk_graph(irg, assert_branch, NULL, &env);
+
+	ir_nodeset_destroy(&env.false_projs);
+	ir_nodeset_destroy(&env.true_projs);
+	ir_nodeset_destroy(&env.kept_nodes);
+	ir_nodeset_destroy(&env.reachable_blocks);
+	pmap_destroy(env.branch_nodes);
+	return env.res;
+}
+
 /*
  * Calls irn_verify for each node in irg.
  * Graph must be in state "op_pin_state_pinned".
@@ -1852,12 +2043,15 @@ int irg_verify(ir_graph *irg, unsigned flags)
 	last_irg_error = NULL;
 #endif /* NDEBUG */
 
-	if ((flags & VERIFY_ENFORCE_SSA) && pinned)
+	if (pinned && !check_cfg(irg))
+		res = 0;
+
+	if (res == 1 && (flags & VERIFY_ENFORCE_SSA) && pinned)
 		compute_doms(irg);
 
 	irg_walk_anchors(
 		irg,
-		pinned && get_irg_dom_state(irg) == dom_consistent
+		pinned && is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE)
 			? verify_wrap_ssa : verify_wrap,
 		NULL,
 		&res
@@ -1913,7 +2107,8 @@ ir_graph_pass_t *irg_verify_pass(const char *name, unsigned flags)
 }
 
 /* create a verify pass */
-int irn_verify_irg_dump(ir_node *n, ir_graph *irg, const char **bad_string)
+int irn_verify_irg_dump(const ir_node *n, ir_graph *irg,
+                        const char **bad_string)
 {
 	int res;
 	firm_verification_t old = get_node_verification_mode();
@@ -1921,7 +2116,7 @@ int irn_verify_irg_dump(ir_node *n, ir_graph *irg, const char **bad_string)
 	firm_verify_failure_msg = NULL;
 	do_node_verification(FIRM_VERIFICATION_ERROR_ONLY);
 	res = irn_verify_irg(n, irg);
-	if (res && get_irg_dom_state(irg) == dom_consistent &&
+	if (res && is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE) &&
 	    get_irg_pinned(irg) == op_pin_state_pinned)
 		res = check_dominance_for_node(n);
 	do_node_verification(old);
@@ -1958,7 +2153,7 @@ static void check_bads(ir_node *node, void *env)
 						fprintf(stderr, "irg_verify_bads: Block %ld has Bad predecessor\n", get_irn_node_nr(node));
 					}
 					if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-						dump_ir_graph(irg, "-assert");
+						dump_ir_graph(irg, "assert");
 						assert(0 && "Bad CF detected");
 					}
 				}
@@ -1975,7 +2170,7 @@ static void check_bads(ir_node *node, void *env)
 					fprintf(stderr, "irg_verify_bads: node %ld has Bad Block\n", get_irn_node_nr(node));
 				}
 				if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-					dump_ir_graph(irg, "-assert");
+					dump_ir_graph(irg, "assert");
 					assert(0 && "Bad CF detected");
 				}
 			}
@@ -1989,7 +2184,7 @@ static void check_bads(ir_node *node, void *env)
 					fprintf(stderr, "irg_verify_bads: node %ld is a Tuple\n", get_irn_node_nr(node));
 				}
 				if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-					dump_ir_graph(irg, "-assert");
+					dump_ir_graph(irg, "assert");
 					assert(0 && "Tuple detected");
 				}
 			}
@@ -2010,7 +2205,7 @@ static void check_bads(ir_node *node, void *env)
 							fprintf(stderr, "irg_verify_bads: Phi %ld has Bad Input\n", get_irn_node_nr(node));
 						}
 						if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-							dump_ir_graph(irg, "-assert");
+							dump_ir_graph(irg, "assert");
 							assert(0 && "Bad CF detected");
 						}
 					}
@@ -2024,7 +2219,7 @@ static void check_bads(ir_node *node, void *env)
 						fprintf(stderr, "irg_verify_bads: node %ld has Bad Input\n", get_irn_node_nr(node));
 					}
 					if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-						dump_ir_graph(irg, "-assert");
+						dump_ir_graph(irg, "assert");
 						assert(0 && "Bad NON-CF detected");
 					}
 				}
@@ -2051,7 +2246,7 @@ int irg_verify_bads(ir_graph *irg, int flags)
 /*
  * set the default verify operation
  */
-void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops)
+void firm_set_default_verifier(unsigned code, ir_op_ops *ops)
 {
 #define CASE(a)                           \
    case iro_##a:                          \
@@ -2059,49 +2254,50 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops)
      break
 
 	switch (code) {
-	CASE(Proj);
+	CASE(Add);
+	CASE(Alloc);
+	CASE(And);
 	CASE(Block);
-	CASE(Start);
-	CASE(Jmp);
-	CASE(IJmp);
+	CASE(Bound);
+	CASE(Call);
+	CASE(Cast);
+	CASE(Cmp);
 	CASE(Cond);
-	CASE(Return);
-	CASE(Raise);
+	CASE(Confirm);
 	CASE(Const);
-	CASE(SymConst);
-	CASE(Sel);
+	CASE(Conv);
+	CASE(CopyB);
+	CASE(Div);
+	CASE(Eor);
+	CASE(Free);
+	CASE(IJmp);
 	CASE(InstOf);
-	CASE(Call);
-	CASE(Add);
-	CASE(Sub);
+	CASE(Jmp);
+	CASE(Load);
 	CASE(Minus);
+	CASE(Mod);
 	CASE(Mul);
 	CASE(Mulh);
-	CASE(Div);
-	CASE(Mod);
-	CASE(And);
-	CASE(Or);
-	CASE(Eor);
+	CASE(Mux);
 	CASE(Not);
-	CASE(Cmp);
+	CASE(Or);
+	CASE(Phi);
+	CASE(Proj);
+	CASE(Raise);
+	CASE(Return);
+	CASE(Rotl);
+	CASE(Sel);
 	CASE(Shl);
 	CASE(Shr);
 	CASE(Shrs);
-	CASE(Rotl);
-	CASE(Conv);
-	CASE(Cast);
-	CASE(Phi);
-	CASE(Load);
+	CASE(Start);
 	CASE(Store);
-	CASE(Alloc);
-	CASE(Free);
+	CASE(Sub);
+	CASE(Switch);
+	CASE(SymConst);
 	CASE(Sync);
-	CASE(Confirm);
-	CASE(Mux);
-	CASE(CopyB);
-	CASE(Bound);
 	default:
-		/* leave NULL */;
+		break;
 	}
 #undef CASE
 
@@ -2111,22 +2307,23 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops)
      break
 
 	switch (code) {
-	CASE(Start);
-	CASE(Cond);
-	CASE(Raise);
-	CASE(InstOf);
+	CASE(Alloc);
+	CASE(Bound);
 	CASE(Call);
+	CASE(Cond);
+	CASE(CopyB);
 	CASE(Div);
-	CASE(Mod);
+	CASE(InstOf);
 	CASE(Load);
-	CASE(Store);
-	CASE(Alloc);
+	CASE(Mod);
 	CASE(Proj);
+	CASE(Raise);
+	CASE(Start);
+	CASE(Store);
+	CASE(Switch);
 	CASE(Tuple);
-	CASE(CopyB);
-	CASE(Bound);
 	default:
-		/* leave NULL */;
+		break;
 	}
 #undef CASE
 }