A little better debug output

[libfirm] / ir / ana / irsimpletype.c

diff --git a/ir/ana/irsimpletype.c b/ir/ana/irsimpletype.c
index dc14cea..610e96f 100644 (file)
--- a/ir/ana/irsimpletype.c
+++ b/ir/ana/irsimpletype.c
@@ -29,6 +29,7 @@
 # include "irprog_t.h"
 # include "irgwalk.h"
 # include "ident.h"
+# include "trouts.h"
 
 #define VERBOSE_UNKNOWN_TYPE(s) printf s
 
@@ -38,29 +39,49 @@ static type *phi_cycle_type = NULL;
 /* ------------ Building and Removing the type information  ----------- */
 
 
-/* init type link field so that types point to their pointers. */
-void precompute_pointer_types(void) {
+/**
+ * init type link field so that types point to their pointers.
+ */
+static void precompute_pointer_types(void) {
+#if 0
   int i;
   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)
+
+  for (i = get_irp_n_types() - 1; i >= 0; --i)
     set_type_link(get_irp_type(i), (void *)firm_unknown_type);
-  for (i = get_irp_n_types()-1; i>=0; --i) {
+
+  for (i = get_irp_n_types() - 1; i >= 0; --i) {
     type *tp = get_irp_type(i);
     if (is_Pointer_type(tp))
       set_type_link(get_pointer_points_to_type(tp), (void *)tp);
   }
+#else
+  compute_trouts();
+#endif
 }
 
-/* Store pointer in link to speed up search of pointer type. */
+/**
+ * Returns a pointer to type which was stored in the link field
+ * to speed up search.
+ */
 static type *find_pointer_type_to (type *tp) {
+#if 0
   return (type *)get_type_link(tp);
+#else
+  if (get_type_n_pointertypes_to(tp) > 0)
+    return get_type_pointertype_to(tp, 0);
+  else
+    return firm_unknown_type;
+#endif
 }
 
-static type* compute_irn_type(ir_node *n);
+static type *compute_irn_type(ir_node *n);
 
 static type *find_type_for_Proj(ir_node *n) {
   type *tp;
+
+  /* Avoid nested Tuples. */
   ir_node *pred = skip_Tuple(get_Proj_pred(n));
   ir_mode *m = get_irn_mode(n);
 
@@ -83,6 +104,8 @@ static type *find_type_for_Proj(ir_node *n) {
     } 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 if (get_irn_op(pred_pred) == op_Tuple) {
+      assert(0 && "Encountered nested Tuple");
     } else {
       VERBOSE_UNKNOWN_TYPE(("Proj %ld from Proj from ??: unknown type\n", get_irn_node_nr(n)));
       tp = firm_unknown_type;
@@ -112,6 +135,9 @@ static type *find_type_for_Proj(ir_node *n) {
       tp = firm_unknown_type;
     }
   } break;
+  case iro_Tuple: {
+    tp = compute_irn_type(get_Tuple_pred(pred, get_Proj_proj(n)));
+  } break;
   default:
     tp = compute_irn_type(pred);
   }
@@ -119,6 +145,10 @@ static type *find_type_for_Proj(ir_node *n) {
   return tp;
 }
 
+/**
+ * Try to determine the type of a node.
+ * If a type cannot be determined, return @p firm_none_type.
+ */
 static type *find_type_for_node(ir_node *n) {
   type *tp = NULL;
   type *tp1 = NULL, *tp2 = NULL;
@@ -226,7 +256,7 @@ static type *find_type_for_node(ir_node *n) {
 
     if (tp1 == tp2) { tp = tp1; break; }
 
-    if (get_firm_verbosity() > 1) {
+    if (get_firm_verbosity() > 55) {  // Do not commit 55! should be 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)));
     }
@@ -258,21 +288,21 @@ 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(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 =  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)) &&
-       mode_is_int(get_irn_mode(a))       &&
-       mode_is_reference(get_irn_mode(b))    ) {
+        mode_is_int(get_irn_mode(a))       &&
+        mode_is_reference(get_irn_mode(b))    ) {
       tp = tp2; break;
     }
     goto default_code;
@@ -296,7 +326,7 @@ static type *find_type_for_node(ir_node *n) {
   } break;
 
   default:
-  default_code: {
+default_code: {
 
     if (is_unop(n)) {
       /* Is is proper to walk past a Conv??? */
@@ -313,8 +343,8 @@ static type *find_type_for_node(ir_node *n) {
              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),
+      if (get_firm_verbosity() > 55) {
+        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 = firm_unknown_type;
@@ -331,7 +361,7 @@ static type *find_type_for_node(ir_node *n) {
 }
 
 
-static type* compute_irn_type(ir_node *n) {
+static type *compute_irn_type(ir_node *n) {
   type *tp = get_irn_typeinfo_type(n);
 
   if (tp == initial_type) {