X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firtypeinfo.c;h=fa79546e6e412e4bef64f82b5f8b87433617f3d3;hb=229528cc3e74e956082afb64791e46ec5ed49f20;hp=cf72bf2b1ae9f10f384ef6e26346264575f873cd;hpb=dc87aa49c6d24b8d08f14d26ff42537cf82b559c;p=libfirm

diff --git a/ir/ana/irtypeinfo.c b/ir/ana/irtypeinfo.c
index cf72bf2b1..fa79546e6 100644
--- a/ir/ana/irtypeinfo.c
+++ b/ir/ana/irtypeinfo.c
@@ -25,12 +25,17 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "irtypeinfo.h"
 
 #include <stddef.h>
 
 #include "irgraph_t.h"   /* for setting the state flag. */
-#include "irprog.h"
+#include "irprog_t.h"
+#include "irnode_t.h"
 #include "pmap.h"
 
 /* ------------ The map. ---------------------------------------------- */
@@ -45,8 +50,7 @@ static pmap *type_node_map = NULL;
  *  variable is set by init_irtypeinfo.  The type is freed by
  *  free_irtypeinfo.
  */
-type *initial_type = NULL;
-
+ir_type *initial_type = NULL;
 
 /* ------------ Initializing this module. ----------------------------- */
 
@@ -66,8 +70,7 @@ void init_irtypeinfo(void) {
   type_node_map = pmap_create();
 
   for (i = 0; i < get_irp_n_irgs(); ++i)
-    set_irg_typeinfo_state(get_irp_irg(i), irg_typeinfo_none);
-
+    set_irg_typeinfo_state(get_irp_irg(i), ir_typeinfo_none);
 }
 
 void free_irtypeinfo(void) {
@@ -76,53 +79,76 @@ void free_irtypeinfo(void) {
   if (initial_type) {
     free_type(initial_type);
     initial_type = NULL;
-  } else
-    assert(0 && "call init_type_info before freeing");
-
+  }
+  //else assert(0 && "call init_type_info before freeing");
 
   if (type_node_map) {
     pmap_destroy(type_node_map);
     type_node_map = NULL;
-  } else
-    assert(0 && "call init_type_info before freeing");
+  }
+  //else assert(0 && "call init_type_info before freeing");
 
   for (i = 0; i < get_irp_n_irgs(); ++i)
-    set_irg_typeinfo_state(get_irp_irg(i), irg_typeinfo_none);
+    set_irg_typeinfo_state(get_irp_irg(i), ir_typeinfo_none);
 }
 
 
 /* ------------ Irgraph state handling. ------------------------------- */
 
-void set_irg_typeinfo_state(ir_graph *irg, irg_typeinfo_state s) {
+void set_irg_typeinfo_state(ir_graph *irg, ir_typeinfo_state s) {
   assert(is_ir_graph(irg));
   irg->typeinfo_state = s;
+  if ((irg->typeinfo_state == ir_typeinfo_consistent) &&
+      (irp->typeinfo_state == ir_typeinfo_consistent) &&
+      (s                   != ir_typeinfo_consistent)   )
+    irp->typeinfo_state = ir_typeinfo_inconsistent;
 }
 
-irg_typeinfo_state get_irg_typeinfo_state(ir_graph *irg) {
+ir_typeinfo_state get_irg_typeinfo_state(ir_graph *irg) {
   assert(is_ir_graph(irg));
   return irg->typeinfo_state;
 }
 
+
+/* Returns accumulated type information state information.
+ *
+ * Returns ir_typeinfo_consistent if the type information of all irgs is
+ * consistent.  Returns ir_typeinfo_inconsistent if at least one irg has inconsistent
+ * or no type information.  Returns ir_typeinfo_none if no irg contains type information.
+ */
+ir_typeinfo_state get_irp_typeinfo_state(void) {
+  return irp->typeinfo_state;
+}
+void set_irp_typeinfo_state(ir_typeinfo_state s) {
+  irp->typeinfo_state = s;
+}
+/* If typeinfo is consistent, sets it to inconsistent. */
+void set_irp_typeinfo_inconsistent(void) {
+  if (irp->typeinfo_state == ir_typeinfo_consistent)
+    irp->typeinfo_state = ir_typeinfo_inconsistent;
+}
+
+
 /* ------------ Irnode type information. ------------------------------ */
 
 /* These routines only work properly if the ir_graph is in state
- * irg_typeinfo_consistent or irg_typeinfo_inconsistent.  They
+ * ir_typeinfo_consistent or ir_typeinfo_inconsistent.  They
  * assume current_ir_graph set properly.
  */
-type *get_irn_type(ir_node *n) {
-  type *res = initial_type;
-  assert(get_irg_typeinfo_state(current_ir_graph) == irg_typeinfo_consistent  ||
-	 get_irg_typeinfo_state(current_ir_graph) == irg_typeinfo_inconsistent  );
+ir_type *get_irn_typeinfo_type(ir_node *n) {
+  ir_type *res = initial_type;
+  assert(get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_consistent  ||
+	 get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_inconsistent  );
 
   if (pmap_contains(type_node_map, (void *)n))
-    res = (type *) pmap_get(type_node_map, (void *)n);
+    res = (ir_type *) pmap_get(type_node_map, (void *)n);
 
   return res;
 }
 
-void set_irn_type(ir_node *n, type *tp) {
-  assert(get_irg_typeinfo_state(current_ir_graph) == irg_typeinfo_consistent  ||
-  	 get_irg_typeinfo_state(current_ir_graph) == irg_typeinfo_inconsistent  );
+void set_irn_typeinfo_type(ir_node *n, ir_type *tp) {
+  assert(get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_consistent  ||
+  	 get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_inconsistent  );
 
   pmap_insert(type_node_map, (void *)n, (void *)tp);
 }