added data for post-dominance

[libfirm] / ir / ir / irgraph.c

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 4a73c35..9237954 100644 (file)
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -20,20 +20,21 @@
 
 #include <stddef.h>
 
-# include "xmalloc.h"
-# include "ircons.h"
-# include "irgraph_t.h"
-# include "irprog_t.h"
-# include "irnode_t.h"
-# include "iropt_t.h"
-# include "irflag_t.h"
-# include "array.h"
-# include "irgmod.h"
-# include "mangle.h"
-# include "irouts.h"
-# include "irhooks.h"
-# include "irgwalk.h"
-# include "iredges_t.h"
+#include "xmalloc.h"
+#include "ircons.h"
+#include "irgraph_t.h"
+#include "irprog_t.h"
+#include "irnode_t.h"
+#include "iropt_t.h"
+#include "irflag_t.h"
+#include "array.h"
+#include "irgmod.h"
+#include "mangle.h"
+#include "irouts.h"
+#include "irhooks.h"
+#include "irgwalk.h"
+#include "iredges_t.h"
+#include "type_t.h"
 
 /**
  * Indicates, whether additional data can be registered to graphs.
@@ -56,14 +57,14 @@ void set_current_ir_graph(ir_graph *graph) {
 }
 
 
-int __interprocedural_view = false;
+int firm_interprocedural_view = 0;
 
 int (get_interprocedural_view)(void) {
   return _get_interprocedural_view();
 }
 
 void (set_interprocedural_view)(int state) {
-  __interprocedural_view = state;
+  firm_interprocedural_view = state;
 
   /* set function vectors for faster access */
   if (state) {
@@ -80,9 +81,9 @@ void (set_interprocedural_view)(int state) {
 static ident *frame_type_suffix = NULL;
 
 /* initialize the IR graph module */
-void init_irgraph(void) {
+void firm_init_irgraph(void) {
   frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX);
-       forbid_new_data = 1;
+  forbid_new_data   = 1;
 }
 
 /**
@@ -177,12 +178,13 @@ new_r_ir_graph (entity *ent, int n_loc)
   res->outs = NULL;
 
   res->inline_property       = irg_inline_any;
-  res->additional_properties = 0;
+  res->additional_properties = mtp_property_inherited;  /* inherited from type */
 
   res->phase_state         = phase_building;
-  res->op_pin_state_pinned = op_pin_state_pinned;
+  res->irg_pinned_state    = op_pin_state_pinned;
   res->outs_state          = outs_none;
   res->dom_state           = dom_none;
+  res->pdom_state          = dom_none;
   res->typeinfo_state      = ir_typeinfo_none;
   set_irp_typeinfo_inconsistent();           /* there is a new graph with typeinfo_none. */
   res->callee_info_state   = irg_callee_info_none;
@@ -235,6 +237,7 @@ new_r_ir_graph (entity *ent, int n_loc)
   add_immBlock_pred (first_block, projX);
 
   res->method_execution_frequency = -1;
+  res->estimated_node_count       = 0;
 
   return res;
 }
@@ -271,9 +274,9 @@ ir_graph *new_const_code_irg(void) {
   obstack_init (res->obst);
   res->extbb_obst = NULL;
 
-  res->phase_state = phase_building;
-  res->op_pin_state_pinned = op_pin_state_pinned;
-  res->extblk_state = ir_extblk_info_none;
+  res->phase_state      = phase_building;
+  res->irg_pinned_state = op_pin_state_pinned;
+  res->extblk_state     = ir_extblk_info_none;
 
   res->value_table = new_identities (); /* value table for global value
                        numbering for optimizing use in
@@ -533,13 +536,13 @@ void
   _set_irg_entity(irg, ent);
 }
 
-type *
+ir_type *
 (get_irg_frame_type)(ir_graph *irg) {
   return _get_irg_frame_type(irg);
 }
 
 void
-(set_irg_frame_type)(ir_graph *irg, type *ftp) {
+(set_irg_frame_type)(ir_graph *irg, ir_type *ftp) {
   _set_irg_frame_type(irg, ftp);
 }
 
@@ -620,9 +623,14 @@ irg_dom_state
   return _get_irg_dom_state(irg);
 }
 
+irg_dom_state
+(get_irg_postdom_state)(const ir_graph *irg) {
+  return _get_irg_postdom_state(irg);
+}
+
 void
-(set_irg_dom_inconsistent)(ir_graph *irg) {
-  _set_irg_dom_inconsistent(irg);
+(set_irg_doms_inconsistent)(ir_graph *irg) {
+  _set_irg_doms_inconsistent(irg);
 }
 
 irg_loopinfo_state
@@ -685,7 +693,7 @@ void
 }
 
 void
-(set_irg_additional_property)(ir_graph *irg, irg_additional_property flag) {
+(set_irg_additional_property)(ir_graph *irg, mtp_additional_property flag) {
   _set_irg_additional_property(irg, flag);
 }
 
@@ -809,6 +817,11 @@ void *get_irg_loc_description(ir_graph *irg, int n)
   return irg->loc_descriptions ? irg->loc_descriptions[n] : NULL;
 }
 
+/* Returns a estimated node count of the irg. */
+unsigned (get_irg_estimated_node_cnt)(const ir_graph *irg) {
+  return _get_irg_estimated_node_cnt(irg);
+}
+
 /* register additional space in an IR graph */
 size_t register_additional_graph_data(size_t size)
 {