X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=b2ff2072232974437be9cb78fb16fda1f670c3a5;hb=e5bab593a4048c0a320d7794fb2cb17697da8389;hp=ac197ac557af34f561fa73cd9104d0f2dacc1ec6;hpb=d50c81778642f0a14a3eec1a1a5d96d11f7ade77;p=libfirm

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index ac197ac55..b2ff20722 100644
--- 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
@@ -74,7 +74,7 @@ new_ir_graph (entity *ent, int n_loc)
 
   res = (ir_graph *) malloc (sizeof (ir_graph));
   memset(res, 0, sizeof (ir_graph));
-  res->kind=k_ir_graph;
+  res->kind = k_ir_graph;
 
   /* inform statistics here, as blocks will be already build on this graph */
   stat_new_graph(res, ent);
@@ -85,20 +85,20 @@ new_ir_graph (entity *ent, int n_loc)
   /*-- initialized for each graph. --*/
   if (get_opt_precise_exc_context()) {
     res->n_loc = n_loc + 1 + 1; /* number of local variables that are never
-				   dereferenced in this graph plus one for
-				   the store plus one for links to fragile
-				   operations.  n_loc is not the number of
-				   parameters to the procedure!  */
+                   dereferenced in this graph plus one for
+                   the store plus one for links to fragile
+                   operations.  n_loc is not the number of
+                   parameters to the procedure!  */
   }
   else {
     res->n_loc = n_loc + 1;  /* number of local variables that are never
-				dereferenced in this graph plus one for
-				the store. This is not the number of parameters
-				to the procedure!  */
+                dereferenced in this graph plus one for
+                the store. This is not the number of parameters
+                to the procedure!  */
   }
 
   res->visited = 0;     /* visited flag, for the ir walker */
-  res->block_visited=0; /* visited flag, for the 'block'-walker */
+  res->block_visited = 0; /* visited flag, for the 'block'-walker */
 
 #if USE_EXPLICIT_PHI_IN_STACK
   res->Phi_in_stack = new_Phi_in_stack();  /* A stack needed for automatic Phi
@@ -112,10 +112,10 @@ new_ir_graph (entity *ent, int n_loc)
                        iropt.c */
   res->outs = NULL;
 
-  res->phase_state = phase_building;
-  res->pinned = pinned;
-  res->outs_state = no_outs;
-  res->dom_state = no_dom;
+  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 = irg_typeinfo_none;
   res->loopinfo_state = loopinfo_none;
 
@@ -123,45 +123,44 @@ new_ir_graph (entity *ent, int n_loc)
   res->ent = ent;
   set_entity_irg(ent, res);
 
-  /*-- contain "inner" methods as in Pascal. --*/
+  /*--  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);
 
   /*-- Nodes needed in every graph --*/
-  res->end_block  = new_immBlock ();
-  res->end        = new_End ();
+  res->end_block  = new_immBlock();
+  res->end        = new_End();
   res->end_reg    = res->end;
   res->end_except = res->end;
 
-  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); */
+  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);
 
   /* Proj results of start node */
-  projX        = new_Proj (res->start, mode_X, pns_initial_exec);
-  set_store (new_Proj (res->start, mode_M, pns_global_store));
-  res->frame   = new_Proj (res->start, mode_P_mach, pns_frame_base);
-  res->globals = new_Proj (res->start, mode_P_mach, pns_globals);
-  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();
+  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);
-
+  first_block = new_immBlock();
+  add_immBlock_pred (first_block, projX);
 
   return res;
 }
@@ -180,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
@@ -190,35 +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);
-  set_store (new_Proj (res->start, mode_M, pns_global_store));
-  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,11 +234,18 @@ 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) set_entity_irg(irg->ent, NULL);  /* not set in const code irg */
+  if (irg->ent) {
+    peculiarity pec = get_entity_peculiarity (irg->ent);
+    set_entity_peculiarity (irg->ent, peculiarity_description);
+    set_entity_irg(irg->ent, NULL);  /* not set in const code irg */
+    set_entity_peculiarity (irg->ent, pec);
+  }
+
   free_End(irg->end);
   obstack_free(irg->obst,NULL);
   free(irg->obst);
@@ -254,12 +262,8 @@ void free_ir_graph (ir_graph *irg) {
    void set_irg_{attr name} (ir_graph *irg, {attr type} {attr}); */
 
 int
-is_ir_graph(void *thing) {
-  assert(thing);
-  if (get_kind(thing) == k_ir_graph)
-    return 1;
-  else
-    return 0;
+(is_ir_graph)(void *thing) {
+  return __is_ir_graph(thing);
 }
 
 /* Outputs a unique number for this node */
@@ -270,55 +274,47 @@ get_irg_graph_nr(ir_graph *irg) {
 #ifdef DEBUG_libfirm
   return irg->graph_nr;
 #else
-  return 0;
+  return (long)irg;
 #endif
 }
 
 ir_node *
-(get_irg_start_block)(ir_graph *irg)
-{
+(get_irg_start_block)(ir_graph *irg) {
   return __get_irg_start_block(irg);
 }
 
 void
-(set_irg_start_block)(ir_graph *irg, ir_node *node)
-{
+(set_irg_start_block)(ir_graph *irg, ir_node *node) {
   __set_irg_start_block(irg, node);
 }
 
 ir_node *
-(get_irg_start)(ir_graph *irg)
-{
+(get_irg_start)(ir_graph *irg) {
   return __get_irg_start(irg);
 }
 
 void
-(set_irg_start)(ir_graph *irg, ir_node *node)
-{
+(set_irg_start)(ir_graph *irg, ir_node *node) {
   __set_irg_start(irg, node);
 }
 
 ir_node *
-(get_irg_end_block)(ir_graph *irg)
-{
+(get_irg_end_block)(ir_graph *irg) {
   return __get_irg_end_block(irg);
 }
 
 void
-(set_irg_end_block)(ir_graph *irg, ir_node *node)
-{
+(set_irg_end_block)(ir_graph *irg, ir_node *node) {
   __set_irg_end_block(irg, node);
 }
 
 ir_node *
-(get_irg_end)(ir_graph *irg)
-{
+(get_irg_end)(ir_graph *irg) {
   return __get_irg_end(irg);
 }
 
 void
-(set_irg_end)(ir_graph *irg, ir_node *node)
-{
+(set_irg_end)(ir_graph *irg, ir_node *node) {
   __set_irg_end(irg, node);
 }
 
@@ -343,62 +339,63 @@ void     set_irg_end_except (ir_graph *irg, ir_node *node) {
 }
 
 ir_node *
-(get_irg_cstore)(ir_graph *irg)
-{
+(get_irg_cstore)(ir_graph *irg) {
   return __get_irg_cstore(irg);
 }
 
 void
-(set_irg_cstore)(ir_graph *irg, ir_node *node)
-{
+(set_irg_cstore)(ir_graph *irg, ir_node *node) {
   __set_irg_cstore(irg, node);
 }
 
 ir_node *
-(get_irg_frame)(ir_graph *irg)
-{
+(get_irg_frame)(ir_graph *irg) {
   return __get_irg_frame(irg);
 }
 
 void
-(set_irg_frame)(ir_graph *irg, ir_node *node)
-{
+(set_irg_frame)(ir_graph *irg, ir_node *node) {
   __set_irg_frame(irg, node);
 }
 
 ir_node *
-(get_irg_globals)(ir_graph *irg)
-{
+(get_irg_globals)(ir_graph *irg) {
   return __get_irg_globals(irg);
 }
 
 void
-(set_irg_globals)(ir_graph *irg, ir_node *node)
-{
+(set_irg_globals)(ir_graph *irg, ir_node *node) {
   __set_irg_globals(irg, node);
 }
 
 ir_node *
-(get_irg_args)(ir_graph *irg)
+(get_irg_initial_mem)(ir_graph *irg)
 {
+  return __get_irg_initial_mem(irg);
+}
+
+void
+(set_irg_initial_mem)(ir_graph *irg, ir_node *node) {
+  __set_irg_initial_mem(irg, node);
+}
+
+ir_node *
+(get_irg_args)(ir_graph *irg) {
   return __get_irg_args(irg);
 }
 
 void
-(set_irg_args)(ir_graph *irg, ir_node *node)
-{
+(set_irg_args)(ir_graph *irg, ir_node *node) {
   __set_irg_args(irg, node);
 }
 
 ir_node *
-(get_irg_bad)(ir_graph *irg)
-{
+(get_irg_bad)(ir_graph *irg) {
   return __get_irg_bad(irg);
 }
 
 void
-(set_irg_bad)(ir_graph *irg, ir_node *node)
-{
+(set_irg_bad)(ir_graph *irg, ir_node *node) {
   __set_irg_bad(irg, node);
 }
 
@@ -417,38 +414,32 @@ set_irg_unknown (ir_graph *irg, ir_node *node)
 */
 
 ir_node *
-(get_irg_current_block)(ir_graph *irg)
-{
+(get_irg_current_block)(ir_graph *irg) {
   return __get_irg_current_block(irg);
 }
 
 void
-(set_irg_current_block)(ir_graph *irg, ir_node *node)
-{
+(set_irg_current_block)(ir_graph *irg, ir_node *node) {
   __set_irg_current_block(irg, node);
 }
 
 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);
 }
 
 type *
-(get_irg_frame_type)(ir_graph *irg)
-{
+(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, type *ftp) {
   __set_irg_frame_type(irg, ftp);
 }
 
@@ -514,47 +505,48 @@ int node_is_in_irgs_storage(ir_graph *irg, ir_node *n)
 }
 
 irg_phase_state
-get_irg_phase_state (ir_graph *irg) {
-  return irg->phase_state;
+(get_irg_phase_state)(ir_graph *irg) {
+  return __get_irg_phase_state(irg);
 }
 
 void
-set_irg_phase_low(ir_graph *irg) {
-  irg->phase_state = phase_low;
+(set_irg_phase_low)(ir_graph *irg) {
+  __set_irg_phase_low(irg);
 }
 
-op_pinned
-get_irg_pinned (ir_graph *irg) {
-  return irg->pinned;
+op_pin_state
+(get_irg_pinned)(ir_graph *irg) {
+  return __get_irg_pinned(irg);
 }
 
 irg_outs_state
-get_irg_outs_state(ir_graph *irg) {
-  return irg->outs_state;
+(get_irg_outs_state)(ir_graph *irg) {
+  return __get_irg_outs_state(irg);
 }
 
 void
-set_irg_outs_inconsistent(ir_graph *irg) {
-  irg->outs_state = outs_inconsistent;
+(set_irg_outs_inconsistent)(ir_graph *irg) {
+  __set_irg_outs_inconsistent(irg);
 }
 
 irg_dom_state
-get_irg_dom_state(ir_graph *irg) {
-  return irg->dom_state;
+(get_irg_dom_state)(ir_graph *irg) {
+  return __get_irg_dom_state(irg);
 }
 
 void
-set_irg_dom_inconsistent(ir_graph *irg) {
-  irg->dom_state = dom_inconsistent;
+(set_irg_dom_inconsistent)(ir_graph *irg) {
+  __set_irg_dom_inconsistent(irg);
 }
 
 irg_loopinfo_state
-get_irg_loopinfo_state(ir_graph *irg) {
-  return irg->loopinfo_state;
+(get_irg_loopinfo_state)(ir_graph *irg) {
+  return __get_irg_loopinfo_state(irg);
 }
 
-void set_irg_loopinfo_state(ir_graph *irg, irg_loopinfo_state s) {
-  irg->loopinfo_state = s;
+void
+(set_irg_loopinfo_state)(ir_graph *irg, irg_loopinfo_state s) {
+  __set_irg_loopinfo_state(irg, s);
 }
 
 void
@@ -572,27 +564,30 @@ set_irg_loopinfo_inconsistent(ir_graph *irg) {
     irg->loopinfo_state = loopinfo_cf_inconsistent;
 }
 
-INLINE void
-set_irg_pinned (ir_graph *irg, op_pinned p) {
-  irg->pinned = p;
+void
+(set_irg_pinned)(ir_graph *irg, op_pin_state p) {
+  __set_irg_pinned(irg, p);
 }
 
-
-irg_callee_info_state get_irg_callee_info_state(ir_graph *irg) {
-  return irg->callee_info_state;
+irg_callee_info_state
+(get_irg_callee_info_state)(ir_graph *irg) {
+  return __get_irg_callee_info_state(irg);
 }
 
-void set_irg_callee_info_state(ir_graph *irg, irg_callee_info_state s) {
-  irg->callee_info_state = s;
+void
+(set_irg_callee_info_state)(ir_graph *irg, irg_callee_info_state s) {
+  __set_irg_callee_info_state(irg, s);
 }
 
-irg_inline_property get_irg_inline_property(ir_graph *irg) {
-  return irg->inline_property;
-}
-void set_irg_inline_property(ir_graph *irg, irg_inline_property s) {
-  irg->inline_property = s;
+irg_inline_property
+(get_irg_inline_property)(ir_graph *irg) {
+  return __get_irg_inline_property(irg);
 }
 
+void
+(set_irg_inline_property)(ir_graph *irg, irg_inline_property s) {
+  __set_irg_inline_property(irg, s);
+}
 
 void
 (set_irg_link)(ir_graph *irg, void *thing) {
@@ -608,8 +603,7 @@ void *
 static int max_irg_visited = 0;
 
 unsigned long
-(get_irg_visited)(ir_graph *irg)
-{
+(get_irg_visited)(ir_graph *irg) {
   return __get_irg_visited(irg);
 }
 
@@ -658,19 +652,16 @@ inc_max_irg_visited(void)
 }
 
 unsigned long
-(get_irg_block_visited)(ir_graph *irg)
-{
+(get_irg_block_visited)(ir_graph *irg) {
   return __get_irg_block_visited(irg);
 }
 
 void
-(set_irg_block_visited)(ir_graph *irg, unsigned long visited)
-{
+(set_irg_block_visited)(ir_graph *irg, unsigned long visited) {
   __set_irg_block_visited(irg, visited);
 }
 
 void
-(inc_irg_block_visited)(ir_graph *irg)
-{
+(inc_irg_block_visited)(ir_graph *irg) {
   __inc_irg_block_visited(irg);
 }