X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firvrfy.c;h=468903b79c2127c959eb795756d66cd3fe1c987b;hb=5af4cb6fd26054ef16c8da79d534abacb2a32c6e;hp=6042e31df014bd8dba34d2fa8c81fc02cd130c27;hpb=77784cce8c7c47b9d5e86c0a7c1ef23263f4fed5;p=libfirm

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index 6042e31df..468903b79 100644
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -49,6 +49,8 @@ void vrfy_enable_entity_tests(int enable) {
 	vrfy_entities = enable;
 }
 
+#ifndef NDEBUG
+
 /**
  * little helper for NULL modes
  */
@@ -273,11 +275,17 @@ static void show_phi_inputs(ir_node *phi, ir_node *block) {
 		get_irn_node_nr(block), get_irn_arity(block));
 }
 
-/** If the address is Sel or SymConst, return the entity. */
+#endif /* #ifndef NDEBUG */
+
+/**
+ * If the address is Sel or SymConst, return the entity.
+ *
+ * @param ptr  the node representing the address
+ */
 static ir_entity *get_ptr_entity(ir_node *ptr) {
 	if (get_irn_op(ptr) == op_Sel) {
 		return get_Sel_entity(ptr);
-	} else if ((get_irn_op(ptr) == op_SymConst) && (get_SymConst_kind(ptr) == symconst_addr_ent)) {
+	} else if (is_SymConst_addr_ent(ptr)) {
 		return get_SymConst_entity(ptr);
 	}
 	return NULL;
@@ -384,6 +392,7 @@ static int verify_node_Proj_Call(ir_node *n, ir_node *p) {
 		"wrong Proj from Call", 0,
 		show_proj_failure(p);
 	);
+	/* if we have exception flow, we must have a real Memory input */
 	if (proj == pn_Call_X_regular)
 		ASSERT_AND_RET(
 			get_irn_op(get_Call_mem(n)) != op_NoMem,
@@ -541,6 +550,11 @@ static int verify_node_Proj_Cmp(ir_node *n, ir_node *p) {
 		"wrong Proj from Cmp", 0,
 		show_proj_failure(p);
 	);
+	ASSERT_AND_RET_DBG(
+		(mode_is_float(get_irn_mode(get_Cmp_left(n))) || !(proj & pn_Cmp_Uo)),
+		"unordered Proj for non-float Cmp", 0,
+		show_proj_failure(p);
+	);
 	return 1;
 }
 
@@ -846,29 +860,48 @@ verify_node_Proj(ir_node *p, ir_graph *irg) {
  */
 static int verify_node_Block(ir_node *n, ir_graph *irg) {
 	int i;
+	ir_node *mb = get_Block_MacroBlock(n);
+
+	ASSERT_AND_RET(is_Block(mb) || is_Bad(mb), "Block node with wrong MacroBlock", 0);
+
+	if (is_Block(mb) && mb != n) {
+		ir_node *pred;
+
+		/* Blocks with more than one predecessor must be header blocks */
+		ASSERT_AND_RET(get_Block_n_cfgpreds(n) == 1, "partBlock with more than one predecessor", 0);
+		pred = get_Block_cfgpred(n, 0);
+		if (is_Proj(pred)) {
+			/* the predecessor MUST be a regular Proj */
+			ir_node *frag_op = get_Proj_pred(pred);
+			ASSERT_AND_RET(is_fragile_op(frag_op) && get_Proj_proj(pred) == pn_Generic_X_regular,
+				"partBlock with non-regular predecessor", 0);
+		} else {
+			/* We allow Jmps to be predecessors of partBlocks. This can happen due to optimization
+			   of fragile nodes during construction. It does not violate our assumption of dominance
+			   so let it. */
+			ASSERT_AND_RET(is_Jmp(pred) || is_Bad(pred),
+				"partBlock with non-regular predecessor", 0);
+		}
+	}
 
 	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)     ||
-				is_Unknown(pred) ||
-				(get_irn_mode(pred) == mode_X)
-			),
-			"Block node", 0);
+			is_Bad(pred) ||	(get_irn_mode(pred) == mode_X),
+			"Block node must have a mode_X predecessor", 0);
 	}
 
-	/*  End block may only have Return, Raise or fragile ops as preds. */
 	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));
-			if (is_Proj(pred) || get_irn_op(pred) == op_Tuple)
+			if (is_Proj(pred) || is_Tuple(pred))
 				break;   /*  We can not test properly.  How many tuples are there? */
 			ASSERT_AND_RET(
 				(
-					is_Return(pred)                 ||
-					is_Bad(pred)                    ||
-					(get_irn_op(pred) == op_Raise)  ||
+					is_Return(pred) ||
+					is_Bad(pred)    ||
+					is_Raise(pred)  ||
 					is_fragile_op(pred)
 				),
 				"End Block node", 0);
@@ -1157,14 +1190,17 @@ static int verify_node_Call(ir_node *n, ir_graph *irg) {
 			get_Call_n_params(n) >= get_method_n_params(mt),
 			"Number of args for Call doesn't match number of args in variadic type.",
 			0,
-			fprintf(stderr, "Call has %d params, method %s type %d\n",
-			get_Call_n_params(n), get_type_name(mt), get_method_n_params(mt));
+			ir_fprintf(stderr, "Call %+F has %d params, method %s type %d\n",
+			n, get_Call_n_params(n), get_type_name(mt), get_method_n_params(mt));
 		);
 	} else {
-		ASSERT_AND_RET(
+		ASSERT_AND_RET_DBG(
 			get_Call_n_params(n) == get_method_n_params(mt),
 			"Number of args for Call doesn't match number of args in non variadic type.",
-			0);
+			0,
+			ir_fprintf(stderr, "Call %+F has %d params, method %s type %d\n",
+			n, get_Call_n_params(n), get_type_name(mt), get_method_n_params(mt));
+		);
 	}
 
 	for (i = 0; i < get_method_n_params(mt); i++) {
@@ -1860,8 +1896,18 @@ 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) {
+	if (is_Block(use)) {
+		ir_node *mbh = get_Block_MacroBlock(use);
+
+		if (mbh != use) {
+			/* must be a partBlock */
+			if (is_Block(mbh)) {
+				ASSERT_AND_RET(block_dominates(mbh, use), "MacroBlock header must dominate a partBlock", 0);
+			}
+		}
+	}
 	/* This won't work for blocks and the end node */
-	if (!is_Block(use) && use != get_irg_end(current_ir_graph) && use != current_ir_graph->anchor) {
+	else if (use != get_irg_end(current_ir_graph) && use != current_ir_graph->anchor) {
 		int i;
 		ir_node *bl = get_nodes_block(use);
 
@@ -1996,7 +2042,10 @@ int irg_verify(ir_graph *irg, unsigned flags) {
 
 	rem = current_ir_graph;
 	current_ir_graph = irg;
-	last_irg_error = NULL;
+
+#ifndef NDEBUG
+    last_irg_error = NULL;
+#endif /* NDEBUG */
 
 	assert(get_irg_pinned(irg) == op_pin_state_pinned && "Verification need pinned graph");
 
@@ -2071,7 +2120,7 @@ static void check_bads(ir_node *node, void *env) {
 						fprintf(stderr, "irg_vrfy_bads: Block %ld has Bad predecessor\n", get_irn_node_nr(node));
 					}
 					if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-						dump_ir_block_graph(current_ir_graph, "-assert");
+						dump_ir_block_graph_sched(current_ir_graph, "-assert");
 						assert(0 && "Bad CF detected");
 					}
 				}
@@ -2088,7 +2137,7 @@ static void check_bads(ir_node *node, void *env) {
 					fprintf(stderr, "irg_vrfy_bads: node %ld has Bad Block\n", get_irn_node_nr(node));
 				}
 				if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-					dump_ir_block_graph(current_ir_graph, "-assert");
+					dump_ir_block_graph_sched(current_ir_graph, "-assert");
 					assert(0 && "Bad CF detected");
 				}
 			}
@@ -2102,7 +2151,7 @@ static void check_bads(ir_node *node, void *env) {
 					fprintf(stderr, "irg_vrfy_bads: node %ld is a Tuple\n", get_irn_node_nr(node));
 				}
 				if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-					dump_ir_block_graph(current_ir_graph, "-assert");
+					dump_ir_block_graph_sched(current_ir_graph, "-assert");
 					assert(0 && "Tuple detected");
 				}
 			}
@@ -2123,7 +2172,7 @@ static void check_bads(ir_node *node, void *env) {
 							fprintf(stderr, "irg_vrfy_bads: Phi %ld has Bad Input\n", get_irn_node_nr(node));
 						}
 						if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-							dump_ir_block_graph(current_ir_graph, "-assert");
+							dump_ir_block_graph_sched(current_ir_graph, "-assert");
 							assert(0 && "Bad CF detected");
 						}
 					}
@@ -2137,7 +2186,7 @@ static void check_bads(ir_node *node, void *env) {
 						fprintf(stderr, "irg_vrfy_bads: node %ld has Bad Input\n", get_irn_node_nr(node));
 					}
 					if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
-						dump_ir_block_graph(current_ir_graph, "-assert");
+						dump_ir_block_graph_sched(current_ir_graph, "-assert");
 						assert(0 && "Bad NON-CF detected");
 					}
 				}