X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firverify.c;h=c093b921ccbce13e0c3e4e6eabf2bea15ff79d8a;hb=4f92e524762e0febc361676111b3b5b79addd03a;hp=ec368e7ea5341e310ad564eb7c6a740ae7d4f93a;hpb=0a805b86eef336b87ea2d3871e7a7928dec68b38;p=libfirm

diff --git a/ir/ir/irverify.c b/ir/ir/irverify.c
index ec368e7ea..c093b921c 100644
--- a/ir/ir/irverify.c
+++ b/ir/ir/irverify.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2010 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -233,7 +233,7 @@ static void show_node_on_graph(ir_graph *irg, ir_node *n)
  */
 static void show_call_param(ir_node *n, ir_type *mt)
 {
-	int i;
+	size_t i;
 	char type_name[256];
 	ir_print_type(type_name, sizeof(type_name), mt);
 
@@ -273,9 +273,10 @@ static void show_return_nres(ir_graph *irg, ir_node *n, ir_type *mt)
 	ir_entity *ent = get_irg_entity(irg);
 
 	show_entity_failure(n);
-	fprintf(stderr, "  Return node %ld in entity \"%s\" has %d results different from type %d\n",
+	fprintf(stderr, "  Return node %ld in entity \"%s\" has %lu results different from type %lu\n",
 		get_irn_node_nr(n), get_entity_name(ent),
-		get_Return_n_ress(n), get_method_n_ress(mt));
+		(unsigned long) get_Return_n_ress(n),
+		(unsigned long) get_method_n_ress(mt));
 }
 
 /**
@@ -332,7 +333,6 @@ static int verify_node_Proj_Start(ir_node *n, ir_node *p)
 			(proj == pn_Start_X_initial_exec && mode == mode_X) ||
 			(proj == pn_Start_M              && mode == mode_M) ||
 			(proj == pn_Start_P_frame_base   && mode_is_reference(mode)) ||
-			(proj == pn_Start_P_tls          && mode_is_reference(mode)) ||
 			(proj == pn_Start_T_args         && mode == mode_T)
 		),
 		"wrong Proj from Start", 0,
@@ -413,8 +413,7 @@ static int verify_node_Proj_Call(ir_node *n, ir_node *p)
 			(proj == pn_Call_M                && mode == mode_M) ||
 			(proj == pn_Call_X_regular        && mode == mode_X) ||
 			(proj == pn_Call_X_except         && mode == mode_X) ||
-			(proj == pn_Call_T_result         && mode == mode_T) ||
-			(proj == pn_Call_P_value_res_base && mode_is_reference(mode))
+			(proj == pn_Call_T_result         && mode == mode_T)
 		),
 		"wrong Proj from Call", 0,
 		show_proj_failure(p);
@@ -431,73 +430,6 @@ static int verify_node_Proj_Call(ir_node *n, ir_node *p)
 	return 1;
 }
 
-/**
- * verify a Proj(Quot) node
- */
-static int verify_node_Proj_Quot(ir_node *n, ir_node *p)
-{
-	ir_mode *mode = get_irn_mode(p);
-	long proj     = get_Proj_proj(p);
-
-	ASSERT_AND_RET_DBG(
-		(
-			(proj == pn_Quot_M         && mode == mode_M) ||
-			(proj == pn_Quot_X_regular && mode == mode_X) ||
-			(proj == pn_Quot_X_except  && mode == mode_X) ||
-			(proj == pn_Quot_res       && mode_is_float(mode) && mode == get_Quot_resmode(n))
-		),
-		"wrong Proj from Quot", 0,
-		show_proj_failure(p);
-	);
-	if (proj == pn_Quot_X_regular)
-		ASSERT_AND_RET(
-			get_irn_pinned(n) == op_pin_state_pinned,
-			"Regular Proj from unpinned Quot", 0);
-	else if (proj == pn_Quot_X_except)
-		ASSERT_AND_RET(
-			get_irn_pinned(n) == op_pin_state_pinned,
-			"Exception Proj from unpinned Quot", 0);
-	else if (proj == pn_Quot_M)
-		ASSERT_AND_RET(
-			get_irn_pinned(n) == op_pin_state_pinned,
-			"Memory Proj from unpinned Quot", 0);
-	return 1;
-}
-
-/**
- * verify a Proj(DivMod) node
- */
-static int verify_node_Proj_DivMod(ir_node *n, ir_node *p)
-{
-	ir_mode *mode = get_irn_mode(p);
-	long proj     = get_Proj_proj(p);
-
-	ASSERT_AND_RET_DBG(
-		(
-			(proj == pn_DivMod_M         && mode == mode_M) ||
-			(proj == pn_DivMod_X_regular && mode == mode_X) ||
-			(proj == pn_DivMod_X_except  && mode == mode_X) ||
-			(proj == pn_DivMod_res_div   && mode_is_int(mode) && mode == get_DivMod_resmode(n)) ||
-			(proj == pn_DivMod_res_mod   && mode_is_int(mode) && mode == get_DivMod_resmode(n))
-		),
-		"wrong Proj from DivMod", 0,
-		show_proj_failure(p);
-	);
-	if (proj == pn_DivMod_X_regular)
-		ASSERT_AND_RET(
-			get_irn_pinned(n) == op_pin_state_pinned,
-			"Regular Proj from unpinned DivMod", 0);
-	else if (proj == pn_DivMod_X_except)
-		ASSERT_AND_RET(
-			get_irn_pinned(n) == op_pin_state_pinned,
-			"Exception Proj from unpinned DivMod", 0);
-	else if (proj == pn_DivMod_M)
-		ASSERT_AND_RET(
-			get_irn_pinned(n) == op_pin_state_pinned,
-			"Memory Proj from unpinned DivMod", 0);
-	return 1;
-}
-
 /**
  * verify a Proj(Div) node
  */
@@ -511,7 +443,7 @@ static int verify_node_Proj_Div(ir_node *n, ir_node *p)
 			(proj == pn_Div_M         && mode == mode_M) ||
 			(proj == pn_Div_X_regular && mode == mode_X) ||
 			(proj == pn_Div_X_except  && mode == mode_X) ||
-			(proj == pn_Div_res       && mode_is_int(mode) && mode == get_Div_resmode(n))
+			(proj == pn_Div_res       && mode_is_data(mode) && mode == get_Div_resmode(n))
 		),
 		"wrong Proj from Div", 0,
 		show_proj_failure(p);
@@ -544,7 +476,7 @@ static int verify_node_Proj_Mod(ir_node *n, ir_node *p)
 			(proj == pn_Mod_M         && mode == mode_M) ||
 			(proj == pn_Mod_X_regular && mode == mode_X) ||
 			(proj == pn_Mod_X_except  && mode == mode_X) ||
-			(proj == pn_Mod_res       && mode_is_int(mode) && mode == get_Mod_resmode(n))
+			(proj == pn_Mod_res       && mode == get_Mod_resmode(n))
 		),
 		"wrong Proj from Mod", 0,
 		show_proj_failure(p);
@@ -564,28 +496,6 @@ static int verify_node_Proj_Mod(ir_node *n, ir_node *p)
 	return 1;
 }
 
-/**
- * verify a Proj(Cmp) node
- */
-static int verify_node_Proj_Cmp(ir_node *n, ir_node *p)
-{
-	ir_mode *mode = get_irn_mode(p);
-	long proj     = get_Proj_proj(p);
-	(void) n;
-
-	ASSERT_AND_RET_DBG(
-		(proj >= 0 && proj <= 15 && mode == mode_b),
-		"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;
-}
-
 /**
  * verify a Proj(Load) node
  */
@@ -711,7 +621,7 @@ static int verify_node_Proj_Proj(ir_node *pred, ir_node *p)
 				(proj >= 0 && mode_is_datab(mode)),
 				"wrong Proj from Proj from Start", 0);
 			ASSERT_AND_RET(
-				(proj < get_method_n_params(mt)),
+				(proj < (int)get_method_n_params(mt)),
 				"More Projs for args than args in type", 0
 				);
 			if ((mode_is_reference(mode)) && is_compound_type(get_method_param_type(mt, proj)))
@@ -736,7 +646,7 @@ static int verify_node_Proj_Proj(ir_node *pred, ir_node *p)
 			ASSERT_AND_RET(mt == get_unknown_type() || is_Method_type(mt),
 					"wrong call type on call", 0);
 			ASSERT_AND_RET(
-				(proj < get_method_n_ress(mt)),
+				(proj < (int)get_method_n_ress(mt)),
 				"More Projs for results than results in type.", 0);
 			if ((mode_is_reference(mode)) && is_compound_type(get_method_res_type(mt, proj)))
 				/* value result */ break;
@@ -970,7 +880,7 @@ static int verify_node_Return(ir_node *n, ir_graph *irg)
 	ASSERT_AND_RET( mymode == mode_X, "Result X", 0 );   /* result X */
 	/* Compare returned results with result types of method type */
 	mt = get_entity_type(get_irg_entity(irg));
-	ASSERT_AND_RET_DBG( get_Return_n_ress(n) == get_method_n_ress(mt),
+	ASSERT_AND_RET_DBG(get_Return_n_ress(n) == get_method_n_ress(mt),
 		"Number of results for Return doesn't match number of results in type.", 0,
 		show_return_nres(irg, n, mt););
 	for (i = get_Return_n_ress(n) - 1; i >= 0; --i) {
@@ -1118,7 +1028,8 @@ static int verify_node_Call(ir_node *n, ir_graph *irg)
 	ir_mode *op1mode = get_irn_mode(get_Call_mem(n));
 	ir_mode *op2mode = get_irn_mode(get_Call_ptr(n));
 	ir_type *mt;
-	int i;
+	size_t i;
+	size_t n_params;
 	(void) irg;
 
 	/* Call: BB x M x ref x data1 x ... x datan
@@ -1133,7 +1044,8 @@ static int verify_node_Call(ir_node *n, ir_graph *irg)
 		return 1;
 	}
 
-	for (i = get_Call_n_params(n) - 1; i >= 0; --i) {
+	n_params = get_Call_n_params(n);
+	for (i = 0; i < n_params; ++i) {
 		ASSERT_AND_RET( mode_is_datab(get_irn_mode(get_Call_param(n, i))), "Call node", 0 );  /* operand datai */
 	}
 
@@ -1306,50 +1218,6 @@ static int verify_node_Mulh(ir_node *n, ir_graph *irg)
 	return 1;
 }
 
-/**
- * verify a Quot node
- */
-static int verify_node_Quot(ir_node *n, ir_graph *irg)
-{
-	ir_mode *mymode  = get_irn_mode(n);
-	ir_mode *op1mode = get_irn_mode(get_Quot_mem(n));
-	ir_mode *op2mode = get_irn_mode(get_Quot_left(n));
-	ir_mode *op3mode = get_irn_mode(get_Quot_right(n));
-	(void) irg;
-
-	ASSERT_AND_RET_DBG(
-		/* Quot: BB x M x float x float --> M x X x float */
-		op1mode == mode_M && op2mode == op3mode &&
-		get_mode_sort(op2mode) == irms_float_number &&
-		mymode == mode_T,
-		"Quot node",0,
-		show_binop_failure(n, "/* Quot: BB x M x float x float --> M x X x float */");
-	);
-	return 1;
-}
-
-/**
- * verify a DivMod node
- */
-static int verify_node_DivMod(ir_node *n, ir_graph *irg)
-{
-	ir_mode *mymode  = get_irn_mode(n);
-	ir_mode *op1mode = get_irn_mode(get_DivMod_mem(n));
-	ir_mode *op2mode = get_irn_mode(get_DivMod_left(n));
-	ir_mode *op3mode = get_irn_mode(get_DivMod_right(n));
-	(void) irg;
-
-	ASSERT_AND_RET(
-		/* DivMod: BB x M x int x int --> M x X x int x int */
-		op1mode == mode_M &&
-		mode_is_int(op2mode) &&
-		op3mode == op2mode &&
-		mymode == mode_T,
-		"DivMod node", 0
-		);
-	return 1;
-}
-
 /**
  * verify a Div node
  */
@@ -1362,10 +1230,10 @@ static int verify_node_Div(ir_node *n, ir_graph *irg)
 	(void) irg;
 
 	ASSERT_AND_RET(
-		/* Div: BB x M x int x int --> M x X x int */
+		/* Div: BB x M x data x data --> M x X x data */
 		op1mode == mode_M &&
 		op2mode == op3mode &&
-		mode_is_int(op2mode) &&
+		mode_is_data(op2mode) &&
 		mymode == mode_T,
 		"Div node", 0
 		);
@@ -1406,7 +1274,7 @@ static int verify_node_Logic(ir_node *n, ir_graph *irg)
 
 	ASSERT_AND_RET_DBG(
 		/* And or Or or Eor: BB x int x int --> int */
-		(mode_is_int(mymode) || mymode == mode_b) &&
+		(mode_is_int(mymode) || mode_is_reference(mymode) || mymode == mode_b) &&
 		op2mode == op1mode &&
 		mymode == op2mode,
 		"And, Or or Eor node", 0,
@@ -1452,7 +1320,7 @@ static int verify_node_Cmp(ir_node *n, ir_graph *irg)
 		/* Cmp: BB x datab x datab --> b16 */
 		mode_is_datab(op1mode) &&
 		op2mode == op1mode &&
-		mymode == mode_T,
+		mymode == mode_b,
 		"Cmp node", 0,
 		show_binop_failure(n, "/* Cmp: BB x datab x datab --> b16 */");
 	);
@@ -1978,21 +1846,21 @@ int irg_verify(ir_graph *irg, unsigned flags)
 {
 	int res = 1;
 #ifdef DEBUG_libfirm
+	int pinned = get_irg_pinned(irg) == op_pin_state_pinned;
 
 #ifndef NDEBUG
-    last_irg_error = NULL;
+	last_irg_error = NULL;
 #endif /* NDEBUG */
 
-	assert(get_irg_pinned(irg) == op_pin_state_pinned && "Verification need pinned graph");
-
-	if (flags & VERIFY_ENFORCE_SSA)
+	if ((flags & VERIFY_ENFORCE_SSA) && pinned)
 		compute_doms(irg);
 
 	irg_walk_anchors(
 		irg,
-		get_irg_dom_state(irg) == dom_consistent &&
-		get_irg_pinned(irg) == op_pin_state_pinned ? verify_wrap_ssa : verify_wrap,
-		NULL, &res
+		pinned && get_irg_dom_state(irg) == dom_consistent
+			? verify_wrap_ssa : verify_wrap,
+		NULL,
+		&res
 	);
 
 	if (get_node_verification_mode() == FIRM_VERIFICATION_REPORT && ! res) {
@@ -2183,7 +2051,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:                          \
@@ -2209,8 +2077,6 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops)
 	CASE(Minus);
 	CASE(Mul);
 	CASE(Mulh);
-	CASE(Quot);
-	CASE(DivMod);
 	CASE(Div);
 	CASE(Mod);
 	CASE(And);
@@ -2250,11 +2116,8 @@ void firm_set_default_verifyer(ir_opcode code, ir_op_ops *ops)
 	CASE(Raise);
 	CASE(InstOf);
 	CASE(Call);
-	CASE(Quot);
-	CASE(DivMod);
 	CASE(Div);
 	CASE(Mod);
-	CASE(Cmp);
 	CASE(Load);
 	CASE(Store);
 	CASE(Alloc);