X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=00fa68708dcd222af0229cec8684d19c3cffe2e0;hb=2080968df998886ef494ff80bac44cac5773eb14;hp=3d16c97d6deec4d6faf9da5339d756eb8c8c232f;hpb=19a8e44d561f4eb9d766a790a007641086d00581;p=libfirm

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 3d16c97d6..00fa68708 100644
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -11,42 +11,103 @@
  */
 
 #ifdef HAVE_CONFIG_H
-# include <config.h>
+# include "config.h"
 #endif
 
+#ifdef HAVE_STRING_H
 # include <string.h>
+#endif
 
-# include "ircons.h"
-# include "irgraph_t.h"
-# include "irprog_t.h"
-# include "iropt_t.h"
-# include "irflag_t.h"
-# include "array.h"
-# include "irgmod.h"
-# include "mangle.h"
-# include "irouts.h"
-# include "firmstat.h"
+#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 "irtools.h"
+#include "irgwalk.h"
+#include "iredges_t.h"
+#include "type_t.h"
+
+/**
+ * Indicates, whether additional data can be registered to graphs.
+ * If set to 1, this is not possible anymore.
+ */
+static int forbid_new_data = 0;
+
+/**
+ * The amount of additional space for custom data to be allocated upon
+ * creating a new graph.
+ */
+static size_t additional_graph_data_size = 0;
 
 ir_graph *current_ir_graph;
-INLINE ir_graph *get_current_ir_graph(void) {
+ir_graph *get_current_ir_graph(void) {
   return current_ir_graph;
 }
-INLINE void set_current_ir_graph(ir_graph *graph) {
+void set_current_ir_graph(ir_graph *graph) {
   current_ir_graph = graph;
 }
 
 
-bool interprocedural_view = false;
-INLINE bool get_interprocedural_view(void) {
-  return interprocedural_view;
+int firm_interprocedural_view = 0;
+
+int (get_interprocedural_view)(void) {
+  return _get_interprocedural_view();
+}
+
+void (set_interprocedural_view)(int state) {
+  firm_interprocedural_view = state;
+
+  /* set function vectors for faster access */
+  if (state) {
+    _get_irn_arity = _get_irn_inter_arity;
+    _get_irn_n     = _get_irn_inter_n;
+  }
+  else {
+    _get_irn_arity = _get_irn_intra_arity;
+    _get_irn_n     = _get_irn_intra_n;
+  }
+}
+
+/** contains the suffix for frame type names */
+static ident *frame_type_suffix = NULL;
+
+/* initialize the IR graph module */
+void firm_init_irgraph(void) {
+  frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX);
+  forbid_new_data   = 1;
 }
-INLINE void set_interprocedural_view(bool state) {
-  interprocedural_view = state;
+
+/**
+ * Allocate a new IR graph.
+ * This function respects the registered graph data. The only reason for
+ * this function is, that there are two locations, where graphs are
+ * allocated (new_r_ir_graph, new_const_code_irg).
+ * @return Memory for a new graph.
+ */
+static ir_graph *alloc_graph(void) {
+  size_t size = sizeof(ir_graph) + additional_graph_data_size;
+  char *ptr = xmalloc(size);
+  memset(ptr, 0, size);
+
+  return (ir_graph *) (ptr + additional_graph_data_size);
 }
 
-static ident* frame_type_suffix = NULL;
-void init_irgraph(void) {
-  frame_type_suffix = id_from_str(FRAME_TP_SUFFIX, strlen(FRAME_TP_SUFFIX));
+/**
+ * Frees an allocated IR graph
+ */
+static void free_graph(ir_graph *irg) {
+  char *ptr = (char *)irg;
+  free(ptr - additional_graph_data_size);
 }
 
 #if USE_EXPLICIT_PHI_IN_STACK
@@ -66,159 +127,208 @@ void free_Phi_in_stack(Phi_in_stack *s);
    and optimization.
 */
 ir_graph *
-new_ir_graph (entity *ent, int n_loc)
+new_r_ir_graph (entity *ent, int n_loc)
 {
   ir_graph *res;
-  ir_node *first_block;
-  ir_node *projX;
+  ir_node  *first_block;
+  ir_node  *end, *start, *start_block, *initial_mem, *projX;
+
+  res = alloc_graph();
+  res->kind = k_ir_graph;
 
-  res = (ir_graph *) malloc (sizeof (ir_graph));
-  memset(res, 0, sizeof (ir_graph));
-  res->kind=k_ir_graph;
+  edges_init_graph(res);
 
   /* inform statistics here, as blocks will be already build on this graph */
-  stat_new_graph(res, ent);
+  hook_new_graph(res, ent);
 
   current_ir_graph = res;
-  add_irp_irg(res);          /* remember this graph global. */
 
   /*-- 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 */
+  /* descriptions will be allocated on demand */
+  res->loc_descriptions = NULL;
+
+  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
   res->Phi_in_stack = new_Phi_in_stack();  /* A stack needed for automatic Phi
                                 generation */
 #endif
   res->kind = k_ir_graph;
-  res->obst      = (struct obstack *) xmalloc (sizeof (struct obstack));
-  obstack_init (res->obst);
+  res->obst = xmalloc (sizeof(*res->obst));
+  obstack_init(res->obst);
+  res->extbb_obst = NULL;
+
+  res->last_node_idx = 0;
+
   res->value_table = new_identities (); /* value table for global value
                        numbering for optimizing use in
                        iropt.c */
   res->outs = NULL;
 
-  res->phase_state = phase_building;
-  res->pinned = pinned;
-  res->outs_state = no_outs;
-  res->dom_state = no_dom;
-  res->typeinfo_state = irg_typeinfo_none;
-  res->loopinfo_state = loopinfo_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->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;
+  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);
 
-  /*-- 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);
+  /*--  a class type so that it can contain "inner" methods as in Pascal. --*/
+  res->frame_type = new_type_frame(mangle(get_entity_ident(ent), frame_type_suffix));
 
   /*-- Nodes needed in every graph --*/
-  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); */
+  set_irg_end_block (res, new_immBlock());
+  end               = new_End();
+  set_irg_end       (res, end);
+  set_irg_end_reg   (res, end);
+  set_irg_end_except(res, end);
+
+  start_block = new_immBlock();
+  set_irg_start_block(res, start_block);
+  set_irg_bad        (res, new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL));
+  set_irg_no_mem     (res, new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL));
+  start = new_Start();
+  set_irg_start      (res, start);
 
   /* 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(start, mode_X, pn_Start_X_initial_exec);
+  set_irg_frame      (res, new_Proj(start, mode_P_data, pn_Start_P_frame_base));
+  set_irg_globals    (res, new_Proj(start, mode_P_data, pn_Start_P_globals));
+  set_irg_args       (res, new_Proj(start, mode_T, pn_Start_T_args));
+  initial_mem        = new_Proj(start, mode_M, pn_Start_M);
+  set_irg_initial_mem(res, initial_mem);
+
+  add_immBlock_pred(start_block, projX);
+  set_store(initial_mem);
+
 #ifdef DEBUG_libfirm
-  res->graph_nr = get_irp_new_node_nr();
+  res->graph_nr    = get_irp_new_node_nr();
 #endif
+  res->proj_args   = NULL;
 
-
-  add_in_edge(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);
 
+  res->method_execution_frequency = -1;
+  res->estimated_node_count       = 0;
 
   return res;
 }
 
 
+ir_graph *
+new_ir_graph (entity *ent, int n_loc)
+{
+  ir_graph *res = new_r_ir_graph (ent, n_loc);
+  add_irp_irg(res);          /* remember this graph global. */
+  return res;
+}
+
 /* Make a rudimentary ir graph for the constant code.
    Must look like a correct irg, spare everything else. */
 ir_graph *new_const_code_irg(void) {
   ir_graph *res;
-  ir_node *projX;
+  ir_node  *end, *start_block, *start, *projX;
 
-  res = (ir_graph *) malloc (sizeof(*res));
-  memset(res, 0, sizeof(*res));
+  res = alloc_graph();
 
   /* inform statistics here, as blocks will be already build on this graph */
-  stat_new_graph(res, NULL);
+  hook_new_graph(res, NULL);
 
   current_ir_graph = res;
-  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 */
+  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
   res->Phi_in_stack = NULL;
 #endif
   res->kind = k_ir_graph;
-  res->obst      = (struct obstack *) xmalloc (sizeof (struct obstack));
+  res->obst      = xmalloc (sizeof(*res->obst));
   obstack_init (res->obst);
-  res->phase_state = phase_building;
-  res->pinned = pinned;
+  res->extbb_obst = NULL;
+
+  res->last_node_idx = 0;
+
+  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
                        iropt.c */
   res->ent = 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());
-  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->frame_type  = NULL;
+
+  /* -- The end block -- */
+  set_irg_end_block (res, new_immBlock());
+  end = new_End();
+  set_irg_end       (res, end);
+  set_irg_end_reg   (res, end);
+  set_irg_end_except(res, end);
+  mature_immBlock(get_cur_block());  /* mature the end block */
+
+  /* -- The start block -- */
+  start_block        = new_immBlock();
+  set_irg_start_block(res, start_block);
+  set_irg_bad        (res, new_ir_node (NULL, res, start_block, op_Bad, mode_T, 0, NULL));
+  set_irg_no_mem     (res, new_ir_node (NULL, res, start_block, op_NoMem, mode_M, 0, NULL));
+  start              = new_Start();
+  set_irg_start      (res, start);
 
   /* 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());
-  /* Set the visited flag high enough that the block will never be visited. */
+  set_irg_initial_mem(res, new_Proj(start, mode_M, pn_Start_M));
+  projX = new_Proj(start, mode_X, pn_Start_X_initial_exec);
+  add_immBlock_pred(start_block, projX);
+  mature_immBlock  (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 blocks 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);
+  set_Block_block_visited(start_block, -1);
+  set_irn_visited(start_block, -1);
+  set_irn_visited(get_irg_bad(res), -1);
+  set_irn_visited(get_irg_no_mem(res), -1);
+
+  res->phase_state = phase_high;
+
   return res;
 }
 
@@ -233,19 +343,29 @@ 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->ent) set_entity_irg(irg->ent, NULL);  /* not set in const code irg */
-  free_End(irg->end);
+  assert(is_ir_graph(irg));
+
+  hook_free_graph(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->outs_state != no_outs) free_outs(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(get_irg_end(irg));
   obstack_free(irg->obst,NULL);
   free(irg->obst);
 #if USE_EXPLICIT_PHI_IN_STACK
   free_Phi_in_stack(irg->Phi_in_stack);
 #endif
+  if (irg->loc_descriptions)
+    free(irg->loc_descriptions);
   irg->kind = k_BAD;
-  free(irg);
+  free_graph(irg);
 }
 
 /* access routines for all ir_graph attributes:
@@ -254,216 +374,178 @@ 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)(const void *thing) {
+  return _is_ir_graph(thing);
 }
 
 /* Outputs a unique number for this node */
-
-INLINE long
-get_irg_graph_nr(ir_graph *irg) {
+long get_irg_graph_nr(ir_graph *irg) {
   assert(irg);
 #ifdef DEBUG_libfirm
   return irg->graph_nr;
 #else
-  return 0;
+  return (long)PTR_TO_INT(irg);
 #endif
 }
 
 ir_node *
-(get_irg_start_block)(ir_graph *irg)
-{
-  return __get_irg_start_block(irg);
+(get_irg_start_block)(const ir_graph *irg) {
+  return _get_irg_start_block(irg);
 }
 
 void
-(set_irg_start_block)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_start_block(irg, 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)
-{
-  return __get_irg_start(irg);
+(get_irg_start)(const ir_graph *irg) {
+  return _get_irg_start(irg);
 }
 
 void
-(set_irg_start)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_start(irg, node);
+(set_irg_start)(ir_graph *irg, ir_node *node) {
+  _set_irg_start(irg, node);
 }
 
 ir_node *
-(get_irg_end_block)(ir_graph *irg)
-{
-  return __get_irg_end_block(irg);
+(get_irg_end_block)(const ir_graph *irg) {
+  return _get_irg_end_block(irg);
 }
 
 void
-(set_irg_end_block)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_end_block(irg, 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)
-{
-  return __get_irg_end(irg);
+(get_irg_end)(const ir_graph *irg) {
+  return _get_irg_end(irg);
 }
 
 void
-(set_irg_end)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_end(irg, node);
+(set_irg_end)(ir_graph *irg, ir_node *node) {
+  _set_irg_end(irg, node);
 }
 
 ir_node *
-(get_irg_end_reg)(ir_graph *irg) {
-  return __get_irg_end_reg(irg);
+(get_irg_end_reg)(const ir_graph *irg) {
+  return _get_irg_end_reg(irg);
 }
 
 void     set_irg_end_reg (ir_graph *irg, ir_node *node) {
   assert(get_irn_op(node) == op_EndReg || get_irn_op(node) == op_End);
-  irg->end_reg = node;
+  irg->anchors[anchor_end_reg] = node;
 }
 
 ir_node *
-(get_irg_end_except)(ir_graph *irg) {
-  return __get_irg_end_except(irg);
+(get_irg_end_except)(const ir_graph *irg) {
+  return _get_irg_end_except(irg);
 }
 
 void     set_irg_end_except (ir_graph *irg, ir_node *node) {
   assert(get_irn_op(node) == op_EndExcept || get_irn_op(node) == op_End);
-  irg->end_except = node;
+  irg->anchors[anchor_end_except] = node;
 }
 
 ir_node *
-(get_irg_cstore)(ir_graph *irg)
-{
-  return __get_irg_cstore(irg);
+(get_irg_frame)(const ir_graph *irg) {
+  return _get_irg_frame(irg);
 }
 
 void
-(set_irg_cstore)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_cstore(irg, node);
+(set_irg_frame)(ir_graph *irg, ir_node *node) {
+  _set_irg_frame(irg, node);
 }
 
 ir_node *
-(get_irg_frame)(ir_graph *irg)
-{
-  return __get_irg_frame(irg);
+(get_irg_globals)(const ir_graph *irg) {
+  return _get_irg_globals(irg);
 }
 
 void
-(set_irg_frame)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_frame(irg, node);
+(set_irg_globals)(ir_graph *irg, ir_node *node) {
+  _set_irg_globals(irg, node);
 }
 
 ir_node *
-(get_irg_globals)(ir_graph *irg)
-{
-  return __get_irg_globals(irg);
+(get_irg_initial_mem)(const ir_graph *irg) {
+  return _get_irg_initial_mem(irg);
 }
 
 void
-(set_irg_globals)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_globals(irg, node);
+(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);
+(get_irg_args)(const ir_graph *irg) {
+  return _get_irg_args(irg);
 }
 
 void
-(set_irg_args)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_args(irg, node);
+(set_irg_args)(ir_graph *irg, ir_node *node) {
+  _set_irg_args(irg, node);
 }
 
-ir_node *
-(get_irg_bad)(ir_graph *irg)
-{
-  return __get_irg_bad(irg);
+ir_node **
+(get_irg_proj_args) (const ir_graph *irg) {
+  return _get_irg_proj_args (irg);
 }
 
 void
-(set_irg_bad)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_bad(irg, node);
+(set_irg_proj_args) (ir_graph *irg, ir_node **nodes) {
+  _set_irg_proj_args (irg, nodes);
 }
 
-/* GL removed: we need unknown with mode for analyses.
 ir_node *
-get_irg_unknown (ir_graph *irg)
-{
-  return irg->unknown;
+(get_irg_bad)(const ir_graph *irg) {
+  return _get_irg_bad(irg);
 }
 
 void
-set_irg_unknown (ir_graph *irg, ir_node *node)
-{
-  irg->unknown = node;
+(set_irg_bad)(ir_graph *irg, ir_node *node) {
+  _set_irg_bad(irg, node);
 }
-*/
 
 ir_node *
-(get_irg_current_block)(ir_graph *irg)
-{
-  return __get_irg_current_block(irg);
+(get_irg_no_mem)(const ir_graph *irg) {
+  return _get_irg_no_mem(irg);
 }
 
 void
-(set_irg_current_block)(ir_graph *irg, ir_node *node)
-{
-  __set_irg_current_block(irg, node);
+(set_irg_no_mem)(ir_graph *irg, ir_node *node) {
+  _set_irg_no_mem(irg, node);
 }
 
-entity *
-(get_irg_ent)(ir_graph *irg)
-{
-  return __get_irg_ent(irg);
+ir_node *
+(get_irg_current_block)(const ir_graph *irg) {
+  return _get_irg_current_block(irg);
 }
 
 void
-(set_irg_ent)(ir_graph *irg, entity *ent)
-{
-  __set_irg_ent(irg, ent);
+(set_irg_current_block)(ir_graph *irg, ir_node *node) {
+  _set_irg_current_block(irg, node);
 }
 
-type *
-(get_irg_frame_type)(ir_graph *irg)
-{
-  return __get_irg_frame_type(irg);
+entity *
+(get_irg_entity)(const ir_graph *irg) {
+  return _get_irg_entity(irg);
 }
 
 void
-(set_irg_frame_type)(ir_graph *irg, type *ftp)
-{
-  __set_irg_frame_type(irg, ftp);
+(set_irg_entity)(ir_graph *irg, entity *ent) {
+  _set_irg_entity(irg, ent);
 }
 
+ir_type *
+(get_irg_frame_type)(ir_graph *irg) {
+  return _get_irg_frame_type(irg);
+}
 
-/* To test for a frame type */
-int
-is_frame_type(type *ftp) {
-  int i;
-  if (is_class_type(ftp)) {
-    for (i = 0; i < get_irp_n_irgs(); i++) {
-      type *frame_tp = get_irg_frame_type(get_irp_irg(i));
-      if (ftp == frame_tp) return true;
-    }
-  }
-  return false;
+void
+(set_irg_frame_type)(ir_graph *irg, ir_type *ftp) {
+  _set_irg_frame_type(irg, ftp);
 }
 
 int
@@ -488,8 +570,8 @@ set_irg_n_loc (ir_graph *irg, int n_loc)
 
 /* Returns the obstack associated with the graph. */
 struct obstack *
-(get_irg_obstack)(ir_graph *irg) {
-  return __get_irg_obstack(irg);
+(get_irg_obstack)(const ir_graph *irg) {
+  return _get_irg_obstack(irg);
 }
 
 /*
@@ -502,7 +584,7 @@ int node_is_in_irgs_storage(ir_graph *irg, ir_node *n)
   struct _obstack_chunk *p;
 
   /*
-   * checks wheater the ir_node pointer i on the obstack.
+   * checks weather the ir_node pointer is on the obstack.
    * A more sophisticated check would test the "whole" ir_node
    */
   for (p = irg->obst->chunk; p; p = p->prev) {
@@ -514,96 +596,135 @@ 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)(const 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_state)(ir_graph *irg, irg_phase_state state) {
+  _set_irg_phase_state(irg, state);
 }
 
-op_pinned
-get_irg_pinned (ir_graph *irg) {
-  return irg->pinned;
+op_pin_state
+(get_irg_pinned)(const 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)(const 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_extblk_state
+(get_irg_extblk_state)(const ir_graph *irg) {
+  return _get_irg_extblk_state(irg);
+}
+
+void
+(set_irg_extblk_inconsistent)(ir_graph *irg) {
+  _set_irg_extblk_inconsistent(irg);
 }
 
 irg_dom_state
-get_irg_dom_state(ir_graph *irg) {
-  return irg->dom_state;
+(get_irg_dom_state)(const ir_graph *irg) {
+  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) {
-  irg->dom_state = dom_inconsistent;
+(set_irg_doms_inconsistent)(ir_graph *irg) {
+  _set_irg_doms_inconsistent(irg);
 }
 
 irg_loopinfo_state
-get_irg_loopinfo_state(ir_graph *irg) {
-  return irg->loopinfo_state;
+(get_irg_loopinfo_state)(const 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
-set_irg_loopinfo_inconsistent(ir_graph *irg) {
-  if (irg->loopinfo_state == loopinfo_ip_consistent)
-    irg->loopinfo_state = loopinfo_ip_inconsistent;
-  else
-    irg->loopinfo_state = loopinfo_inconsistent;
+(set_irg_loopinfo_inconsistent)(ir_graph *irg) {
+  _set_irg_loopinfo_inconsistent(irg);
 }
 
-INLINE void
-set_irg_pinned (ir_graph *irg, op_pinned p) {
-  irg->pinned = p;
+void set_irp_loopinfo_inconsistent(void) {
+  int i, n_irgs = get_irp_n_irgs();
+  for (i = 0; i < n_irgs; ++i) {
+    set_irg_loopinfo_inconsistent(get_irp_irg(i));
+  }
 }
 
 
-irg_callee_info_state get_irg_callee_info_state(ir_graph *irg) {
-  return irg->callee_info_state;
+
+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)(const ir_graph *irg) {
+  return _get_irg_callee_info_state(irg);
+}
+
+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)(const ir_graph *irg) {
+  return _get_irg_inline_property(irg);
 }
 
-void set_irg_callee_info_state(ir_graph *irg, irg_callee_info_state s) {
-  irg->callee_info_state = s;
+void
+(set_irg_inline_property)(ir_graph *irg, irg_inline_property s) {
+  _set_irg_inline_property(irg, s);
 }
 
-irg_inline_property get_irg_inline_property(ir_graph *irg) {
-  return irg->inline_property;
+unsigned
+(get_irg_additional_properties)(const ir_graph *irg) {
+  return _get_irg_additional_properties(irg);
 }
-void set_irg_inline_property(ir_graph *irg, irg_inline_property s) {
-  irg->inline_property = s;
+
+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);
+  _set_irg_link(irg, thing);
 }
 
 void *
-(get_irg_link)(ir_graph *irg) {
-  return __get_irg_link(irg);
+(get_irg_link)(const ir_graph *irg) {
+  return _get_irg_link(irg);
 }
 
-/* maximum visited flag content of all ir_graph visited fields. */
-static int max_irg_visited = 0;
+/** maximum visited flag content of all ir_graph visited fields. */
+static unsigned long max_irg_visited = 0;
 
 unsigned long
-(get_irg_visited)(ir_graph *irg)
-{
-  return __get_irg_visited(irg);
+(get_irg_visited)(const ir_graph *irg) {
+  return _get_irg_visited(irg);
 }
 
 void
@@ -651,19 +772,75 @@ inc_max_irg_visited(void)
 }
 
 unsigned long
-(get_irg_block_visited)(ir_graph *irg)
-{
-  return __get_irg_block_visited(irg);
+(get_irg_block_visited)(const ir_graph *irg) {
+  return _get_irg_block_visited(irg);
 }
 
 void
-(set_irg_block_visited)(ir_graph *irg, unsigned long visited)
-{
-  __set_irg_block_visited(irg, 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);
+}
+
+
+/**
+ * walker Start->End: places Proj nodes into the same block
+ * as it's predecessors
+ *
+ * @param n    the node
+ * @param env  ignored
+ */
+static void normalize_proj_walker(ir_node *n, void *env)
 {
-  __inc_irg_block_visited(irg);
+  if (is_Proj(n)) {
+    ir_node *pred  = get_Proj_pred(n);
+    ir_node *block = get_nodes_block(pred);
+
+    set_nodes_block(n, block);
+  }
+}
+
+/* move Proj nodes into the same block as its predecessors */
+void normalize_proj_nodes(ir_graph *irg)
+{
+  irg_walk_graph(irg, NULL, normalize_proj_walker, NULL);
+  set_irg_outs_inconsistent(irg);
+}
+
+/* set a description for local value n */
+void set_irg_loc_description(ir_graph *irg, int n, void *description)
+{
+  assert(0 <= n && n < irg->n_loc);
+
+  if (! irg->loc_descriptions)
+    irg->loc_descriptions = xcalloc(sizeof(*irg->loc_descriptions), irg->n_loc);
+
+  irg->loc_descriptions[n] = description;
+}
+
+/* get the description for local value n */
+void *get_irg_loc_description(ir_graph *irg, int n)
+{
+  assert(0 <= n && n < irg->n_loc);
+  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)
+{
+  assert(!forbid_new_data && "Too late to register additional node data");
+
+  if (forbid_new_data)
+    return 0;
+
+  return additional_graph_data_size += size;
 }