- fixed error with cse and programs containing endless loops:

[libfirm] / ir / ana / irsimpletype.c

diff --git a/ir/ana/irsimpletype.c b/ir/ana/irsimpletype.c
index a8546ed..1e7f93a 100644 (file)
--- a/ir/ana/irsimpletype.c
+++ b/ir/ana/irsimpletype.c
@@ -25,7 +25,7 @@
 # include "irsimpletype.h"
 
 # include "irnode_t.h"
-# include "irprog.h"
+# include "irprog_t.h"
 # include "irgwalk.h"
 # include "ident.h"
 
@@ -61,7 +61,7 @@ static type* compute_irn_type(ir_node *n);
 static type *find_type_for_Proj(ir_node *n) {
   type *tp;
   ir_node *pred = skip_Tuple(get_Proj_pred(n));
-  ir_mode *m = intern_get_irn_mode(n);
+  ir_mode *m = get_irn_mode(n);
 
   if (m == mode_T  ||
       m == mode_BB ||
@@ -70,16 +70,16 @@ static type *find_type_for_Proj(ir_node *n) {
       m == mode_b    )
     return none_type;
 
-  switch(intern_get_irn_opcode(pred)) {
+  switch (get_irn_opcode(pred)) {
   case iro_Proj: {
     ir_node *pred_pred;
     /* 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 (intern_get_irn_op(pred_pred) == op_Start)  {
-      type *mtp = get_entity_type(get_irg_ent(get_Start_irg(pred_pred)));
+    if (get_irn_op(pred_pred) == op_Start)  {
+      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 (intern_get_irn_op(pred_pred) == op_Call) {
+    } else if (get_irn_op(pred_pred) == op_Call) {
       type *mtp = get_Call_type(pred_pred);
       tp = get_method_res_type(mtp, get_Proj_proj(n));
     } else {
@@ -89,13 +89,13 @@ static type *find_type_for_Proj(ir_node *n) {
   } break;
   case iro_Start: {
     /* globals and frame pointer */
-    if (get_Proj_proj(n) == pns_frame_base)
-      tp = find_pointer_type_to(get_irg_frame_type(get_Start_irg(pred)));
-    else if (get_Proj_proj(n) == pns_globals)
+    if (get_Proj_proj(n) ==  pn_Start_P_frame_base)
+      tp = find_pointer_type_to(get_irg_frame_type(get_irn_irg(pred)));
+    else if (get_Proj_proj(n) == pn_Start_P_globals)
       tp = find_pointer_type_to(get_glob_type());
-    else  if (get_Proj_proj(n) == pns_value_arg_base) {
+    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_ent(get_Start_irg(pred))))); */
+      tp =  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;
@@ -103,7 +103,7 @@ static type *find_type_for_Proj(ir_node *n) {
   } break;
   case iro_Call: {
     /* value args pointer */
-    if (get_Proj_proj(n) == pncl_value_res_base) {
+    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)); */
     } else {
@@ -136,7 +136,7 @@ static type *find_type_for_node(ir_node *n) {
     tp2 = compute_irn_type(b);
   }
 
-  switch(intern_get_irn_opcode(n)) {
+  switch(get_irn_opcode(n)) {
 
   case iro_InstOf: {
     assert(0 && "op_InstOf not supported");
@@ -147,7 +147,7 @@ static type *find_type_for_node(ir_node *n) {
     /* Check returned type. */
     /*
     int i;
-    type *meth_type = get_entity_type(get_irg_ent(current_ir_graph));
+    type *meth_type = get_entity_type(get_irg_entity(current_ir_graph));
     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));
@@ -230,11 +230,8 @@ static type *find_type_for_node(ir_node *n) {
   } break;
   case iro_Load: {
     ir_node *a = get_Load_ptr(n);
-    if (intern_get_irn_op(a) == op_Sel)
+    if (get_irn_op(a) == op_Sel)
       tp = get_entity_type(get_Sel_entity(a));
-    else if ((intern_get_irn_op(a) == op_Const) &&
-    (tarval_is_entity(get_Const_tarval(a))))
-      tp = get_entity_type(tarval_to_entity(get_Const_tarval(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);
@@ -256,28 +253,28 @@ static type *find_type_for_node(ir_node *n) {
 
   /* catch special cases with fallthrough to binop/unop cases in default. */
   case iro_Sub: {
-    if (mode_is_int(intern_get_irn_mode(n))       &&
-    mode_is_reference(intern_get_irn_mode(a)) &&
-    mode_is_reference(intern_get_irn_mode(b))   ) {
+    if (mode_is_int(get_irn_mode(n))       &&
+    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;
     }
   } /* fall through to Add. */
   case iro_Add: {
-    if (mode_is_reference(intern_get_irn_mode(n)) &&
-    mode_is_reference(intern_get_irn_mode(a)) &&
-    mode_is_int(intern_get_irn_mode(b))         ) {
+    if (mode_is_reference(get_irn_mode(n)) &&
+    mode_is_reference(get_irn_mode(a)) &&
+    mode_is_int(get_irn_mode(b))         ) {
       tp = tp1; break;
     }
-    if (mode_is_reference(intern_get_irn_mode(n)) &&
-    mode_is_int(intern_get_irn_mode(a))       &&
-    mode_is_reference(intern_get_irn_mode(b))    ) {
+    if (mode_is_reference(get_irn_mode(n)) &&
+    mode_is_int(get_irn_mode(a))       &&
+    mode_is_reference(get_irn_mode(b))    ) {
       tp = tp2; break;
     }
     goto default_code;
   } break;
   case iro_Mul: {
-    if (intern_get_irn_mode(n) != intern_get_irn_mode(a)) {
+    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;
     }