X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firvrfy.c;h=f615cd1f352390beb630ba8a9a10892071b93c54;hb=5f05c97be1452a4fd611648879c1544a8af611c9;hp=a0bea16b2e775a982cfb70e6c1ee1652ec1f2d70;hpb=1e40d1804340fe29acbce80ed54a64e670a25eff;p=libfirm

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index a0bea16b2..f615cd1f3 100644
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -49,6 +49,8 @@ void vrfy_enable_entity_tests(int enable) {
 	vrfy_entities = enable;
 }
 
+#ifndef NDEBUG
+
 /**
  * little helper for NULL modes
  */
@@ -273,6 +275,8 @@ static void show_phi_inputs(ir_node *phi, ir_node *block) {
 		get_irn_node_nr(block), get_irn_arity(block));
 }
 
+#endif /* #ifndef NDEBUG */
+
 /** If the address is Sel or SymConst, return the entity. */
 static ir_entity *get_ptr_entity(ir_node *ptr) {
 	if (get_irn_op(ptr) == op_Sel) {
@@ -670,11 +674,13 @@ static int verify_node_Proj_Proj(ir_node *pred, ir_node *p) {
 			if ((mode_is_reference(mode)) && is_compound_type(get_method_param_type(mt, proj)))
 				/* value argument */ break;
 
+			if (get_irg_phase_state(get_irn_irg(pred)) != phase_backend) {
 				ASSERT_AND_RET_DBG(
-				(mode == get_type_mode(get_method_param_type(mt, proj))),
-				"Mode of Proj from Start doesn't match mode of param type.", 0,
-				show_proj_mode_failure(p, get_method_param_type(mt, proj));
-			);
+						(mode == get_type_mode(get_method_param_type(mt, proj))),
+						"Mode of Proj from Start doesn't match mode of param type.", 0,
+						show_proj_mode_failure(p, get_method_param_type(mt, proj));
+						);
+			}
 		} else if (nr == pn_Start_P_value_arg_base) {
 			ASSERT_AND_RET(
 				(proj >= 0 && mode_is_reference(mode)),
@@ -745,9 +751,11 @@ static int verify_node_Proj_CallBegin(ir_node *n, ir_node *p) {
 static int verify_node_Proj_EndReg(ir_node *n, ir_node *p) {
 	(void) n;
 	(void) p;
+#ifdef INTERPROCEDURAL_VIEW
 	ASSERT_AND_RET(
 		(get_irp_ip_view_state() != ip_view_no),
 		"EndReg may only appear if ip view is constructed.", 0);
+#endif
 	return 1;
 }
 
@@ -757,9 +765,11 @@ static int verify_node_Proj_EndReg(ir_node *n, ir_node *p) {
 static int verify_node_Proj_EndExcept(ir_node *n, ir_node *p) {
 	(void) n;
 	(void) p;
+#ifdef INTERPROCEDURAL_VIEW
 	ASSERT_AND_RET(
 		(get_irp_ip_view_state() != ip_view_no),
 		"EndExcept may only appear if ip view is constructed.", 0);
+#endif
 	return 1;
 }
 
@@ -840,7 +850,13 @@ 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_irn_n(n, -1);
 
+	if (mb != n) {
+		/* must be a partBlock */
+		ASSERT_AND_RET(mb != NULL && (is_Block(mb) || is_Bad(mb)), "wrong MacroBlock header", 0);
+		ASSERT_AND_RET(get_Block_n_cfgpreds(n) == 1, "partBlock with more than one predecessor", 0);
+	}
 	for (i = get_Block_n_cfgpreds(n) - 1; i >= 0; --i) {
 		ir_node *pred =  get_Block_cfgpred(n, i);
 		ASSERT_AND_RET(
@@ -852,17 +868,17 @@ static int verify_node_Block(ir_node *n, ir_graph *irg) {
 			"Block node", 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);
@@ -924,8 +940,10 @@ static int verify_node_Break(ir_node *n, ir_graph *irg) {
 	ir_mode *mymode = get_irn_mode(n);
 	(void) irg;
 
+#ifdef INTERPROCEDURAL_VIEW
 	ASSERT_AND_RET((get_irp_ip_view_state() != ip_view_no),
 		"Break may only appear if ip view is constructed.", 0);
+#endif
 	ASSERT_AND_RET(
 		/* Jmp: BB --> X */
 		mymode == mode_X, "Break node", 0
@@ -977,18 +995,20 @@ static int verify_node_Return(ir_node *n, ir_graph *irg) {
 	for (i = get_Return_n_ress(n) - 1; i >= 0; --i) {
 		ir_type *res_type = get_method_res_type(mt, i);
 
-		if (is_atomic_type(res_type)) {
-			ASSERT_AND_RET_DBG(
-				get_irn_mode(get_Return_res(n, i)) == get_type_mode(res_type),
-				"Mode of result for Return doesn't match mode of result type.", 0,
-				show_return_modes(irg, n, mt, i);
-			);
-		} else {
-			ASSERT_AND_RET_DBG(
-				mode_is_reference(get_irn_mode(get_Return_res(n, i))),
-				"Mode of result for Return doesn't match mode of result type.", 0,
-				show_return_modes(irg, n, mt, i);
-			);
+		if (get_irg_phase_state(irg) != phase_backend) {
+			if (is_atomic_type(res_type)) {
+				ASSERT_AND_RET_DBG(
+					get_irn_mode(get_Return_res(n, i)) == get_type_mode(res_type),
+					"Mode of result for Return doesn't match mode of result type.", 0,
+					show_return_modes(irg, n, mt, i);
+				);
+			} else {
+				ASSERT_AND_RET_DBG(
+					mode_is_reference(get_irn_mode(get_Return_res(n, i))),
+					"Mode of result for Return doesn't match mode of result type.", 0,
+					show_return_modes(irg, n, mt, i);
+				);
+			}
 		}
 	}
 	return 1;
@@ -1096,6 +1116,22 @@ static int verify_node_InstOf(ir_node *n, ir_graph *irg) {
 	return 1;
 }
 
+/**
+ * Check if the pinned state is right.
+ */
+static int verify_right_pinned(ir_node *n) {
+	ir_node *mem;
+
+	if (get_irn_pinned(n) == op_pin_state_pinned)
+		return 1;
+	mem = get_Call_mem(n);
+
+	/* if it's not pinned, its memory predecessor must be NoMem or Pin */
+	if (is_NoMem(mem) || is_Pin(mem))
+		return 1;
+	return 0;
+}
+
 /**
  * verify a Call node
  */
@@ -1112,10 +1148,7 @@ static int verify_node_Call(ir_node *n, ir_graph *irg) {
 	ASSERT_AND_RET( op1mode == mode_M && mode_is_reference(op2mode), "Call node", 0 );  /* operand M x ref */
 
 	/* NoMem nodes are only allowed as memory input if the Call is NOT pinned */
-	ASSERT_AND_RET(
-		(get_irn_op(get_Call_mem(n)) == op_NoMem) ||
-		(get_irn_op(get_Call_mem(n)) != op_NoMem && get_irn_pinned(n) == op_pin_state_pinned),
-		"Call node with wrong memory input", 0 );
+	ASSERT_AND_RET(verify_right_pinned(n),"Call node with wrong memory input", 0 );
 
 	mt = get_Call_type(n);
 	if(get_unknown_type() == mt) {
@@ -1147,19 +1180,21 @@ static int verify_node_Call(ir_node *n, ir_graph *irg) {
 	for (i = 0; i < get_method_n_params(mt); i++) {
 		ir_type *t = get_method_param_type(mt, i);
 
-		if (is_atomic_type(t)) {
-			ASSERT_AND_RET_DBG(
-				get_irn_mode(get_Call_param(n, i)) == get_type_mode(t),
-				"Mode of arg for Call doesn't match mode of arg type.", 0,
-				show_call_param(n, mt);
-			);
-		} else {
-			/* call with a compound type, mode must be reference */
-			ASSERT_AND_RET_DBG(
-				mode_is_reference(get_irn_mode(get_Call_param(n, i))),
-				"Mode of arg for Call doesn't match mode of arg type.", 0,
-				show_call_param(n, mt);
-			);
+		if (get_irg_phase_state(irg) != phase_backend) {
+			if (is_atomic_type(t)) {
+				ASSERT_AND_RET_DBG(
+					get_irn_mode(get_Call_param(n, i)) == get_type_mode(t),
+					"Mode of arg for Call doesn't match mode of arg type.", 0,
+					show_call_param(n, mt);
+				);
+			} else {
+				/* call with a compound type, mode must be reference */
+				ASSERT_AND_RET_DBG(
+					mode_is_reference(get_irn_mode(get_Call_param(n, i))),
+					"Mode of arg for Call doesn't match mode of arg type.", 0,
+					show_call_param(n, mt);
+				);
+			}
 		}
 	}
 
@@ -1185,7 +1220,7 @@ static int verify_node_Add(ir_node *n, ir_graph *irg) {
 	ASSERT_AND_RET_DBG(
 		(
 			/* common Add: BB x numP x numP --> numP */
-			(op1mode == mymode && op2mode == op1mode && mode_is_numP(mymode)) ||
+			(op1mode == mymode && op2mode == op1mode && mode_is_data(mymode)) ||
 			/* Pointer Add: BB x ref x int --> ref */
 			(mode_is_reference(op1mode) && mode_is_int(op2mode) && op1mode == mymode) ||
 			/* Pointer Add: BB x int x ref --> ref */
@@ -1211,7 +1246,7 @@ static int verify_node_Sub(ir_node *n, ir_graph *irg) {
 	ASSERT_AND_RET_DBG(
 		(
 			/* common Sub: BB x numP x numP --> numP */
-			(mymode ==op1mode && mymode == op2mode && mode_is_numP(op1mode)) ||
+			(mymode ==op1mode && mymode == op2mode && mode_is_data(op1mode)) ||
 			/* Pointer Sub: BB x ref x int --> ref */
 			(op1mode == mymode && mode_is_int(op2mode) && mode_is_reference(mymode)) ||
 			/* Pointer Sub: BB x int x ref --> ref */
@@ -1255,18 +1290,39 @@ static int verify_node_Mul(ir_node *n, ir_graph *irg) {
 
 	ASSERT_AND_RET_DBG(
 		(
-			/* Mul: BB x int1 x int1 --> int2 */
-			(mode_is_int(op1mode)   && op2mode == op1mode && mode_is_int(mymode)) ||
+			/* Mul: BB x int_n x int_n --> int_n|int_2n */
+			(mode_is_int(op1mode)   && op2mode == op1mode && mode_is_int(mymode) &&
+			 (op1mode == mymode || get_mode_size_bits(op1mode) * 2 == get_mode_size_bits(mymode))) ||
 			/* Mul: BB x float x float --> float */
 			(mode_is_float(op1mode) && op2mode == op1mode && mymode == op1mode)
 		),
 		"Mul node",0,
-		show_binop_failure(n, "/* Mul: BB x int1 x int1 --> int2 */ |\n"
+		show_binop_failure(n, "/* Mul: BB x int_n x int_n --> int_n|int_2n */ |\n"
 		"/* Mul: BB x float x float --> float */");
 	);
 	return 1;
 }
 
+/**
+ * verify a Mulh node
+ */
+static int verify_node_Mulh(ir_node *n, ir_graph *irg) {
+	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(
+		(
+			/* Mulh: BB x int x int --> int */
+			(mode_is_int(op1mode) && op2mode == op1mode && op1mode == mymode)
+		),
+		"Mulh node",0,
+		show_binop_failure(n, "/* Mulh: BB x int x int --> int */");
+	);
+	return 1;
+}
+
 /**
  * verify a Quot node
  */
@@ -1422,7 +1478,7 @@ static int verify_node_Cmp(ir_node *n, ir_graph *irg) {
 
 	ASSERT_AND_RET_DBG(
 		/* Cmp: BB x datab x datab --> b16 */
-		mode_is_data (op1mode) &&
+		mode_is_datab(op1mode) &&
 		op2mode == op1mode &&
 		mymode == mode_T,
 		"Cmp node", 0,
@@ -1485,10 +1541,10 @@ static int verify_node_Conv(ir_node *n, ir_graph *irg) {
 	(void) irg;
 
 	ASSERT_AND_RET_DBG(
-		/* Conv: BB x datab1 --> datab2 */
-		mode_is_datab(op1mode) && mode_is_datab(mymode),
+		get_irg_phase_state(irg) == phase_backend ||
+		(mode_is_datab(op1mode) && mode_is_data(mymode)),
 		"Conv node", 0,
-		show_unop_failure(n, "/* Conv: BB x datab1 --> datab2 */");
+		show_unop_failure(n, "/* Conv: BB x datab --> data */");
 	);
 	return 1;
 }
@@ -1519,7 +1575,7 @@ static int verify_node_Phi(ir_node *n, ir_graph *irg) {
 	int i;
 	(void) irg;
 
-	if (! is_Bad(block) && get_irg_phase_state(get_irn_irg(n)) != phase_building) {
+	if (! is_Bad(block) && get_irg_phase_state(get_irn_irg(n)) != phase_building && get_irn_arity(n) > 0) {
 		/* a Phi node MUST have the same number of inputs as its block */
 		ASSERT_AND_RET_DBG(
 			get_irn_arity(n) == get_irn_arity(block),
@@ -1575,8 +1631,10 @@ static int verify_node_Phi(ir_node *n, ir_graph *irg) {
 static int verify_node_Filter(ir_node *n, ir_graph *irg) {
 	(void) n;
 	(void) irg;
+#ifdef INTERPROCEDURAL_VIEW
 	ASSERT_AND_RET((get_irp_ip_view_state() != ip_view_no),
 		"Filter may only appear if ip view is constructed.", 0);
+#endif
 	/* We should further do tests as for Proj and Phi. */
 	return 1;
 }
@@ -1627,7 +1685,7 @@ static int verify_node_Store(ir_node *n, ir_graph *irg) {
 	ir_mode *op2mode = get_irn_mode(get_Store_ptr(n));
 	ir_mode *op3mode = get_irn_mode(get_Store_value(n));
 
-	ASSERT_AND_RET(op1mode == mode_M && mode_is_data(op3mode), "Store node", 0 );
+	ASSERT_AND_RET(op1mode == mode_M && mode_is_datab(op3mode), "Store node", 0 );
 	if (get_irg_phase_state(irg) != phase_backend) {
 		ASSERT_AND_RET(mode_is_reference(op2mode), "Store node", 0 );
 	} else {
@@ -1743,7 +1801,7 @@ static int verify_node_Mux(ir_node *n, ir_graph *irg) {
 		op1mode == mode_b &&
 		op2mode == mymode &&
 		op3mode == mymode &&
-		mode_is_numP(mymode),
+		mode_is_data(mymode),
 		"Mux node", 0
 		);
 	return 1;
@@ -1777,10 +1835,7 @@ static int verify_node_CopyB(ir_node *n, ir_graph *irg) {
 
 	/* NoMem nodes are only allowed as memory input if the CopyB is NOT pinned.
 	   This should happen RARELY, as CopyB COPIES MEMORY */
-	ASSERT_AND_RET(
-		(get_irn_op(get_CopyB_mem(n)) == op_NoMem) ||
-		(get_irn_op(get_CopyB_mem(n)) != op_NoMem && get_irn_pinned(n) == op_pin_state_pinned),
-		"CopyB node with wrong memory input", 0 );
+	ASSERT_AND_RET(verify_right_pinned(n), "CopyB node with wrong memory input", 0 );
 	return 1;
 }
 
@@ -1815,8 +1870,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)) {
+	else if (use != get_irg_end(current_ir_graph) && use != current_ir_graph->anchor) {
 		int i;
 		ir_node *bl = get_nodes_block(use);
 
@@ -1903,11 +1968,12 @@ int irn_vrfy_irg(ir_node *n, ir_graph *irg) {
 }
 
 int irn_vrfy(ir_node *n) {
-	int res = 1;
 #ifdef DEBUG_libfirm
-	res = irn_vrfy_irg(n, current_ir_graph);
+	return irn_vrfy_irg(n, current_ir_graph);
+#else
+	(void)n;
+	return 1;
 #endif
-	return res;
 }
 
 /*-----------------------------------------------------------------*/
@@ -1931,8 +1997,9 @@ static void vrfy_wrap_ssa(ir_node *node, void *env) {
 	int *res = env;
 
 	*res = irn_vrfy(node);
-	if (*res)
+	if (*res) {
 		*res = check_dominance_for_node(node);
+	}
 }
 
 #endif /* DEBUG_libfirm */
@@ -1956,7 +2023,7 @@ int irg_verify(ir_graph *irg, unsigned flags) {
 	if (flags & VRFY_ENFORCE_SSA)
 		compute_doms(irg);
 
-	irg_walk_graph(
+	irg_walk_anchors(
 		irg,
 		get_irg_dom_state(irg) == dom_consistent &&
 		get_irg_pinned(irg) == op_pin_state_pinned ? vrfy_wrap_ssa : vrfy_wrap,
@@ -1973,6 +2040,9 @@ int irg_verify(ir_graph *irg, unsigned flags) {
 		else
 			fprintf(stderr, "irg_verify: Verifying graph %p failed\n", (void *)current_ir_graph);
 	}
+#else
+	(void)irg;
+	(void)flags;
 #endif /* DEBUG_libfirm */
 
 	return res;
@@ -2138,6 +2208,7 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops) {
 	CASE(Sub);
 	CASE(Minus);
 	CASE(Mul);
+	CASE(Mulh);
 	CASE(Quot);
 	CASE(DivMod);
 	CASE(Div);