X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firsimpletype.c;h=b3c6f8a1cb8de993cab135dd740fe4b0ff440c9e;hb=4bad1346ff2abc3923beea23e5ac949acc7ca514;hp=1e7f93a1e234065e0218568cc79f5e0a118a0ab1;hpb=dddcc630819f338c3b45e2bc646233e6872d5bb6;p=libfirm

diff --git a/ir/ana/irsimpletype.c b/ir/ana/irsimpletype.c
index 1e7f93a1e..b3c6f8a1c 100644
--- a/ir/ana/irsimpletype.c
+++ b/ir/ana/irsimpletype.c
@@ -40,13 +40,13 @@ static type *phi_cycle_type = NULL;
 /* init type link field so that types point to their pointers. */
 void precompute_pointer_types(void) {
   int i;
-  set_type_link(unknown_type, unknown_type);
-  set_type_link(none_type,    unknown_type);
+  set_type_link(firm_unknown_type, firm_unknown_type);
+  set_type_link(firm_none_type,    firm_unknown_type);
   for (i = 0; i < get_irp_n_types(); ++i)
-    set_type_link(get_irp_type(i), (void *)unknown_type);
+    set_type_link(get_irp_type(i), (void *)firm_unknown_type);
   for (i = get_irp_n_types()-1; i>=0; --i) {
     type *tp = get_irp_type(i);
-    if (is_pointer_type(tp))
+    if (is_Pointer_type(tp))
       set_type_link(get_pointer_points_to_type(tp), (void *)tp);
   }
 }
@@ -68,7 +68,7 @@ static type *find_type_for_Proj(ir_node *n) {
       m == mode_X  ||
       m == mode_M  ||
       m == mode_b    )
-    return none_type;
+    return firm_none_type;
 
   switch (get_irn_opcode(pred)) {
   case iro_Proj: {
@@ -84,7 +84,7 @@ static type *find_type_for_Proj(ir_node *n) {
       tp = get_method_res_type(mtp, get_Proj_proj(n));
     } else {
       VERBOSE_UNKNOWN_TYPE(("Proj %ld from Proj from ??: unknown type\n", get_irn_node_nr(n)));
-      tp = unknown_type;
+      tp = firm_unknown_type;
     }
   } break;
   case iro_Start: {
@@ -95,20 +95,20 @@ static type *find_type_for_Proj(ir_node *n) {
       tp = find_pointer_type_to(get_glob_type());
     else  if (get_Proj_proj(n) == pn_Start_P_value_arg_base) {
       VERBOSE_UNKNOWN_TYPE(("Value arg base proj %ld from Start: unknown type\n", get_irn_node_nr(n)));
-      tp =  unknown_type; /* find_pointer_type_to(get....(get_entity_type(get_irg_entity(get_irn_irg(pred))))); */
+      tp =  firm_unknown_type; /* find_pointer_type_to(get....(get_entity_type(get_irg_entity(get_irn_irg(pred))))); */
     } else {
       VERBOSE_UNKNOWN_TYPE(("Proj %ld %ld from Start: unknown type\n", get_Proj_proj(n), get_irn_node_nr(n)));
-      tp = unknown_type;
+      tp = firm_unknown_type;
     }
   } break;
   case iro_Call: {
     /* value args pointer */
     if (get_Proj_proj(n) == pn_Call_P_value_res_base) {
       VERBOSE_UNKNOWN_TYPE(("Value res base Proj %ld from Call: unknown type\n", get_irn_node_nr(n)));
-      tp = unknown_type; /* find_pointer_type_to(get....get_Call_type(pred)); */
+      tp = firm_unknown_type; /* find_pointer_type_to(get....get_Call_type(pred)); */
     } else {
       VERBOSE_UNKNOWN_TYPE(("Proj %ld %ld from Call: unknown type\n", get_Proj_proj(n), get_irn_node_nr(n)));
-      tp = unknown_type;
+      tp = firm_unknown_type;
     }
   } break;
   default:
@@ -151,10 +151,10 @@ static type *find_type_for_node(ir_node *n) {
     for (i = 0; i < get_method_n_ress(meth_type); i++) {
       type *res_type = get_method_res_type(meth_type, i);
       type *ana_res_type = get_irn_type(get_Return_res(n, i));
-      if (ana_res_type == unknown_type) continue;
+      if (ana_res_type == firm_unknown_type) continue;
       if (res_type != ana_res_type && "return value has wrong type") {
-    DDMN(n);
-    assert(res_type == ana_res_type && "return value has wrong type");
+        DDMN(n);
+        assert(res_type == ana_res_type && "return value has wrong type");
       }
     }
     */
@@ -172,19 +172,20 @@ static type *find_type_for_node(ir_node *n) {
   case iro_Sync:
   case iro_Tuple:
   case iro_Bad:
+  case iro_NoMem:
   case iro_Break:
   case iro_CallBegin:
   case iro_EndReg:
   case iro_EndExcept:
-    tp = none_type; break;
+    tp = firm_none_type; break;
 
   /* compute the type */
   case iro_Const:  tp = get_Const_type(n); break;
   case iro_SymConst:
-    tp = unknown_type; break;
+    tp = get_SymConst_value_type(n); break;
   case iro_Sel:
     tp = find_pointer_type_to(get_entity_type(get_Sel_entity(n))); break;
-  /* assymetric binops */
+  /* asymmetric binops */
   case iro_Shl:
   case iro_Shr:
   case iro_Shrs:
@@ -196,26 +197,26 @@ static type *find_type_for_node(ir_node *n) {
     int i;
     int n_preds = get_Phi_n_preds(n);
 
-    if (n_preds == 0)  {tp = none_type; break; }
+    if (n_preds == 0)  {tp = firm_none_type; break; }
 
     /* initialize this Phi */
-    set_irn_type(n, phi_cycle_type);
+    set_irn_typeinfo_type(n, phi_cycle_type);
 
     /* find a first real type */
     for (i = 0; i < n_preds; ++i) {
       tp1 = compute_irn_type(get_Phi_pred(n, i));
       assert(tp1 != initial_type);
-      if ((tp1 != phi_cycle_type) && (tp1 != none_type))
-    break;
+      if ((tp1 != phi_cycle_type) && (tp1 != firm_none_type))
+        break;
     }
 
     /* find a second real type */
     tp2 = tp1;
     for (; (i < n_preds); ++i) {
       tp2 = compute_irn_type(get_Phi_pred(n, i));
-      if ((tp2 == phi_cycle_type) || (tp2 == none_type)) {
-    tp2 = tp1;
-    continue;
+      if ((tp2 == phi_cycle_type) || (tp2 == firm_none_type)) {
+        tp2 = tp1;
+        continue;
       }
       if (tp2 != tp1) break;
     }
@@ -224,20 +225,22 @@ static type *find_type_for_node(ir_node *n) {
 
     if (tp1 == tp2) { tp = tp1; break; }
 
-    VERBOSE_UNKNOWN_TYPE(("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 = unknown_type;
+    if (get_firm_verbosity() > 1) {
+      VERBOSE_UNKNOWN_TYPE(("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;
   } break;
   case iro_Load: {
     ir_node *a = get_Load_ptr(n);
     if (get_irn_op(a) == op_Sel)
       tp = get_entity_type(get_Sel_entity(a));
-    else if (is_pointer_type(compute_irn_type(a))) {
-      tp = get_pointer_points_to_type(get_irn_type(a));
-      if (is_array_type(tp)) tp = get_array_element_type(tp);
+    else if (is_Pointer_type(compute_irn_type(a))) {
+      tp = get_pointer_points_to_type(get_irn_typeinfo_type(a));
+      if (is_Array_type(tp)) tp = get_array_element_type(tp);
     } else {
       VERBOSE_UNKNOWN_TYPE(("Load %ld with typeless address. result: unknown type\n", get_irn_node_nr(n)));
-      tp = unknown_type;
+      tp = firm_unknown_type;
     }
   } break;
   case iro_Alloc:
@@ -247,23 +250,23 @@ static type *find_type_for_node(ir_node *n) {
   case iro_Id:
     tp = compute_irn_type(get_Id_pred(n)); break;
  case iro_Unknown:
-    tp = unknown_type;  break;
+    tp = firm_unknown_type;  break;
  case iro_Filter:
     assert(0 && "Filter not implemented"); break;
 
   /* catch special cases with fallthrough to binop/unop cases in default. */
   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))   ) {
+	      mode_is_reference(get_irn_mode(a)) &&
+	      mode_is_reference(get_irn_mode(b))   ) {
       VERBOSE_UNKNOWN_TYPE(("Sub %ld ptr - ptr = int: unknown type\n", get_irn_node_nr(n)));
-      tp =  unknown_type; break;
+      tp =  firm_unknown_type; break;
     }
   } /* 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))         ) {
+	      mode_is_reference(get_irn_mode(a)) &&
+	      mode_is_int(get_irn_mode(b))         ) {
       tp = tp1; break;
     }
     if (mode_is_reference(get_irn_mode(n)) &&
@@ -276,7 +279,7 @@ static type *find_type_for_node(ir_node *n) {
   case iro_Mul: {
     if (get_irn_mode(n) != get_irn_mode(a)) {
       VERBOSE_UNKNOWN_TYPE(("Mul %ld int1 * int1 = int2: unknown type\n", get_irn_node_nr(n)));
-      tp = unknown_type; break;
+      tp = firm_unknown_type; break;
     }
     goto default_code;
   } break;
@@ -292,16 +295,18 @@ static type *find_type_for_node(ir_node *n) {
 
     if (is_binop(n)) {
       if (tp1 == tp2) {
-    tp = tp1;
-    break;
+	      tp = tp1;
+	      break;
       }
       if((tp1 == phi_cycle_type) || (tp2 == phi_cycle_type)) {
-    tp = phi_cycle_type;
-    break;
+	      tp = phi_cycle_type;
+	      break;
+      }
+      if (get_firm_verbosity() > 1) {
+	VERBOSE_UNKNOWN_TYPE(("Binop %ld with two different types: %s, %s: unknown type \n", get_irn_node_nr(n),
+			      get_type_name(tp1), get_type_name(tp2)));
       }
-      VERBOSE_UNKNOWN_TYPE(("Binop %ld with two different types: %s, %s: unknown type \n", get_irn_node_nr(n),
-                get_type_name(tp1), get_type_name(tp2)));
-      tp = unknown_type;
+      tp = firm_unknown_type;
       break;
     }
 
@@ -316,13 +321,11 @@ static type *find_type_for_node(ir_node *n) {
 
 
 static type* compute_irn_type(ir_node *n) {
-  /* DDMN(n); */
-
-  type *tp = get_irn_type(n);
+  type *tp = get_irn_typeinfo_type(n);
 
-  if ((tp == initial_type)) {
+  if (tp == initial_type) {
     tp = find_type_for_node(n);
-    set_irn_type(n, tp);
+    set_irn_typeinfo_type(n, tp);
   }
 
   /* printf (" found %s ", get_type_name(tp)); DDM; */
@@ -332,17 +335,17 @@ static type* compute_irn_type(ir_node *n) {
 
 static void compute_type(ir_node *n, void *env) {
 
-  type *tp = get_irn_type(n);
+  type *tp = get_irn_typeinfo_type(n);
   if (tp ==  phi_cycle_type) {
     /* printf(" recomputing for phi_cycle_type "); DDMN(n); */
-    set_irn_type(n, initial_type);
+    set_irn_typeinfo_type(n, initial_type);
   }
 
   compute_irn_type(n);
 }
 
 static void analyse_irg (ir_graph *irg) {
-  set_irg_typeinfo_state(irg, irg_typeinfo_consistent);
+  set_irg_typeinfo_state(irg, ir_typeinfo_consistent);
   irg_walk_graph(irg, NULL, compute_type, NULL);
 }
 
@@ -360,6 +363,7 @@ void simple_analyse_types(void) {
     current_ir_graph = get_irp_irg(i);
     analyse_irg(current_ir_graph);
   }
+  set_irp_typeinfo_state(ir_typeinfo_consistent);
 }
 
 void free_simple_type_information(void) {
@@ -369,4 +373,5 @@ void free_simple_type_information(void) {
     free_type(phi_cycle_type);
     phi_cycle_type = NULL;
   }
+  set_irp_typeinfo_state(ir_typeinfo_none);
 }