X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Fircons.c;h=452811a94d307f62d896f7b5f7c81e554e57dc22;hb=3425dde7c85323534890cdcfe11b232a707d04e1;hp=d39d066f1f208cc8476dd9c616a6eaf80a25ecfb;hpb=8cb8730614f09dc3a9966839b0d936f15e9a3412;p=libfirm

diff --git a/ir/ir/ircons.c b/ir/ir/ircons.c
index d39d066f1..452811a94 100644
--- a/ir/ir/ircons.c
+++ b/ir/ir/ircons.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.
  *
@@ -22,8 +22,7 @@
  * @brief   Various irnode constructors. Automatic construction of SSA
  *          representation.
  * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Boris Boesler
-            Michael Beck
- * @version $Id$
+ *          Michael Beck, Matthias Braun
  */
 #include "config.h"
 
@@ -44,180 +43,37 @@
 #include "irflag_t.h"
 #include "error.h"
 
-/* when we need verifying */
-#ifdef NDEBUG
-# define IRN_VERIFY_IRG(res, irg)
-#else
-# define IRN_VERIFY_IRG(res, irg)  irn_verify_irg(res, irg)
-#endif /* NDEBUG */
+#include "gen_ir_cons.c.inl"
 
 /**
  * Language dependent variable initialization callback.
  */
 static uninitialized_local_variable_func_t *default_initialize_local_variable = NULL;
 
-#include "gen_ir_cons.c.inl"
-
-static ir_node *new_bd_Start(dbg_info *db, ir_node *block)
-{
-	ir_node  *res;
-	ir_graph *irg = get_irn_irg(block);
-
-	res = new_ir_node(db, irg, block, op_Start, mode_T, 0, NULL);
-
-	IRN_VERIFY_IRG(res, irg);
-	return res;
-}  /* new_bd_Start */
-
-static ir_node *new_bd_End(dbg_info *db, ir_node *block)
-{
-	ir_node  *res;
-	ir_graph *irg = get_irn_irg(block);
-
-	res = new_ir_node(db, irg, block, op_End, mode_X, -1, NULL);
-
-	IRN_VERIFY_IRG(res, irg);
-	return res;
-}  /* new_bd_End */
-
-/**
- * Creates a Phi node with all predecessors.  Calling this constructor
- * is only allowed if the corresponding block is mature.
- */
-static ir_node *new_bd_Phi(dbg_info *db, ir_node *block, int arity, ir_node **in, ir_mode *mode)
+ir_node *new_rd_Const_long(dbg_info *db, ir_graph *irg, ir_mode *mode,
+                           long value)
 {
-	ir_node  *res;
-	ir_graph *irg = get_irn_irg(block);
-	int i;
-	int has_unknown = 0;
-
-	/* Don't assert that block matured: the use of this constructor is strongly
-	   restricted ... */
-	if (get_Block_matured(block))
-		assert(get_irn_arity(block) == arity);
-
-	res = new_ir_node(db, irg, block, op_Phi, mode, arity, in);
-
-	res->attr.phi.u.backedge = new_backedge_arr(irg->obst, arity);
-
-	for (i = arity - 1; i >= 0; --i)
-		if (is_Unknown(in[i])) {
-			has_unknown = 1;
-			break;
-		}
-
-	if (!has_unknown) res = optimize_node(res);
-	IRN_VERIFY_IRG(res, irg);
-
-	/* Memory Phis in endless loops must be kept alive.
-	   As we can't distinguish these easily we keep all of them alive. */
-	if (is_Phi(res) && mode == mode_M)
-		add_End_keepalive(get_irg_end(irg), res);
-	return res;
-}  /* new_bd_Phi */
-
-static ir_node *new_bd_Const_type(dbg_info *db, tarval *con, ir_type *tp)
-{
-	ir_node  *res;
-	ir_graph *irg = current_ir_graph;
-
-	res = new_ir_node(db, irg, get_irg_start_block(irg), op_Const, get_tarval_mode(con), 0, NULL);
-	res->attr.con.tarval = con;
-	set_Const_type(res, tp);  /* Call method because of complex assertion. */
-	res = optimize_node (res);
-	assert(get_Const_type(res) == tp);
-	IRN_VERIFY_IRG(res, irg);
-
-	return res;
-}  /* new_bd_Const_type */
-
-static ir_node *new_bd_Const(dbg_info *db, tarval *con)
-{
-	ir_graph *irg = current_ir_graph;
-
-	return new_rd_Const_type(db, irg, con, firm_unknown_type);
-}  /* new_bd_Const */
-
-static ir_node *new_bd_Const_long(dbg_info *db, ir_mode *mode, long value)
-{
-	ir_graph *irg = current_ir_graph;
-
 	return new_rd_Const(db, irg, new_tarval_from_long(value, mode));
-}  /* new_bd_Const_long */
+}
 
-static ir_node *new_bd_defaultProj(dbg_info *db, ir_node *arg, long max_proj)
+ir_node *new_rd_defaultProj(dbg_info *db, ir_node *arg, long max_proj)
 {
-	ir_node  *res;
+	ir_node *res;
 
 	assert(is_Cond(arg));
 	arg->attr.cond.default_proj = max_proj;
 	res = new_rd_Proj(db, arg, mode_X, max_proj);
 	return res;
-}  /* new_bd_defaultProj */
-
-static ir_node *new_bd_Sel(dbg_info *db, ir_node *block, ir_node *store,
-                           ir_node *objptr, int arity, ir_node **in,
-                           ir_entity *ent)
-{
-	ir_node  **r_in;
-	ir_node  *res;
-	int      r_arity;
-	ir_graph *irg  = get_irn_irg(block);
-	ir_mode  *mode = is_Method_type(get_entity_type(ent)) ? mode_P_code : mode_P_data;
-
-	assert(ent != NULL && is_entity(ent) && "entity expected in Sel construction");
-
-	r_arity = arity + 2;
-	NEW_ARR_A(ir_node *, r_in, r_arity);  /* uses alloca */
-	r_in[0] = store;
-	r_in[1] = objptr;
-	memcpy(&r_in[2], in, sizeof(ir_node *) * arity);
-	/*
-	 * Sel's can select functions which should be of mode mode_P_code.
-	 */
-	res = new_ir_node(db, irg, block, op_Sel, mode, r_arity, r_in);
-	res->attr.sel.entity = ent;
-	res = optimize_node(res);
-	IRN_VERIFY_IRG(res, irg);
-	return res;
-}  /* new_bd_Sel */
-
-static ir_node *new_bd_SymConst_type(dbg_info *db, ir_node *block,
-                                     ir_mode *mode, symconst_symbol value,
-                                     symconst_kind symkind, ir_type *tp)
-{
-	ir_graph *irg = get_irn_irg(block);
-	ir_node  *res = new_ir_node(db, irg, block, op_SymConst, mode, 0, NULL);
-
-	res->attr.symc.kind = symkind;
-	res->attr.symc.sym  = value;
-	res->attr.symc.tp   = tp;
-
-	res = optimize_node(res);
-	IRN_VERIFY_IRG(res, irg);
-	return res;
-}  /* new_bd_SymConst_type */
-
-static ir_node *new_bd_Sync(dbg_info *db, ir_node *block)
-{
-	ir_node  *res;
-	ir_graph *irg = get_irn_irg(block);
-
-	res = new_ir_node(db, irg, block, op_Sync, mode_M, -1, NULL);
-	/* no need to call optimize node here, Sync are always created with no predecessors */
-	IRN_VERIFY_IRG(res, irg);
-	return res;
-}  /* new_bd_Sync */
+}
 
-static ir_node *new_bd_ASM(dbg_info *db, ir_node *block, int arity,
-                           ir_node *in[], ir_asm_constraint *inputs, int n_outs,
-	                         ir_asm_constraint *outputs, int n_clobber,
-	                         ident *clobber[], ident *text)
+ir_node *new_rd_ASM(dbg_info *db, ir_node *block, int arity, ir_node *in[],
+                    ir_asm_constraint *inputs, int n_outs,
+	                ir_asm_constraint *outputs, int n_clobber,
+	                ident *clobber[], ident *text)
 {
-	ir_node  *res;
 	ir_graph *irg = get_irn_irg(block);
+	ir_node  *res = new_ir_node(db, irg, block, op_ASM, mode_T, arity, in);
 
-	res = new_ir_node(db, irg, block, op_ASM, mode_T, arity, in);
 	res->attr.assem.pin_state = op_pin_state_pinned;
 	res->attr.assem.input_constraints
 		= NEW_ARR_D(ir_asm_constraint, irg->obst, arity);
@@ -230,211 +86,69 @@ static ir_node *new_bd_ASM(dbg_info *db, ir_node *block, int arity,
 	memcpy(res->attr.assem.output_constraints, outputs, sizeof(outputs[0]) * n_outs);
 	memcpy(res->attr.assem.clobbers, clobber, sizeof(clobber[0]) * n_clobber);
 
+	irn_verify_irg(res, irg);
 	res = optimize_node(res);
-	IRN_VERIFY_IRG(res, irg);
-	return res;
-}  /* new_bd_ASM */
-
-/* --------------------------------------------- */
-/* private interfaces, for professional use only */
-/* --------------------------------------------- */
-
-ir_node *new_rd_Start(dbg_info *db, ir_graph *irg, ir_node *block)
-{
-	ir_graph *rem = current_ir_graph;
-	ir_node  *res;
-
-	current_ir_graph = irg;
-	res = new_bd_Start(db, block);
-	current_ir_graph = rem;
-
 	return res;
-}  /* new_rd_Start */
-
-ir_node *new_rd_End(dbg_info *db, ir_graph *irg, ir_node *block)
-{
-	ir_node  *res;
-	ir_graph *rem = current_ir_graph;
-
-	current_ir_graph = irg;
-	res = new_bd_End(db, block);
-	current_ir_graph = rem;
-
-	return res;
-}  /* new_rd_End */
-
-/* Creates a Phi node with all predecessors.  Calling this constructor
-   is only allowed if the corresponding block is mature.  */
-ir_node *new_rd_Phi(dbg_info *db, ir_node *block, int arity, ir_node **in, ir_mode *mode)
-{
-	ir_node  *res;
-	ir_graph *rem = current_ir_graph;
-
-	current_ir_graph = get_Block_irg(block);
-	res = new_bd_Phi(db, block,arity, in, mode);
-	current_ir_graph = rem;
-
-	return res;
-}  /* new_rd_Phi */
-
-ir_node *new_rd_Const_type(dbg_info *db, ir_graph *irg, tarval *con, ir_type *tp)
-{
-	ir_node  *res;
-	ir_graph *rem = current_ir_graph;
-
-	current_ir_graph = irg;
-	res = new_bd_Const_type(db, con, tp);
-	current_ir_graph = rem;
-
-	return res;
-}  /* new_rd_Const_type */
-
-ir_node *new_rd_Const(dbg_info *db, ir_graph *irg, tarval *con)
-{
-	ir_node  *res;
-//#ifdef USE_ORIGINAL
-	ir_graph *rem = current_ir_graph;
-
-	current_ir_graph = irg;
-	res = new_bd_Const_type(db, con, firm_unknown_type);
-	current_ir_graph = rem;
-//#else
-//	res = new_rd_Const_type(db, irg, con, firm_unknown_type);
-//#endif
-
-	return res;
-}  /* new_rd_Const */
-
-ir_node *new_rd_Const_long(dbg_info *db, ir_graph *irg, ir_mode *mode, long value)
-{
-	return new_rd_Const(db, irg, new_tarval_from_long(value, mode));
-}  /* new_rd_Const_long */
-
-ir_node *new_rd_defaultProj(dbg_info *db, ir_node *arg, long max_proj)
-{
-	return new_bd_defaultProj(db, arg, max_proj);
-}  /* new_rd_defaultProj */
+}
 
 ir_node *new_rd_simpleSel(dbg_info *db, ir_node *block, ir_node *store,
                           ir_node *objptr, ir_entity *ent)
 {
-	ir_node  *res;
-	ir_graph *rem = current_ir_graph;
-
-	current_ir_graph = get_Block_irg(block);
-	res = new_bd_Sel(db, block, store, objptr, 0, NULL, ent);
-	current_ir_graph = rem;
-
-	return res;
-}  /* new_rd_simpleSel */
-
-ir_node *new_rd_SymConst_type(dbg_info *db, ir_graph *irg, ir_mode *mode,
-                              symconst_symbol value, symconst_kind symkind,
-                              ir_type *tp)
-{
-	ir_node  *res;
-	ir_graph *rem = current_ir_graph;
-	ir_node  *block = get_irg_start_block(irg);
-
-	current_ir_graph = irg;
-	res = new_bd_SymConst_type(db, block, mode, value, symkind, tp);
-	current_ir_graph = rem;
-
-	return res;
-}  /* new_rd_SymConst_type */
+	return new_rd_Sel(db, block, store, objptr, 0, NULL, ent);
+}
 
 ir_node *new_rd_SymConst(dbg_info *db, ir_graph *irg, ir_mode *mode,
                          symconst_symbol value, symconst_kind symkind)
 {
-	return new_rd_SymConst_type(db, irg, mode, value, symkind, firm_unknown_type);
-}  /* new_rd_SymConst */
+	ir_node *block = get_irg_start_block(irg);
+	ir_node *res   = new_ir_node(db, irg, block, op_SymConst, mode, 0, NULL);
+	res->attr.symc.kind = symkind;
+	res->attr.symc.sym  = value;
+
+	irn_verify_irg(res, irg);
+	res = optimize_node(res);
+	return res;
+}
 
-ir_node *new_rd_SymConst_addr_ent(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_entity *symbol, ir_type *tp)
+ir_node *new_rd_SymConst_addr_ent(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_entity *symbol)
 {
 	symconst_symbol sym;
 	sym.entity_p = symbol;
-	return new_rd_SymConst_type(db, irg, mode, sym, symconst_addr_ent, tp);
-}  /* new_rd_SymConst_addr_ent */
+	return new_rd_SymConst(db, irg, mode, sym, symconst_addr_ent);
+}
 
-ir_node *new_rd_SymConst_ofs_ent(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_entity *symbol, ir_type *tp)
+ir_node *new_rd_SymConst_ofs_ent(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_entity *symbol)
 {
 	symconst_symbol sym;
 	sym.entity_p = symbol;
-	return new_rd_SymConst_type(db, irg, mode, sym, symconst_ofs_ent, tp);
-}  /* new_rd_SymConst_ofs_ent */
+	return new_rd_SymConst(db, irg, mode, sym, symconst_ofs_ent);
+}
 
-ir_node *new_rd_SymConst_type_tag(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_type *symbol, ir_type *tp)
+ir_node *new_rd_SymConst_type_tag(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_type *symbol)
 {
 	symconst_symbol sym;
 	sym.type_p = symbol;
-	return new_rd_SymConst_type(db, irg, mode, sym, symconst_type_tag, tp);
-}  /* new_rd_SymConst_type_tag */
+	return new_rd_SymConst(db, irg, mode, sym, symconst_type_tag);
+}
 
-ir_node *new_rd_SymConst_size(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_type *symbol, ir_type *tp)
+ir_node *new_rd_SymConst_size(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_type *symbol)
 {
 	symconst_symbol sym;
 	sym.type_p = symbol;
-	return new_rd_SymConst_type(db, irg, mode, sym, symconst_type_size, tp);
-}  /* new_rd_SymConst_size */
+	return new_rd_SymConst(db, irg, mode, sym, symconst_type_size);
+}
 
-ir_node *new_rd_SymConst_align(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_type *symbol, ir_type *tp)
+ir_node *new_rd_SymConst_align(dbg_info *db, ir_graph *irg, ir_mode *mode, ir_type *symbol)
 {
 	symconst_symbol sym;
 	sym.type_p = symbol;
-	return new_rd_SymConst_type(db, irg, mode, sym, symconst_type_align, tp);
-}  /* new_rd_SymConst_align */
-
-ir_node *new_rd_Sync(dbg_info *db, ir_node *block, int arity, ir_node *in[])
-{
-	ir_node  *res;
-	ir_graph *rem = current_ir_graph;
-	int      i;
-
-	current_ir_graph = get_Block_irg(block);
-	res = new_bd_Sync(db, block);
-	current_ir_graph = rem;
-
-	for (i = 0; i < arity; ++i)
-		add_Sync_pred(res, in[i]);
-
-	return res;
-}  /* new_rd_Sync */
-
-ir_node *new_rd_ASM(dbg_info *db, ir_node *block,
-                    int arity, ir_node *in[], ir_asm_constraint *inputs,
-                    int n_outs, ir_asm_constraint *outputs,
-                    int n_clobber, ident *clobber[], ident *text)
-{
-	ir_node  *res;
-	ir_graph *rem = current_ir_graph;
-
-	current_ir_graph = get_Block_irg(block);
-	res = new_bd_ASM(db, block, arity, in, inputs, n_outs, outputs, n_clobber, clobber, text);
-	current_ir_graph = rem;
-
-	return res;
-}  /* new_rd_ASM */
-
-ir_node *new_r_Start(ir_graph *irg, ir_node *block)
-{
-	return new_rd_Start(NULL, irg, block);
-}
-ir_node *new_r_End(ir_graph *irg, ir_node *block)
-{
-	return new_rd_End(NULL, irg, block);
-}
-ir_node *new_r_Const(ir_graph *irg, tarval *con)
-{
-	return new_rd_Const(NULL, irg, con);
+	return new_rd_SymConst(db, irg, mode, sym, symconst_type_align);
 }
+
 ir_node *new_r_Const_long(ir_graph *irg, ir_mode *mode, long value)
 {
 	return new_rd_Const_long(NULL, irg, mode, value);
 }
-ir_node *new_r_Const_type(ir_graph *irg, tarval *con, ir_type *tp)
-{
-	return new_rd_Const_type(NULL, irg, con, tp);
-}
 ir_node *new_r_SymConst(ir_graph *irg, ir_mode *mode, symconst_symbol value,
                         symconst_kind symkind)
 {
@@ -445,26 +159,10 @@ ir_node *new_r_simpleSel(ir_node *block, ir_node *store, ir_node *objptr,
 {
 	return new_rd_Sel(NULL, block, store, objptr, 0, NULL, ent);
 }
-ir_node *new_r_Phi(ir_node *block, int arity, ir_node **in, ir_mode *mode)
-{
-	return new_rd_Phi(NULL, block, arity, in, mode);
-}
-ir_node *new_r_Sync(ir_node *block, int arity, ir_node *in[])
-{
-	return new_rd_Sync(NULL, block, arity, in);
-}
 ir_node *new_r_defaultProj(ir_node *arg, long max_proj)
 {
 	return new_rd_defaultProj(NULL, arg, max_proj);
 }
-ir_node *new_r_Bad(ir_graph *irg)
-{
-	return get_irg_bad(irg);
-}
-ir_node *new_r_NoMem(ir_graph *irg)
-{
-	return get_irg_no_mem(irg);
-}
 ir_node *new_r_ASM(ir_node *block,
                    int arity, ir_node *in[], ir_asm_constraint *inputs,
                    int n_outs, ir_asm_constraint *outputs,
@@ -473,151 +171,54 @@ ir_node *new_r_ASM(ir_node *block,
 	return new_rd_ASM(NULL, block, arity, in, inputs, n_outs, outputs, n_clobber, clobber, text);
 }
 
-/** ********************/
-/** public interfaces  */
-/** construction tools */
-
-ir_node *new_d_Start(dbg_info *db)
-{
-	ir_node *res;
-
-	res = new_ir_node(db, current_ir_graph, current_ir_graph->current_block,
-	                  op_Start, mode_T, 0, NULL);
-
-	res = optimize_node(res);
-	IRN_VERIFY_IRG(res, current_ir_graph);
-	return res;
-}  /* new_d_Start */
-
-ir_node *new_d_End(dbg_info *db)
+/** Creates a Phi node with 0 predecessors. */
+static inline ir_node *new_rd_Phi0(dbg_info *dbgi, ir_node *block,
+                                   ir_mode *mode, int pos)
 {
-	ir_node *res;
-	res = new_ir_node(db, current_ir_graph,  current_ir_graph->current_block,
-	                  op_End, mode_X, -1, NULL);
-	res = optimize_node(res);
-	IRN_VERIFY_IRG(res, current_ir_graph);
-
+	ir_graph *irg = get_irn_irg(block);
+	ir_node  *res = new_ir_node(dbgi, irg, block, op_Phi, mode, 0, NULL);
+	res->attr.phi.u.pos = pos;
+	irn_verify_irg(res, irg);
 	return res;
-}  /* new_d_End */
+}
 
-/* ***********************************************************************/
-/* Methods necessary for automatic Phi node creation                     */
-/*
-  ir_node *phi_merge            (ir_node *block, int pos, ir_mode *mode, ir_node **nin, int ins)
-  ir_node *get_r_value_internal (ir_node *block, int pos, ir_mode *mode);
-  ir_node *new_rd_Phi0          (ir_graph *irg, ir_node *block, ir_mode *mode)
-  ir_node *new_rd_Phi_in        (ir_graph *irg, ir_node *block, ir_mode *mode, ir_node **in, int ins)
-
-  Call Graph:   ( A ---> B == A "calls" B)
-
-       get_value         mature_immBlock
-          |                   |
-          |                   |
-          |                   |
-          |          ---> phi_merge
-          |         /       /   \
-          |        /       /     \
-         \|/      /      |/_      \
-       get_r_value_internal        |
-                |                  |
-                |                  |
-               \|/                \|/
-           new_rd_Phi0          new_rd_Phi_in
-
-* *************************************************************************** */
+static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode);
 
-/** Creates a Phi node with 0 predecessors. */
-static inline ir_node *new_rd_Phi0(ir_graph *irg, ir_node *block, ir_mode *mode)
+static void try_remove_unnecessary_phi(ir_node *phi)
 {
-	ir_node *res;
-
-	res = new_ir_node(NULL, irg, block, op_Phi, mode, 0, NULL);
-	IRN_VERIFY_IRG(res, irg);
-	return res;
-}  /* new_rd_Phi0 */
-
+	ir_node *phi_value = NULL;
+	int      arity     = get_irn_arity(phi);
+	int      i;
 
-/**
- * Internal constructor of a Phi node by a phi_merge operation.
- *
- * @param irg    the graph on which the Phi will be constructed
- * @param block  the block in which the Phi will be constructed
- * @param mode   the mod eof the Phi node
- * @param in     the input array of the phi node
- * @param ins    number of elements in the input array
- * @param phi0   in non-NULL: the Phi0 node in the same block that represents
- *               the value for which the new Phi is constructed
- */
-static inline ir_node *new_rd_Phi_in(ir_graph *irg, ir_node *block,
-                                     ir_mode *mode, ir_node **in, int ins,
-                                     ir_node *phi0)
-{
-	int i;
-	ir_node *res, *known;
-
-	/* Allocate a new node on the obstack.  The allocation copies the in
-	   array. */
-	res = new_ir_node(NULL, irg, block, op_Phi, mode, ins, in);
-	res->attr.phi.u.backedge = new_backedge_arr(irg->obst, ins);
-
-	/* This loop checks whether the Phi has more than one predecessor.
-	   If so, it is a real Phi node and we break the loop.  Else the
-	   Phi node merges the same definition on several paths and therefore
-	   is not needed.
-	   Note: We MUST consider Bad nodes, else we might get data flow cycles in dead loops! */
-	known = res;
-	for (i = ins - 1; i >= 0; --i) 	{
-		assert(in[i]);
-
-		in[i] = skip_Id(in[i]);  /* increases the number of freed Phis. */
-
-		/* Optimize self referencing Phis:  We can't detect them yet properly, as
-		they still refer to the Phi0 they will replace.  So replace right now. */
-		if (phi0 && in[i] == phi0)
-			in[i] = res;
-
-		if (in[i] == res || in[i] == known)
+	/* see if all inputs are either pointing to a single value or
+	 * are self references */
+	for (i = 0; i < arity; ++i) {
+		ir_node *in = get_irn_n(phi, i);
+		if (in == phi)
 			continue;
-
-		if (known == res)
-			known = in[i];
-		else
-			break;
+		if (in == phi_value)
+			continue;
+		/** found a different value from the one we already found, can't remove
+		 * the phi (yet) */
+		if (phi_value != NULL)
+			return;
+		phi_value = in;
 	}
-
-	/* i < 0: there is at most one predecessor, we don't need a phi node. */
-	if (i < 0) {
-		if (res != known) {
-			edges_node_deleted(res, current_ir_graph);
-			obstack_free(current_ir_graph->obst, res);
-			if (is_Phi(known)) {
-				/* If pred is a phi node we want to optimize it: If loops are matured in a bad
-				   order, an enclosing Phi know may get superfluous. */
-				res = optimize_in_place_2(known);
-				if (res != known)
-					exchange(known, res);
-			}
-			else
-				res = known;
-		} else {
-			/* A undefined value, e.g., in unreachable code. */
-			res = new_Bad();
-		}
-	} else {
-		res = optimize_node(res);  /* This is necessary to add the node to the hash table for cse. */
-		IRN_VERIFY_IRG(res, irg);
-		/* Memory Phis in endless loops must be kept alive.
-		   As we can't distinguish these easily we keep all of them alive. */
-		if (is_Phi(res) && mode == mode_M)
-			add_End_keepalive(get_irg_end(irg), res);
+	if (phi_value == NULL)
+		return;
+
+	/* if we're here then all phi inputs have been either phi_value
+	 * or self-references, we can replace the phi by phi_value.
+	 * We do this with an Id-node */
+	exchange(phi, phi_value);
+
+	/* recursively check phi_value, because it could be that we were the last
+	 * phi-node in a loop-body. Then our arguments is an unnecessary phi in
+	 * the loop header which can be eliminated now */
+	if (is_Phi(phi_value)) {
+		try_remove_unnecessary_phi(phi_value);
 	}
-
-	return res;
-}  /* new_rd_Phi_in */
-
-static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode);
-
-static ir_node *phi_merge(ir_node *block, int pos, ir_mode *mode, ir_node **nin, int ins);
+}
 
 /**
  * Computes the predecessors for the real phi node, and then
@@ -625,99 +226,45 @@ static ir_node *phi_merge(ir_node *block, int pos, ir_mode *mode, ir_node **nin,
  * node might optimize it away and return a real value.
  * This function must be called with an in-array of proper size.
  */
-static ir_node *phi_merge(ir_node *block, int pos, ir_mode *mode, ir_node **nin, int ins)
-{
-	ir_node *prevBlock, *res, *phi0, *phi0_all;
-	int i;
-
-	/* If this block has no value at pos create a Phi0 and remember it
-	   in graph_arr to break recursions.
-	   Else we may not set graph_arr as there a later value is remembered. */
-	phi0 = NULL;
-	if (block->attr.block.graph_arr[pos] == NULL) {
-		ir_graph *irg = current_ir_graph;
-
-		if (block == get_irg_start_block(irg)) {
-			/* Collapsing to Bad tarvals is no good idea.
-			   So we call a user-supplied routine here that deals with this
-			   case as appropriate for the given language. Sorrily the only
-			   help we can give here is the position.
-
-			   Even if all variables are defined before use, it can happen that
-			   we get to the start block, if a Cond has been replaced by a tuple
-			   (bad, jmp).  In this case we call the function needlessly,
-			   eventually generating an non existent error.
-			   However, this SHOULD NOT HAPPEN, as bad control flow nodes are
-			   intercepted before recurring.
-			 */
-			if (default_initialize_local_variable != NULL) {
-				ir_node *rem = get_cur_block();
-
-				set_cur_block(block);
-				block->attr.block.graph_arr[pos] = default_initialize_local_variable(irg, mode, pos - 1);
-				set_cur_block(rem);
-			} else {
-				block->attr.block.graph_arr[pos] = new_Unknown(mode);
-			}
-			return block->attr.block.graph_arr[pos];
-		} else {
-			phi0 = new_rd_Phi0(irg, block, mode);
-			block->attr.block.graph_arr[pos] = phi0;
-		}
-	}
+static ir_node *set_phi_arguments(ir_node *phi, int pos)
+{
+	ir_node  *block        = get_nodes_block(phi);
+	ir_graph *irg          = get_irn_irg(block);
+	int       arity        = get_irn_arity(block);
+	ir_node **in           = ALLOCAN(ir_node*, arity);
+	ir_mode  *mode         = get_irn_mode(phi);
+	int       i;
 
 	/* This loop goes to all predecessor blocks of the block the Phi node
 	   is in and there finds the operands of the Phi node by calling
 	   get_r_value_internal.  */
-	for (i = 1; i <= ins; ++i) {
-		ir_node *cf_pred = block->in[i];
-		ir_node *prevCfOp = skip_Proj(cf_pred);
-		assert(prevCfOp);
-		if (is_Bad(prevCfOp)) {
-			/* In case a Cond has been optimized we would get right to the start block
-			with an invalid definition. */
-			nin[i-1] = new_Bad();
-			continue;
-		}
-		prevBlock = prevCfOp->in[0]; /* go past control flow op to prev block */
-		assert(prevBlock);
-		if (!is_Bad(prevBlock)) {
-			nin[i-1] = get_r_value_internal(prevBlock, pos, mode);
+	for (i = 0; i < arity; ++i) {
+		ir_node *cfgpred = get_Block_cfgpred_block(block, i);
+		ir_node *value;
+		if (is_Bad(cfgpred)) {
+			value = new_r_Bad(irg, mode);
 		} else {
-			nin[i-1] = new_Bad();
+			inc_irg_visited(irg);
+
+			value = get_r_value_internal(cfgpred, pos, mode);
 		}
+		in[i] = value;
 	}
 
-	/* We want to pass the Phi0 node to the constructor: this finds additional
-	   optimization possibilities.
-	   The Phi0 node either is allocated in this function, or it comes from
-	   a former call to get_r_value_internal(). In this case we may not yet
-	   exchange phi0, as this is done in mature_immBlock(). */
-	if (phi0 == NULL) {
-		phi0_all = block->attr.block.graph_arr[pos];
-		if (! is_Phi0(phi0_all)            ||
-		    get_irn_arity(phi0_all) != 0   ||
-		    get_nodes_block(phi0_all) != block)
-			phi0_all = NULL;
-	} else {
-		phi0_all = phi0;
-	}
+	phi->attr.phi.u.backedge = new_backedge_arr(irg->obst, arity);
+	set_irn_in(phi, arity, in);
+	set_irn_op(phi, op_Phi);
 
-	/* After collecting all predecessors into the array nin a new Phi node
-	   with these predecessors is created.  This constructor contains an
-	   optimization: If all predecessors of the Phi node are identical it
-	   returns the only operand instead of a new Phi node.  */
-	res = new_rd_Phi_in(current_ir_graph, block, mode, nin, ins, phi0_all);
-
-	/* In case we allocated a Phi0 node at the beginning of this procedure,
-	   we need to exchange this Phi0 with the real Phi. */
-	if (phi0 != NULL) {
-		exchange(phi0, res);
-		block->attr.block.graph_arr[pos] = res;
-	}
+	irn_verify_irg(phi, irg);
 
-	return res;
-}  /* phi_merge */
+	/* Memory Phis in endless loops must be kept alive.
+	   As we can't distinguish these easily we keep all of them alive. */
+	if (is_Phi(phi) && mode == mode_M)
+		add_End_keepalive(get_irg_end(irg), phi);
+
+	try_remove_unnecessary_phi(phi);
+	return phi;
+}
 
 /**
  * This function returns the last definition of a value.  In case
@@ -731,85 +278,57 @@ static ir_node *phi_merge(ir_node *block, int pos, ir_mode *mode, ir_node **nin,
  */
 static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
 {
-	ir_node *res;
-	/* There are 4 cases to treat.
-
-	   1. The block is not mature and we visit it the first time.  We can not
-	      create a proper Phi node, therefore a Phi0, i.e., a Phi without
-	      predecessors is returned.  This node is added to the linked list (block
-	      attribute "phis") of the containing block to be completed when this block is
-	      matured. (Completion will add a new Phi and turn the Phi0 into an Id
-	      node.)
-
-	   2. The value is already known in this block, graph_arr[pos] is set and we
-	      visit the block the first time.  We can return the value without
-	      creating any new nodes.
-
-	   3. The block is mature and we visit it the first time.  A Phi node needs
-	      to be created (phi_merge).  If the Phi is not needed, as all it's
-	      operands are the same value reaching the block through different
-	      paths, it's optimized away and the value itself is returned.
-
-	   4. The block is mature, and we visit it the second time.  Now two
-	      subcases are possible:
-	      * The value was computed completely the last time we were here. This
-	        is the case if there is no loop.  We can return the proper value.
-	      * The recursion that visited this node and set the flag did not
-	        return yet.  We are computing a value in a loop and need to
-	        break the recursion.  This case only happens if we visited
-	    the same block with phi_merge before, which inserted a Phi0.
-	    So we return the Phi0.
-	*/
-
-	/* case 4 -- already visited. */
-	if (get_irn_visited(block) == get_irg_visited(current_ir_graph)) {
-		/* As phi_merge allocates a Phi0 this value is always defined. Here
-		is the critical difference of the two algorithms. */
-		assert(block->attr.block.graph_arr[pos]);
-		return block->attr.block.graph_arr[pos];
-	}
-
-	/* visited the first time */
-	set_irn_visited(block, get_irg_visited(current_ir_graph));
-
-	/* Get the local valid value */
-	res = block->attr.block.graph_arr[pos];
-
-	/* case 2 -- If the value is actually computed, return it. */
+	ir_node  *res = block->attr.block.graph_arr[pos];
+	ir_graph *irg = get_irn_irg(block);
 	if (res != NULL)
 		return res;
 
-	if (block->attr.block.is_matured) { /* case 3 */
-
-		/* The Phi has the same amount of ins as the corresponding block. */
-		int ins = get_irn_arity(block);
-		ir_node **nin;
-		NEW_ARR_A(ir_node *, nin, ins);
-
-		/* Phi merge collects the predecessors and then creates a node. */
-		res = phi_merge(block, pos, mode, nin, ins);
-
-	} else {  /* case 1 */
-		/* The block is not mature, we don't know how many in's are needed.  A Phi
-		   with zero predecessors is created.  Such a Phi node is called Phi0
-		   node.  The Phi0 is then added to the list of Phi0 nodes in this block
-		   to be matured by mature_immBlock later.
-		   The Phi0 has to remember the pos of it's internal value.  If the real
-		   Phi is computed, pos is used to update the array with the local
-		   values. */
-		res = new_rd_Phi0(current_ir_graph, block, mode);
-		res->attr.phi.u.pos    = pos;
+	/* We ran into a cycle. This may happen in unreachable loops. */
+	if (irn_visited_else_mark(block)) {
+		/* Since the loop is unreachable, return a Bad. */
+		return new_r_Bad(irg, mode);
+	}
+
+	/* in a matured block we can immediately determine the phi arguments */
+	if (get_Block_matured(block)) {
+		int arity = get_irn_arity(block);
+		/* no predecessors: use unknown value */
+		if (arity == 0 && block == get_irg_start_block(get_irn_irg(block))) {
+			if (default_initialize_local_variable != NULL) {
+				ir_node *rem = get_r_cur_block(irg);
+				set_r_cur_block(irg, block);
+				res = default_initialize_local_variable(irg, mode, pos - 1);
+				set_r_cur_block(irg, rem);
+			} else {
+				res = new_r_Unknown(irg, mode);
+			}
+		/* one predecessor just use its value */
+		} else if (arity == 1) {
+			ir_node *cfgpred = get_Block_cfgpred(block, 0);
+			if (is_Bad(cfgpred)) {
+				res = new_r_Bad(irg, mode);
+			} else {
+				ir_node *cfgpred_block = get_nodes_block(cfgpred);
+				res = get_r_value_internal(cfgpred_block, pos, mode);
+			}
+		/* multiple predecessors construct Phi */
+		} else {
+			res = new_rd_Phi0(NULL, block, mode, pos);
+			/* enter phi0 into our variable value table to break cycles
+			 * arising from set_phi_arguments */
+			block->attr.block.graph_arr[pos] = res;
+			res = set_phi_arguments(res, pos);
+		}
+	} else {
+		/* in case of immature block we have to keep a Phi0 */
+		res = new_rd_Phi0(NULL, block, mode, pos);
+		/* enqueue phi so we can set arguments once the block matures */
 		res->attr.phi.next     = block->attr.block.phis;
 		block->attr.block.phis = res;
 	}
-
-	assert(is_ir_node(res) && "phi_merge() failed to construct a definition");
-
-	/* The local valid value is available now. */
 	block->attr.block.graph_arr[pos] = res;
-
 	return res;
-}  /* get_r_value_internal */
+}
 
 /* ************************************************************************** */
 
@@ -819,216 +338,250 @@ static ir_node *get_r_value_internal(ir_node *block, int pos, ir_mode *mode)
  */
 void mature_immBlock(ir_node *block)
 {
-	int ins;
-	ir_node *n, **nin;
-	ir_node *next;
+	size_t   n_preds;
+	ir_node  *next;
+	ir_node  *phi;
+	ir_graph *irg;
 
 	assert(is_Block(block));
-	if (!get_Block_matured(block)) {
-		ir_graph *irg = current_ir_graph;
+	if (get_Block_matured(block))
+		return;
+
+	irg     = get_irn_irg(block);
+	n_preds = ARR_LEN(block->in) - 1;
+	/* Fix block parameters */
+	block->attr.block.backedge = new_backedge_arr(irg->obst, n_preds);
+
+	/* Traverse a chain of Phi nodes attached to this block and mature
+	these, too. */
+	for (phi = block->attr.block.phis; phi != NULL; phi = next) {
+		ir_node *new_value;
+		int      pos = phi->attr.phi.u.pos;
+
+		next = phi->attr.phi.next;
+		new_value = set_phi_arguments(phi, pos);
+		if (block->attr.block.graph_arr[pos] == phi) {
+			block->attr.block.graph_arr[pos] = new_value;
+		}
+	}
 
-		ins = ARR_LEN(block->in) - 1;
-		/* Fix block parameters */
-		block->attr.block.backedge = new_backedge_arr(irg->obst, ins);
+	set_Block_matured(block, 1);
 
-		/* An array for building the Phi nodes. */
-		NEW_ARR_A(ir_node *, nin, ins);
+	/* Now, as the block is a finished Firm node, we can optimize it.
+	   Since other nodes have been allocated since the block was created
+	   we can not free the node on the obstack.  Therefore we have to call
+	   optimize_in_place().
+	   Unfortunately the optimization does not change a lot, as all allocated
+	   nodes refer to the unoptimized node.
+	   We can call optimize_in_place_2(), as global cse has no effect on blocks.
+	 */
+	irn_verify_irg(block, irg);
+	block = optimize_in_place_2(block);
+}
 
-		/* Traverse a chain of Phi nodes attached to this block and mature
-		these, too. **/
-		for (n = block->attr.block.phis; n; n = next) {
-			inc_irg_visited(irg);
-			next = n->attr.phi.next;
-			exchange(n, phi_merge(block, n->attr.phi.u.pos, n->mode, nin, ins));
-		}
+ir_node *new_d_Const_long(dbg_info *db, ir_mode *mode, long value)
+{
+	assert(get_irg_phase_state(current_ir_graph) == phase_building);
+	return new_rd_Const_long(db, current_ir_graph, mode, value);
+}
 
-		block->attr.block.is_matured = 1;
-
-		/* Now, as the block is a finished Firm node, we can optimize it.
-		   Since other nodes have been allocated since the block was created
-		   we can not free the node on the obstack.  Therefore we have to call
-		   optimize_in_place().
-		   Unfortunately the optimization does not change a lot, as all allocated
-		   nodes refer to the unoptimized node.
-		   We can call optimize_in_place_2(), as global cse has no effect on blocks. */
-		block = optimize_in_place_2(block);
-		IRN_VERIFY_IRG(block, irg);
-	}
-}  /* mature_immBlock */
+ir_node *new_d_defaultProj(dbg_info *db, ir_node *arg, long max_proj)
+{
+	ir_node *res;
+	assert(is_Cond(arg) || is_Bad(arg));
+	assert(get_irg_phase_state(current_ir_graph) == phase_building);
+	if (is_Cond(arg))
+		arg->attr.cond.default_proj = max_proj;
+	res = new_d_Proj(db, arg, mode_X, max_proj);
+	return res;
+}
 
-ir_node *new_d_Phi(dbg_info *db, int arity, ir_node **in, ir_mode *mode)
+ir_node *new_d_simpleSel(dbg_info *db, ir_node *store, ir_node *objptr,
+                         ir_entity *ent)
 {
-	return new_bd_Phi(db, current_ir_graph->current_block, arity, in, mode);
-}  /* new_d_Phi */
+	assert(get_irg_phase_state(current_ir_graph) == phase_building);
+	return new_rd_Sel(db, current_ir_graph->current_block,
+	                  store, objptr, 0, NULL, ent);
+}
 
-ir_node *new_d_Const(dbg_info *db, tarval *con)
+ir_node *new_d_SymConst(dbg_info *db, ir_mode *mode, symconst_symbol value,
+                        symconst_kind kind)
 {
-	return new_bd_Const(db, con);
-}  /* new_d_Const */
+	assert(get_irg_phase_state(current_ir_graph) == phase_building);
+	return new_rd_SymConst(db, current_ir_graph, mode, value, kind);
+}
 
-ir_node *new_d_Const_long(dbg_info *db, ir_mode *mode, long value)
+ir_node *new_d_ASM(dbg_info *db, int arity, ir_node *in[],
+                   ir_asm_constraint *inputs,
+                   int n_outs, ir_asm_constraint *outputs, int n_clobber,
+                   ident *clobber[], ident *text)
 {
-	return new_bd_Const_long(db, mode, value);
-}  /* new_d_Const_long */
+	assert(get_irg_phase_state(current_ir_graph) == phase_building);
+	return new_rd_ASM(db, current_ir_graph->current_block, arity, in, inputs,
+	                  n_outs, outputs, n_clobber, clobber, text);
+}
 
-ir_node *new_d_Const_type(dbg_info *db, tarval *con, ir_type *tp)
+ir_node *new_rd_strictConv(dbg_info *dbgi, ir_node *block, ir_node * irn_op, ir_mode * mode)
 {
-	return new_bd_Const_type(db, con, tp);
-}  /* new_d_Const_type */
+	ir_node *res;
+	ir_graph *irg = get_Block_irg(block);
 
+	ir_node *in[1];
+	in[0] = irn_op;
 
-ir_node *new_d_defaultProj(dbg_info *db, ir_node *arg, long max_proj)
+	res = new_ir_node(dbgi, irg, block, op_Conv, mode, 1, in);
+	res->attr.conv.strict = 1;
+	irn_verify_irg(res, irg);
+	res = optimize_node(res);
+	return res;
+}
+
+ir_node *new_r_strictConv(ir_node *block, ir_node * irn_op, ir_mode * mode)
+{
+	return new_rd_strictConv(NULL, block, irn_op, mode);
+}
+
+ir_node *new_d_strictConv(dbg_info *dbgi, ir_node * irn_op, ir_mode * mode)
 {
 	ir_node *res;
-	assert(is_Cond(arg));
-	arg->attr.cond.default_proj = max_proj;
-	res = new_d_Proj(db, arg, mode_X, max_proj);
+	assert(get_irg_phase_state(current_ir_graph) == phase_building);
+	res = new_rd_strictConv(dbgi, current_ir_graph->current_block, irn_op, mode);
 	return res;
-}  /* new_d_defaultProj */
+}
 
-ir_node *new_d_simpleSel(dbg_info *db, ir_node *store, ir_node *objptr, ir_entity *ent)
-/* GL: objptr was called frame before.  Frame was a bad choice for the name
-   as the operand could as well be a pointer to a dynamic object. */
+ir_node *new_strictConv(ir_node * irn_op, ir_mode * mode)
 {
-	return new_bd_Sel(db, current_ir_graph->current_block,
-	                  store, objptr, 0, NULL, ent);
-}  /* new_d_simpleSel */
+	return new_d_strictConv(NULL, irn_op, mode);
+}
 
-ir_node *new_d_SymConst_type(dbg_info *db, ir_mode *mode, symconst_symbol value, symconst_kind kind, ir_type *tp)
+ir_node *new_rd_DivRL(dbg_info *dbgi, ir_node *block, ir_node * irn_mem, ir_node * irn_left, ir_node * irn_right, ir_mode* resmode, op_pin_state pin_state)
 {
-	return new_bd_SymConst_type(db, get_irg_start_block(current_ir_graph), mode,
-	                            value, kind, tp);
-}  /* new_d_SymConst_type */
+	ir_node *res;
+	ir_graph *irg = get_Block_irg(block);
+
+	ir_node *in[3];
+	in[0] = irn_mem;
+	in[1] = irn_left;
+	in[2] = irn_right;
+
+	res = new_ir_node(dbgi, irg, block, op_Div, mode_T, 3, in);
+	res->attr.div.resmode = resmode;
+	res->attr.div.no_remainder = 1;
+	res->attr.div.exc.pin_state = pin_state;
+	irn_verify_irg(res, irg);
+	res = optimize_node(res);
+	return res;
+}
 
-ir_node *new_d_SymConst(dbg_info *db, ir_mode *mode, symconst_symbol value, symconst_kind kind)
+ir_node *new_r_DivRL(ir_node *block, ir_node * irn_mem, ir_node * irn_left, ir_node * irn_right, ir_mode* resmode, op_pin_state pin_state)
 {
-	return new_bd_SymConst_type(db, get_irg_start_block(current_ir_graph), mode,
-	                            value, kind, firm_unknown_type);
-}  /* new_d_SymConst */
+	return new_rd_DivRL(NULL, block, irn_mem, irn_left, irn_right, resmode, pin_state);
+}
 
-ir_node *new_d_Sync(dbg_info *db, int arity, ir_node *in[])
+ir_node *new_d_DivRL(dbg_info *dbgi, ir_node * irn_mem, ir_node * irn_left, ir_node * irn_right, ir_mode* resmode, op_pin_state pin_state)
 {
-	return new_rd_Sync(db, current_ir_graph->current_block, arity, in);
-}  /* new_d_Sync */
+	ir_node *res;
+	assert(get_irg_phase_state(current_ir_graph) == phase_building);
+	res = new_rd_DivRL(dbgi, current_ir_graph->current_block, irn_mem, irn_left, irn_right, resmode, pin_state);
+	return res;
+}
 
-ir_node *new_d_ASM(dbg_info *db, int arity, ir_node *in[], ir_asm_constraint *inputs,
-                   int n_outs, ir_asm_constraint *outputs, int n_clobber,
-                   ident *clobber[], ident *text)
+ir_node *new_DivRL(ir_node * irn_mem, ir_node * irn_left, ir_node * irn_right, ir_mode* resmode, op_pin_state pin_state)
 {
-	return new_bd_ASM(db, current_ir_graph->current_block, arity, in, inputs, n_outs, outputs, n_clobber, clobber, text);
-}  /* new_d_ASM */
-
-/* ********************************************************************* */
-/* Comfortable interface with automatic Phi node construction.           */
-/* (Uses also constructors of ?? interface, except new_Block.            */
-/* ********************************************************************* */
+	return new_d_DivRL(NULL, irn_mem, irn_left, irn_right, resmode, pin_state);
+}
 
-/*  Block construction */
-/* immature Block without predecessors */
-ir_node *new_d_immBlock(dbg_info *db)
+ir_node *new_rd_immBlock(dbg_info *dbgi, ir_graph *irg)
 {
 	ir_node *res;
 
-	assert(get_irg_phase_state(current_ir_graph) == phase_building);
+	assert(get_irg_phase_state(irg) == phase_building);
 	/* creates a new dynamic in-array as length of in is -1 */
-	res = new_ir_node(db, current_ir_graph, NULL, op_Block, mode_BB, -1, NULL);
+	res = new_ir_node(dbgi, irg, NULL, op_Block, mode_BB, -1, NULL);
 
-	/* macroblock head */
-	res->in[0] = res;
-
-	res->attr.block.is_matured  = 0;
-	res->attr.block.is_dead     = 0;
-	res->attr.block.is_mb_head  = 1;
-	res->attr.block.irg.irg     = current_ir_graph;
+	set_Block_matured(res, 0);
+	res->attr.block.irg.irg     = irg;
 	res->attr.block.backedge    = NULL;
 	res->attr.block.in_cg       = NULL;
 	res->attr.block.cg_backedge = NULL;
 	res->attr.block.extblk      = NULL;
-	res->attr.block.region      = NULL;
-	res->attr.block.mb_depth    = 0;
 	res->attr.block.entity      = NULL;
 
 	set_Block_block_visited(res, 0);
 
 	/* Create and initialize array for Phi-node construction. */
-	res->attr.block.graph_arr = NEW_ARR_D(ir_node *, current_ir_graph->obst,
-	                                      current_ir_graph->n_loc);
-	memset(res->attr.block.graph_arr, 0, sizeof(ir_node *)*current_ir_graph->n_loc);
+	res->attr.block.graph_arr = NEW_ARR_D(ir_node *, irg->obst, irg->n_loc);
+	memset(res->attr.block.graph_arr, 0, sizeof(ir_node*) * irg->n_loc);
 
 	/* Immature block may not be optimized! */
-	IRN_VERIFY_IRG(res, current_ir_graph);
+	irn_verify_irg(res, irg);
 
 	return res;
-}  /* new_d_immBlock */
+}
 
-ir_node *new_immBlock(void)
+ir_node *new_r_immBlock(ir_graph *irg)
 {
-	return new_d_immBlock(NULL);
-}  /* new_immBlock */
+	return new_rd_immBlock(NULL, irg);
+}
 
-/* immature PartBlock with its predecessors */
-ir_node *new_d_immPartBlock(dbg_info *db, ir_node *pred_jmp)
+ir_node *new_d_immBlock(dbg_info *dbgi)
 {
-	ir_node *res = new_d_immBlock(db);
-	ir_node *blk = get_nodes_block(pred_jmp);
-
-	res->in[0] = blk->in[0];
-	assert(res->in[0] != NULL);
-	add_immBlock_pred(res, pred_jmp);
-
-	res->attr.block.is_mb_head = 0;
-	res->attr.block.mb_depth = blk->attr.block.mb_depth + 1;
-
-	return res;
-}  /* new_d_immPartBlock */
+	return new_rd_immBlock(dbgi, current_ir_graph);
+}
 
-ir_node *new_immPartBlock(ir_node *pred_jmp)
+ir_node *new_immBlock(void)
 {
-	return new_d_immPartBlock(NULL, pred_jmp);
-}  /* new_immPartBlock */
+	return new_rd_immBlock(NULL, current_ir_graph);
+}
 
-/* add an edge to a jmp/control flow node */
 void add_immBlock_pred(ir_node *block, ir_node *jmp)
 {
 	int n = ARR_LEN(block->in) - 1;
 
 	assert(is_Block(block) && "Error: Must be a Block");
-	assert(!block->attr.block.is_matured && "Error: Block already matured!\n");
-	assert(block->attr.block.is_mb_head && "Error: Cannot add a predecessor to a PartBlock");
+	assert(!get_Block_matured(block) && "Error: Block already matured!\n");
 	assert(is_ir_node(jmp));
 
 	ARR_APP1(ir_node *, block->in, jmp);
 	/* Call the hook */
 	hook_set_irn_n(block, n, jmp, NULL);
-}  /* add_immBlock_pred */
+}
 
-/* changing the current block */
 void set_cur_block(ir_node *target)
 {
-	current_ir_graph->current_block = target;
-}  /* set_cur_block */
+	set_r_cur_block(current_ir_graph, target);
+}
 
-/* ************************ */
-/* parameter administration */
+void set_r_cur_block(ir_graph *irg, ir_node *target)
+{
+	assert(target == NULL || get_irn_mode(target) == mode_BB);
+	assert(target == NULL || get_irn_irg(target)  == irg);
+	irg->current_block = target;
+}
 
-/* get a value from the parameter array from the current block by its index */
-ir_node *get_d_value(dbg_info *db, int pos, ir_mode *mode)
+ir_node *get_r_cur_block(ir_graph *irg)
 {
-	ir_graph *irg = current_ir_graph;
-	assert(get_irg_phase_state(irg) == phase_building);
-	inc_irg_visited(irg);
-	(void) db;
+	return irg->current_block;
+}
 
+ir_node *get_cur_block(void)
+{
+	return get_r_cur_block(current_ir_graph);
+}
+
+ir_node *get_r_value(ir_graph *irg, int pos, ir_mode *mode)
+{
+	assert(get_irg_phase_state(irg) == phase_building);
 	assert(pos >= 0);
+	inc_irg_visited(irg);
 
 	return get_r_value_internal(irg->current_block, pos + 1, mode);
-}  /* get_d_value */
+}
 
-/* get a value from the parameter array from the current block by its index */
 ir_node *get_value(int pos, ir_mode *mode)
 {
-	return get_d_value(NULL, pos, mode);
-}  /* get_value */
+	return get_r_value(current_ir_graph, pos, mode);
+}
 
 /**
  * helper function for guess_mode: recursively look for a definition for
@@ -1040,9 +593,8 @@ static ir_mode *guess_recursively(ir_node *block, int pos)
 	int      n_preds;
 	int      i;
 
-	if (irn_visited(block))
+	if (irn_visited_else_mark(block))
 		return NULL;
-	mark_irn_visited(block);
 
 	/* already have a defintion -> we can simply look at its mode */
 	value = block->attr.block.graph_arr[pos];
@@ -1062,9 +614,8 @@ static ir_mode *guess_recursively(ir_node *block, int pos)
 	return NULL;
 }
 
-ir_mode *ir_guess_mode(int pos)
+ir_mode *ir_r_guess_mode(ir_graph *irg, int pos)
 {
-	ir_graph *irg   = current_ir_graph;
 	ir_node  *block = irg->current_block;
 	ir_node  *value = block->attr.block.graph_arr[pos+1];
 	ir_mode  *mode;
@@ -1073,54 +624,67 @@ ir_mode *ir_guess_mode(int pos)
 	if (value != NULL)
 		return get_irn_mode(value);
 
-	ir_reserve_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
-	inc_irg_visited(current_ir_graph);
+	ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
+	inc_irg_visited(irg);
 	mode = guess_recursively(block, pos+1);
-	ir_free_resources(current_ir_graph, IR_RESOURCE_IRN_VISITED);
+	ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
 
 	return mode;
 }
 
-/* set a value at position pos in the parameter array from the current block */
-void set_value(int pos, ir_node *value)
+ir_mode *ir_guess_mode(int pos)
+{
+	return ir_r_guess_mode(current_ir_graph, pos);
+}
+
+void set_r_value(ir_graph *irg, int pos, ir_node *value)
 {
-	ir_graph *irg = current_ir_graph;
 	assert(get_irg_phase_state(irg) == phase_building);
 	assert(pos >= 0);
 	assert(pos+1 < irg->n_loc);
 	assert(is_ir_node(value));
 	irg->current_block->attr.block.graph_arr[pos + 1] = value;
-}  /* set_value */
+}
 
-/* Find the value number for a node in the current block.*/
-int find_value(ir_node *value)
+void set_value(int pos, ir_node *value)
+{
+	set_r_value(current_ir_graph, pos, value);
+}
+
+int r_find_value(ir_graph *irg, ir_node *value)
 {
-	int i;
-	ir_node *bl = current_ir_graph->current_block;
+	size_t i;
+	ir_node *bl = irg->current_block;
 
-	for (i = ARR_LEN(bl->attr.block.graph_arr) - 1; i >= 1; --i)
-		if (bl->attr.block.graph_arr[i] == value)
+	for (i = ARR_LEN(bl->attr.block.graph_arr); i > 1;) {
+		if (bl->attr.block.graph_arr[--i] == value)
 			return i - 1;
+	}
 	return -1;
-}  /* find_value */
+}
 
-/* get the current store */
-ir_node *get_store(void)
+int find_value(ir_node *value)
 {
-	ir_graph *irg = current_ir_graph;
+	return r_find_value(current_ir_graph, value);
+}
 
+ir_node *get_r_store(ir_graph *irg)
+{
 	assert(get_irg_phase_state(irg) == phase_building);
-	/* GL: one could call get_value instead */
 	inc_irg_visited(irg);
 	return get_r_value_internal(irg->current_block, 0, mode_M);
-}  /* get_store */
+}
 
-/* set the current store: handles automatic Sync construction for Load nodes */
-void set_store(ir_node *store)
+ir_node *get_store(void)
+{
+	return get_r_store(current_ir_graph);
+}
+
+void set_r_store(ir_graph *irg, ir_node *store)
 {
 	ir_node *load, *pload, *pred, *in[2];
 
-	assert(get_irg_phase_state(current_ir_graph) == phase_building);
+	assert(get_irg_phase_state(irg) == phase_building);
 	/* Beware: due to dead code elimination, a store might become a Bad node even in
 	   the construction phase. */
 	assert((get_irn_mode(store) == mode_M || is_Bad(store)) && "storing non-memory node");
@@ -1146,38 +710,25 @@ void set_store(ir_node *store)
 
 					in[0] = pred;
 					in[1] = store;
-					store = new_Sync(2, in);
+					store = new_r_Sync(irg->current_block, 2, in);
 				}
 			}
 		}
 	}
-	current_ir_graph->current_block->attr.block.graph_arr[0] = store;
-}  /* set_store */
-
-void keep_alive(ir_node *ka)
-{
-	add_End_keepalive(get_irg_end(current_ir_graph), ka);
-}  /* keep_alive */
+	irg->current_block->attr.block.graph_arr[0] = store;
+}
 
-/* --- Useful access routines --- */
-/* Returns the current block of the current graph.  To set the current
-   block use set_cur_block. */
-ir_node *get_cur_block(void)
+void set_store(ir_node *store)
 {
-	return get_irg_current_block(current_ir_graph);
-}  /* get_cur_block */
+	set_r_store(current_ir_graph, store);
+}
 
-/* Returns the frame type of the current graph */
-ir_type *get_cur_frame_type(void)
+void keep_alive(ir_node *ka)
 {
-	return get_irg_frame_type(current_ir_graph);
-}  /* get_cur_frame_type */
-
-
-/* ********************************************************************* */
-/* initialize */
+	ir_graph *irg = get_irn_irg(ka);
+	add_End_keepalive(get_irg_end(irg), ka);
+}
 
-/* call once for each run of the library */
 void ir_set_uninitialized_local_variable_func(
 		uninitialized_local_variable_func_t *func)
 {
@@ -1191,40 +742,18 @@ void irg_finalize_cons(ir_graph *irg)
 
 void irp_finalize_cons(void)
 {
-	int i;
-	for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+	size_t i, n;
+	for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
 		irg_finalize_cons(get_irp_irg(i));
 	}
 	irp->phase_state = phase_high;
 }
 
-ir_node *new_Start(void)
-{
-	return new_d_Start(NULL);
-}
-ir_node *new_End(void)
-{
-	return new_d_End(NULL);
-}
-ir_node *new_Const(tarval *con)
-{
-	return new_d_Const(NULL, con);
-}
-
 ir_node *new_Const_long(ir_mode *mode, long value)
 {
 	return new_d_Const_long(NULL, mode, value);
 }
 
-ir_node *new_Const_type(tarval *con, ir_type *tp)
-{
-	return new_d_Const_type(NULL, con, tp);
-}
-
-ir_node *new_SymConst_type(ir_mode *mode, symconst_symbol value, symconst_kind kind, ir_type *type)
-{
-	return new_d_SymConst_type(NULL, mode, value, kind, type);
-}
 ir_node *new_SymConst(ir_mode *mode, symconst_symbol value, symconst_kind kind)
 {
 	return new_d_SymConst(NULL, mode, value, kind);
@@ -1233,26 +762,10 @@ ir_node *new_simpleSel(ir_node *store, ir_node *objptr, ir_entity *ent)
 {
 	return new_d_simpleSel(NULL, store, objptr, ent);
 }
-ir_node *new_Phi(int arity, ir_node **in, ir_mode *mode)
-{
-	return new_d_Phi(NULL, arity, in, mode);
-}
-ir_node *new_Sync(int arity, ir_node *in[])
-{
-	return new_d_Sync(NULL, arity, in);
-}
 ir_node *new_defaultProj(ir_node *arg, long max_proj)
 {
 	return new_d_defaultProj(NULL, arg, max_proj);
 }
-ir_node *new_Bad(void)
-{
-	return get_irg_bad(current_ir_graph);
-}
-ir_node *new_NoMem(void)
-{
-	return get_irg_no_mem(current_ir_graph);
-}
 ir_node *new_ASM(int arity, ir_node *in[], ir_asm_constraint *inputs,
                  int n_outs, ir_asm_constraint *outputs,
                  int n_clobber, ident *clobber[], ident *text)
@@ -1260,18 +773,38 @@ ir_node *new_ASM(int arity, ir_node *in[], ir_asm_constraint *inputs,
 	return new_d_ASM(NULL, arity, in, inputs, n_outs, outputs, n_clobber, clobber, text);
 }
 
-/* create a new anchor node */
-ir_node *new_Anchor(ir_graph *irg)
+ir_node *new_r_Anchor(ir_graph *irg)
 {
-	ir_node *in[anchor_last];
+	ir_node *in[anchor_last+1];
 	ir_node *res;
+	size_t   i;
 	memset(in, 0, sizeof(in));
-	res = new_ir_node(NULL, irg, NULL, op_Anchor, mode_ANY, anchor_last, in);
+	res = new_ir_node(NULL, irg, NULL, op_Anchor, mode_ANY, anchor_last+1, in);
+	res->attr.anchor.irg.irg = irg;
 
 	/* hack to get get_irn_irg working: set block to ourself and allow
 	 * get_Block_irg for anchor */
-	res->attr.irg.irg = irg;
 	res->in[0] = res;
 
+	/* we can't have NULL inputs so reference ourselfes for now */
+	for (i = 0; i <= (size_t)anchor_last; ++i) {
+		set_irn_n(res, i, res);
+	}
+
+	return res;
+}
+
+ir_node *new_r_Block_noopt(ir_graph *irg, int arity, ir_node *in[])
+{
+	ir_node *res = new_ir_node(NULL, irg, NULL, op_Block, mode_BB, arity, in);
+	res->attr.block.irg.irg = irg;
+	res->attr.block.backedge = new_backedge_arr(irg->obst, arity);
+	set_Block_matured(res, 1);
+	/* Create and initialize array for Phi-node construction. */
+	if (get_irg_phase_state(irg) == phase_building) {
+		res->attr.block.graph_arr = NEW_ARR_D(ir_node *, irg->obst, irg->n_loc);
+		memset(res->attr.block.graph_arr, 0, irg->n_loc * sizeof(ir_node*));
+	}
+	irn_verify_irg(res, irg);
 	return res;
 }