preprocessor flag for node_nr

[libfirm] / ir / ir / irgraph.c

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 86e356a..b2ff207 100644 (file)
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -46,7 +46,7 @@ INLINE void set_interprocedural_view(bool state) {
 
 static ident* frame_type_suffix = NULL;
 void init_irgraph(void) {
-  frame_type_suffix = id_from_str(FRAME_TP_SUFFIX, strlen(FRAME_TP_SUFFIX));
+  frame_type_suffix = new_id_from_chars(FRAME_TP_SUFFIX, strlen(FRAME_TP_SUFFIX));
 }
 
 #if USE_EXPLICIT_PHI_IN_STACK
@@ -113,9 +113,9 @@ new_ir_graph (entity *ent, int n_loc)
   res->outs = NULL;
 
   res->phase_state    = phase_building;
-  res->pinned         = pinned;
-  res->outs_state     = no_outs;
-  res->dom_state      = no_dom;
+  res->op_pin_state_pinned = op_pin_state_pinned;
+  res->outs_state     = outs_none;
+  res->dom_state      = dom_none;
   res->typeinfo_state = irg_typeinfo_none;
   res->loopinfo_state = loopinfo_none;
 
@@ -138,31 +138,29 @@ new_ir_graph (entity *ent, int n_loc)
   res->start_block = new_immBlock();
   res->start   = new_Start();
   res->bad     = new_ir_node(NULL, res, res->start_block, op_Bad, mode_T, 0, NULL);
-  /* res->unknown = new_ir_node (NULL, res, res->start_block, op_Unknown, mode_T, 0, NULL); */
 
   /* Proj results of start node */
-  projX            = new_Proj (res->start, mode_X, pns_initial_exec);
-  res->frame       = new_Proj (res->start, mode_P_mach, pns_frame_base);
-  res->globals     = new_Proj (res->start, mode_P_mach, pns_globals);
-  res->initial_mem = new_Proj (res->start, mode_M, pns_global_store);
-  res->args        = new_Proj (res->start, mode_T, pns_args);
+  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->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
   res->graph_nr    = get_irp_new_node_nr();
 #endif
 
   set_store(res->initial_mem);
 
-  add_in_edge(res->start_block, projX);
+  add_immBlock_pred(res->start_block, projX);
   /*
    * The code generation needs it. leave it in now.
    * Use of this edge is matter of discussion, unresolved. Also possible:
-   * add_in_edge(res->start_block, res->start_block), but invalid typed.
+   * add_immBlock_pred(res->start_block, res->start_block), but invalid typed.
    */
-  mature_block (res->current_block);
+  mature_immBlock (res->current_block);
 
   /*-- Make a block to start with --*/
   first_block = new_immBlock();
-  add_in_edge (first_block, projX);
+  add_immBlock_pred (first_block, projX);
 
   return res;
 }
@@ -181,7 +179,7 @@ ir_graph *new_const_code_irg(void) {
   stat_new_graph(res, NULL);
 
   current_ir_graph = res;
-  res->n_loc = 1;      /* Only the memory. */
+  res->n_loc = 1;       /* Only the memory. */
   res->visited = 0;     /* visited flag, for the ir walker */
   res->block_visited=0; /* visited flag, for the 'block'-walker */
 #if USE_EXPLICIT_PHI_IN_STACK
@@ -191,34 +189,37 @@ ir_graph *new_const_code_irg(void) {
   res->obst      = (struct obstack *) xmalloc (sizeof (struct obstack));
   obstack_init (res->obst);
   res->phase_state = phase_building;
-  res->pinned = pinned;
+  res->op_pin_state_pinned = op_pin_state_pinned;
   res->value_table = new_identities (); /* value table for global value
                        numbering for optimizing use in
                        iropt.c */
   res->ent = NULL;
-  res->frame_type = NULL;
+  res->frame_type  = NULL;
   res->start_block = new_immBlock ();
   res->end_block  = new_immBlock ();
   res->end        = new_End ();
   res->end_reg    = res->end;
   res->end_except = res->end;
-  mature_block(get_cur_block());
+  mature_immBlock(get_cur_block());  /* mature the end block */
   res->bad = new_ir_node (NULL, res, res->start_block, op_Bad, mode_T, 0, NULL);
-  /* res->unknown = new_ir_node (NULL, res, res->start_block, op_Unknown, mode_T, 0, NULL); */
   res->start   = new_Start ();
+  res->initial_mem = new_Proj (res->start, mode_M, pn_Start_M);
 
   /* Proj results of start node */
-  projX        = new_Proj (res->start, mode_X, pns_initial_exec);
-  add_in_edge(res->start_block, projX);
-  mature_block (res->current_block);
-  add_in_edge (new_immBlock (), projX);
-  mature_block(get_cur_block());
+  projX        = new_Proj (res->start, mode_X, pn_Start_X_initial_exec);
+  add_immBlock_pred (res->start_block, projX);
+  mature_immBlock   (res->start_block);  /* mature the start block */
+
+  add_immBlock_pred (new_immBlock (), projX);
+  mature_immBlock   (get_cur_block());   /* mature the 'body' block for expressions */
   /* Set the visited flag high enough that the block will never be visited. */
   set_irn_visited(get_cur_block(), -1);
   set_Block_block_visited(get_cur_block(), -1);
   set_Block_block_visited(res->start_block, -1);
   set_irn_visited(res->start_block, -1);
   set_irn_visited(res->bad, -1);
+
+  res->phase_state = phase_high;
   return res;
 }
 
@@ -233,8 +234,9 @@ void  del_identities (pset *value_table);
    Does not free types, entities or modes that are used only by this
    graph, nor the entity standing for this graph. */
 void free_ir_graph (ir_graph *irg) {
+
   stat_free_graph(irg);
-  if (irg->outs_state != no_outs) free_outs(irg);
+  if (irg->outs_state != outs_none) free_outs(irg);
   if (irg->frame_type)  free_type(irg->frame_type);
   if (irg->value_table) del_identities(irg->value_table);
   if (irg->ent) {
@@ -422,12 +424,12 @@ void
 }
 
 entity *
-(get_irg_ent)(ir_graph *irg) {
+(get_irg_entity)(ir_graph *irg) {
   return __get_irg_ent(irg);
 }
 
 void
-(set_irg_ent)(ir_graph *irg, entity *ent) {
+(set_irg_entity)(ir_graph *irg, entity *ent) {
   __set_irg_ent(irg, ent);
 }
 
@@ -512,7 +514,7 @@ void
   __set_irg_phase_low(irg);
 }
 
-op_pinned
+op_pin_state
 (get_irg_pinned)(ir_graph *irg) {
   return __get_irg_pinned(irg);
 }
@@ -563,7 +565,7 @@ set_irg_loopinfo_inconsistent(ir_graph *irg) {
 }
 
 void
-(set_irg_pinned)(ir_graph *irg, op_pinned p) {
+(set_irg_pinned)(ir_graph *irg, op_pin_state p) {
   __set_irg_pinned(irg, p);
 }