X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firsimpletype.c;h=918d78d0c74357d9296af5042eafb9117070efde;hb=d935aa267d00966c360931d2f0f43008030c0592;hp=52282959a39b61961091e33366f5edba54d1e4b6;hpb=e0de495ee85f3abf9a9004a1af4bd81045590bc1;p=libfirm

diff --git a/ir/ana/irsimpletype.c b/ir/ana/irsimpletype.c
index 52282959a..918d78d0c 100644
--- a/ir/ana/irsimpletype.c
+++ b/ir/ana/irsimpletype.c
@@ -117,13 +117,13 @@ static ir_type *find_type_for_Proj(ir_node *n) {
 		/* Deal with Start / Call here: we need to know the Proj Nr. */
 		assert(get_irn_mode(pred) == mode_T);
 		pred_pred = get_Proj_pred(pred);
-		if (get_irn_op(pred_pred) == op_Start)  {
+		if (is_Start(pred_pred))  {
 			ir_type *mtp = get_entity_type(get_irg_entity(get_irn_irg(pred_pred)));
 			tp = get_method_param_type(mtp, get_Proj_proj(n));
-		} else if (get_irn_op(pred_pred) == op_Call) {
+		} else if (is_Call(pred_pred)) {
 			ir_type *mtp = get_Call_type(pred_pred);
 			tp = get_method_res_type(mtp, get_Proj_proj(n));
-		} else if (get_irn_op(pred_pred) == op_Tuple) {
+		} else if (is_Tuple(pred_pred)) {
 			panic("Encountered nested Tuple");
 		} else {
 			DB((dbg, SET_LEVEL_1, "Proj %ld from Proj from ??: unknown type\n", get_irn_node_nr(n)));
@@ -137,9 +137,6 @@ static ir_type *find_type_for_Proj(ir_node *n) {
 		case pn_Start_P_frame_base:
 			tp = find_pointer_type_to(get_irg_frame_type(get_irn_irg(pred)));
 			break;
-		case pn_Start_P_globals:
-			tp = find_pointer_type_to(get_glob_type());
-			break;
 		case pn_Start_P_tls:
 			tp = find_pointer_type_to(get_tls_type());
 			break;
@@ -194,9 +191,9 @@ static ir_type *find_type_for_node(ir_node *n) {
 
 	switch (get_irn_opcode(n)) {
 
-	case iro_InstOf: {
+	case iro_InstOf:
 		assert(0 && "op_InstOf not supported");
-	} break;
+		break;
 
 		/* has no type */
 	case iro_Return: {
@@ -236,19 +233,26 @@ static ir_type *find_type_for_node(ir_node *n) {
 		break;
 
 		/* compute the type */
-	case iro_Const:  tp = get_Const_type(n); break;
+	case iro_Const:
+	     	tp = get_Const_type(n);
+		break;
 	case iro_SymConst:
-		tp = get_SymConst_value_type(n); break;
+		tp = get_SymConst_value_type(n);
+		break;
 	case iro_Sel:
-		tp = find_pointer_type_to(get_entity_type(get_Sel_entity(n))); break;
+		tp = find_pointer_type_to(get_entity_type(get_Sel_entity(n)));
+		break;
+
 		/* asymmetric binops */
 	case iro_Shl:
 	case iro_Shr:
 	case iro_Shrs:
-	case iro_Rot:
-		tp = tp1;  break;
+	case iro_Rotl:
+		tp = tp1;
+		break;
 	case iro_Cast:
-		tp = get_Cast_type(n);  break;
+		tp = get_Cast_type(n);
+		break;
 	case iro_Phi: {
 		int i;
 		int n_preds = get_Phi_n_preds(n);
@@ -285,7 +289,8 @@ static ir_type *find_type_for_node(ir_node *n) {
 		DB((dbg, SET_LEVEL_2, "Phi %ld with two different types: %s, %s: unknown type.\n", get_irn_node_nr(n),
 			get_type_name(tp1), get_type_name(tp2)));
 		tp = firm_unknown_type;   /* Test for supertypes? */
-	} break;
+		break;
+	}
 
 	case iro_Load: {
 		ir_node *a = get_Load_ptr(n);
@@ -298,28 +303,34 @@ static ir_type *find_type_for_node(ir_node *n) {
 		} else {
 			DB((dbg, SET_LEVEL_1, "Load %ld with typeless address. result: unknown type\n", get_irn_node_nr(n)));
 		}
-	} break;
+		break;
+	}
 	case iro_Alloc:
-		tp = find_pointer_type_to(get_Alloc_type(n));  break;
+		tp = find_pointer_type_to(get_Alloc_type(n));
+		break;
 	case iro_Proj:
-		tp = find_type_for_Proj(n); break;
+		tp = find_type_for_Proj(n);
+		break;
 	case iro_Id:
-		tp = compute_irn_type(get_Id_pred(n)); break;
+		tp = compute_irn_type(get_Id_pred(n));
+		break;
 	case iro_Unknown:
-		tp = firm_unknown_type;  break;
+		tp = firm_unknown_type;
+		break;
 	case iro_Filter:
-		assert(0 && "Filter not implemented"); break;
+		assert(0 && "Filter not implemented");
+		break;
 
 		/* catch special cases with fallthrough to binop/unop cases in default. */
-	case iro_Sub: {
+	case iro_Sub:
 		if (mode_is_int(get_irn_mode(n))       &&
 		    mode_is_reference(get_irn_mode(a)) &&
 		    mode_is_reference(get_irn_mode(b))   ) {
 			DB((dbg, SET_LEVEL_1, "Sub %ld ptr - ptr = int: unknown type\n", get_irn_node_nr(n)));
 			tp =  firm_unknown_type; break;
 		}
-	} /* fall through to Add. */
-	case iro_Add: {
+		/* fall through to Add. */
+	case iro_Add:
 		if (mode_is_reference(get_irn_mode(n)) &&
 		    mode_is_reference(get_irn_mode(a)) &&
 		    mode_is_int(get_irn_mode(b))         ) {
@@ -331,37 +342,22 @@ static ir_type *find_type_for_node(ir_node *n) {
 			tp = tp2; break;
 		}
 		goto default_code;
-	} break;
 
-	case iro_Mul: {
+	case iro_Mul:
 		if (get_irn_mode(n) != get_irn_mode(a)) {
 			DB((dbg, SET_LEVEL_1, "Mul %ld int1 * int1 = int2: unknown type\n", get_irn_node_nr(n)));
 			tp = firm_unknown_type; break;
 		}
 		goto default_code;
-	} break;
 
-	case iro_Mux: {
+	case iro_Mux:
 		a = get_Mux_true(n);
 		b = get_Mux_false(n);
 		tp1 = compute_irn_type(a);
 		tp2 = compute_irn_type(b);
 		if (tp1 == tp2)
 			tp = tp1;
-	} break;
-
-	case iro_Psi: {
-		int i, n_conds = get_Psi_n_conds(n);
-		tp1 = compute_irn_type(get_Psi_default(n));
-
-		for (i = 0; i < n_conds; ++i) {
-			tp2 = compute_irn_type(get_Psi_val(n, i));
-			if (tp2 != tp1)
-				break;
-		}
-		if (tp1 == tp2)
-			tp = tp1;
-	} break;
+		break;
 
 	case iro_Bound:
 		tp = compute_irn_type(get_Bound_index(n));
@@ -375,8 +371,7 @@ static ir_type *find_type_for_node(ir_node *n) {
 		break;
 
 	default:
-default_code: {
-
+default_code:
 		if (is_unop(n)) {
 			/* It's not proper to walk past a Conv, so this case is handled above. */
 			tp = tp1;
@@ -388,7 +383,7 @@ default_code: {
 				tp = tp1;
 				break;
 			}
-			if((tp1 == phi_cycle_type) || (tp2 == phi_cycle_type)) {
+			if ((tp1 == phi_cycle_type) || (tp2 == phi_cycle_type)) {
 				tp = phi_cycle_type;
 				break;
 			}
@@ -399,7 +394,7 @@ default_code: {
 		}
 
 		panic(" not implemented: %+F", n);
-	} break; /* default */
+		break;
 	} /* end switch */
 
 	return tp;