renamed all type * to ir_type *

[libfirm] / ir / ir / irgraph.c

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 24ac3a7..0a0c3a9 100644 (file)
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -56,14 +56,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 +80,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;
 }
 
 /**
@@ -176,25 +176,27 @@ new_r_ir_graph (entity *ent, int n_loc)
                        iropt.c */
   res->outs = NULL;
 
-  res->phase_state      = phase_building;
-  res->op_pin_state_pinned = op_pin_state_pinned;
-  res->outs_state       = outs_none;
-  res->dom_state        = dom_none;
-  res->typeinfo_state   = ir_typeinfo_none;
+  res->inline_property       = irg_inline_any;
+  res->additional_properties = mtp_property_inherited;  /* inherited from type */
+
+  res->phase_state         = phase_building;
+  res->irg_pinned_state    = op_pin_state_pinned;
+  res->outs_state          = outs_none;
+  res->dom_state           = dom_none;
+  res->typeinfo_state      = ir_typeinfo_none;
   set_irp_typeinfo_inconsistent();           /* there is a new graph with typeinfo_none. */
-  res->loopinfo_state   = loopinfo_none;
-  res->class_cast_state = ir_class_casts_transitive;
-  res->extblk_state     = ir_extblk_info_none;
+  res->callee_info_state   = irg_callee_info_none;
+  res->loopinfo_state      = loopinfo_none;
+  res->execfreq_state      = exec_freq_none;
+  res->class_cast_state    = ir_class_casts_transitive;
+  res->extblk_state        = ir_extblk_info_none;
 
   /*-- Type information for the procedure of the graph --*/
   res->ent = ent;
   set_entity_irg(ent, res);
 
   /*--  a class type so that it can contain "inner" methods as in Pascal. --*/
-  res->frame_type = new_type_class(mangle(get_entity_ident(ent), frame_type_suffix));
-
-  /* Remove type from type list.  Must be treated differently than other types. */
-  remove_irp_type_from_list(res->frame_type);
+  res->frame_type = new_type_frame(mangle(get_entity_ident(ent), frame_type_suffix));
 
   /*-- Nodes needed in every graph --*/
   res->end_block  = new_immBlock();
@@ -209,8 +211,8 @@ new_r_ir_graph (entity *ent, int n_loc)
 
   /* Proj results of start node */
   projX            = new_Proj (res->start, mode_X, pn_Start_X_initial_exec);
-  res->frame       = new_Proj (res->start, mode_P_mach, pn_Start_P_frame_base);
-  res->globals     = new_Proj (res->start, mode_P_mach, pn_Start_P_globals);
+  res->frame       = new_Proj (res->start, mode_P_data, pn_Start_P_frame_base);
+  res->globals     = new_Proj (res->start, mode_P_data, pn_Start_P_globals);
   res->initial_mem = new_Proj (res->start, mode_M, pn_Start_M);
   res->args        = new_Proj (res->start, mode_T, pn_Start_T_args);
 #ifdef DEBUG_libfirm
@@ -233,6 +235,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;
 }
@@ -269,9 +272,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
@@ -327,7 +330,7 @@ void free_ir_graph (ir_graph *irg) {
   assert(is_ir_graph(irg));
 
   hook_free_graph(irg);
-  if (irg->outs_state != outs_none) free_outs(irg);
+  if (irg->outs_state != outs_none) free_irg_outs(irg);
   if (irg->frame_type)  free_type(irg->frame_type);
   if (irg->value_table) del_identities(irg->value_table);
   if (irg->ent) {
@@ -532,7 +535,7 @@ void
 }
 
 type *
-(get_irg_frame_type)(const ir_graph *irg) {
+(get_irg_frame_type)(ir_graph *irg) {
   return _get_irg_frame_type(irg);
 }
 
@@ -541,20 +544,6 @@ void
   _set_irg_frame_type(irg, ftp);
 }
 
-
-/* To test for a frame type */
-int
-is_frame_type(const type *ftp) {
-  int i;
-  if (is_Class_type(ftp)) {
-    for (i = 0; i < get_irp_n_irgs(); i++) {
-      const type *frame_tp = get_irg_frame_type(get_irp_irg(i));
-      if (ftp == frame_tp) return true;
-    }
-  }
-  return false;
-}
-
 int
 get_irg_n_locs (ir_graph *irg)
 {
@@ -686,6 +675,21 @@ void
   _set_irg_inline_property(irg, s);
 }
 
+unsigned
+(get_irg_additional_properties)(const ir_graph *irg) {
+  return _get_irg_additional_properties(irg);
+}
+
+void
+(set_irg_additional_properties)(ir_graph *irg, unsigned property_mask) {
+  _set_irg_additional_properties(irg, property_mask);
+}
+
+void
+(set_irg_additional_property)(ir_graph *irg, mtp_additional_property flag) {
+  _set_irg_additional_property(irg, flag);
+}
+
 void
 (set_irg_link)(ir_graph *irg, void *thing) {
   _set_irg_link(irg, thing);
@@ -806,6 +810,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)
 {