X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fir%2Firgraph.c;h=9e61dd112e409ece4f0f3aa9b214ccccab11cb22;hb=0ba6d24830420634f69caa4c0b947bbdd8955346;hp=af159cfff7def021d181646f7a98dc638ef211ee;hpb=2814a774ee584b3c19ff3c87b3775ff46859b21e;p=libfirm

diff --git a/ir/ir/irgraph.c b/ir/ir/irgraph.c
index af159cfff..9e61dd112 100644
--- a/ir/ir/irgraph.c
+++ b/ir/ir/irgraph.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,14 +21,11 @@
  * @file
  * @brief    Entry point to the representation of procedure code.
  * @author   Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck
- * @version  $Id$
  */
 #include "config.h"
 
 #include <string.h>
-#ifdef HAVE_STDDEF_H
-# include <stddef.h>
-#endif
+#include <stddef.h>
 
 #include "xmalloc.h"
 #include "ircons_t.h"
@@ -43,6 +40,7 @@
 #include "irouts.h"
 #include "irhooks.h"
 #include "irtools.h"
+#include "util.h"
 #include "irgwalk.h"
 #include "irbackedge_t.h"
 #include "iredges_t.h"
@@ -64,41 +62,22 @@ 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) {
+ir_graph *get_current_ir_graph(void)
+{
 	return current_ir_graph;
 }
 
-void set_current_ir_graph(ir_graph *graph) {
+void set_current_ir_graph(ir_graph *graph)
+{
 	current_ir_graph = graph;
 }
 
-#ifdef 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;
-	}
-}
-#endif
-
 /** contains the suffix for frame type names */
 static ident *frame_type_suffix = NULL;
 
 /* initialize the IR graph module */
-void firm_init_irgraph(void) {
+void firm_init_irgraph(void)
+{
 	frame_type_suffix = new_id_from_str(FRAME_TP_SUFFIX);
 	forbid_new_data   = 1;
 }
@@ -110,11 +89,11 @@ void firm_init_irgraph(void) {
  * allocated (new_r_ir_graph, new_const_code_irg).
  * @return Memory for a new graph.
  */
-static ir_graph *alloc_graph(void) {
+static ir_graph *alloc_graph(void)
+{
 	ir_graph *res;
 	size_t   size = sizeof(ir_graph) + additional_graph_data_size;
-	char     *ptr = xmalloc(size);
-	memset(ptr, 0, size);
+	char     *ptr = XMALLOCNZ(char, size);
 
 	res = (ir_graph *)(ptr + additional_graph_data_size);
 	res->kind = k_ir_graph;
@@ -129,11 +108,12 @@ static ir_graph *alloc_graph(void) {
 /**
  * Frees an allocated IR graph
  */
-static void free_graph(ir_graph *irg) {
-	char *ptr = (char *)irg;
-	int  i;
+static void free_graph(ir_graph *irg)
+{
+	char           *ptr = (char *)irg;
+	ir_edge_kind_t  i;
 
-	for (i = 0; i < EDGE_KIND_LAST; ++i)
+	for (i = EDGE_KIND_FIRST; i < EDGE_KIND_LAST; ++i)
 		edges_deactivate_kind(irg, i);
 	DEL_ARR_F(irg->idx_irn_map);
 	free(ptr - additional_graph_data_size);
@@ -145,21 +125,15 @@ static void free_graph(ir_graph *irg) {
  * @param irg    the graph
  * @param n_loc  number of locals
  */
-void irg_set_nloc(ir_graph *res, int n_loc) {
+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!  */
-	}
+	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;
@@ -167,7 +141,7 @@ void irg_set_nloc(ir_graph *res, int n_loc) {
 }
 
 /* Allocates a list of nodes:
-    - The start block containing a start node and Proj nodes for it's four
+    - The start block containing a start node and Proj nodes for its four
       results (X, M, P, Tuple).
     - The end block containing an end node. This block is not matured after
       new_ir_graph as predecessors need to be added to it.
@@ -175,18 +149,17 @@ void irg_set_nloc(ir_graph *res, int n_loc) {
    Further it allocates several datastructures needed for graph construction
    and optimization.
 */
-ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
+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;
+	ir_node  *start, *start_block, *initial_mem, *projX;
 
 	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);
@@ -205,26 +178,18 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
 
 	res->last_node_idx = 0;
 
-	res->value_table = new_identities(); /* value table for global value
-	                                        numbering for optimizing use in iropt.c */
+	new_identities(res);
 	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 --*/
@@ -235,47 +200,37 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
 	res->frame_type = new_type_frame();
 
 	/* the Anchor node must be created first */
-	res->anchor = new_Anchor(res);
+	res->anchor = new_r_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_end_block (res, new_r_immBlock(res));
+	set_irg_end(res, new_r_End(res, 0, NULL));
+
+	start_block = new_r_Block_noopt(res, 0, NULL);
 	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_no_mem     (res, new_r_NoMem(res));
+	start = new_r_Start(res);
 	set_irg_start      (res, start);
 
 	/* Proj results of start node */
-	projX                   = new_Proj(start, mode_X, pn_Start_X_initial_exec);
+	projX                   = new_r_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_frame           (res, new_r_Proj(start, mode_P_data, pn_Start_P_frame_base));
+	set_irg_args            (res, new_r_Proj(start, mode_T,      pn_Start_T_args));
+	initial_mem             = new_r_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();
 #endif
 
-	mature_immBlock(res->current_block);
+	set_r_cur_block(res, start_block);
+	set_r_store(res, initial_mem);
 
 	/*-- Make a block to start with --*/
-	first_block = new_immBlock();
-	set_cur_block(first_block);
+	first_block = new_r_immBlock(res);
+	set_r_cur_block(res, first_block);
 	add_immBlock_pred(first_block, projX);
 
 	res->method_execution_frequency = -1.0;
@@ -284,7 +239,8 @@ ir_graph *new_r_ir_graph(ir_entity *ent, int n_loc) {
 	return res;
 }
 
-ir_graph *new_ir_graph(ir_entity *ent, int n_loc) {
+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;
@@ -295,7 +251,6 @@ ir_graph *new_ir_graph(ir_entity *ent, int n_loc) {
 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;
@@ -307,7 +262,6 @@ ir_graph *new_const_code_irg(void)
 	/* 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 */
@@ -319,58 +273,43 @@ ir_graph *new_const_code_irg(void)
 
 	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();
+	new_identities(res);
 	res->ent         = NULL;
 	res->frame_type  = NULL;
 
 	/* the Anchor node must be created first */
-	res->anchor = new_Anchor(res);
+	res->anchor = new_r_Anchor(res);
 
 	/* -- The end block -- */
-	end_block = new_immBlock();
+	end_block = new_r_Block_noopt(res, 0, NULL);
 	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);
+	end = new_r_End(res, 0, NULL);
+	set_irg_end(res, end);
 
 	/* -- The start block -- */
-	start_block        = new_immBlock();
-	set_cur_block(start_block);
+	start_block = new_r_Block_noopt(res, 0, NULL);
 	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);
+	no_mem = new_r_NoMem(res);
 	set_irg_no_mem(res, no_mem);
-	start = new_Start();
+	start = new_r_Start(res);
 	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);
+	set_irg_initial_mem(res, new_r_Proj(start, mode_M, pn_Start_M));
+	projX = new_r_Proj(start, mode_X, pn_Start_X_initial_exec);
 
-	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);
+	body_block = new_r_Block(res, 1, &projX);
+
+	set_r_cur_block(res, 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;
 }
@@ -382,44 +321,25 @@ ir_graph *new_const_code_irg(void)
  * @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 *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;
+static void copy_all_nodes(ir_node *node, void *env)
+{
+	ir_graph *irg      = (ir_graph*)env;
+	ir_node  *new_node = irn_copy_into_irg(node, irg);
+
+	set_irn_link(node, new_node);
 
 	/* 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_Sel(new_node)) {
+		ir_entity *ent = get_Sel_entity(new_node);
+		ir_type   *tp  = get_entity_owner(ent);
 
 		if (is_frame_type(tp)) {
 			/* replace by the copied entity */
-			ent = get_entity_link(ent);
+			ent = (ir_entity*)get_entity_link(ent);
 
 			assert(is_entity(ent));
 			assert(get_entity_owner(ent) == get_irg_frame_type(irg));
-			set_Sel_entity(nn, ent);
+			set_Sel_entity(new_node, ent);
 		}
 	}
 }
@@ -429,36 +349,22 @@ static void copy_all_nodes(ir_node *n, void *env) {
  * 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;
+static void rewire(ir_node *irn, void *env)
+{
 	(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));
-		}
-	}
+	irn_rewire_inputs(irn);
 }
 
-#define NN(irn)  get_irn_link(irn)
+static ir_node *get_new_node(const ir_node *old_node)
+{
+	return (ir_node*) get_irn_link(old_node);
+}
 
 /*
  * Create a new graph that is a copy of a given one.
  */
-ir_graph *create_irg_copy(ir_graph *irg) {
+ir_graph *create_irg_copy(ir_graph *irg)
+{
 	ir_graph *res;
 
 	res = alloc_graph();
@@ -474,13 +380,12 @@ ir_graph *create_irg_copy(ir_graph *irg) {
 
 	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();
+	new_identities(res);
 
 	/* clone the frame type here for safety */
-	irp_reserve_resources(irp, IR_RESOURCE_ENTITY_LINK);
+	irp_reserve_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 	res->frame_type  = clone_frame_type(irg->frame_type);
 
 	res->phase_state = irg->phase_state;
@@ -488,37 +393,32 @@ ir_graph *create_irg_copy(ir_graph *irg) {
 	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);
+	irg_walk_anchors(irg, copy_all_nodes, rewire, res);
 
 	/* copy the Anchor node */
-	res->anchor = NN(irg->anchor);
+	res->anchor = get_new_node(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)));
+	set_irg_end_block (res, get_new_node(get_irg_end_block(irg)));
+	set_irg_end       (res, get_new_node(get_irg_end(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)));
+	set_irg_start_block(res, get_new_node(get_irg_start_block(irg)));
+	set_irg_no_mem     (res, get_new_node(get_irg_no_mem(irg)));
+	set_irg_start      (res, get_new_node(get_irg_start(irg)));
 
 	/* Proj results of start node */
-	set_irg_initial_mem(res, NN(get_irg_initial_mem(irg)));
+	set_irg_initial_mem(res, get_new_node(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);
+	irp_free_resources(irp, IRP_RESOURCE_ENTITY_LINK);
 
 	return res;
 }
-#undef NN
-
 
 /* Frees the passed irgraph.
    Deallocates all nodes in this graph and the ir_graph structure.
@@ -534,18 +434,14 @@ void free_ir_graph(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);
+	free_irg_outs(irg);
+	del_identities(irg);
 	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);
+	obstack_free(irg->obst, NULL);
 	free(irg->obst);
 	if (irg->loc_descriptions)
 		free(irg->loc_descriptions);
@@ -558,220 +454,153 @@ 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);
 }
 
 #ifdef DEBUG_libfirm
 /* Outputs a unique number for this node */
-long get_irg_graph_nr(const ir_graph *irg) {
+long get_irg_graph_nr(const ir_graph *irg)
+{
 	return irg->graph_nr;
 }
 #else
-long get_irg_graph_nr(const ir_graph *irg) {
+long get_irg_graph_nr(const ir_graph *irg)
+{
 	return PTR_TO_INT(irg);
 }
 #endif
 
-int get_irg_idx(const ir_graph *irg) {
+size_t get_irg_idx(const ir_graph *irg)
+{
 	return irg->index;
 }
 
-ir_node *(get_idx_irn)(ir_graph *irg, unsigned idx) {
-	return _get_idx_irn(irg, idx);
-}
-
-ir_node *
-(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);
-}
-
-ir_node *
-(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);
-}
-
-ir_node *
-(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);
-}
-
-ir_node *
-(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);
-}
-
-ir_node *
-(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) {
-	_set_irg_end_reg(irg, node);
-}
-
-ir_node *
-(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 || is_End(node));
-	_set_irg_end_except(irg, node);
+ir_node *(get_idx_irn)(const ir_graph *irg, unsigned idx)
+{
+	return get_idx_irn_(irg, idx);
 }
 
-ir_node *
-(get_irg_initial_exec)(const ir_graph *irg) {
-	return _get_irg_initial_exec(irg);
+ir_node *(get_irg_start_block)(const ir_graph *irg)
+{
+	return get_irg_start_block_(irg);
 }
 
-void
-(set_irg_initial_exec)(ir_graph *irg, ir_node *node) {
-	_set_irg_initial_exec(irg, node);
+void (set_irg_start_block)(ir_graph *irg, ir_node *node)
+{
+	set_irg_start_block_(irg, node);
 }
 
-ir_node *
-(get_irg_frame)(const ir_graph *irg) {
-	return _get_irg_frame(irg);
+ir_node *(get_irg_start)(const ir_graph *irg)
+{
+	return get_irg_start_(irg);
 }
 
-void
-(set_irg_frame)(ir_graph *irg, ir_node *node) {
-	_set_irg_frame(irg, node);
+void (set_irg_start)(ir_graph *irg, ir_node *node)
+{
+	set_irg_start_(irg, node);
 }
 
-ir_node *
-(get_irg_tls)(const ir_graph *irg) {
-	return _get_irg_tls(irg);
+ir_node *(get_irg_end_block)(const ir_graph *irg)
+{
+	return get_irg_end_block_(irg);
 }
 
-void
-(set_irg_tls)(ir_graph *irg, ir_node *node) {
-	_set_irg_tls(irg, node);
+void (set_irg_end_block)(ir_graph *irg, ir_node *node)
+{
+	set_irg_end_block_(irg, node);
 }
 
-ir_node *
-(get_irg_initial_mem)(const ir_graph *irg) {
-	return _get_irg_initial_mem(irg);
+ir_node *(get_irg_end)(const ir_graph *irg)
+{
+	return get_irg_end_(irg);
 }
 
-void
-(set_irg_initial_mem)(ir_graph *irg, ir_node *node) {
-	_set_irg_initial_mem(irg, node);
+void (set_irg_end)(ir_graph *irg, ir_node *node)
+{
+	set_irg_end_(irg, node);
 }
 
-ir_node *
-(get_irg_args)(const ir_graph *irg) {
-	return _get_irg_args(irg);
+ir_node *(get_irg_initial_exec)(const ir_graph *irg)
+{
+	return get_irg_initial_exec_(irg);
 }
 
-void
-(set_irg_args)(ir_graph *irg, ir_node *node) {
-	_set_irg_args(irg, node);
+void (set_irg_initial_exec)(ir_graph *irg, ir_node *node)
+{
+	set_irg_initial_exec_(irg, node);
 }
 
-ir_node *
-(get_irg_bad)(const ir_graph *irg) {
-	return _get_irg_bad(irg);
+ir_node *(get_irg_frame)(const ir_graph *irg)
+{
+	return get_irg_frame_(irg);
 }
 
-void
-(set_irg_bad)(ir_graph *irg, ir_node *node) {
-	_set_irg_bad(irg, node);
+void (set_irg_frame)(ir_graph *irg, ir_node *node)
+{
+	set_irg_frame_(irg, node);
 }
 
-ir_node *
-(get_irg_no_mem)(const ir_graph *irg) {
-	return _get_irg_no_mem(irg);
+ir_node *(get_irg_initial_mem)(const ir_graph *irg)
+{
+	return get_irg_initial_mem_(irg);
 }
 
-void
-(set_irg_no_mem)(ir_graph *irg, ir_node *node) {
-	_set_irg_no_mem(irg, node);
+void (set_irg_initial_mem)(ir_graph *irg, ir_node *node)
+{
+	set_irg_initial_mem_(irg, node);
 }
 
-ir_node *
-(get_irg_current_block)(const ir_graph *irg) {
-	return _get_irg_current_block(irg);
+ir_node *(get_irg_args)(const ir_graph *irg)
+{
+	return get_irg_args_(irg);
 }
 
-void
-(set_irg_current_block)(ir_graph *irg, ir_node *node) {
-	_set_irg_current_block(irg, node);
+void (set_irg_args)(ir_graph *irg, ir_node *node)
+{
+	set_irg_args_(irg, node);
 }
 
-ir_entity *
-(get_irg_entity)(const ir_graph *irg) {
-	return _get_irg_entity(irg);
+ir_node *(get_irg_no_mem)(const ir_graph *irg)
+{
+	return get_irg_no_mem_(irg);
 }
 
-void
-(set_irg_entity)(ir_graph *irg, ir_entity *ent) {
-	_set_irg_entity(irg, ent);
+void (set_irg_no_mem)(ir_graph *irg, ir_node *node)
+{
+	set_irg_no_mem_(irg, node);
 }
 
-ir_type *
-(get_irg_frame_type)(ir_graph *irg) {
-	return _get_irg_frame_type(irg);
+ir_entity *(get_irg_entity)(const ir_graph *irg)
+{
+	return get_irg_entity_(irg);
 }
 
-void
-(set_irg_frame_type)(ir_graph *irg, ir_type *ftp) {
-	_set_irg_frame_type(irg, ftp);
+void (set_irg_entity)(ir_graph *irg, ir_entity *ent)
+{
+	set_irg_entity_(irg, ent);
 }
 
-/* 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);
+ir_type *(get_irg_frame_type)(ir_graph *irg)
+{
+	return get_irg_frame_type_(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;
+void (set_irg_frame_type)(ir_graph *irg, ir_type *ftp)
+{
+	set_irg_frame_type_(irg, ftp);
 }
 
-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;
+int get_irg_n_locs(ir_graph *irg)
+{
+	return irg->n_loc - 1;
 }
 
-
-
 /* Returns the obstack associated with the graph. */
-struct obstack *
-(get_irg_obstack)(const ir_graph *irg) {
-	return _get_irg_obstack(irg);
+struct obstack *(get_irg_obstack)(const ir_graph *irg)
+{
+	return get_irg_obstack_(irg);
 }
 
 /*
@@ -779,7 +608,8 @@ struct obstack *
  *
  * Implementation is GLIBC specific as is uses the internal _obstack_chunk implementation.
  */
-int node_is_in_irgs_storage(ir_graph *irg, ir_node *n) {
+int node_is_in_irgs_storage(const ir_graph *irg, const ir_node *n)
+{
 	struct _obstack_chunk *p;
 
 	/*
@@ -794,133 +624,74 @@ int node_is_in_irgs_storage(ir_graph *irg, ir_node *n) {
 	return 0;
 }
 
-irg_phase_state
-(get_irg_phase_state)(const ir_graph *irg) {
-	return _get_irg_phase_state(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);
-}
-
-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);
-}
-
-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)(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_doms_inconsistent)(ir_graph *irg) {
-	_set_irg_doms_inconsistent(irg);
-}
-
-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) {
-	_set_irg_loopinfo_state(irg, s);
+irg_phase_state (get_irg_phase_state)(const ir_graph *irg)
+{
+	return get_irg_phase_state_(irg);
 }
 
-void
-(set_irg_loopinfo_inconsistent)(ir_graph *irg) {
-	_set_irg_loopinfo_inconsistent(irg);
+void (set_irg_phase_state)(ir_graph *irg, irg_phase_state state)
+{
+	set_irg_phase_state_(irg, state);
 }
 
-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));
-	}
+op_pin_state (get_irg_pinned)(const ir_graph *irg)
+{
+	return get_irg_pinned_(irg);
 }
 
-
-
-void
-(set_irg_pinned)(ir_graph *irg, op_pin_state p) {
-	_set_irg_pinned(irg, 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)(const ir_graph *irg) {
-	return _get_irg_callee_info_state(irg);
+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);
+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);
+irg_inline_property (get_irg_inline_property)(const 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_inline_property)(ir_graph *irg, irg_inline_property s)
+{
+	set_irg_inline_property_(irg, s);
 }
 
-unsigned
-(get_irg_additional_properties)(const ir_graph *irg) {
-	return _get_irg_additional_properties(irg);
+mtp_additional_properties (get_irg_additional_properties)(const ir_graph *irg)
+{
+	return get_irg_additional_properties_(irg);
 }
 
-void
-(set_irg_additional_properties)(ir_graph *irg, unsigned property_mask) {
-	_set_irg_additional_properties(irg, property_mask);
+void (set_irg_additional_properties)(ir_graph *irg, mtp_additional_properties 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 (add_irg_additional_properties)(ir_graph *irg, mtp_additional_properties flag)
+{
+	add_irg_additional_properties_(irg, flag);
 }
 
-void
-(set_irg_link)(ir_graph *irg, void *thing) {
-	_set_irg_link(irg, thing);
+void (set_irg_link)(ir_graph *irg, void *thing)
+{
+	set_irg_link_(irg, thing);
 }
 
-void *
-(get_irg_link)(const ir_graph *irg) {
-	return _get_irg_link(irg);
+void *(get_irg_link)(const ir_graph *irg)
+{
+	return get_irg_link_(irg);
 }
 
-ir_visited_t
-(get_irg_visited)(const ir_graph *irg) {
-	return _get_irg_visited(irg);
+ir_visited_t (get_irg_visited)(const ir_graph *irg)
+{
+	return get_irg_visited_(irg);
 }
 
 /** maximum visited flag content of all ir_graph visited fields. */
@@ -955,63 +726,43 @@ void set_max_irg_visited(int val)
 ir_visited_t inc_max_irg_visited(void)
 {
 #ifndef NDEBUG
-	int i;
-	for(i = 0; i < get_irp_n_irgs(); i++)
+	size_t 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;
 }
 
-ir_visited_t
-(get_irg_block_visited)(const ir_graph *irg) {
-	return _get_irg_block_visited(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 (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);
+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);
+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) {
+void set_irg_fp_model(ir_graph *irg, unsigned model)
+{
 	irg->fp_model = model;
 }
 
-/**
- * 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) {
-	(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);
-	}
-}
-
-/* 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) {
+void set_irg_loc_description(ir_graph *irg, int n, void *description)
+{
 	assert(0 <= n && n < irg->n_loc);
 
 	if (! irg->loc_descriptions)
@@ -1021,40 +772,46 @@ void set_irg_loc_description(ir_graph *irg, int n, void *description) {
 }
 
 /* get the description for local value n */
-void *get_irg_loc_description(ir_graph *irg, int 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;
 }
 
 #ifndef NDEBUG
-void ir_reserve_resources(ir_graph *irg, ir_resources_t resources) {
-	assert((resources & ~IR_RESOURCE_LOCAL_MASK) == 0);
+void ir_reserve_resources(ir_graph *irg, ir_resources_t resources)
+{
 	assert((irg->reserved_resources & resources) == 0);
 	irg->reserved_resources |= resources;
 }
 
-void ir_free_resources(ir_graph *irg, ir_resources_t 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) {
+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);
+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) {
+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) {
+size_t register_additional_graph_data(size_t size)
+{
 	assert(!forbid_new_data && "Too late to register additional node data");
 
 	if (forbid_new_data)
@@ -1065,15 +822,15 @@ size_t register_additional_graph_data(size_t size) {
 
 void (set_irg_state)(ir_graph *irg, ir_graph_state_t state)
 {
-	_set_irg_state(irg, state);
+	set_irg_state_(irg, state);
 }
 
 void (clear_irg_state)(ir_graph *irg, ir_graph_state_t state)
 {
-	_clear_irg_state(irg, 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);
+	return is_irg_state_(irg, state);
 }