X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=83bf3edbd5034d2f36b7e575719e01bf93120e35;hb=2af4a97900b435e35d7c20350604e3863aff2b4c;hp=38c962f16e22cc7218877c6172145cd31a82e4ae;hpb=d44948c7bf953b1929f6f8e4d51330e5e2ab29c0;p=libfirm

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index 38c962f16..83bf3edbd 100644
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -23,14 +23,11 @@
  * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
+#include <string.h>
 
+#include "pset_new.h"
 #include "ident.h"
 #include "irnode_t.h"
 #include "irgraph_t.h"
@@ -46,10 +43,12 @@
 #include "irhooks.h"
 #include "irtools.h"
 
+#include "beinfo.h"
+
 /* some constants fixing the positions of nodes predecessors
    in the in array */
 #define CALL_PARAM_OFFSET     2
-#define FUNCCALL_PARAM_OFFSET 1
+#define BUILDIN_PARAM_OFFSET  1
 #define SEL_INDEX_OFFSET      2
 #define RETURN_RESULT_OFFSET  1  /* mem is not a result */
 #define END_KEEPALIVE_OFFSET  0
@@ -138,7 +137,9 @@ new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mod
 	char *p;
 	int i;
 
-	assert(irg && op && mode);
+	assert(irg);
+	assert(op);
+	assert(mode);
 	p = obstack_alloc(irg->obst, node_size);
 	memset(p, 0, node_size);
 	res = (ir_node *)(p + firm_add_node_size);
@@ -162,16 +163,17 @@ new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mod
 		memcpy(&res->in[1], in, sizeof(ir_node *) * arity);
 	}
 
-	res->in[0] = block;
+	res->in[0]   = block;
 	set_irn_dbg_info(res, db);
-	res->out = NULL;
-
-#ifdef DEBUG_libfirm
+	res->out     = NULL;
 	res->node_nr = get_irp_new_node_nr();
-#endif
 
-	for (i = 0; i < EDGE_KIND_LAST; ++i)
+	for (i = 0; i < EDGE_KIND_LAST; ++i) {
 		INIT_LIST_HEAD(&res->edge_info[i].outs_head);
+		/* edges will be build immediately */
+		res->edge_info[i].edges_built = 1;
+		res->edge_info[i].out_count = 0;
+	}
 
 	/* don't put this into the for loop, arity is -1 for some nodes! */
 	edges_notify_edge(res, -1, res->in[0], NULL, irg);
@@ -179,6 +181,28 @@ new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mod
 		edges_notify_edge(res, i - 1, res->in[i], NULL, irg);
 
 	hook_new_node(irg, res);
+	if (get_irg_phase_state(irg) == phase_backend) {
+		be_info_new_node(res);
+	}
+	// Init the VRP structures
+	res->vrp.range_type = VRP_UNDEFINED;
+	res->vrp.valid = 0;
+	if(mode_is_int(mode)) {
+		// We are assuming that 0 is always represented as 0x0000
+		res->vrp.bits_set = new_tarval_from_long(0, mode);
+		res->vrp.bits_not_set = new_tarval_from_long(0, mode);
+		res->vrp.range_bottom = get_tarval_top();
+		res->vrp.range_top = get_tarval_top();
+	} else {
+		res->vrp.bits_set = get_tarval_bad();
+		res->vrp.bits_not_set = get_tarval_bad();
+		res->vrp.range_bottom = get_tarval_bad();
+		res->vrp.range_top = get_tarval_bad();
+	}
+	res->vrp.bits_node = NULL;
+	res->vrp.range_node = NULL;
+	res->vrp.range_op = VRP_NONE;
+
 
 	return res;
 }
@@ -211,6 +235,7 @@ int (get_irn_arity)(const ir_node *node) {
    consecutive. */
 ir_node **get_irn_in(const ir_node *node) {
 	assert(node);
+#ifdef INTERPROCEDURAL_VIEW
 	if (get_interprocedural_view()) { /* handle Filter and Block specially */
 		if (get_irn_opcode(node) == iro_Filter) {
 			assert(node->attr.filter.in_cg);
@@ -220,14 +245,17 @@ ir_node **get_irn_in(const ir_node *node) {
 		}
 		/* else fall through */
 	}
+#endif /* INTERPROCEDURAL_VIEW */
 	return node->in;
 }
 
 void set_irn_in(ir_node *node, int arity, ir_node **in) {
 	int i;
 	ir_node *** pOld_in;
-	ir_graph *irg = current_ir_graph;
+	ir_graph *irg = get_irn_irg(node);
+
 	assert(node);
+#ifdef INTERPROCEDURAL_VIEW
 	if (get_interprocedural_view()) { /* handle Filter and Block specially */
 		ir_opcode code = get_irn_opcode(node);
 		if (code  == iro_Filter) {
@@ -238,9 +266,10 @@ void set_irn_in(ir_node *node, int arity, ir_node **in) {
 		} else {
 			pOld_in = &node->in;
 		}
-	} else {
+	} else
+#endif /* INTERPROCEDURAL_VIEW */
 		pOld_in = &node->in;
-	}
+
 
 	for (i = 0; i < arity; i++) {
 		if (i < ARR_LEN(*pOld_in)-1)
@@ -263,11 +292,11 @@ void set_irn_in(ir_node *node, int arity, ir_node **in) {
 }
 
 ir_node *(get_irn_intra_n)(const ir_node *node, int n) {
-	return _get_irn_intra_n (node, n);
+	return _get_irn_intra_n(node, n);
 }
 
 ir_node *(get_irn_inter_n)(const ir_node *node, int n) {
-	return _get_irn_inter_n (node, n);
+	return _get_irn_inter_n(node, n);
 }
 
 ir_node *(*_get_irn_n)(const ir_node *node, int n) = _get_irn_intra_n;
@@ -282,6 +311,7 @@ void set_irn_n(ir_node *node, int n, ir_node *in) {
 	assert(n < get_irn_arity(node));
 	assert(in && in->kind == k_ir_node);
 
+#ifdef INTERPROCEDURAL_VIEW
 	if ((n == -1) && (get_irn_opcode(node) == iro_Filter)) {
 		/* Change block pred in both views! */
 		node->in[n + 1] = in;
@@ -300,6 +330,7 @@ void set_irn_n(ir_node *node, int n, ir_node *in) {
 		}
 		/* else fall through */
 	}
+#endif /* INTERPROCEDURAL_VIEW */
 
 	/* Call the hook */
 	hook_set_irn_n(node, n, in, node->in[n + 1]);
@@ -349,6 +380,8 @@ void (set_irn_dep)(ir_node *node, int pos, ir_node *dep) {
 int add_irn_dep(ir_node *node, ir_node *dep) {
 	int res = 0;
 
+	/* DEP edges are only allowed in backend phase */
+	assert(get_irg_phase_state(get_irn_irg(node)) == phase_backend);
 	if (node->deps == NULL) {
 		node->deps = NEW_ARR_F(ir_node *, 1);
 		node->deps[0] = dep;
@@ -394,11 +427,6 @@ void (set_irn_mode)(ir_node *node, ir_mode *mode) {
 	_set_irn_mode(node, mode);
 }
 
-modecode get_irn_modecode(const ir_node *node) {
-	assert(node);
-	return node->mode->code;
-}
-
 /** Gets the string representation of the mode .*/
 const char *get_irn_modename(const ir_node *node) {
 	assert(node);
@@ -434,11 +462,11 @@ ident *get_irn_opident(const ir_node *node) {
 	return node->op->name;
 }
 
-unsigned long (get_irn_visited)(const ir_node *node) {
+ir_visited_t (get_irn_visited)(const ir_node *node) {
 	return _get_irn_visited(node);
 }
 
-void (set_irn_visited)(ir_node *node, unsigned long visited) {
+void (set_irn_visited)(ir_node *node, ir_visited_t visited) {
 	_set_irn_visited(node, visited);
 }
 
@@ -446,14 +474,14 @@ void (mark_irn_visited)(ir_node *node) {
 	_mark_irn_visited(node);
 }
 
-int (irn_not_visited)(const ir_node *node) {
-	return _irn_not_visited(node);
-}
-
 int (irn_visited)(const ir_node *node) {
 	return _irn_visited(node);
 }
 
+int (irn_visited_else_mark)(ir_node *node) {
+	return _irn_visited_else_mark(node);
+}
+
 void (set_irn_link)(ir_node *node, void *link) {
 	_set_irn_link(node, link);
 }
@@ -472,7 +500,7 @@ op_pin_state (is_irn_pinned_in_irg) (const ir_node *node) {
 
 void set_irn_pinned(ir_node *node, op_pin_state state) {
 	/* due to optimization an opt may be turned into a Tuple */
-	if (get_irn_op(node) == op_Tuple)
+	if (is_Tuple(node))
 		return;
 
 	assert(node && get_op_pinned(get_irn_op(node)) >= op_pin_state_exc_pinned);
@@ -481,85 +509,45 @@ void set_irn_pinned(ir_node *node, op_pin_state state) {
 	node->attr.except.pin_state = state;
 }
 
-#ifdef DO_HEAPANALYSIS
-/* Access the abstract interpretation information of a node.
-   Returns NULL if no such information is available. */
-struct abstval *get_irn_abst_value(ir_node *n) {
-	return n->av;
-}
-/* Set the abstract interpretation information of a node. */
-void set_irn_abst_value(ir_node *n, struct abstval *os) {
-	n->av = os;
-}
-struct section *firm_get_irn_section(ir_node *n) {
-	return n->sec;
-}
-void firm_set_irn_section(ir_node *n, struct section *s) {
-	n->sec = s;
-}
-#else
-/* Dummies needed for firmjni. */
-struct abstval *get_irn_abst_value(ir_node *n) {
-	(void) n;
-	return NULL;
-}
-void set_irn_abst_value(ir_node *n, struct abstval *os) {
-	(void) n;
-	(void) os;
-}
-struct section *firm_get_irn_section(ir_node *n) {
-	(void) n;
-	return NULL;
-}
-void firm_set_irn_section(ir_node *n, struct section *s) {
-	(void) n;
-	(void) s;
-}
-#endif /* DO_HEAPANALYSIS */
-
-
 /* Outputs a unique number for this node */
 long get_irn_node_nr(const ir_node *node) {
 	assert(node);
-#ifdef DEBUG_libfirm
 	return node->node_nr;
-#else
-	return (long)PTR_TO_INT(node);
-#endif
 }
 
 const_attr *get_irn_const_attr(ir_node *node) {
-	assert(node->op == op_Const);
+	assert(is_Const(node));
 	return &node->attr.con;
 }
 
 long get_irn_proj_attr(ir_node *node) {
+	/* BEWARE: check for true Proj node here, no Filter */
 	assert(node->op == op_Proj);
 	return node->attr.proj;
 }
 
 alloc_attr *get_irn_alloc_attr(ir_node *node) {
-	assert(node->op == op_Alloc);
+	assert(is_Alloc(node));
 	return &node->attr.alloc;
 }
 
 free_attr *get_irn_free_attr(ir_node *node) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	return &node->attr.free;
 }
 
 symconst_attr *get_irn_symconst_attr(ir_node *node) {
-	assert(node->op == op_SymConst);
+	assert(is_SymConst(node));
 	return &node->attr.symc;
 }
 
-ir_type *get_irn_call_attr(ir_node *node) {
-	assert(node->op == op_Call);
-	return node->attr.call.cld_tp = skip_tid(node->attr.call.cld_tp);
+call_attr *get_irn_call_attr(ir_node *node) {
+	assert(is_Call(node));
+	return &node->attr.call;
 }
 
 sel_attr *get_irn_sel_attr(ir_node *node) {
-	assert(node->op == op_Sel);
+	assert(is_Sel(node));
 	return &node->attr.sel;
 }
 
@@ -568,17 +556,17 @@ phi_attr *get_irn_phi_attr(ir_node *node) {
 }
 
 block_attr *get_irn_block_attr(ir_node *node) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	return &node->attr.block;
 }
 
 load_attr *get_irn_load_attr(ir_node *node) {
-	assert(node->op == op_Load);
+	assert(is_Load(node));
 	return &node->attr.load;
 }
 
 store_attr *get_irn_store_attr(ir_node *node) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	return &node->attr.store;
 }
 
@@ -594,6 +582,11 @@ divmod_attr *get_irn_divmod_attr(ir_node *node) {
 	return &node->attr.divmod;
 }
 
+builtin_attr *get_irn_builtin_attr(ir_node *node) {
+	assert(is_Builtin(node));
+	return &node->attr.builtin;
+}
+
 void *(get_irn_generic_attr)(ir_node *node) {
 	assert(is_ir_node(node));
 	return _get_irn_generic_attr(node);
@@ -661,22 +654,8 @@ ir_type *is_tls_pointer(const ir_node *n) {
 	return NULL;
 }
 
-/* Test whether arbitrary node is value arg base, i.e. Proj(pn_Start_P_value_arg_base)
- * from Start.  If so returns 1, else 0. */
-int is_value_arg_pointer(const ir_node *n) {
-	if (is_Proj(n) &&
-		(get_Proj_proj(n) == pn_Start_P_value_arg_base) &&
-		is_Start(get_Proj_pred(n)))
-		return 1;
-	return 0;
-}
-
-/* Returns an array with the predecessors of the Block. Depending on
-   the implementation of the graph data structure this can be a copy of
-   the internal representation of predecessors as well as the internal
-   array itself. Therefore writing to this array might obstruct the ir. */
 ir_node **get_Block_cfgpred_arr(ir_node *node) {
-	assert((node->op == op_Block));
+	assert(is_Block(node));
 	return (ir_node **)&(get_irn_in(node)[1]);
 }
 
@@ -689,29 +668,39 @@ ir_node *(get_Block_cfgpred)(const ir_node *node, int pos) {
 }
 
 void set_Block_cfgpred(ir_node *node, int pos, ir_node *pred) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	set_irn_n(node, pos, pred);
 }
 
+int get_Block_cfgpred_pos(const ir_node *block, const ir_node *pred) {
+	int i;
+
+	for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i) {
+		if (get_Block_cfgpred_block(block, i) == pred)
+			return i;
+	}
+	return -1;
+}
+
 ir_node *(get_Block_cfgpred_block)(const ir_node *node, int pos) {
 	return _get_Block_cfgpred_block(node, pos);
 }
 
 int get_Block_matured(const ir_node *node) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	return (int)node->attr.block.is_matured;
 }
 
 void set_Block_matured(ir_node *node, int matured) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	node->attr.block.is_matured = matured;
 }
 
-unsigned long (get_Block_block_visited)(const ir_node *node) {
+ir_visited_t (get_Block_block_visited)(const ir_node *node) {
 	return _get_Block_block_visited(node);
 }
 
-void (set_Block_block_visited)(ir_node *node, unsigned long visit) {
+void (set_Block_block_visited)(ir_node *node, ir_visited_t visit) {
 	_set_Block_block_visited(node, visit);
 }
 
@@ -720,27 +709,23 @@ void (mark_Block_block_visited)(ir_node *node) {
 	_mark_Block_block_visited(node);
 }
 
-int (Block_not_block_visited)(const ir_node *node) {
-	return _Block_not_block_visited(node);
-}
-
 int (Block_block_visited)(const ir_node *node) {
 	return _Block_block_visited(node);
 }
 
 ir_node *get_Block_graph_arr(ir_node *node, int pos) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	return node->attr.block.graph_arr[pos+1];
 }
 
 void set_Block_graph_arr(ir_node *node, int pos, ir_node *value) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	node->attr.block.graph_arr[pos+1] = value;
 }
 
 #ifdef INTERPROCEDURAL_VIEW
 void set_Block_cg_cfgpred_arr(ir_node *node, int arity, ir_node *in[]) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	if (node->attr.block.in_cg == NULL || arity != ARR_LEN(node->attr.block.in_cg) - 1) {
 		node->attr.block.in_cg = NEW_ARR_D(ir_node *, current_ir_graph->obst, arity + 1);
 		node->attr.block.in_cg[0] = NULL;
@@ -758,32 +743,31 @@ void set_Block_cg_cfgpred_arr(ir_node *node, int arity, ir_node *in[]) {
 }
 
 void set_Block_cg_cfgpred(ir_node *node, int pos, ir_node *pred) {
-	assert(node->op == op_Block &&
-	       node->attr.block.in_cg &&
+	assert(is_Block(node) && node->attr.block.in_cg &&
 	       0 <= pos && pos < ARR_LEN(node->attr.block.in_cg) - 1);
 	node->attr.block.in_cg[pos + 1] = pred;
 }
 
 ir_node **get_Block_cg_cfgpred_arr(ir_node *node) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	return node->attr.block.in_cg == NULL ? NULL : node->attr.block.in_cg  + 1;
 }
 
 int get_Block_cg_n_cfgpreds(const ir_node *node) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	return node->attr.block.in_cg == NULL ? 0 : ARR_LEN(node->attr.block.in_cg) - 1;
 }
 
 ir_node *get_Block_cg_cfgpred(const ir_node *node, int pos) {
-	assert(node->op == op_Block && node->attr.block.in_cg);
+	assert(is_Block(node) && node->attr.block.in_cg);
 	return node->attr.block.in_cg[pos + 1];
 }
 
 void remove_Block_cg_cfgpred_arr(ir_node *node) {
-	assert(node->op == op_Block);
+	assert(is_Block(node));
 	node->attr.block.in_cg = NULL;
 }
-#endif
+#endif /* INTERPROCEDURAL_VIEW */
 
 ir_node *(set_Block_dead)(ir_node *block) {
 	return _set_Block_dead(block);
@@ -821,6 +805,7 @@ ir_node *get_Block_MacroBlock(const ir_node *block) {
 /* Sets the macro block header of a block. */
 void set_Block_MacroBlock(ir_node *block, ir_node *mbh) {
 	assert(is_Block(block));
+	mbh = skip_Id(mbh);
 	assert(is_Block(mbh));
 	set_irn_n(block, -1, mbh);
 }
@@ -837,25 +822,47 @@ ir_node *get_irn_MacroBlock(const ir_node *n) {
 }
 
 /* returns the graph of a Block. */
-ir_graph *get_Block_irg(const ir_node *block) {
-	assert(is_Block(block));
-	return block->attr.block.irg;
+ir_graph *(get_Block_irg)(const ir_node *block) {
+	return _get_Block_irg(block);
 }
 
-int has_Block_label(const ir_node *block) {
+ir_entity *create_Block_entity(ir_node *block) {
+	ir_entity *entity;
 	assert(is_Block(block));
-	return block->attr.block.has_label;
+
+	entity = block->attr.block.entity;
+	if (entity == NULL) {
+		ir_label_t  nr;
+		ir_type   *glob;
+
+		glob = get_glob_type();
+		entity = new_entity(glob, id_unique("block_%u"), get_code_type());
+		set_entity_visibility(entity, ir_visibility_local);
+		set_entity_linkage(entity, IR_LINKAGE_CONSTANT);
+		nr = get_irp_next_label_nr();
+		set_entity_label(entity, nr);
+		set_entity_compiler_generated(entity, 1);
+
+		block->attr.block.entity = entity;
+	}
+	return entity;
 }
 
-ir_label_t get_Block_label(const ir_node *block) {
+ir_entity *get_Block_entity(const ir_node *block) {
 	assert(is_Block(block));
-	return block->attr.block.label;
+	return block->attr.block.entity;
 }
 
-void set_Block_label(ir_node *block, ir_label_t label) {
+void set_Block_entity(ir_node *block, ir_entity *entity)
+{
 	assert(is_Block(block));
-	block->attr.block.has_label = 1;
-	block->attr.block.label = label;
+	assert(get_entity_type(entity) == get_code_type());
+	block->attr.block.entity = entity;
+}
+
+int has_Block_entity(const ir_node *block)
+{
+	return block->attr.block.entity != NULL;
 }
 
 ir_node *(get_Block_phis)(const ir_node *block) {
@@ -866,24 +873,37 @@ void (set_Block_phis)(ir_node *block, ir_node *phi) {
 	_set_Block_phis(block, phi);
 }
 
+void (add_Block_phi)(ir_node *block, ir_node *phi) {
+	_add_Block_phi(block, phi);
+}
+
+/* Get the Block mark (single bit). */
+unsigned (get_Block_mark)(const ir_node *block) {
+	return _get_Block_mark(block);
+}
+
+/* Set the Block mark (single bit). */
+void (set_Block_mark)(ir_node *block, unsigned mark) {
+	_set_Block_mark(block, mark);
+}
+
 int get_End_n_keepalives(const ir_node *end) {
-	assert(end->op == op_End);
+	assert(is_End(end));
 	return (get_irn_arity(end) - END_KEEPALIVE_OFFSET);
 }
 
 ir_node *get_End_keepalive(const ir_node *end, int pos) {
-	assert(end->op == op_End);
+	assert(is_End(end));
 	return get_irn_n(end, pos + END_KEEPALIVE_OFFSET);
 }
 
 void add_End_keepalive(ir_node *end, ir_node *ka) {
-	assert(end->op == op_End);
-	assert((is_Phi(ka) || is_Proj(ka) || is_Block(ka) || is_irn_keep(ka)) && "Only Phi, Block or Keep nodes can be kept alive!");
+	assert(is_End(end));
 	add_irn_n(end, ka);
 }
 
 void set_End_keepalive(ir_node *end, int pos, ir_node *ka) {
-	assert(end->op == op_End);
+	assert(is_End(end));
 	set_irn_n(end, pos + END_KEEPALIVE_OFFSET, ka);
 }
 
@@ -906,27 +926,77 @@ void set_End_keepalives(ir_node *end, int n, ir_node *in[]) {
 
 /* Set new keep-alives from old keep-alives, skipping irn */
 void remove_End_keepalive(ir_node *end, ir_node *irn) {
-	int     n = get_End_n_keepalives(end);
-	ir_node **in;
-	int     i, idx;
+	int      n = get_End_n_keepalives(end);
+	int      i, idx;
+	ir_graph *irg;
+
+	idx = -1;
+	for (i = n -1; i >= 0; --i) {
+		ir_node *old_ka = end->in[1 + END_KEEPALIVE_OFFSET + i];
+
+		/* find irn */
+		if (old_ka == irn) {
+			idx = i;
+			goto found;
+		}
+	}
+	return;
+found:
+	irg = get_irn_irg(end);
+
+	/* remove the edge */
+	edges_notify_edge(end, idx, NULL, irn, irg);
+
+	if (idx != n - 1) {
+		/* exchange with the last one */
+		ir_node *old = end->in[1 + END_KEEPALIVE_OFFSET + n - 1];
+		edges_notify_edge(end, n - 1, NULL, old, irg);
+		end->in[1 + END_KEEPALIVE_OFFSET + idx] = old;
+		edges_notify_edge(end, idx, old, NULL, irg);
+	}
+	/* now n - 1 keeps, 1 block input */
+	ARR_RESIZE(ir_node *, end->in, (n - 1) + 1 + END_KEEPALIVE_OFFSET);
+}
+
+/* remove Bads, NoMems and doublets from the keep-alive set */
+void remove_End_Bads_and_doublets(ir_node *end) {
+	pset_new_t keeps;
+	int        idx, n = get_End_n_keepalives(end);
+	ir_graph   *irg;
+
+	if (n <= 0)
+		return;
+
+	irg = get_irn_irg(end);
+	pset_new_init(&keeps);
 
-	NEW_ARR_A(ir_node *, in, n);
+	for (idx = n - 1; idx >= 0; --idx) {
+		ir_node *ka = get_End_keepalive(end, idx);
 
-	for (idx = i = 0; i < n; ++i) {
-		ir_node *old_ka = get_End_keepalive(end, i);
+		if (is_Bad(ka) || is_NoMem(ka) || pset_new_contains(&keeps, ka)) {
+			/* remove the edge */
+			edges_notify_edge(end, idx, NULL, ka, irg);
 
-		/* skip irn */
-		if (old_ka != irn)
-			in[idx++] = old_ka;
+			if (idx != n - 1) {
+				/* exchange with the last one */
+				ir_node *old = end->in[1 + END_KEEPALIVE_OFFSET + n - 1];
+				edges_notify_edge(end, n - 1, NULL, old, irg);
+				end->in[1 + END_KEEPALIVE_OFFSET + idx] = old;
+				edges_notify_edge(end, idx, old, NULL, irg);
+			}
+			--n;
+		} else {
+			pset_new_insert(&keeps, ka);
+		}
 	}
+	/* n keeps, 1 block input */
+	ARR_RESIZE(ir_node *, end->in, n + 1 + END_KEEPALIVE_OFFSET);
 
-	/* set new keep-alives */
-	set_End_keepalives(end, idx, in);
+	pset_new_destroy(&keeps);
 }
 
-void
-free_End(ir_node *end) {
-	assert(end->op == op_End);
+void free_End(ir_node *end) {
+	assert(is_End(end));
 	end->kind = k_BAD;
 	DEL_ARR_F(end->in);
 	end->in = NULL;   /* @@@ make sure we get an error if we use the
@@ -935,98 +1005,60 @@ free_End(ir_node *end) {
 
 /* Return the target address of an IJmp */
 ir_node *get_IJmp_target(const ir_node *ijmp) {
-	assert(ijmp->op == op_IJmp);
+	assert(is_IJmp(ijmp));
 	return get_irn_n(ijmp, 0);
 }
 
 /** Sets the target address of an IJmp */
 void set_IJmp_target(ir_node *ijmp, ir_node *tgt) {
-	assert(ijmp->op == op_IJmp);
+	assert(is_IJmp(ijmp));
 	set_irn_n(ijmp, 0, tgt);
 }
 
-/*
-> Implementing the case construct (which is where the constant Proj node is
-> important) involves far more than simply determining the constant values.
-> We could argue that this is more properly a function of the translator from
-> Firm to the target machine.  That could be done if there was some way of
-> projecting "default" out of the Cond node.
-I know it's complicated.
-Basically there are two problems:
- - determining the gaps between the Projs
- - determining the biggest case constant to know the proj number for
-   the default node.
-I see several solutions:
-1. Introduce a ProjDefault node.  Solves both problems.
-   This means to extend all optimizations executed during construction.
-2. Give the Cond node for switch two flavors:
-   a) there are no gaps in the Projs  (existing flavor)
-   b) gaps may exist, default proj is still the Proj with the largest
-      projection number.  This covers also the gaps.
-3. Fix the semantic of the Cond to that of 2b)
-
-Solution 2 seems to be the best:
-Computing the gaps in the Firm representation is not too hard, i.e.,
-libFIRM can implement a routine that transforms between the two
-flavours.  This is also possible for 1) but 2) does not require to
-change any existing optimization.
-Further it should be far simpler to determine the biggest constant than
-to compute all gaps.
-I don't want to choose 3) as 2a) seems to have advantages for
-dataflow analysis and 3) does not allow to convert the representation to
-2a).
-*/
 ir_node *
 get_Cond_selector(const ir_node *node) {
-	assert(node->op == op_Cond);
+	assert(is_Cond(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Cond_selector(ir_node *node, ir_node *selector) {
-	assert(node->op == op_Cond);
+	assert(is_Cond(node));
 	set_irn_n(node, 0, selector);
 }
 
-cond_kind
-get_Cond_kind(const ir_node *node) {
-	assert(node->op == op_Cond);
-	return node->attr.cond.kind;
-}
-
-void
-set_Cond_kind(ir_node *node, cond_kind kind) {
-	assert(node->op == op_Cond);
-	node->attr.cond.kind = kind;
-}
-
 long
-get_Cond_defaultProj(const ir_node *node) {
-	assert(node->op == op_Cond);
+get_Cond_default_proj(const ir_node *node) {
+	assert(is_Cond(node));
 	return node->attr.cond.default_proj;
 }
 
+void set_Cond_default_proj(ir_node *node, long defproj) {
+	assert(is_Cond(node));
+	node->attr.cond.default_proj = defproj;
+}
+
 ir_node *
 get_Return_mem(const ir_node *node) {
-	assert(node->op == op_Return);
+	assert(is_Return(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Return_mem(ir_node *node, ir_node *mem) {
-	assert(node->op == op_Return);
+	assert(is_Return(node));
 	set_irn_n(node, 0, mem);
 }
 
 int
 get_Return_n_ress(const ir_node *node) {
-	assert(node->op == op_Return);
+	assert(is_Return(node));
 	return (get_irn_arity(node) - RETURN_RESULT_OFFSET);
 }
 
 ir_node **
 get_Return_res_arr(ir_node *node) {
-	assert((node->op == op_Return));
+	assert(is_Return(node));
 	if (get_Return_n_ress(node) > 0)
 		return (ir_node **)&(get_irn_in(node)[1 + RETURN_RESULT_OFFSET]);
 	else
@@ -1036,20 +1068,20 @@ get_Return_res_arr(ir_node *node) {
 /*
 void
 set_Return_n_res(ir_node *node, int results) {
-	assert(node->op == op_Return);
+	assert(is_Return(node));
 }
 */
 
 ir_node *
 get_Return_res(const ir_node *node, int pos) {
-	assert(node->op == op_Return);
+	assert(is_Return(node));
 	assert(get_Return_n_ress(node) > pos);
 	return get_irn_n(node, pos + RETURN_RESULT_OFFSET);
 }
 
 void
 set_Return_res(ir_node *node, int pos, ir_node *res){
-	assert(node->op == op_Return);
+	assert(is_Return(node));
 	set_irn_n(node, pos + RETURN_RESULT_OFFSET, res);
 }
 
@@ -1059,7 +1091,7 @@ tarval *(get_Const_tarval)(const ir_node *node) {
 
 void
 set_Const_tarval(ir_node *node, tarval *con) {
-	assert(node->op == op_Const);
+	assert(is_Const(node));
 	node->attr.con.tv = con;
 }
 
@@ -1081,14 +1113,13 @@ int (is_Const_all_one)(const ir_node *node) {
    entity type. */
 ir_type *
 get_Const_type(ir_node *node) {
-	assert(node->op == op_Const);
-	node->attr.con.tp = skip_tid(node->attr.con.tp);
+	assert(is_Const(node));
 	return node->attr.con.tp;
 }
 
 void
 set_Const_type(ir_node *node, ir_type *tp) {
-	assert(node->op == op_Const);
+	assert(is_Const(node));
 	if (tp != firm_unknown_type) {
 		assert(is_atomic_type(tp));
 		assert(get_type_mode(tp) == get_irn_mode(node));
@@ -1099,132 +1130,124 @@ set_Const_type(ir_node *node, ir_type *tp) {
 
 symconst_kind
 get_SymConst_kind(const ir_node *node) {
-	assert(node->op == op_SymConst);
-	return node->attr.symc.num;
+	assert(is_SymConst(node));
+	return node->attr.symc.kind;
 }
 
 void
-set_SymConst_kind(ir_node *node, symconst_kind num) {
-	assert(node->op == op_SymConst);
-	node->attr.symc.num = num;
+set_SymConst_kind(ir_node *node, symconst_kind kind) {
+	assert(is_SymConst(node));
+	node->attr.symc.kind = kind;
 }
 
 ir_type *
-get_SymConst_type(ir_node *node) {
-	assert((node->op == op_SymConst) &&
+get_SymConst_type(const ir_node *node) {
+	/* the cast here is annoying, but we have to compensate for
+	   the skip_tip() */
+	ir_node *irn = (ir_node *)node;
+	assert(is_SymConst(node) &&
 	       (SYMCONST_HAS_TYPE(get_SymConst_kind(node))));
-	return node->attr.symc.sym.type_p = skip_tid(node->attr.symc.sym.type_p);
+	return irn->attr.symc.sym.type_p;
 }
 
 void
 set_SymConst_type(ir_node *node, ir_type *tp) {
-	assert((node->op == op_SymConst) &&
+	assert(is_SymConst(node) &&
 	       (SYMCONST_HAS_TYPE(get_SymConst_kind(node))));
 	node->attr.symc.sym.type_p = tp;
 }
 
 ident *
 get_SymConst_name(const ir_node *node) {
-	assert(node->op == op_SymConst && SYMCONST_HAS_ID(get_SymConst_kind(node)));
+	assert(is_SymConst(node) && SYMCONST_HAS_ID(get_SymConst_kind(node)));
 	return node->attr.symc.sym.ident_p;
 }
 
 void
 set_SymConst_name(ir_node *node, ident *name) {
-	assert(node->op == op_SymConst && SYMCONST_HAS_ID(get_SymConst_kind(node)));
+	assert(is_SymConst(node) && SYMCONST_HAS_ID(get_SymConst_kind(node)));
 	node->attr.symc.sym.ident_p = name;
 }
 
 
 /* Only to access SymConst of kind symconst_addr_ent.  Else assertion: */
 ir_entity *get_SymConst_entity(const ir_node *node) {
-	assert(node->op == op_SymConst && SYMCONST_HAS_ENT(get_SymConst_kind(node)));
+	assert(is_SymConst(node) && SYMCONST_HAS_ENT(get_SymConst_kind(node)));
 	return node->attr.symc.sym.entity_p;
 }
 
 void set_SymConst_entity(ir_node *node, ir_entity *ent) {
-	assert(node->op == op_SymConst && SYMCONST_HAS_ENT(get_SymConst_kind(node)));
+	assert(is_SymConst(node) && SYMCONST_HAS_ENT(get_SymConst_kind(node)));
 	node->attr.symc.sym.entity_p  = ent;
 }
 
 ir_enum_const *get_SymConst_enum(const ir_node *node) {
-	assert(node->op == op_SymConst && SYMCONST_HAS_ENUM(get_SymConst_kind(node)));
+	assert(is_SymConst(node) && SYMCONST_HAS_ENUM(get_SymConst_kind(node)));
 	return node->attr.symc.sym.enum_p;
 }
 
 void set_SymConst_enum(ir_node *node, ir_enum_const *ec) {
-	assert(node->op == op_SymConst && SYMCONST_HAS_ENUM(get_SymConst_kind(node)));
+	assert(is_SymConst(node) && SYMCONST_HAS_ENUM(get_SymConst_kind(node)));
 	node->attr.symc.sym.enum_p  = ec;
 }
 
 union symconst_symbol
 get_SymConst_symbol(const ir_node *node) {
-	assert(node->op == op_SymConst);
+	assert(is_SymConst(node));
 	return node->attr.symc.sym;
 }
 
 void
 set_SymConst_symbol(ir_node *node, union symconst_symbol sym) {
-	assert(node->op == op_SymConst);
+	assert(is_SymConst(node));
 	node->attr.symc.sym = sym;
 }
 
-ir_label_t get_SymConst_label(const ir_node *node) {
-	assert(node->op == op_SymConst && SYMCONST_HAS_LABEL(get_SymConst_kind(node)));
-	return node->attr.symc.sym.label;
-}
-
-void set_SymConst_label(ir_node *node, ir_label_t label) {
-	assert(node->op == op_SymConst && SYMCONST_HAS_LABEL(get_SymConst_kind(node)));
-	node->attr.symc.sym.label = label;
-}
-
 ir_type *
 get_SymConst_value_type(ir_node *node) {
-	assert(node->op == op_SymConst);
-	if (node->attr.symc.tp) node->attr.symc.tp = skip_tid(node->attr.symc.tp);
+	assert(is_SymConst(node));
 	return node->attr.symc.tp;
 }
 
 void
 set_SymConst_value_type(ir_node *node, ir_type *tp) {
-	assert(node->op == op_SymConst);
+	assert(is_SymConst(node));
 	node->attr.symc.tp = tp;
 }
 
 ir_node *
 get_Sel_mem(const ir_node *node) {
-	assert(node->op == op_Sel);
+	assert(is_Sel(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Sel_mem(ir_node *node, ir_node *mem) {
-	assert(node->op == op_Sel);
+	assert(is_Sel(node));
 	set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Sel_ptr(const ir_node *node) {
-	assert(node->op == op_Sel);
+	assert(is_Sel(node));
 	return get_irn_n(node, 1);
 }
 
 void
 set_Sel_ptr(ir_node *node, ir_node *ptr) {
-	assert(node->op == op_Sel);
+	assert(is_Sel(node));
 	set_irn_n(node, 1, ptr);
 }
 
 int
 get_Sel_n_indexs(const ir_node *node) {
-	assert(node->op == op_Sel);
+	assert(is_Sel(node));
 	return (get_irn_arity(node) - SEL_INDEX_OFFSET);
 }
 
 ir_node **
 get_Sel_index_arr(ir_node *node) {
-	assert((node->op == op_Sel));
+	assert(is_Sel(node));
 	if (get_Sel_n_indexs(node) > 0)
 		return (ir_node **)& get_irn_in(node)[SEL_INDEX_OFFSET + 1];
 	else
@@ -1233,30 +1256,31 @@ get_Sel_index_arr(ir_node *node) {
 
 ir_node *
 get_Sel_index(const ir_node *node, int pos) {
-	assert(node->op == op_Sel);
+	assert(is_Sel(node));
 	return get_irn_n(node, pos + SEL_INDEX_OFFSET);
 }
 
 void
 set_Sel_index(ir_node *node, int pos, ir_node *index) {
-	assert(node->op == op_Sel);
+	assert(is_Sel(node));
 	set_irn_n(node, pos + SEL_INDEX_OFFSET, index);
 }
 
 ir_entity *
 get_Sel_entity(const ir_node *node) {
-	assert(node->op == op_Sel);
-	return node->attr.sel.ent;
+	assert(is_Sel(node));
+	return node->attr.sel.entity;
 }
 
-ir_entity *_get_Sel_entity(ir_node *node) {
+/* need a version without const to prevent warning */
+static ir_entity *_get_Sel_entity(ir_node *node) {
 	return get_Sel_entity(node);
 }
 
 void
 set_Sel_entity(ir_node *node, ir_entity *ent) {
-	assert(node->op == op_Sel);
-	node->attr.sel.ent = ent;
+	assert(is_Sel(node));
+	node->attr.sel.entity = ent;
 }
 
 
@@ -1270,85 +1294,170 @@ set_Sel_entity(ir_node *node, ir_entity *ent) {
 
 ir_node *
 get_Call_mem(const ir_node *node) {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Call_mem(ir_node *node, ir_node *mem) {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Call_ptr(const ir_node *node) {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	return get_irn_n(node, 1);
 }
 
 void
 set_Call_ptr(ir_node *node, ir_node *ptr) {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	set_irn_n(node, 1, ptr);
 }
 
 ir_node **
 get_Call_param_arr(ir_node *node) {
-	assert(node->op == op_Call);
-	return (ir_node **)&get_irn_in(node)[CALL_PARAM_OFFSET + 1];
+	assert(is_Call(node));
+	return &get_irn_in(node)[CALL_PARAM_OFFSET + 1];
 }
 
 int
 get_Call_n_params(const ir_node *node)  {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	return (get_irn_arity(node) - CALL_PARAM_OFFSET);
 }
 
-int
-get_Call_arity(const ir_node *node) {
-	assert(node->op == op_Call);
-	return get_Call_n_params(node);
-}
-
-/* void
-set_Call_arity(ir_node *node, ir_node *arity) {
-	assert(node->op == op_Call);
-}
-*/
-
 ir_node *
 get_Call_param(const ir_node *node, int pos) {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	return get_irn_n(node, pos + CALL_PARAM_OFFSET);
 }
 
 void
 set_Call_param(ir_node *node, int pos, ir_node *param) {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	set_irn_n(node, pos + CALL_PARAM_OFFSET, param);
 }
 
 ir_type *
 get_Call_type(ir_node *node) {
-	assert(node->op == op_Call);
-	return node->attr.call.cld_tp = skip_tid(node->attr.call.cld_tp);
+	assert(is_Call(node));
+	return node->attr.call.type;
 }
 
 void
 set_Call_type(ir_node *node, ir_type *tp) {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	assert((get_unknown_type() == tp) || is_Method_type(tp));
-	node->attr.call.cld_tp = tp;
+	node->attr.call.type = tp;
+}
+
+unsigned
+get_Call_tail_call(const ir_node *node) {
+	assert(is_Call(node));
+	return node->attr.call.tail_call;
+}
+
+void
+set_Call_tail_call(ir_node *node, unsigned tail_call) {
+	assert(is_Call(node));
+	node->attr.call.tail_call = tail_call != 0;
 }
 
+ir_node *
+get_Builtin_mem(const ir_node *node) {
+	assert(is_Builtin(node));
+	return get_irn_n(node, 0);
+}
+
+void
+set_Builin_mem(ir_node *node, ir_node *mem) {
+	assert(is_Builtin(node));
+	set_irn_n(node, 0, mem);
+}
+
+ir_builtin_kind
+get_Builtin_kind(const ir_node *node) {
+	assert(is_Builtin(node));
+	return node->attr.builtin.kind;
+}
+
+void
+set_Builtin_kind(ir_node *node, ir_builtin_kind kind) {
+	assert(is_Builtin(node));
+	node->attr.builtin.kind = kind;
+}
+
+ir_node **
+get_Builtin_param_arr(ir_node *node) {
+	assert(is_Builtin(node));
+	return &get_irn_in(node)[BUILDIN_PARAM_OFFSET + 1];
+}
+
+int
+get_Builtin_n_params(const ir_node *node)  {
+	assert(is_Builtin(node));
+	return (get_irn_arity(node) - BUILDIN_PARAM_OFFSET);
+}
+
+ir_node *
+get_Builtin_param(const ir_node *node, int pos) {
+	assert(is_Builtin(node));
+	return get_irn_n(node, pos + BUILDIN_PARAM_OFFSET);
+}
+
+void
+set_Builtin_param(ir_node *node, int pos, ir_node *param) {
+	assert(is_Builtin(node));
+	set_irn_n(node, pos + BUILDIN_PARAM_OFFSET, param);
+}
+
+ir_type *
+get_Builtin_type(ir_node *node) {
+	assert(is_Builtin(node));
+	return node->attr.builtin.type;
+}
+
+void
+set_Builtin_type(ir_node *node, ir_type *tp) {
+	assert(is_Builtin(node));
+	assert((get_unknown_type() == tp) || is_Method_type(tp));
+	node->attr.builtin.type = tp;
+}
+
+/* Returns a human readable string for the ir_builtin_kind. */
+const char *get_builtin_kind_name(ir_builtin_kind kind) {
+#define X(a)    case a: return #a;
+	switch (kind) {
+		X(ir_bk_trap);
+		X(ir_bk_debugbreak);
+		X(ir_bk_return_address);
+		X(ir_bk_frame_address);
+		X(ir_bk_prefetch);
+		X(ir_bk_ffs);
+		X(ir_bk_clz);
+		X(ir_bk_ctz);
+		X(ir_bk_popcount);
+		X(ir_bk_parity);
+		X(ir_bk_bswap);
+		X(ir_bk_inport);
+		X(ir_bk_outport);
+		X(ir_bk_inner_trampoline);
+	}
+	return "<unknown>";
+#undef X
+}
+
+
 int Call_has_callees(const ir_node *node) {
-	assert(node && node->op == op_Call);
+	assert(is_Call(node));
 	return ((get_irg_callee_info_state(get_irn_irg(node)) != irg_callee_info_none) &&
 	        (node->attr.call.callee_arr != NULL));
 }
 
 int get_Call_n_callees(const ir_node *node) {
-  assert(node && node->op == op_Call && node->attr.call.callee_arr);
+  assert(is_Call(node) && node->attr.call.callee_arr);
   return ARR_LEN(node->attr.call.callee_arr);
 }
 
@@ -1358,7 +1467,7 @@ ir_entity *get_Call_callee(const ir_node *node, int pos) {
 }
 
 void set_Call_callee_arr(ir_node *node, const int n, ir_entity ** arr) {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	if (node->attr.call.callee_arr == NULL || get_Call_n_callees(node) != n) {
 		node->attr.call.callee_arr = NEW_ARR_D(ir_entity *, current_ir_graph->obst, n);
 	}
@@ -1366,56 +1475,71 @@ void set_Call_callee_arr(ir_node *node, const int n, ir_entity ** arr) {
 }
 
 void remove_Call_callee_arr(ir_node *node) {
-	assert(node->op == op_Call);
+	assert(is_Call(node));
 	node->attr.call.callee_arr = NULL;
 }
 
 ir_node *get_CallBegin_ptr(const ir_node *node) {
-	assert(node->op == op_CallBegin);
+	assert(is_CallBegin(node));
 	return get_irn_n(node, 0);
 }
 
 void set_CallBegin_ptr(ir_node *node, ir_node *ptr) {
-	assert(node->op == op_CallBegin);
+	assert(is_CallBegin(node));
 	set_irn_n(node, 0, ptr);
 }
 
 ir_node *get_CallBegin_call(const ir_node *node) {
-	assert(node->op == op_CallBegin);
+	assert(is_CallBegin(node));
 	return node->attr.callbegin.call;
 }
 
 void set_CallBegin_call(ir_node *node, ir_node *call) {
-	assert(node->op == op_CallBegin);
+	assert(is_CallBegin(node));
 	node->attr.callbegin.call = call;
 }
 
+/*
+ * Returns non-zero if a Call is surely a self-recursive Call.
+ * Beware: if this functions returns 0, the call might be self-recursive!
+ */
+int is_self_recursive_Call(const ir_node *call) {
+	const ir_node *callee = get_Call_ptr(call);
+
+	if (is_SymConst_addr_ent(callee)) {
+		const ir_entity *ent = get_SymConst_entity(callee);
+		const ir_graph  *irg = get_entity_irg(ent);
+		if (irg == get_irn_irg(call))
+			return 1;
+	}
+	return 0;
+}
 
 #define BINOP(OP)                                      \
 ir_node * get_##OP##_left(const ir_node *node) {       \
-  assert(node->op == op_##OP);                         \
+  assert(is_##OP(node));                               \
   return get_irn_n(node, node->op->op_index);          \
 }                                                      \
 void set_##OP##_left(ir_node *node, ir_node *left) {   \
-  assert(node->op == op_##OP);                         \
+  assert(is_##OP(node));                               \
   set_irn_n(node, node->op->op_index, left);           \
 }                                                      \
 ir_node *get_##OP##_right(const ir_node *node) {       \
-  assert(node->op == op_##OP);                         \
+  assert(is_##OP(node));                               \
   return get_irn_n(node, node->op->op_index + 1);      \
 }                                                      \
 void set_##OP##_right(ir_node *node, ir_node *right) { \
-  assert(node->op == op_##OP);                         \
+  assert(is_##OP(node));                               \
   set_irn_n(node, node->op->op_index + 1, right);      \
 }
 
 #define UNOP(OP)                                  \
 ir_node *get_##OP##_op(const ir_node *node) {     \
-  assert(node->op == op_##OP);                    \
+  assert(is_##OP(node));                          \
   return get_irn_n(node, node->op->op_index);     \
 }                                                 \
 void set_##OP##_op(ir_node *node, ir_node *op) {  \
-  assert(node->op == op_##OP);                    \
+  assert(is_##OP(node));                          \
   set_irn_n(node, node->op->op_index, op);        \
 }
 
@@ -1424,13 +1548,13 @@ BINOP(OP)                                     \
                                               \
 ir_node *                                     \
 get_##OP##_mem(const ir_node *node) {         \
-  assert(node->op == op_##OP);                \
+  assert(is_##OP(node));                      \
   return get_irn_n(node, 0);                  \
 }                                             \
                                               \
 void                                          \
 set_##OP##_mem(ir_node *node, ir_node *mem) { \
-  assert(node->op == op_##OP);                \
+  assert(is_##OP(node));                      \
   set_irn_n(node, 0, mem);                    \
 }
 
@@ -1438,17 +1562,19 @@ set_##OP##_mem(ir_node *node, ir_node *mem) { \
 BINOP_MEM(OP)                                           \
                                                         \
 ir_mode *get_##OP##_resmode(const ir_node *node) {      \
-  assert(node->op == op_##OP);                          \
-  return node->attr.divmod.res_mode;                    \
+  assert(is_##OP(node));                                \
+  return node->attr.divmod.resmode;                     \
 }                                                       \
                                                         \
 void set_##OP##_resmode(ir_node *node, ir_mode *mode) { \
-  assert(node->op == op_##OP);                          \
-  node->attr.divmod.res_mode = mode;                    \
+  assert(is_##OP(node));                                \
+  node->attr.divmod.resmode = mode;                     \
 }
 
 
 BINOP(Add)
+BINOP(Borrow)
+BINOP(Carry)
 BINOP(Sub)
 UNOP(Minus)
 BINOP(Mul)
@@ -1465,37 +1591,41 @@ UNOP(Not)
 BINOP(Shl)
 BINOP(Shr)
 BINOP(Shrs)
-BINOP(Rot)
+BINOP(Rotl)
 BINOP(Cmp)
 UNOP(Conv)
 UNOP(Cast)
 
-int is_Div_remainderless(const ir_node *node) {
-	assert(node->op == op_Div);
+int get_Div_no_remainder(const ir_node *node) {
+	assert(is_Div(node));
 	return node->attr.divmod.no_remainder;
 }
 
+void set_Div_no_remainder(ir_node *node, int no_remainder) {
+	assert(is_Div(node));
+	node->attr.divmod.no_remainder = no_remainder;
+}
+
 int get_Conv_strict(const ir_node *node) {
-	assert(node->op == op_Conv);
+	assert(is_Conv(node));
 	return node->attr.conv.strict;
 }
 
 void set_Conv_strict(ir_node *node, int strict_flag) {
-	assert(node->op == op_Conv);
+	assert(is_Conv(node));
 	node->attr.conv.strict = (char)strict_flag;
 }
 
 ir_type *
 get_Cast_type(ir_node *node) {
-	assert(node->op == op_Cast);
-	node->attr.cast.totype = skip_tid(node->attr.cast.totype);
-	return node->attr.cast.totype;
+	assert(is_Cast(node));
+	return node->attr.cast.type;
 }
 
 void
 set_Cast_type(ir_node *node, ir_type *to_tp) {
-	assert(node->op == op_Cast);
-	node->attr.cast.totype = to_tp;
+	assert(is_Cast(node));
+	node->attr.cast.type = to_tp;
 }
 
 
@@ -1594,11 +1724,6 @@ set_binop_right(ir_node *node, ir_node *right) {
 	set_irn_n(node, node->op->op_index + 1, right);
 }
 
-int
-(is_Phi)(const ir_node *n) {
-	return _is_Phi(n);
-}
-
 int is_Phi0(const ir_node *n) {
 	assert(n);
 
@@ -1672,264 +1797,264 @@ void set_memop_ptr(ir_node *node, ir_node *ptr) {
 
 ir_node *
 get_Load_mem(const ir_node *node) {
-	assert(node->op == op_Load);
+	assert(is_Load(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Load_mem(ir_node *node, ir_node *mem) {
-	assert(node->op == op_Load);
+	assert(is_Load(node));
 	set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Load_ptr(const ir_node *node) {
-	assert(node->op == op_Load);
+	assert(is_Load(node));
 	return get_irn_n(node, 1);
 }
 
 void
 set_Load_ptr(ir_node *node, ir_node *ptr) {
-	assert(node->op == op_Load);
+	assert(is_Load(node));
 	set_irn_n(node, 1, ptr);
 }
 
 ir_mode *
 get_Load_mode(const ir_node *node) {
-	assert(node->op == op_Load);
-	return node->attr.load.load_mode;
+	assert(is_Load(node));
+	return node->attr.load.mode;
 }
 
 void
 set_Load_mode(ir_node *node, ir_mode *mode) {
-	assert(node->op == op_Load);
-	node->attr.load.load_mode = mode;
+	assert(is_Load(node));
+	node->attr.load.mode = mode;
 }
 
 ir_volatility
 get_Load_volatility(const ir_node *node) {
-	assert(node->op == op_Load);
+	assert(is_Load(node));
 	return node->attr.load.volatility;
 }
 
 void
 set_Load_volatility(ir_node *node, ir_volatility volatility) {
-	assert(node->op == op_Load);
+	assert(is_Load(node));
 	node->attr.load.volatility = volatility;
 }
 
 ir_align
 get_Load_align(const ir_node *node) {
-	assert(node->op == op_Load);
+	assert(is_Load(node));
 	return node->attr.load.aligned;
 }
 
 void
 set_Load_align(ir_node *node, ir_align align) {
-	assert(node->op == op_Load);
+	assert(is_Load(node));
 	node->attr.load.aligned = align;
 }
 
 
 ir_node *
 get_Store_mem(const ir_node *node) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Store_mem(ir_node *node, ir_node *mem) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Store_ptr(const ir_node *node) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	return get_irn_n(node, 1);
 }
 
 void
 set_Store_ptr(ir_node *node, ir_node *ptr) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	set_irn_n(node, 1, ptr);
 }
 
 ir_node *
 get_Store_value(const ir_node *node) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	return get_irn_n(node, 2);
 }
 
 void
 set_Store_value(ir_node *node, ir_node *value) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	set_irn_n(node, 2, value);
 }
 
 ir_volatility
 get_Store_volatility(const ir_node *node) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	return node->attr.store.volatility;
 }
 
 void
 set_Store_volatility(ir_node *node, ir_volatility volatility) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	node->attr.store.volatility = volatility;
 }
 
 ir_align
 get_Store_align(const ir_node *node) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	return node->attr.store.aligned;
 }
 
 void
 set_Store_align(ir_node *node, ir_align align) {
-	assert(node->op == op_Store);
+	assert(is_Store(node));
 	node->attr.store.aligned = align;
 }
 
 
 ir_node *
 get_Alloc_mem(const ir_node *node) {
-	assert(node->op == op_Alloc);
+	assert(is_Alloc(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Alloc_mem(ir_node *node, ir_node *mem) {
-	assert(node->op == op_Alloc);
+	assert(is_Alloc(node));
 	set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Alloc_size(const ir_node *node) {
-	assert(node->op == op_Alloc);
+	assert(is_Alloc(node));
 	return get_irn_n(node, 1);
 }
 
 void
 set_Alloc_size(ir_node *node, ir_node *size) {
-	assert(node->op == op_Alloc);
+	assert(is_Alloc(node));
 	set_irn_n(node, 1, size);
 }
 
 ir_type *
 get_Alloc_type(ir_node *node) {
-	assert(node->op == op_Alloc);
-	return node->attr.alloc.type = skip_tid(node->attr.alloc.type);
+	assert(is_Alloc(node));
+	return node->attr.alloc.type;
 }
 
 void
 set_Alloc_type(ir_node *node, ir_type *tp) {
-	assert(node->op == op_Alloc);
+	assert(is_Alloc(node));
 	node->attr.alloc.type = tp;
 }
 
 ir_where_alloc
 get_Alloc_where(const ir_node *node) {
-	assert(node->op == op_Alloc);
+	assert(is_Alloc(node));
 	return node->attr.alloc.where;
 }
 
 void
 set_Alloc_where(ir_node *node, ir_where_alloc where) {
-	assert(node->op == op_Alloc);
+	assert(is_Alloc(node));
 	node->attr.alloc.where = where;
 }
 
 
 ir_node *
 get_Free_mem(const ir_node *node) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Free_mem(ir_node *node, ir_node *mem) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Free_ptr(const ir_node *node) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	return get_irn_n(node, 1);
 }
 
 void
 set_Free_ptr(ir_node *node, ir_node *ptr) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	set_irn_n(node, 1, ptr);
 }
 
 ir_node *
 get_Free_size(const ir_node *node) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	return get_irn_n(node, 2);
 }
 
 void
 set_Free_size(ir_node *node, ir_node *size) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	set_irn_n(node, 2, size);
 }
 
 ir_type *
 get_Free_type(ir_node *node) {
-	assert(node->op == op_Free);
-	return node->attr.free.type = skip_tid(node->attr.free.type);
+	assert(is_Free(node));
+	return node->attr.free.type;
 }
 
 void
 set_Free_type(ir_node *node, ir_type *tp) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	node->attr.free.type = tp;
 }
 
 ir_where_alloc
 get_Free_where(const ir_node *node) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	return node->attr.free.where;
 }
 
 void
 set_Free_where(ir_node *node, ir_where_alloc where) {
-	assert(node->op == op_Free);
+	assert(is_Free(node));
 	node->attr.free.where = where;
 }
 
 ir_node **get_Sync_preds_arr(ir_node *node) {
-	assert(node->op == op_Sync);
+	assert(is_Sync(node));
 	return (ir_node **)&(get_irn_in(node)[1]);
 }
 
 int get_Sync_n_preds(const ir_node *node) {
-	assert(node->op == op_Sync);
+	assert(is_Sync(node));
 	return (get_irn_arity(node));
 }
 
 /*
 void set_Sync_n_preds(ir_node *node, int n_preds) {
-	assert(node->op == op_Sync);
+	assert(is_Sync(node));
 }
 */
 
 ir_node *get_Sync_pred(const ir_node *node, int pos) {
-	assert(node->op == op_Sync);
+	assert(is_Sync(node));
 	return get_irn_n(node, pos);
 }
 
 void set_Sync_pred(ir_node *node, int pos, ir_node *pred) {
-	assert(node->op == op_Sync);
+	assert(is_Sync(node));
 	set_irn_n(node, pos, pred);
 }
 
 /* Add a new Sync predecessor */
 void add_Sync_pred(ir_node *node, ir_node *pred) {
-	assert(node->op == op_Sync);
+	assert(is_Sync(node));
 	add_irn_n(node, pred);
 }
 
@@ -1944,10 +2069,11 @@ ir_type *get_Proj_type(ir_node *n) {
 		/* Deal with Start / Call here: we need to know the Proj Nr. */
 		assert(get_irn_mode(pred) == mode_T);
 		pred_pred = get_Proj_pred(pred);
-		if (get_irn_op(pred_pred) == op_Start)  {
+
+		if (is_Start(pred_pred))  {
 			ir_type *mtp = get_entity_type(get_irg_entity(get_irn_irg(pred_pred)));
 			tp = get_method_param_type(mtp, get_Proj_proj(n));
-		} else if (get_irn_op(pred_pred) == op_Call) {
+		} else if (is_Call(pred_pred)) {
 			ir_type *mtp = get_Call_type(pred_pred);
 			tp = get_method_res_type(mtp, get_Proj_proj(n));
 		}
@@ -1979,122 +2105,146 @@ set_Proj_pred(ir_node *node, ir_node *pred) {
 
 long
 get_Proj_proj(const ir_node *node) {
-	assert(is_Proj(node));
-	if (get_irn_opcode(node) == iro_Proj) {
+#ifdef INTERPROCEDURAL_VIEW
+	ir_opcode code = get_irn_opcode(node);
+
+	if (code == iro_Proj) {
 		return node->attr.proj;
-	} else {
-		assert(get_irn_opcode(node) == iro_Filter);
+	}
+	else {
+		assert(code == iro_Filter);
 		return node->attr.filter.proj;
 	}
+#else
+	assert(is_Proj(node));
+	return node->attr.proj;
+#endif /* INTERPROCEDURAL_VIEW */
 }
 
 void
 set_Proj_proj(ir_node *node, long proj) {
-	assert(node->op == op_Proj);
+#ifdef INTERPROCEDURAL_VIEW
+	ir_opcode code = get_irn_opcode(node);
+
+	if (code == iro_Proj) {
+		node->attr.proj = proj;
+	}
+	else {
+		assert(code == iro_Filter);
+		node->attr.filter.proj = proj;
+	}
+#else
+	assert(is_Proj(node));
 	node->attr.proj = proj;
+#endif /* INTERPROCEDURAL_VIEW */
+}
+
+/* Returns non-zero if a node is a routine parameter. */
+int (is_arg_Proj)(const ir_node *node) {
+	return _is_arg_Proj(node);
 }
 
 ir_node **
 get_Tuple_preds_arr(ir_node *node) {
-	assert(node->op == op_Tuple);
+	assert(is_Tuple(node));
 	return (ir_node **)&(get_irn_in(node)[1]);
 }
 
 int
 get_Tuple_n_preds(const ir_node *node) {
-	assert(node->op == op_Tuple);
-	return (get_irn_arity(node));
+	assert(is_Tuple(node));
+	return get_irn_arity(node);
 }
 
 /*
 void
 set_Tuple_n_preds(ir_node *node, int n_preds) {
-	assert(node->op == op_Tuple);
+	assert(is_Tuple(node));
 }
 */
 
 ir_node *
 get_Tuple_pred(const ir_node *node, int pos) {
-  assert(node->op == op_Tuple);
+  assert(is_Tuple(node));
   return get_irn_n(node, pos);
 }
 
 void
 set_Tuple_pred(ir_node *node, int pos, ir_node *pred) {
-	assert(node->op == op_Tuple);
+	assert(is_Tuple(node));
 	set_irn_n(node, pos, pred);
 }
 
 ir_node *
 get_Id_pred(const ir_node *node) {
-	assert(node->op == op_Id);
+	assert(is_Id(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Id_pred(ir_node *node, ir_node *pred) {
-	assert(node->op == op_Id);
+	assert(is_Id(node));
 	set_irn_n(node, 0, pred);
 }
 
 ir_node *get_Confirm_value(const ir_node *node) {
-	assert(node->op == op_Confirm);
+	assert(is_Confirm(node));
 	return get_irn_n(node, 0);
 }
 
 void set_Confirm_value(ir_node *node, ir_node *value) {
-	assert(node->op == op_Confirm);
+	assert(is_Confirm(node));
 	set_irn_n(node, 0, value);
 }
 
 ir_node *get_Confirm_bound(const ir_node *node) {
-	assert(node->op == op_Confirm);
+	assert(is_Confirm(node));
 	return get_irn_n(node, 1);
 }
 
 void set_Confirm_bound(ir_node *node, ir_node *bound) {
-	assert(node->op == op_Confirm);
+	assert(is_Confirm(node));
 	set_irn_n(node, 0, bound);
 }
 
 pn_Cmp get_Confirm_cmp(const ir_node *node) {
-	assert(node->op == op_Confirm);
+	assert(is_Confirm(node));
 	return node->attr.confirm.cmp;
 }
 
 void set_Confirm_cmp(ir_node *node, pn_Cmp cmp) {
-	assert(node->op == op_Confirm);
+	assert(is_Confirm(node));
 	node->attr.confirm.cmp = cmp;
 }
 
 ir_node *
 get_Filter_pred(ir_node *node) {
-	assert(node->op == op_Filter);
+	assert(is_Filter(node));
 	return node->in[1];
 }
 
 void
 set_Filter_pred(ir_node *node, ir_node *pred) {
-	assert(node->op == op_Filter);
+	assert(is_Filter(node));
 	node->in[1] = pred;
 }
 
 long
 get_Filter_proj(ir_node *node) {
-	assert(node->op == op_Filter);
+	assert(is_Filter(node));
 	return node->attr.filter.proj;
 }
 
 void
 set_Filter_proj(ir_node *node, long proj) {
-	assert(node->op == op_Filter);
+	assert(is_Filter(node));
 	node->attr.filter.proj = proj;
 }
 
 /* Don't use get_irn_arity, get_irn_n in implementation as access
    shall work independent of view!!! */
 void set_Filter_cg_pred_arr(ir_node *node, int arity, ir_node ** in) {
-	assert(node->op == op_Filter);
+	assert(is_Filter(node));
 	if (node->attr.filter.in_cg == NULL || arity != ARR_LEN(node->attr.filter.in_cg) - 1) {
 		ir_graph *irg = get_irn_irg(node);
 		node->attr.filter.in_cg = NEW_ARR_D(ir_node *, current_ir_graph->obst, arity + 1);
@@ -2105,19 +2255,19 @@ void set_Filter_cg_pred_arr(ir_node *node, int arity, ir_node ** in) {
 }
 
 void set_Filter_cg_pred(ir_node * node, int pos, ir_node * pred) {
-	assert(node->op == op_Filter && node->attr.filter.in_cg &&
+	assert(is_Filter(node) && node->attr.filter.in_cg &&
 	       0 <= pos && pos < ARR_LEN(node->attr.filter.in_cg) - 1);
 	node->attr.filter.in_cg[pos + 1] = pred;
 }
 
 int get_Filter_n_cg_preds(ir_node *node) {
-	assert(node->op == op_Filter && node->attr.filter.in_cg);
+	assert(is_Filter(node) && node->attr.filter.in_cg);
 	return (ARR_LEN(node->attr.filter.in_cg) - 1);
 }
 
 ir_node *get_Filter_cg_pred(ir_node *node, int pos) {
 	int arity;
-	assert(node->op == op_Filter && node->attr.filter.in_cg &&
+	assert(is_Filter(node) && node->attr.filter.in_cg &&
 	       0 <= pos);
 	arity = ARR_LEN(node->attr.filter.in_cg);
 	assert(pos < arity - 1);
@@ -2126,106 +2276,38 @@ ir_node *get_Filter_cg_pred(ir_node *node, int pos) {
 
 /* Mux support */
 ir_node *get_Mux_sel(const ir_node *node) {
-	if (node->op == op_Psi) {
-		assert(get_irn_arity(node) == 3);
-		return get_Psi_cond(node, 0);
-	}
-	assert(node->op == op_Mux);
+	assert(is_Mux(node));
 	return node->in[1];
 }
 
 void set_Mux_sel(ir_node *node, ir_node *sel) {
-	if (node->op == op_Psi) {
-		assert(get_irn_arity(node) == 3);
-		set_Psi_cond(node, 0, sel);
-	} else {
-		assert(node->op == op_Mux);
-		node->in[1] = sel;
-	}
+	assert(is_Mux(node));
+	node->in[1] = sel;
 }
 
 ir_node *get_Mux_false(const ir_node *node) {
-	if (node->op == op_Psi) {
-		assert(get_irn_arity(node) == 3);
-		return get_Psi_default(node);
-	}
-	assert(node->op == op_Mux);
+	assert(is_Mux(node));
 	return node->in[2];
 }
 
 void set_Mux_false(ir_node *node, ir_node *ir_false) {
-	if (node->op == op_Psi) {
-		assert(get_irn_arity(node) == 3);
-		set_Psi_default(node, ir_false);
-	} else {
-		assert(node->op == op_Mux);
-		node->in[2] = ir_false;
-	}
+	assert(is_Mux(node));
+	node->in[2] = ir_false;
 }
 
 ir_node *get_Mux_true(const ir_node *node) {
-	if (node->op == op_Psi) {
-		assert(get_irn_arity(node) == 3);
-		return get_Psi_val(node, 0);
-	}
-	assert(node->op == op_Mux);
+	assert(is_Mux(node));
 	return node->in[3];
 }
 
 void set_Mux_true(ir_node *node, ir_node *ir_true) {
-	if (node->op == op_Psi) {
-		assert(get_irn_arity(node) == 3);
-		set_Psi_val(node, 0, ir_true);
-	} else {
-		assert(node->op == op_Mux);
-		node->in[3] = ir_true;
-	}
-}
-
-/* Psi support */
-ir_node *get_Psi_cond(const ir_node *node, int pos) {
-	assert(node->op == op_Psi);
-	assert(pos < get_Psi_n_conds(node));
-	return get_irn_n(node, 2 * pos);
-}
-
-void set_Psi_cond(ir_node *node, int pos, ir_node *cond) {
-	assert(node->op == op_Psi);
-	assert(pos < get_Psi_n_conds(node));
-	set_irn_n(node, 2 * pos, cond);
-}
-
-ir_node *get_Psi_val(const ir_node *node, int pos) {
-	assert(node->op == op_Psi);
-	assert(pos < get_Psi_n_conds(node));
-	return get_irn_n(node, 2 * pos + 1);
-}
-
-void set_Psi_val(ir_node *node, int pos, ir_node *val) {
-	assert(node->op == op_Psi);
-	assert(pos < get_Psi_n_conds(node));
-	set_irn_n(node, 2 * pos + 1, val);
-}
-
-ir_node *get_Psi_default(const ir_node *node) {
-	int def_pos = get_irn_arity(node) - 1;
-	assert(node->op == op_Psi);
-	return get_irn_n(node, def_pos);
-}
-
-void set_Psi_default(ir_node *node, ir_node *val) {
-	int def_pos = get_irn_arity(node);
-	assert(node->op == op_Psi);
-	set_irn_n(node, def_pos, val);
-}
-
-int (get_Psi_n_conds)(const ir_node *node) {
-	return _get_Psi_n_conds(node);
+	assert(is_Mux(node));
+	node->in[3] = ir_true;
 }
 
 /* CopyB support */
 ir_node *get_CopyB_mem(const ir_node *node) {
-	assert(node->op == op_CopyB);
+	assert(is_CopyB(node));
 	return get_irn_n(node, 0);
 }
 
@@ -2235,40 +2317,40 @@ void set_CopyB_mem(ir_node *node, ir_node *mem) {
 }
 
 ir_node *get_CopyB_dst(const ir_node *node) {
-	assert(node->op == op_CopyB);
+	assert(is_CopyB(node));
 	return get_irn_n(node, 1);
 }
 
 void set_CopyB_dst(ir_node *node, ir_node *dst) {
-	assert(node->op == op_CopyB);
+	assert(is_CopyB(node));
 	set_irn_n(node, 1, dst);
 }
 
 ir_node *get_CopyB_src(const ir_node *node) {
-  assert(node->op == op_CopyB);
+  assert(is_CopyB(node));
   return get_irn_n(node, 2);
 }
 
 void set_CopyB_src(ir_node *node, ir_node *src) {
-	assert(node->op == op_CopyB);
+	assert(is_CopyB(node));
 	set_irn_n(node, 2, src);
 }
 
 ir_type *get_CopyB_type(ir_node *node) {
-	assert(node->op == op_CopyB);
-	return node->attr.copyb.data_type = skip_tid(node->attr.copyb.data_type);
+	assert(is_CopyB(node));
+	return node->attr.copyb.type;
 }
 
 void set_CopyB_type(ir_node *node, ir_type *data_type) {
-	assert(node->op == op_CopyB && data_type);
-	node->attr.copyb.data_type = data_type;
+	assert(is_CopyB(node) && data_type);
+	node->attr.copyb.type = data_type;
 }
 
 
 ir_type *
 get_InstOf_type(ir_node *node) {
 	assert(node->op == op_InstOf);
-	return node->attr.instof.type = skip_tid(node->attr.instof.type);
+	return node->attr.instof.type;
 }
 
 void
@@ -2304,25 +2386,25 @@ set_InstOf_obj(ir_node *node, ir_node *obj) {
 /* Returns the memory input of a Raise operation. */
 ir_node *
 get_Raise_mem(const ir_node *node) {
-	assert(node->op == op_Raise);
+	assert(is_Raise(node));
 	return get_irn_n(node, 0);
 }
 
 void
 set_Raise_mem(ir_node *node, ir_node *mem) {
-	assert(node->op == op_Raise);
+	assert(is_Raise(node));
 	set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Raise_exo_ptr(const ir_node *node) {
-	assert(node->op == op_Raise);
+	assert(is_Raise(node));
 	return get_irn_n(node, 1);
 }
 
 void
 set_Raise_exo_ptr(ir_node *node, ir_node *exo_ptr) {
-	assert(node->op == op_Raise);
+	assert(is_Raise(node));
 	set_irn_n(node, 1, exo_ptr);
 }
 
@@ -2330,98 +2412,98 @@ set_Raise_exo_ptr(ir_node *node, ir_node *exo_ptr) {
 
 /* Returns the memory input of a Bound operation. */
 ir_node *get_Bound_mem(const ir_node *bound) {
-	assert(bound->op == op_Bound);
+	assert(is_Bound(bound));
 	return get_irn_n(bound, 0);
 }
 
 void set_Bound_mem(ir_node *bound, ir_node *mem) {
-	assert(bound->op == op_Bound);
+	assert(is_Bound(bound));
 	set_irn_n(bound, 0, mem);
 }
 
 /* Returns the index input of a Bound operation. */
 ir_node *get_Bound_index(const ir_node *bound) {
-	assert(bound->op == op_Bound);
+	assert(is_Bound(bound));
 	return get_irn_n(bound, 1);
 }
 
 void set_Bound_index(ir_node *bound, ir_node *idx) {
-	assert(bound->op == op_Bound);
+	assert(is_Bound(bound));
 	set_irn_n(bound, 1, idx);
 }
 
 /* Returns the lower bound input of a Bound operation. */
 ir_node *get_Bound_lower(const ir_node *bound) {
-	assert(bound->op == op_Bound);
+	assert(is_Bound(bound));
 	return get_irn_n(bound, 2);
 }
 
 void set_Bound_lower(ir_node *bound, ir_node *lower) {
-	assert(bound->op == op_Bound);
+	assert(is_Bound(bound));
 	set_irn_n(bound, 2, lower);
 }
 
 /* Returns the upper bound input of a Bound operation. */
 ir_node *get_Bound_upper(const ir_node *bound) {
-	assert(bound->op == op_Bound);
+	assert(is_Bound(bound));
 	return get_irn_n(bound, 3);
 }
 
 void set_Bound_upper(ir_node *bound, ir_node *upper) {
-	assert(bound->op == op_Bound);
+	assert(is_Bound(bound));
 	set_irn_n(bound, 3, upper);
 }
 
 /* Return the operand of a Pin node. */
 ir_node *get_Pin_op(const ir_node *pin) {
-	assert(pin->op == op_Pin);
+	assert(is_Pin(pin));
 	return get_irn_n(pin, 0);
 }
 
 void set_Pin_op(ir_node *pin, ir_node *node) {
-	assert(pin->op == op_Pin);
+	assert(is_Pin(pin));
 	set_irn_n(pin, 0, node);
 }
 
 /* Return the assembler text of an ASM pseudo node. */
 ident *get_ASM_text(const ir_node *node) {
-	assert(node->op == op_ASM);
+	assert(is_ASM(node));
 	return node->attr.assem.asm_text;
 }
 
 /* Return the number of input constraints for an ASM node. */
 int get_ASM_n_input_constraints(const ir_node *node) {
-	assert(node->op == op_ASM);
+	assert(is_ASM(node));
 	return ARR_LEN(node->attr.assem.inputs);
 }
 
 /* Return the input constraints for an ASM node. This is a flexible array. */
 const ir_asm_constraint *get_ASM_input_constraints(const ir_node *node) {
-	assert(node->op == op_ASM);
+	assert(is_ASM(node));
 	return node->attr.assem.inputs;
 }
 
 /* Return the number of output constraints for an ASM node.  */
 int get_ASM_n_output_constraints(const ir_node *node) {
-	assert(node->op == op_ASM);
+	assert(is_ASM(node));
 	return ARR_LEN(node->attr.assem.outputs);
 }
 
 /* Return the output constraints for an ASM node. */
 const ir_asm_constraint *get_ASM_output_constraints(const ir_node *node) {
-	assert(node->op == op_ASM);
+	assert(is_ASM(node));
 	return node->attr.assem.outputs;
 }
 
 /* Return the number of clobbered registers for an ASM node.  */
 int get_ASM_n_clobbers(const ir_node *node) {
-	assert(node->op == op_ASM);
+	assert(is_ASM(node));
 	return ARR_LEN(node->attr.assem.clobber);
 }
 
 /* Return the list of clobbered registers for an ASM node. */
 ident **get_ASM_clobbers(const ir_node *node) {
-	assert(node->op == op_ASM);
+	assert(is_ASM(node));
 	return node->attr.assem.clobber;
 }
 
@@ -2436,10 +2518,8 @@ get_irn_irg(const ir_node *node) {
 	 */
 	if (! is_Block(node))
 		node = get_irn_n(node, -1);
-	if (is_Bad(node))  /* sometimes bad is predecessor of nodes instead of block: in case of optimization */
-		node = get_irn_n(node, -1);
-	assert(get_irn_op(node) == op_Block);
-	return node->attr.block.irg;
+	/* note that get_Block_irg() can handle Bad nodes */
+	return get_Block_irg(node);
 }
 
 
@@ -2476,10 +2556,8 @@ skip_Tuple(ir_node *node) {
   ir_node *pred;
   ir_op   *op;
 
-  if (!get_opt_normalize()) return node;
-
 restart:
-	if (get_irn_op(node) == op_Proj) {
+	if (is_Proj(node)) {
 	    pred = get_Proj_pred(node);
 	    op   = get_irn_op(pred);
 
@@ -2489,9 +2567,8 @@ restart:
 		 */
 		if (op == op_Proj) { /* nested Tuple ? */
 		    pred = skip_Tuple(pred);
-		    op   = get_irn_op(pred);
 
-			if (op == op_Tuple) {
+			if (is_Tuple(pred)) {
 				node = get_Tuple_pred(pred, get_Proj_proj(node));
 				goto restart;
 			}
@@ -2505,14 +2582,28 @@ restart:
 
 /* returns operand of node if node is a Cast */
 ir_node *skip_Cast(ir_node *node) {
-	if (get_irn_op(node) == op_Cast)
+	if (is_Cast(node))
+		return get_Cast_op(node);
+	return node;
+}
+
+/* returns operand of node if node is a Cast */
+const ir_node *skip_Cast_const(const ir_node *node) {
+	if (is_Cast(node))
 		return get_Cast_op(node);
 	return node;
 }
 
+/* returns operand of node if node is a Pin */
+ir_node *skip_Pin(ir_node *node) {
+	if (is_Pin(node))
+		return get_Pin_op(node);
+	return node;
+}
+
 /* returns operand of node if node is a Confirm */
 ir_node *skip_Confirm(ir_node *node) {
-	if (get_irn_op(node) == op_Confirm)
+	if (is_Confirm(node))
 		return get_Confirm_value(node);
 	return node;
 }
@@ -2577,271 +2668,22 @@ void skip_Id_and_store(ir_node **node) {
 	*node = skip_Id(n);
 }
 
-int
-(is_Bad)(const ir_node *node) {
-	return _is_Bad(node);
-}
-
-int
-(is_NoMem)(const ir_node *node) {
-	return _is_NoMem(node);
-}
-
-int
-(is_Minus)(const ir_node *node) {
-	return _is_Minus(node);
-}
-
-int
-(is_Abs)(const ir_node *node) {
-	return _is_Abs(node);
-}
-
-int
-(is_Mod)(const ir_node *node) {
-	return _is_Mod(node);
-}
-
-int
-(is_Div)(const ir_node *node) {
-	return _is_Div(node);
-}
-
-int
-(is_DivMod)(const ir_node *node) {
-	return _is_DivMod(node);
-}
-
-int
-(is_Quot)(const ir_node *node) {
-	return _is_Quot(node);
-}
-
-int
-(is_Add)(const ir_node *node) {
-	return _is_Add(node);
-}
-
-int
-(is_And)(const ir_node *node) {
-	return _is_And(node);
-}
-
-int
-(is_Or)(const ir_node *node) {
-	return _is_Or(node);
-}
-
-int
-(is_Eor)(const ir_node *node) {
-	return _is_Eor(node);
-}
-
-int
-(is_Sub)(const ir_node *node) {
-	return _is_Sub(node);
-}
-
-int
-(is_Shl)(const ir_node *node) {
-	return _is_Shl(node);
-}
-
-int
-(is_Shr)(const ir_node *node) {
-	return _is_Shr(node);
-}
-
-int
-(is_Shrs)(const ir_node *node) {
-	return _is_Shrs(node);
-}
-
-int
-(is_Rot)(const ir_node *node) {
-	return _is_Rot(node);
-}
-
-int
-(is_Not)(const ir_node *node) {
-	return _is_Not(node);
-}
-
-int
-(is_Psi)(const ir_node *node) {
-	return _is_Psi(node);
-}
-
-int
-(is_Tuple)(const ir_node *node) {
-	return _is_Tuple(node);
-}
-
-int
-(is_Bound)(const ir_node *node) {
-	return _is_Bound(node);
-}
-
-int
-(is_Start)(const ir_node *node) {
-  return _is_Start(node);
-}
-
-int
-(is_End)(const ir_node *node) {
-	return _is_End(node);
-}
-
-int
-(is_Const)(const ir_node *node) {
-	return _is_Const(node);
-}
-
-int
-(is_Conv)(const ir_node *node) {
-	return _is_Conv(node);
-}
-
 int
 (is_strictConv)(const ir_node *node) {
 	return _is_strictConv(node);
 }
 
-int
-(is_Cast)(const ir_node *node) {
-	return _is_Cast(node);
-}
-
 int
 (is_no_Block)(const ir_node *node) {
 	return _is_no_Block(node);
 }
 
-int
-(is_Block)(const ir_node *node) {
-	return _is_Block(node);
-}
-
-/* returns true if node is an Unknown node. */
-int
-(is_Unknown)(const ir_node *node) {
-	return _is_Unknown(node);
-}
-
-/* returns true if node is a Return node. */
-int
-(is_Return)(const ir_node *node) {
-	return _is_Return(node);
-}
-
-/* returns true if node is a Call node. */
-int
-(is_Call)(const ir_node *node) {
-	return _is_Call(node);
-}
-
-/* returns true if node is a Sel node. */
-int
-(is_Sel)(const ir_node *node) {
-	return _is_Sel(node);
-}
-
-/* returns true if node is a Mux node or a Psi with only one condition. */
-int
-(is_Mux)(const ir_node *node) {
-	return _is_Mux(node);
-}
-
-/* returns true if node is a Load node. */
-int
-(is_Load)(const ir_node *node) {
-	return _is_Load(node);
-}
-
-/* returns true if node is a Load node. */
-int
-(is_Store)(const ir_node *node) {
-	return _is_Store(node);
-}
-
-/* returns true if node is a Sync node. */
-int
-(is_Sync)(const ir_node *node) {
-	return _is_Sync(node);
-}
-
-/* Returns true if node is a Confirm node. */
-int
-(is_Confirm)(const ir_node *node) {
-	return _is_Confirm(node);
-}
-
-/* Returns true if node is a Pin node. */
-int
-(is_Pin)(const ir_node *node) {
-	return _is_Pin(node);
-}
-
-/* Returns true if node is a SymConst node. */
-int
-(is_SymConst)(const ir_node *node) {
-	return _is_SymConst(node);
-}
-
 /* Returns true if node is a SymConst node with kind symconst_addr_ent. */
 int
 (is_SymConst_addr_ent)(const ir_node *node) {
 	return _is_SymConst_addr_ent(node);
 }
 
-/* Returns true if node is a Cond node. */
-int
-(is_Cond)(const ir_node *node) {
-	return _is_Cond(node);
-}
-
-int
-(is_CopyB)(const ir_node *node) {
-	return _is_CopyB(node);
-}
-
-/* returns true if node is a Cmp node. */
-int
-(is_Cmp)(const ir_node *node) {
-	return _is_Cmp(node);
-}
-
-/* returns true if node is an Alloc node. */
-int
-(is_Alloc)(const ir_node *node) {
-	return _is_Alloc(node);
-}
-
-/* returns true if a node is a Jmp node. */
-int
-(is_Jmp)(const ir_node *node) {
-	return _is_Jmp(node);
-}
-
-/* returns true if a node is a Raise node. */
-int
-(is_Raise)(const ir_node *node) {
-	return _is_Raise(node);
-}
-
-/* returns true if a node is an ASM node. */
-int
-(is_ASM)(const ir_node *node) {
-	return _is_ASM(node);
-}
-
-int
-(is_Proj)(const ir_node *node) {
-	assert(node);
-	return node->op == op_Proj ||
-	       (!get_interprocedural_view() && node->op == op_Filter);
-}
-
 /* Returns true if the operation manipulates control flow. */
 int is_cfop(const ir_node *node) {
 	return is_op_cfopcode(get_irn_op(node));
@@ -2875,7 +2717,7 @@ ir_node *get_fragile_op_mem(ir_node *node) {
 	case iro_Alloc :
 	case iro_Bound :
 	case iro_CopyB :
-		return get_irn_n(node, pn_Generic_M_regular);
+		return get_irn_n(node, pn_Generic_M);
 	case iro_Bad   :
 	case iro_Unknown:
 		return node;
@@ -2903,6 +2745,10 @@ int (is_irn_forking)(const ir_node *node) {
 	return _is_irn_forking(node);
 }
 
+void (copy_node_attr)(const ir_node *old_node, ir_node *new_node) {
+	_copy_node_attr(old_node, new_node);
+}
+
 /* Return the type associated with the value produced by n
  * if the node remarks this type as it is the case for
  * Cast, Const, SymConst and some Proj nodes. */
@@ -2956,15 +2802,21 @@ int (is_irn_machine_user)(const ir_node *node, unsigned n) {
 	return _is_irn_machine_user(node, n);
 }
 
+/* Returns non-zero for nodes that are CSE neutral to its users. */
+int (is_irn_cse_neutral)(const ir_node *node) {
+	return _is_irn_cse_neutral(node);
+}
 
 /* Gets the string representation of the jump prediction .*/
 const char *get_cond_jmp_predicate_name(cond_jmp_predicate pred) {
+#define X(a)    case a: return #a;
 	switch (pred) {
-	default:
-	case COND_JMP_PRED_NONE:  return "no prediction";
-	case COND_JMP_PRED_TRUE:  return "true taken";
-	case COND_JMP_PRED_FALSE: return "false taken";
+		X(COND_JMP_PRED_NONE);
+		X(COND_JMP_PRED_TRUE);
+		X(COND_JMP_PRED_FALSE);
 	}
+	return "<unknown>";
+#undef X
 }
 
 /* Returns the conditional jump prediction of a Cond node. */
@@ -3072,30 +2924,6 @@ dbg_info *(get_irn_dbg_info)(const ir_node *n) {
 	return _get_irn_dbg_info(n);
 }
 
-#if 0 /* allow the global pointer */
-
-/* checks whether a node represents a global address */
-int is_Global(const ir_node *node) {
-	ir_node *ptr;
-
-	if (is_SymConst_addr_ent(node))
-		return 1;
-	if (! is_Sel(node))
-		return 0;
-
-	ptr = get_Sel_ptr(node);
-	return is_globals_pointer(ptr) != NULL;
-}
-
-/* returns the entity of a global address */
-ir_entity *get_Global_entity(const ir_node *node) {
-	if (is_SymConst(node))
-		return get_SymConst_entity(node);
-	else
-		return get_Sel_entity(node);
-}
-#else
-
 /* checks whether a node represents a global address */
 int is_Global(const ir_node *node) {
 	return is_SymConst_addr_ent(node);
@@ -3105,25 +2933,33 @@ int is_Global(const ir_node *node) {
 ir_entity *get_Global_entity(const ir_node *node) {
 	return get_SymConst_entity(node);
 }
-#endif
 
-#ifdef DEBUG_libfirm
-void dump_irn(const ir_node *n) {
-	int i, arity = get_irn_arity(n);
-	printf("%s%s: %ld (%p)\n", get_irn_opname(n), get_mode_name(get_irn_mode(n)), get_irn_node_nr(n), (void *)n);
-	if (!is_Block(n)) {
-		ir_node *pred = get_irn_n(n, -1);
-		printf("  block: %s%s: %ld (%p)\n", get_irn_opname(pred), get_mode_name(get_irn_mode(pred)),
-			get_irn_node_nr(pred), (void *)pred);
-	}
-	printf("  preds: \n");
-	for (i = 0; i < arity; ++i) {
-		ir_node *pred = get_irn_n(n, i);
-		printf("    %d: %s%s: %ld (%p)\n", i, get_irn_opname(pred), get_mode_name(get_irn_mode(pred)),
-			get_irn_node_nr(pred), (void *)pred);
+/*
+ * Calculate a hash value of a node.
+ */
+unsigned firm_default_hash(const ir_node *node) {
+	unsigned h;
+	int i, irn_arity;
+
+	/* hash table value = 9*(9*(9*(9*(9*arity+in[0])+in[1])+ ...)+mode)+code */
+	h = irn_arity = get_irn_intra_arity(node);
+
+	/* consider all in nodes... except the block if not a control flow. */
+	for (i = is_cfop(node) ? -1 : 0;  i < irn_arity;  ++i) {
+		ir_node *pred = get_irn_intra_n(node, i);
+		if (is_irn_cse_neutral(pred))
+			h *= 9;
+		else
+			h = 9*h + HASH_PTR(pred);
 	}
-}
 
-#else  /* DEBUG_libfirm */
-void dump_irn(const ir_node *n) { (void) n; }
-#endif /* DEBUG_libfirm */
+	/* ...mode,... */
+	h = 9*h + HASH_PTR(get_irn_mode(node));
+	/* ...and code */
+	h = 9*h + HASH_PTR(get_irn_op(node));
+
+	return h;
+}  /* firm_default_hash */
+
+/* include generated code */
+#include "gen_irnode.c.inl"