X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph.c;h=34e237b0d08cb71485783a741841ae2cff933d7f;hb=abbf9492df1993d211412ba520feb81de0688c2a;hp=713a9924d87a4d2a1dacb899d8ba5af46aad8a3f;hpb=48f1b28180d854b626a47612a576bf64c1d341c3;p=libfirm

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index 713a9924d..34e237b0d 100644
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -1,38 +1,55 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/irgraph.c
- * Purpose:     Entry point to the representation of procedure code.
- * Author:      Martin Trapp, Christian Schaefer
- * Modified by: Goetz Lindenmaier
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2003 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+/**
+ * @file
+ * @brief    Entry point to the representation of procedure code.
+ * @author   Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck
+ * @version  $Id$
+ */
+#include "config.h"
 
-#ifdef HAVE_STRING_H
-# include <string.h>
+#include <string.h>
+#ifdef HAVE_STDDEF_H
+# include <stddef.h>
 #endif
 
-#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 "xmalloc.h"
+#include "ircons_t.h"
+#include "irgraph_t.h"
+#include "irprog_t.h"
+#include "irgraph_t.h"
+#include "irnode_t.h"
+#include "iropt_t.h"
+#include "irflag_t.h"
+#include "array.h"
+#include "irgmod.h"
+#include "irouts.h"
+#include "irhooks.h"
+#include "irtools.h"
+#include "irgwalk.h"
+#include "irbackedge_t.h"
+#include "iredges_t.h"
+#include "type_t.h"
+#include "irmemory.h"
+
+#define INITIAL_IDX_IRN_MAP_SIZE 1024
 
 /**
  * Indicates, whether additional data can be registered to graphs.
@@ -47,41 +64,48 @@ static int forbid_new_data = 0;
 static size_t additional_graph_data_size = 0;
 
 ir_graph *current_ir_graph;
-ir_graph *get_current_ir_graph(void) {
-  return current_ir_graph;
-}
-void set_current_ir_graph(ir_graph *graph) {
-  current_ir_graph = graph;
+ir_graph *get_current_ir_graph(void)
+{
+	return current_ir_graph;
 }
 
+void set_current_ir_graph(ir_graph *graph)
+{
+	current_ir_graph = graph;
+}
 
-int __interprocedural_view = false;
+#ifdef INTERPROCEDURAL_VIEW
+int firm_interprocedural_view = 0;
 
-int (get_interprocedural_view)(void) {
-  return _get_interprocedural_view();
+int (get_interprocedural_view)(void)
+{
+	return _get_interprocedural_view();
 }
 
-void (set_interprocedural_view)(int state) {
-  __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;
-  }
+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;
+	}
 }
+#endif
 
 /** contains the suffix for frame type names */
 static ident *frame_type_suffix = NULL;
 
 /* initialize the IR graph module */
-void init_irgraph(void) {
-  frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX);
-	forbid_new_data = 1;
+void firm_init_irgraph(void)
+{
+	frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX);
+	forbid_new_data   = 1;
 }
 
 /**
@@ -93,19 +117,62 @@ void init_irgraph(void) {
  */
 static ir_graph *alloc_graph(void)
 {
-	size_t size = sizeof(ir_graph) + additional_graph_data_size;
-	char *ptr = xmalloc(size);
+	ir_graph *res;
+	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);
+	res = (ir_graph *)(ptr + additional_graph_data_size);
+	res->kind = k_ir_graph;
+
+	/* initialize the idx->node map. */
+	res->idx_irn_map = NEW_ARR_F(ir_node *, INITIAL_IDX_IRN_MAP_SIZE);
+	memset(res->idx_irn_map, 0, INITIAL_IDX_IRN_MAP_SIZE * sizeof(res->idx_irn_map[0]));
+
+	return res;
 }
 
-#if USE_EXPLICIT_PHI_IN_STACK
-/* really defined in ircons.c */
-typedef struct Phi_in_stack Phi_in_stack;
-Phi_in_stack *new_Phi_in_stack();
-void free_Phi_in_stack(Phi_in_stack *s);
-#endif
+/**
+ * Frees an allocated IR graph
+ */
+static void free_graph(ir_graph *irg)
+{
+	char *ptr = (char *)irg;
+	int  i;
+
+	for (i = 0; i < EDGE_KIND_LAST; ++i)
+		edges_deactivate_kind(irg, i);
+	DEL_ARR_F(irg->idx_irn_map);
+	free(ptr - additional_graph_data_size);
+}
+
+/**
+ * Set the number of locals for a given graph.
+ *
+ * @param irg    the graph
+ * @param n_loc  number of locals
+ */
+void irg_set_nloc(ir_graph *res, int n_loc)
+{
+	assert(res->phase_state == phase_building);
+
+	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!  */
+	} 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!  */
+	}
+	if (res->loc_descriptions) {
+		xfree(res->loc_descriptions);
+		res->loc_descriptions = NULL;
+	}
+}
 
 /* Allocates a list of nodes:
     - The start block containing a start node and Proj nodes for it's four
@@ -116,185 +183,355 @@ void free_Phi_in_stack(Phi_in_stack *s);
    Further it allocates several datastructures needed for graph construction
    and optimization.
 */
-ir_graph *
-new_r_ir_graph (entity *ent, int n_loc)
-{
-  ir_graph *res;
-  ir_node *first_block;
-  ir_node *projX;
-
-  res = alloc_graph();
-  res->kind = k_ir_graph;
-
-  /* inform statistics here, as blocks will be already build on this graph */
-  hook_new_graph(res, ent);
-
-  current_ir_graph = res;
-
-  /*-- 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!  */
-  }
-  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!  */
-  }
-
-  /* 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 = xmalloc (sizeof(*res->obst));
-  obstack_init (res->obst);
-  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->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;
-
-  /*-- 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);
-
-  /*-- 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->no_mem  = new_ir_node(NULL, res, res->start_block, op_NoMem, mode_M, 0, NULL);
-
-  /* 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->initial_mem = new_Proj (res->start, mode_M, pn_Start_M);
-  res->args        = new_Proj (res->start, mode_T, pn_Start_T_args);
+ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc)
+{
+	ir_graph *res;
+	ir_node  *first_block;
+	ir_node  *end, *start, *start_block, *initial_mem, *projX, *bad;
+
+	res = alloc_graph();
+
+	/* inform statistics here, as blocks will be already build on this graph */
+	hook_new_graph(res, ent);
+
+	current_ir_graph = res;
+
+	/*-- initialized for each graph. --*/
+	res->kind = k_ir_graph;
+	res->obst = XMALLOC(struct obstack);
+	obstack_init(res->obst);
+
+	res->phase_state = phase_building;
+	irg_set_nloc(res, n_loc);
+
+	/* 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 */
+
+	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->inline_property       = irg_inline_any;
+	res->additional_properties = mtp_property_inherited;  /* inherited from type */
+
+	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->class_cast_state    = ir_class_casts_transitive;
+	res->extblk_state        = ir_extblk_info_none;
+	res->execfreq_state      = exec_freq_none;
+	res->fp_model            = fp_model_precise;
+	res->entity_usage_state  = ir_entity_usage_not_computed;
+	res->mem_disambig_opt    = aa_opt_inherited;
+
+	/*-- 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_frame();
+
+	/* the Anchor node must be created first */
+	res->anchor = new_Anchor(res);
+
+	/*-- Nodes needed in every graph --*/
+	set_irg_end_block (res, new_immBlock());
+	set_cur_block(get_irg_end_block(res));
+	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_cur_block(start_block);
+	set_irg_start_block(res, start_block);
+	bad = new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL);
+	bad->attr.irg.irg = res;
+	set_irg_bad        (res, bad);
+	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(start, mode_X, pn_Start_X_initial_exec);
+	set_irg_initial_exec    (res, projX);
+	set_irg_frame           (res, new_Proj(start, mode_P_data, pn_Start_P_frame_base));
+	set_irg_tls             (res, new_Proj(start, mode_P_data, pn_Start_P_tls));
+	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);
+
+	set_store(initial_mem);
+
+	res->index       = get_irp_new_irg_idx();
 #ifdef DEBUG_libfirm
-  res->graph_nr    = get_irp_new_node_nr();
+	res->graph_nr    = get_irp_new_node_nr();
 #endif
-  res->proj_args   = NULL;
 
-  set_store(res->initial_mem);
+	mature_immBlock(res->current_block);
 
-  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_immBlock_pred(res->start_block, res->start_block), but invalid typed.
-   */
-  mature_immBlock (res->current_block);
+	/*-- Make a block to start with --*/
+	first_block = new_immBlock();
+	set_cur_block(first_block);
+	add_immBlock_pred(first_block, projX);
 
-  /*-- Make a block to start with --*/
-  first_block = new_immBlock();
-  add_immBlock_pred (first_block, projX);
+	res->method_execution_frequency = -1.0;
+	res->estimated_node_count       = 0;
 
-  res->method_execution_frequency = -1;
+	return res;
+}
 
-  return res;
+ir_graph *new_ir_graph(ir_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 = alloc_graph();
+	ir_node  *bad;
+	ir_node  *body_block;
+	ir_node  *end;
+	ir_node  *end_block;
+	ir_node  *no_mem;
+	ir_node  *projX;
+	ir_node  *start_block;
+	ir_node  *start;
+
+	/* inform statistics here, as blocks will be already build on this graph */
+	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->obst          = XMALLOC(struct obstack);
+	obstack_init(res->obst);
+	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->fp_model         = fp_model_precise;
+
+	/* value table for global value numbering for optimizing use in iropt.c */
+	res->value_table = new_identities();
+	res->ent         = NULL;
+	res->frame_type  = NULL;
+
+	/* the Anchor node must be created first */
+	res->anchor = new_Anchor(res);
+
+	/* -- The end block -- */
+	end_block = new_immBlock();
+	set_irg_end_block(res, end_block);
+	set_cur_block(end_block);
+	end = new_End();
+	set_irg_end       (res, end);
+	set_irg_end_reg   (res, end);
+	set_irg_end_except(res, end);
+	mature_immBlock(end_block);
+
+	/* -- The start block -- */
+	start_block        = new_immBlock();
+	set_cur_block(start_block);
+	set_irg_start_block(res, start_block);
+	bad = new_ir_node(NULL, res, start_block, op_Bad, mode_T, 0, NULL);
+	bad->attr.irg.irg = res;
+	set_irg_bad(res, bad);
+	no_mem = new_ir_node(NULL, res, start_block, op_NoMem, mode_M, 0, NULL);
+	set_irg_no_mem(res, no_mem);
+	start = new_Start();
+	set_irg_start(res, start);
+
+	/* Proj results of start node */
+	set_irg_initial_mem(res, new_Proj(start, mode_M, pn_Start_M));
+	projX = new_Proj(start, mode_X, pn_Start_X_initial_exec);
+	mature_immBlock(start_block);
+
+	body_block = new_immBlock();
+	add_immBlock_pred(body_block, projX);
+	mature_immBlock(body_block); /* mature the 'body' block for expressions */
+	set_cur_block(body_block);
+
+	/* Set the visited flag high enough that the blocks will never be visited. */
+	set_irn_visited(body_block, -1);
+	set_Block_block_visited(body_block, -1);
+	set_Block_block_visited(start_block, -1);
+	set_irn_visited(start_block, -1);
+	set_irn_visited(bad, -1);
+	set_irn_visited(no_mem, -1);
+
+	res->phase_state = phase_high;
+
+	return res;
+}
 
-ir_graph *
-new_ir_graph (entity *ent, int n_loc)
+/**
+ * Pre-Walker: Copies blocks and nodes from the original method graph
+ * to the copied graph.
+ *
+ * @param n    A node from the original method graph.
+ * @param env  The copied graph.
+ */
+static void copy_all_nodes(ir_node *n, void *env)
 {
-  ir_graph *res = new_r_ir_graph (ent, n_loc);
-  add_irp_irg(res);          /* remember this graph global. */
-  return res;
+	ir_graph *irg = env;
+	ir_op    *op  = get_irn_op(n);
+	ir_node  *nn;
+
+	nn = new_ir_node(get_irn_dbg_info(n),
+	                 irg,
+	                 NULL,            /* no block yet, will be set later */
+	                 op,
+	                 get_irn_mode(n),
+	                 get_irn_arity(n),
+	                 get_irn_in(n) + 1);
+
+
+	/* Copy the attributes.  These might point to additional data.  If this
+	   was allocated on the old obstack the pointers now are dangling.  This
+	   frees e.g. the memory of the graph_arr allocated in new_immBlock. */
+	copy_node_attr(n, nn);
+	new_backedge_info(nn);
+	set_irn_link(n, nn);
+
+	/* fix the irg for Blocks: as Bad nodes are NOT copied, no
+	   need t fix them */
+	if (is_Block(nn))
+		nn->attr.block.irg.irg = irg;
+
+	/* fix access to entities on the stack frame */
+	if (is_Sel(nn)) {
+		ir_entity *ent = get_Sel_entity(nn);
+		ir_type   *tp = get_entity_owner(ent);
+
+		if (is_frame_type(tp)) {
+			/* replace by the copied entity */
+			ent = get_entity_link(ent);
+
+			assert(is_entity(ent));
+			assert(get_entity_owner(ent) == get_irg_frame_type(irg));
+			set_Sel_entity(nn, ent);
+		}
+	}
 }
 
-/* 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;
+/**
+ * Post-walker: Set the predecessors of the copied nodes.
+ * The copied nodes are set as link of their original nodes. The links of
+ * "irn" predecessors are the predecessors of copied node.
+ */
+static void set_all_preds(ir_node *irn, void *env)
+{
+	int      i;
+	ir_node  *nn, *pred;
+	(void) env;
+
+	nn = get_irn_link(irn);
+
+	if (is_Block(irn)) {
+		ir_node *mbh = get_Block_MacroBlock(irn);
+		set_Block_MacroBlock(nn, get_irn_link(mbh));
+		for (i = get_Block_n_cfgpreds(irn) - 1; i >= 0; i--) {
+			pred = get_Block_cfgpred(irn, i);
+			set_Block_cfgpred(nn, i, get_irn_link(pred));
+		}
+	} else {
+		/* First we set the block our copy if it is not a block.*/
+		set_nodes_block(nn, get_irn_link(get_nodes_block(irn)));
+		for (i = get_irn_arity(irn) - 1; i >= 0; i--) {
+			pred = get_irn_n(irn, i);
+			set_irn_n(nn, i, get_irn_link(pred));
+		}
+	}
+}
+
+#define NN(irn)  get_irn_link(irn)
+
+/*
+ * Create a new graph that is a copy of a given one.
+ */
+ir_graph *create_irg_copy(ir_graph *irg)
+{
+	ir_graph *res;
 
-  res = alloc_graph();
+	res = alloc_graph();
 
-  /* inform statistics here, as blocks will be already build on this graph */
-  hook_new_graph(res, NULL);
+	res->n_loc = 0;
+	res->visited = 0;       /* visited flag, for the ir walker */
+	res->block_visited = 0; /* visited flag, for the 'block'-walker */
+	res->obst       = XMALLOC(struct obstack);
+	obstack_init(res->obst);
+	res->extbb_obst = NULL;
+
+	res->last_node_idx = 0;
+
+	res->phase_state      = irg->phase_state;
+	res->irg_pinned_state = irg->irg_pinned_state;
+	res->extblk_state     = ir_extblk_info_none;
+	res->fp_model         = irg->fp_model;
+
+	res->value_table = new_identities();
+
+	/* clone the frame type here for safety */
+	irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+	res->frame_type  = clone_frame_type(irg->frame_type);
+
+	res->phase_state = irg->phase_state;
+
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+
+	/* copy all nodes from the graph irg to the new graph res */
+	irg_walk_anchors(irg, copy_all_nodes, set_all_preds, res);
+
+	/* copy the Anchor node */
+	res->anchor = NN(irg->anchor);
+
+	/* -- The end block -- */
+	set_irg_end_block (res, NN(get_irg_end_block(irg)));
+	set_irg_end       (res, NN(get_irg_end(irg)));
+	set_irg_end_reg   (res, NN(get_irg_end_reg(irg)));
+	set_irg_end_except(res, NN(get_irg_end_except(irg)));
+
+	/* -- The start block -- */
+	set_irg_start_block(res, NN(get_irg_start_block(irg)));
+	set_irg_bad        (res, NN(get_irg_bad(irg)));
+	set_irg_no_mem     (res, NN(get_irg_no_mem(irg)));
+	set_irg_start      (res, NN(get_irg_start(irg)));
+
+	/* Proj results of start node */
+	set_irg_initial_mem(res, NN(get_irg_initial_mem(irg)));
+
+	/* Copy the node count estimation. Would be strange if this
+	   is different from the original one. */
+	res->estimated_node_count = irg->estimated_node_count;
+
+	ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
+	irp_free_resources(irp, IR_RESOURCE_ENTITY_LINK);
+
+	return res;
+}
+#undef NN
 
-  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 */
-#if USE_EXPLICIT_PHI_IN_STACK
-  res->Phi_in_stack = NULL;
-#endif
-  res->kind = k_ir_graph;
-  res->obst      = xmalloc (sizeof(*res->obst));
-  obstack_init (res->obst);
-  res->phase_state = phase_building;
-  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;
-
-  /* -- The end block -- */
-  res->end_block  = new_immBlock ();
-  res->end        = new_End ();
-  res->end_reg    = res->end;
-  res->end_except = res->end;
-  mature_immBlock(get_cur_block());  /* mature the end block */
-
-  /* -- The start block -- */
-  res->start_block = new_immBlock ();
-  res->bad     = new_ir_node (NULL, res, res->start_block, op_Bad, mode_T, 0, NULL);
-  res->no_mem  = new_ir_node (NULL, res, res->start_block, op_NoMem, mode_M, 0, NULL);
-  res->start   = new_Start ();
-  /* Proj results of start node */
-  res->initial_mem = new_Proj (res->start, mode_M, pn_Start_M);
-  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 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_irn_visited(res->no_mem, -1);
-
-  res->phase_state = phase_high;
-  return res;
-}
-
-/* Defined in iropt.c */
-void  del_identities (pset *value_table);
 
 /* Frees the passed irgraph.
    Deallocates all nodes in this graph and the ir_graph structure.
@@ -303,29 +540,30 @@ void  del_identities (pset *value_table);
    inefficient search, call remove_irp_irg by hand).
    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) {
-
-  hook_free_graph(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) {
-    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);
-#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);
+void free_ir_graph(ir_graph *irg)
+{
+	assert(is_ir_graph(irg));
+
+	edges_deactivate(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->ent) {
+		set_entity_irg(irg->ent, NULL);  /* not set in const code irg */
+	}
+
+	free_End(get_irg_end(irg));
+	obstack_free(irg->obst,NULL);
+	free(irg->obst);
+	if (irg->loc_descriptions)
+		free(irg->loc_descriptions);
+	irg->kind = k_BAD;
+	free_graph(irg);
 }
 
 /* access routines for all ir_graph attributes:
@@ -333,223 +571,217 @@ void free_ir_graph (ir_graph *irg) {
    {attr type} get_irg_{attribute name} (ir_graph *irg);
    void set_irg_{attr name} (ir_graph *irg, {attr type} {attr}); */
 
-int
-(is_ir_graph)(const void *thing) {
-  return _is_ir_graph(thing);
+int (is_ir_graph)(const void *thing)
+{
+	return _is_ir_graph(thing);
 }
 
-/* Outputs a unique number for this node */
-
-long
-get_irg_graph_nr(ir_graph *irg) {
-  assert(irg);
 #ifdef DEBUG_libfirm
-  return irg->graph_nr;
+/* Outputs a unique number for this node */
+long get_irg_graph_nr(const ir_graph *irg)
+{
+	return irg->graph_nr;
+}
 #else
-  return (long)irg;
-#endif
+long get_irg_graph_nr(const ir_graph *irg)
+{
+	return PTR_TO_INT(irg);
 }
+#endif
 
-ir_node *
-(get_irg_start_block)(const ir_graph *irg) {
-  return _get_irg_start_block(irg);
+int get_irg_idx(const ir_graph *irg)
+{
+	return irg->index;
 }
 
-void
-(set_irg_start_block)(ir_graph *irg, ir_node *node) {
-  _set_irg_start_block(irg, node);
+ir_node *(get_idx_irn)(ir_graph *irg, unsigned idx)
+{
+	return _get_idx_irn(irg, idx);
 }
 
-ir_node *
-(get_irg_start)(const ir_graph *irg) {
-  return _get_irg_start(irg);
+ir_node *(get_irg_start_block)(const ir_graph *irg)
+{
+	return _get_irg_start_block(irg);
 }
 
-void
-(set_irg_start)(ir_graph *irg, ir_node *node) {
-  _set_irg_start(irg, node);
+void (set_irg_start_block)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_start_block(irg, node);
 }
 
-ir_node *
-(get_irg_end_block)(const ir_graph *irg) {
-  return _get_irg_end_block(irg);
+ir_node *(get_irg_start)(const ir_graph *irg)
+{
+	return _get_irg_start(irg);
 }
 
-void
-(set_irg_end_block)(ir_graph *irg, ir_node *node) {
-  _set_irg_end_block(irg, node);
+void (set_irg_start)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_start(irg, node);
 }
 
-ir_node *
-(get_irg_end)(const ir_graph *irg) {
-  return _get_irg_end(irg);
+ir_node *(get_irg_end_block)(const ir_graph *irg)
+{
+	return _get_irg_end_block(irg);
 }
 
-void
-(set_irg_end)(ir_graph *irg, ir_node *node) {
-  _set_irg_end(irg, node);
+void (set_irg_end_block)(ir_graph *irg, ir_node *node)
+{
+  _set_irg_end_block(irg, node);
 }
 
-ir_node *
-(get_irg_end_reg)(const ir_graph *irg) {
-  return _get_irg_end_reg(irg);
+ir_node *(get_irg_end)(const ir_graph *irg)
+{
+	return _get_irg_end(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;
+void (set_irg_end)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_end(irg, node);
 }
 
-ir_node *
-(get_irg_end_except)(const ir_graph *irg) {
-  return _get_irg_end_except(irg);
+ir_node *(get_irg_end_reg)(const ir_graph *irg)
+{
+	return _get_irg_end_reg(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;
+void (set_irg_end_reg)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_end_reg(irg, node);
 }
 
-ir_node *
-(get_irg_cstore)(const ir_graph *irg) {
-  return _get_irg_cstore(irg);
+ir_node *(get_irg_end_except)(const ir_graph *irg)
+{
+	return _get_irg_end_except(irg);
 }
 
-void
-(set_irg_cstore)(ir_graph *irg, ir_node *node) {
-  _set_irg_cstore(irg, node);
+void (set_irg_end_except)(ir_graph *irg, ir_node *node)
+{
+	assert(get_irn_op(node) == op_EndExcept || is_End(node));
+	_set_irg_end_except(irg, node);
 }
 
-ir_node *
-(get_irg_frame)(const ir_graph *irg) {
-  return _get_irg_frame(irg);
+ir_node *(get_irg_initial_exec)(const ir_graph *irg)
+{
+	return _get_irg_initial_exec(irg);
 }
 
-void
-(set_irg_frame)(ir_graph *irg, ir_node *node) {
-  _set_irg_frame(irg, node);
+void (set_irg_initial_exec)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_initial_exec(irg, node);
 }
 
-ir_node *
-(get_irg_globals)(const ir_graph *irg) {
-  return _get_irg_globals(irg);
+ir_node *(get_irg_frame)(const ir_graph *irg)
+{
+	return _get_irg_frame(irg);
 }
 
-void
-(set_irg_globals)(ir_graph *irg, ir_node *node) {
-  _set_irg_globals(irg, node);
+void (set_irg_frame)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_frame(irg, node);
 }
 
-ir_node *
-(get_irg_initial_mem)(const ir_graph *irg) {
-  return _get_irg_initial_mem(irg);
+ir_node *(get_irg_tls)(const ir_graph *irg)
+{
+	return _get_irg_tls(irg);
 }
 
-void
-(set_irg_initial_mem)(ir_graph *irg, ir_node *node) {
-  _set_irg_initial_mem(irg, node);
+void (set_irg_tls)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_tls(irg, node);
 }
 
-ir_node *
-(get_irg_args)(const ir_graph *irg) {
-  return _get_irg_args(irg);
+ir_node *(get_irg_initial_mem)(const ir_graph *irg)
+{
+	return _get_irg_initial_mem(irg);
 }
 
-void
-(set_irg_args)(ir_graph *irg, ir_node *node) {
-  _set_irg_args(irg, node);
+void (set_irg_initial_mem)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_initial_mem(irg, node);
 }
 
-ir_node **
-(get_irg_proj_args) (const ir_graph *irg) {
-  return _get_irg_proj_args (irg);
+ir_node *(get_irg_args)(const ir_graph *irg)
+{
+	return _get_irg_args(irg);
 }
 
-void
-(set_irg_proj_args) (ir_graph *irg, ir_node **nodes) {
-  _set_irg_proj_args (irg, nodes);
+void (set_irg_args)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_args(irg, node);
 }
 
-ir_node *
-(get_irg_bad)(const ir_graph *irg) {
-  return _get_irg_bad(irg);
+ir_node *(get_irg_bad)(const ir_graph *irg)
+{
+	return _get_irg_bad(irg);
 }
 
-void
-(set_irg_bad)(ir_graph *irg, ir_node *node) {
-  _set_irg_bad(irg, node);
+void (set_irg_bad)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_bad(irg, node);
 }
 
-ir_node *
-(get_irg_no_mem)(const ir_graph *irg) {
-  return _get_irg_no_mem(irg);
+ir_node *(get_irg_no_mem)(const ir_graph *irg)
+{
+	return _get_irg_no_mem(irg);
 }
 
-void
-(set_irg_no_mem)(ir_graph *irg, ir_node *node) {
-  _set_irg_no_mem(irg, node);
+void (set_irg_no_mem)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_no_mem(irg, node);
 }
 
-ir_node *
-(get_irg_current_block)(const ir_graph *irg) {
-  return _get_irg_current_block(irg);
+ir_node *(get_irg_current_block)(const ir_graph *irg)
+{
+	return _get_irg_current_block(irg);
 }
 
-void
-(set_irg_current_block)(ir_graph *irg, ir_node *node) {
-  _set_irg_current_block(irg, node);
+void (set_irg_current_block)(ir_graph *irg, ir_node *node)
+{
+	_set_irg_current_block(irg, node);
 }
 
-entity *
-(get_irg_entity)(const ir_graph *irg) {
-  return _get_irg_entity(irg);
+ir_entity *(get_irg_entity)(const ir_graph *irg)
+{
+	return _get_irg_entity(irg);
 }
 
-void
-(set_irg_entity)(ir_graph *irg, entity *ent) {
-  _set_irg_entity(irg, ent);
+void (set_irg_entity)(ir_graph *irg, ir_entity *ent)
+{
+	_set_irg_entity(irg, ent);
 }
 
-type *
-(get_irg_frame_type)(const ir_graph *irg) {
-  return _get_irg_frame_type(irg);
+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(irg, ftp);
+void (set_irg_frame_type)(ir_graph *irg, ir_type *ftp)
+{
+	_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;
+/* Returns the value parameter type of an IR graph. */
+ir_type *get_irg_value_param_type(ir_graph *irg)
+{
+	ir_entity *ent = get_irg_entity(irg);
+	ir_type   *mtp = get_entity_type(ent);
+	return get_method_value_param_type(mtp);
 }
 
-int
-get_irg_n_locs (ir_graph *irg)
+int get_irg_n_locs(ir_graph *irg)
 {
-  if (get_opt_precise_exc_context())
-    return irg->n_loc - 1 - 1;
-  else
-    return irg->n_loc - 1;
+	if (get_opt_precise_exc_context())
+		return irg->n_loc - 1 - 1;
+	else
+		return irg->n_loc - 1;
 }
 
-void
-set_irg_n_loc (ir_graph *irg, int n_loc)
+void set_irg_n_loc(ir_graph *irg, int n_loc)
 {
-  if (get_opt_precise_exc_context())
-    irg->n_loc = n_loc + 1 + 1;
-  else
-    irg->n_loc = n_loc + 1;
+	if (get_opt_precise_exc_context())
+		irg->n_loc = n_loc + 1 + 1;
+	else
+		irg->n_loc = n_loc + 1;
 }
 
 
@@ -557,7 +789,7 @@ set_irg_n_loc (ir_graph *irg, int n_loc)
 /* Returns the obstack associated with the graph. */
 struct obstack *
 (get_irg_obstack)(const ir_graph *irg) {
-  return _get_irg_obstack(irg);
+	return _get_irg_obstack(irg);
 }
 
 /*
@@ -567,182 +799,215 @@ struct obstack *
  */
 int node_is_in_irgs_storage(ir_graph *irg, ir_node *n)
 {
-  struct _obstack_chunk *p;
+	struct _obstack_chunk *p;
 
-  /*
-   * checks wheater the ir_node pointer i on the obstack.
-   * A more sophisticated check would test the "whole" ir_node
-   */
-  for (p = irg->obst->chunk; p; p = p->prev) {
-    if (((char *)p->contents <= (char *)n) && ((char *)n < (char *)p->limit))
-      return 1;
-  }
+	/*
+	 * 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) {
+		if (((char *)p->contents <= (char *)n) && ((char *)n < (char *)p->limit))
+			return 1;
+	}
 
-  return 0;
+	return 0;
 }
 
-irg_phase_state
-(get_irg_phase_state)(const ir_graph *irg) {
-  return _get_irg_phase_state(irg);
+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) {
-  _set_irg_phase_low(irg);
+void (set_irg_phase_state)(ir_graph *irg, irg_phase_state state)
+{
+	_set_irg_phase_state(irg, state);
 }
 
-op_pin_state
-(get_irg_pinned)(const ir_graph *irg) {
-  return _get_irg_pinned(irg);
+op_pin_state (get_irg_pinned)(const ir_graph *irg)
+{
+	return _get_irg_pinned(irg);
 }
 
-irg_outs_state
-(get_irg_outs_state)(const ir_graph *irg) {
-  return _get_irg_outs_state(irg);
+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) {
-  _set_irg_outs_inconsistent(irg);
+void (set_irg_outs_inconsistent)(ir_graph *irg)
+{
+	_set_irg_outs_inconsistent(irg);
 }
 
-irg_dom_state
-(get_irg_dom_state)(const ir_graph *irg) {
-  return _get_irg_dom_state(irg);
+irg_extblk_state (get_irg_extblk_state)(const ir_graph *irg)
+{
+	return _get_irg_extblk_state(irg);
 }
 
-void
-(set_irg_dom_inconsistent)(ir_graph *irg) {
-  _set_irg_dom_inconsistent(irg);
+void (set_irg_extblk_inconsistent)(ir_graph *irg)
+{
+	_set_irg_extblk_inconsistent(irg);
 }
 
-irg_loopinfo_state
-(get_irg_loopinfo_state)(const ir_graph *irg) {
-  return _get_irg_loopinfo_state(irg);
+irg_dom_state (get_irg_dom_state)(const ir_graph *irg)
+{
+	return _get_irg_dom_state(irg);
 }
 
-void
-(set_irg_loopinfo_state)(ir_graph *irg, irg_loopinfo_state s) {
-  _set_irg_loopinfo_state(irg, s);
+irg_dom_state (get_irg_postdom_state)(const ir_graph *irg)
+{
+	return _get_irg_postdom_state(irg);
 }
 
-void
-set_irg_loopinfo_inconsistent(ir_graph *irg) {
-  if (irg->loopinfo_state == loopinfo_ip_consistent)
-    irg->loopinfo_state = loopinfo_ip_inconsistent;
+void (set_irg_doms_inconsistent)(ir_graph *irg)
+{
+	_set_irg_doms_inconsistent(irg);
+}
 
-  else if (irg->loopinfo_state == loopinfo_consistent)
-    irg->loopinfo_state = loopinfo_inconsistent;
+irg_loopinfo_state (get_irg_loopinfo_state)(const ir_graph *irg)
+{
+	return _get_irg_loopinfo_state(irg);
+}
 
-  else if (irg->loopinfo_state == loopinfo_cf_ip_consistent)
-    irg->loopinfo_state = loopinfo_cf_ip_inconsistent;
+void (set_irg_loopinfo_state)(ir_graph *irg, irg_loopinfo_state s)
+{
+	_set_irg_loopinfo_state(irg, s);
+}
 
-  else if (irg->loopinfo_state == loopinfo_cf_consistent)
-    irg->loopinfo_state = loopinfo_cf_inconsistent;
+void (set_irg_loopinfo_inconsistent)(ir_graph *irg)
+{
+	_set_irg_loopinfo_inconsistent(irg);
 }
 
-void
-(set_irg_pinned)(ir_graph *irg, op_pin_state p) {
-  _set_irg_pinned(irg, p);
+void set_irp_loopinfo_inconsistent(void)
+{
+	int i;
+	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+		set_irg_loopinfo_inconsistent(get_irp_irg(i));
+	}
 }
 
-irg_callee_info_state
-(get_irg_callee_info_state)(const ir_graph *irg) {
-  return _get_irg_callee_info_state(irg);
+
+
+void (set_irg_pinned)(ir_graph *irg, op_pin_state p)
+{
+	_set_irg_pinned(irg, p);
 }
 
-void
-(set_irg_callee_info_state)(ir_graph *irg, irg_callee_info_state s) {
-  _set_irg_callee_info_state(irg, s);
+irg_callee_info_state (get_irg_callee_info_state)(const ir_graph *irg)
+{
+	return _get_irg_callee_info_state(irg);
 }
 
-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)
+{
+	_set_irg_callee_info_state(irg, 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)(const ir_graph *irg)
+{
+	return _get_irg_inline_property(irg);
 }
 
-void
-(set_irg_link)(ir_graph *irg, void *thing) {
-  _set_irg_link(irg, thing);
+void (set_irg_inline_property)(ir_graph *irg, irg_inline_property s)
+{
+	_set_irg_inline_property(irg, s);
 }
 
-void *
-(get_irg_link)(const ir_graph *irg) {
-  return _get_irg_link(irg);
+unsigned (get_irg_additional_properties)(const ir_graph *irg)
+{
+	return _get_irg_additional_properties(irg);
 }
 
-/** maximum visited flag content of all ir_graph visited fields. */
-static unsigned long max_irg_visited = 0;
+void (set_irg_additional_properties)(ir_graph *irg, unsigned property_mask)
+{
+	_set_irg_additional_properties(irg, property_mask);
+}
 
-unsigned long
-(get_irg_visited)(const ir_graph *irg) {
-  return _get_irg_visited(irg);
+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);
 }
 
-void
-set_irg_visited (ir_graph *irg, unsigned long visited)
+void *(get_irg_link)(const ir_graph *irg)
 {
-  irg->visited = visited;
-  if (irg->visited > max_irg_visited) {
-    max_irg_visited = irg->visited;
-  }
+	return _get_irg_link(irg);
 }
 
-void
-inc_irg_visited (ir_graph *irg)
+ir_visited_t (get_irg_visited)(const ir_graph *irg)
 {
-  if (++irg->visited > max_irg_visited) {
-    max_irg_visited = irg->visited;
-  }
+	return _get_irg_visited(irg);
 }
 
-unsigned long
-get_max_irg_visited(void)
+/** maximum visited flag content of all ir_graph visited fields. */
+static ir_visited_t max_irg_visited = 0;
+
+void set_irg_visited(ir_graph *irg, ir_visited_t visited)
 {
-  /*
-  int i;
-  for(i = 0; i < get_irp_n_irgs(); i++)
-  assert(max_irg_visited >= get_irg_visited(get_irp_irg(i)));
-   */
-  return max_irg_visited;
+	irg->visited = visited;
+	if (irg->visited > max_irg_visited) {
+		max_irg_visited = irg->visited;
+	}
 }
 
-void set_max_irg_visited(int val) {
-  max_irg_visited = val;
+void inc_irg_visited(ir_graph *irg)
+{
+	++irg->visited;
+	if (irg->visited > max_irg_visited) {
+		max_irg_visited = irg->visited;
+	}
 }
 
-unsigned long
-inc_max_irg_visited(void)
+ir_visited_t get_max_irg_visited(void)
 {
-  /*
-  int i;
-  for(i = 0; i < get_irp_n_irgs(); i++)
-  assert(max_irg_visited >= get_irg_visited(get_irp_irg(i)));
-  */
-  max_irg_visited++;
-  return max_irg_visited;
+	return max_irg_visited;
 }
 
-unsigned long
-(get_irg_block_visited)(const ir_graph *irg) {
-  return _get_irg_block_visited(irg);
+void set_max_irg_visited(int val)
+{
+	max_irg_visited = val;
 }
 
-void
-(set_irg_block_visited)(ir_graph *irg, unsigned long visited) {
-  _set_irg_block_visited(irg, visited);
+ir_visited_t inc_max_irg_visited(void)
+{
+#ifndef NDEBUG
+	int i;
+	for (i = 0; i < get_irp_n_irgs(); i++)
+		assert(max_irg_visited >= get_irg_visited(get_irp_irg(i)));
+#endif
+	return ++max_irg_visited;
 }
 
-void
-(inc_irg_block_visited)(ir_graph *irg) {
+ir_visited_t (get_irg_block_visited)(const ir_graph *irg)
+{
+	return _get_irg_block_visited(irg);
+}
+
+void (set_irg_block_visited)(ir_graph *irg, ir_visited_t visited)
+{
+	_set_irg_block_visited(irg, visited);
+}
+
+void (inc_irg_block_visited)(ir_graph *irg)
+{
   _inc_irg_block_visited(irg);
 }
 
+/* Return the floating point model of this graph. */
+unsigned (get_irg_fp_model)(const ir_graph *irg)
+{
+	return _get_irg_fp_model(irg);
+}
+
+/* Sets the floating point model for this graph. */
+void set_irg_fp_model(ir_graph *irg, unsigned model)
+{
+	irg->fp_model = model;
+}
 
 /**
  * walker Start->End: places Proj nodes into the same block
@@ -753,46 +1018,94 @@ void
  */
 static void normalize_proj_walker(ir_node *n, void *env)
 {
-  if (is_Proj(n)) {
-    ir_node *pred  = get_Proj_pred(n);
-    ir_node *block = get_nodes_block(pred);
+	(void) env;
+	if (is_Proj(n)) {
+		ir_node *pred  = get_Proj_pred(n);
+		ir_node *block = get_nodes_block(pred);
 
-    set_nodes_block(n, block);
-  }
+		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);
+	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);
+	assert(0 <= n && n < irg->n_loc);
 
-  if (! irg->loc_descriptions)
-    irg->loc_descriptions = xmalloc(sizeof(*irg->loc_descriptions) * irg->n_loc);
+	if (! irg->loc_descriptions)
+		irg->loc_descriptions = XMALLOCNZ(void*, irg->n_loc);
 
-  irg->loc_descriptions[n] = description;
+	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;
+	assert(0 <= n && n < irg->n_loc);
+	return irg->loc_descriptions ? irg->loc_descriptions[n] : NULL;
+}
+
+#ifndef NDEBUG
+void ir_reserve_resources(ir_graph *irg, ir_resources_t resources)
+{
+	assert((resources & ~IR_RESOURCE_LOCAL_MASK) == 0);
+	assert((irg->reserved_resources & resources) == 0);
+	irg->reserved_resources |= resources;
+}
+
+void ir_free_resources(ir_graph *irg, ir_resources_t resources)
+{
+	assert((irg->reserved_resources & resources) == resources);
+	irg->reserved_resources &= ~resources;
+}
+
+ir_resources_t ir_resources_reserved(const ir_graph *irg)
+{
+	return irg->reserved_resources;
+}
+#endif /* NDEBUG */
+
+/* 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);
+}
+
+/* Returns the last irn index for this graph. */
+unsigned get_irg_last_idx(const ir_graph *irg)
+{
+	return irg->last_node_idx;
 }
 
 /* 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");
+	assert(!forbid_new_data && "Too late to register additional node data");
+
+	if (forbid_new_data)
+		return 0;
 
-  if (forbid_new_data)
-    return 0;
+	return additional_graph_data_size += size;
+}
 
-  return additional_graph_data_size += size;
+void (set_irg_state)(ir_graph *irg, ir_graph_state_t state)
+{
+	_set_irg_state(irg, state);
+}
+
+void (clear_irg_state)(ir_graph *irg, ir_graph_state_t state)
+{
+	_clear_irg_state(irg, state);
+}
+
+int (is_irg_state)(const ir_graph *irg, ir_graph_state_t state)
+{
+	return _is_irg_state(irg, state);
 }