X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=e81e21266a22b711d9adaeb05700a558e3e4b020;hb=203717b8dd44597fb10c126b33a28528a2432e9c;hp=1ce7634c727fbe102b21a135a4f9e8c407e28103;hpb=b987bd4b7217d31686a6e3546aa8ded3c521ebd4;p=libfirm

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index 1ce7634c7..e81e21266 100644
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -35,7 +35,6 @@
 #include "irnode_t.h"
 #include "irgraph_t.h"
 #include "irmode_t.h"
-#include "typegmod.h"
 #include "irbackedge_t.h"
 #include "irdump.h"
 #include "irop_t.h"
@@ -65,6 +64,8 @@ static const char *pnc_name_arr [] = {
  * returns the pnc name from an pnc constant
  */
 const char *get_pnc_string(int pnc) {
+	assert(pnc >= 0 && pnc <
+			(int) (sizeof(pnc_name_arr)/sizeof(pnc_name_arr[0])));
 	return pnc_name_arr[pnc];
 }
 
@@ -107,7 +108,7 @@ unsigned firm_add_node_size = 0;
 
 
 /* register new space for every node */
-unsigned register_additional_node_data(unsigned size) {
+unsigned firm_register_additional_node_data(unsigned size) {
 	assert(!forbid_new_data && "Too late to register additional node data");
 
 	if (forbid_new_data)
@@ -130,8 +131,8 @@ init_irnode(void) {
  * If arity is negative, a node with a dynamic array is created.
  */
 ir_node *
-new_ir_node (dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mode,
-         int arity, ir_node **in)
+new_ir_node(dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mode,
+            int arity, ir_node **in)
 {
 	ir_node *res;
 	size_t node_size = offsetof(ir_node, attr) + op->attr_size + firm_add_node_size;
@@ -139,9 +140,9 @@ new_ir_node (dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mo
 	int i;
 
 	assert(irg && op && mode);
-	p = obstack_alloc (irg->obst, node_size);
+	p = obstack_alloc(irg->obst, node_size);
 	memset(p, 0, node_size);
-	res = (ir_node *) (p + firm_add_node_size);
+	res = (ir_node *)(p + firm_add_node_size);
 
 	res->kind     = k_ir_node;
 	res->op       = op;
@@ -152,10 +153,10 @@ new_ir_node (dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mo
 	res->deps     = NULL;
 
 	if (arity < 0) {
-		res->in = NEW_ARR_F (ir_node *, 1);  /* 1: space for block */
+		res->in = NEW_ARR_F(ir_node *, 1);  /* 1: space for block */
 	} else {
-		res->in = NEW_ARR_D (ir_node *, irg->obst, (arity+1));
-		memcpy (&res->in[1], in, sizeof (ir_node *) * arity);
+		res->in = NEW_ARR_D(ir_node *, irg->obst, (arity+1));
+		memcpy(&res->in[1], in, sizeof(ir_node *) * arity);
 	}
 
 	res->in[0] = block;
@@ -166,10 +167,10 @@ new_ir_node (dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mo
 	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);
 
-	// don't put this into the for loop, arity is -1 for some nodes!
+	/* don't put this into the for loop, arity is -1 for some nodes! */
 	edges_notify_edge(res, -1, res->in[0], NULL, irg);
 	for (i = 1; i <= arity; ++i)
 		edges_notify_edge(res, i - 1, res->in[i], NULL, irg);
@@ -382,11 +383,10 @@ int add_irn_dep(ir_node *node, ir_node *dep)
 	return res;
 }
 
-void add_irn_deps(ir_node *tgt, ir_node *src)
-{
+void add_irn_deps(ir_node *tgt, ir_node *src) {
 	int i, n;
 
-	for(i = 0, n = get_irn_deps(src); i < n; ++i)
+	for (i = 0, n = get_irn_deps(src); i < n; ++i)
 		add_irn_dep(tgt, get_irn_dep(src, i));
 }
 
@@ -431,7 +431,7 @@ void
 	_set_irn_op(node, op);
 }
 
-ir_opcode
+unsigned
 (get_irn_opcode)(const ir_node *node) {
 	return _get_irn_opcode(node);
 }
@@ -439,9 +439,7 @@ ir_opcode
 const char *
 get_irn_opname(const ir_node *node) {
 	assert(node);
-	if ((get_irn_op((ir_node *)node) == op_Phi) &&
-		(get_irg_phase_state(get_irn_irg((ir_node *)node)) == phase_building) &&
-		(get_irn_arity((ir_node *)node) == 0)) return "Phi0";
+	if (is_Phi0(node)) return "Phi0";
 	return get_id_str(node->op->name);
 }
 
@@ -525,10 +523,22 @@ void firm_set_irn_section(ir_node *n, struct section *s) {
 }
 #else
 /* Dummies needed for firmjni. */
-struct abstval *get_irn_abst_value(ir_node *n) { return NULL; }
-void set_irn_abst_value(ir_node *n, struct abstval *os) {}
-struct section *firm_get_irn_section(ir_node *n) { return NULL; }
-void firm_set_irn_section(ir_node *n, struct section *s) {}
+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 */
 
 
@@ -542,10 +552,10 @@ long get_irn_node_nr(const ir_node *node) {
 #endif
 }
 
-const_attr
+const_attr *
 get_irn_const_attr(ir_node *node) {
 	assert(node->op == op_Const);
-	return node->attr.con;
+	return &node->attr.con;
 }
 
 long
@@ -554,22 +564,22 @@ get_irn_proj_attr(ir_node *node) {
 	return node->attr.proj;
 }
 
-alloc_attr
+alloc_attr *
 get_irn_alloc_attr(ir_node *node) {
 	assert(node->op == op_Alloc);
-	return node->attr.alloc;
+	return &node->attr.alloc;
 }
 
-free_attr
+free_attr *
 get_irn_free_attr(ir_node *node) {
 	assert(node->op == op_Free);
-	return node->attr.free;
+	return &node->attr.free;
 }
 
-symconst_attr
+symconst_attr *
 get_irn_symconst_attr(ir_node *node) {
 	assert(node->op == op_SymConst);
-	return node->attr.symc;
+	return &node->attr.symc;
 }
 
 ir_type *
@@ -578,48 +588,51 @@ get_irn_call_attr(ir_node *node) {
 	return node->attr.call.cld_tp = skip_tid(node->attr.call.cld_tp);
 }
 
-sel_attr
+sel_attr *
 get_irn_sel_attr(ir_node *node) {
 	assert(node->op == op_Sel);
-	return node->attr.sel;
+	return &node->attr.sel;
 }
 
 int
-get_irn_phi_attr(ir_node *node) {
-	assert(node->op == op_Phi);
-	return node->attr.phi0_pos;
+get_irn_phi0_attr(ir_node *node) {
+	assert(is_Phi0(node));
+	return node->attr.phi0.pos;
 }
 
-block_attr
+block_attr *
 get_irn_block_attr(ir_node *node) {
 	assert(node->op == op_Block);
-	return node->attr.block;
+	return &node->attr.block;
 }
 
-load_attr
-get_irn_load_attr(ir_node *node)
-{
-  assert(node->op == op_Load);
-  return node->attr.load;
+load_attr *
+get_irn_load_attr(ir_node *node) {
+	assert(node->op == op_Load);
+	return &node->attr.load;
 }
 
-store_attr
-get_irn_store_attr(ir_node *node)
-{
-  assert(node->op == op_Store);
-  return node->attr.store;
+store_attr *
+get_irn_store_attr(ir_node *node) {
+	assert(node->op == op_Store);
+	return &node->attr.store;
 }
 
-except_attr
+except_attr *
 get_irn_except_attr(ir_node *node) {
 	assert(node->op == op_Div || node->op == op_Quot ||
 	       node->op == op_DivMod || node->op == op_Mod || node->op == op_Call || node->op == op_Alloc);
-	return node->attr.except;
+	return &node->attr.except;
 }
 
-void *
-get_irn_generic_attr(ir_node *node) {
-	return &node->attr;
+void *(get_irn_generic_attr)(ir_node *node) {
+	assert(is_ir_node(node));
+	return _get_irn_generic_attr(node);
+}
+
+const void *(get_irn_generic_attr_const)(const ir_node *node) {
+	assert(is_ir_node(node));
+	return _get_irn_generic_attr_const(node);
 }
 
 unsigned (get_irn_idx)(const ir_node *node) {
@@ -642,7 +655,6 @@ int get_irn_pred_pos(ir_node *node, ir_node *arg) {
 ir_node *
 get_nodes_block(const ir_node *node) {
 	assert(node->op != op_Block);
-	assert(is_irn_pinned_in_irg(node) && "block info may be incorrect");
 	return get_irn_n(node, -1);
 }
 
@@ -652,6 +664,13 @@ set_nodes_block(ir_node *node, ir_node *block) {
 	set_irn_n(node, -1, block);
 }
 
+/* this works for all except Block */
+ir_node *
+get_nodes_MacroBlock(const ir_node *node) {
+	assert(node->op != op_Block);
+	return get_Block_MacroBlock(get_irn_n(node, -1));
+}
+
 /* Test whether arbitrary node is frame pointer, i.e. Proj(pn_Start_P_frame_base)
  * from Start.  If so returns frame type, else Null. */
 ir_type *is_frame_pointer(ir_node *n) {
@@ -714,7 +733,7 @@ int
 }
 
 ir_node *
-(get_Block_cfgpred)(ir_node *node, int pos) {
+(get_Block_cfgpred)(const ir_node *node, int pos) {
 	return _get_Block_cfgpred(node, pos);
 }
 
@@ -725,20 +744,20 @@ set_Block_cfgpred(ir_node *node, int pos, ir_node *pred) {
 }
 
 ir_node  *
-(get_Block_cfgpred_block)(ir_node *node, int pos) {
+(get_Block_cfgpred_block)(const ir_node *node, int pos) {
 	return _get_Block_cfgpred_block(node, pos);
 }
 
 int
-get_Block_matured(ir_node *node) {
+get_Block_matured(const ir_node *node) {
 	assert(node->op == op_Block);
-	return (int)node->attr.block.matured;
+	return (int)node->attr.block.is_matured;
 }
 
 void
 set_Block_matured(ir_node *node, int matured) {
 	assert(node->op == op_Block);
-	node->attr.block.matured = matured;
+	node->attr.block.is_matured = matured;
 }
 
 unsigned long
@@ -779,7 +798,8 @@ set_Block_graph_arr (ir_node *node, int pos, ir_node *value) {
 	node->attr.block.graph_arr[pos+1] = value;
 }
 
-void set_Block_cg_cfgpred_arr(ir_node * node, int arity, ir_node ** in) {
+#ifdef INTERPROCEDURAL_VIEW
+void set_Block_cg_cfgpred_arr(ir_node *node, int arity, ir_node *in[]) {
 	assert(node->op == op_Block);
 	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);
@@ -797,32 +817,33 @@ void set_Block_cg_cfgpred_arr(ir_node * node, int arity, ir_node ** in) {
 	memcpy(node->attr.block.in_cg + 1, in, sizeof(ir_node *) * arity);
 }
 
-void set_Block_cg_cfgpred(ir_node * node, int pos, ir_node * pred) {
+void set_Block_cg_cfgpred(ir_node *node, int pos, ir_node *pred) {
 	assert(node->op == op_Block &&
 	       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) {
+ir_node **get_Block_cg_cfgpred_arr(ir_node *node) {
 	assert(node->op == op_Block);
 	return node->attr.block.in_cg == NULL ? NULL : node->attr.block.in_cg  + 1;
 }
 
-int get_Block_cg_n_cfgpreds(ir_node * node) {
+int get_Block_cg_n_cfgpreds(ir_node *node) {
 	assert(node->op == op_Block);
 	return node->attr.block.in_cg == NULL ? 0 : ARR_LEN(node->attr.block.in_cg) - 1;
 }
 
-ir_node *get_Block_cg_cfgpred(ir_node * node, int pos) {
+ir_node *get_Block_cg_cfgpred(ir_node *node, int pos) {
 	assert(node->op == op_Block && node->attr.block.in_cg);
 	return node->attr.block.in_cg[pos + 1];
 }
 
-void remove_Block_cg_cfgpred_arr(ir_node * node) {
+void remove_Block_cg_cfgpred_arr(ir_node *node) {
 	assert(node->op == op_Block);
 	node->attr.block.in_cg = NULL;
 }
+#endif
 
 ir_node *(set_Block_dead)(ir_node *block) {
 	return _set_Block_dead(block);
@@ -846,6 +867,39 @@ void set_Block_extbb(ir_node *block, ir_extblk *extblk) {
 	block->attr.block.extblk = extblk;
 }
 
+/* returns the macro block header of a block. */
+ir_node *get_Block_MacroBlock(const ir_node *block) {
+	ir_node *mbh;
+	assert(is_Block(block));
+	mbh = get_irn_n(block, -1);
+	/* once macro block header is respected by all optimizations,
+	   this assert can be removed */
+	assert(mbh != NULL);
+	return mbh;
+}
+
+/* returns the graph of a Block. */
+ir_graph *get_Block_irg(const ir_node *block) {
+	assert(is_Block(block));
+	return block->attr.block.irg;
+}
+
+int has_Block_label(const ir_node *block) {
+	assert(is_Block(block));
+	return block->attr.block.has_label;
+}
+
+ir_label_t get_Block_label(const ir_node *block) {
+	assert(is_Block(block));
+	return block->attr.block.label;
+}
+
+void set_Block_label(ir_node *block, ir_label_t label) {
+	assert(is_Block(block));
+	block->attr.block.has_label = 1;
+	block->attr.block.label = label;
+}
+
 int
 get_End_n_keepalives(ir_node *end) {
 	assert(end->op == op_End);
@@ -859,8 +913,9 @@ get_End_keepalive(ir_node *end, int pos) {
 }
 
 void
-add_End_keepalive (ir_node *end, ir_node *ka) {
+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!");
 	add_irn_n(end, ka);
 }
 
@@ -1036,7 +1091,7 @@ set_Return_res(ir_node *node, int pos, ir_node *res){
 	set_irn_n(node, pos + RETURN_RESULT_OFFSET, res);
 }
 
-tarval *(get_Const_tarval)(ir_node *node) {
+tarval *(get_Const_tarval)(const ir_node *node) {
 	return _get_Const_tarval(node);
 }
 
@@ -1046,8 +1101,16 @@ set_Const_tarval(ir_node *node, tarval *con) {
 	node->attr.con.tv = con;
 }
 
-cnst_classify_t (classify_Const)(ir_node *node) {
-	return _classify_Const(node);
+int (is_Const_null)(const ir_node *node) {
+	return _is_Const_null(node);
+}
+
+int (is_Const_one)(const ir_node *node) {
+	return _is_Const_one(node);
+}
+
+int (is_Const_all_one)(const ir_node *node) {
+	return _is_Const_all_one(node);
 }
 
 
@@ -1057,6 +1120,7 @@ cnst_classify_t (classify_Const)(ir_node *node) {
 ir_type *
 get_Const_type(ir_node *node) {
 	assert(node->op == op_Const);
+	node->attr.con.tp = skip_tid(node->attr.con.tp);
 	return node->attr.con.tp;
 }
 
@@ -1143,6 +1207,16 @@ set_SymConst_symbol(ir_node *node, union symconst_symbol sym) {
 	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);
@@ -1352,7 +1426,7 @@ void  set_CallBegin_call(ir_node *node, ir_node *call) {
 
 
 #define BINOP(OP)                                      \
-ir_node * get_##OP##_left(ir_node *node) {             \
+ir_node * get_##OP##_left(const ir_node *node) {       \
   assert(node->op == op_##OP);                         \
   return get_irn_n(node, node->op->op_index);          \
 }                                                      \
@@ -1360,7 +1434,7 @@ void set_##OP##_left(ir_node *node, ir_node *left) {   \
   assert(node->op == op_##OP);                         \
   set_irn_n(node, node->op->op_index, left);           \
 }                                                      \
-ir_node *get_##OP##_right(ir_node *node) {             \
+ir_node *get_##OP##_right(const ir_node *node) {       \
   assert(node->op == op_##OP);                         \
   return get_irn_n(node, node->op->op_index + 1);      \
 }                                                      \
@@ -1370,7 +1444,7 @@ void set_##OP##_right(ir_node *node, ir_node *right) { \
 }
 
 #define UNOP(OP)                                  \
-ir_node *get_##OP##_op(ir_node *node) {           \
+ir_node *get_##OP##_op(const ir_node *node) {     \
   assert(node->op == op_##OP);                    \
   return get_irn_n(node, node->op->op_index);     \
 }                                                 \
@@ -1394,14 +1468,29 @@ set_##OP##_mem(ir_node *node, ir_node *mem) { \
   set_irn_n(node, 0, mem);                    \
 }
 
+#define DIVOP(OP)                                       \
+BINOP_MEM(OP)                                           \
+                                                        \
+ir_mode *get_##OP##_resmode(const ir_node *node) {      \
+  assert(node->op == op_##OP);                          \
+  return node->attr.divmod.res_mode;                    \
+}                                                       \
+                                                        \
+void set_##OP##_resmode(ir_node *node, ir_mode *mode) { \
+  assert(node->op == op_##OP);                          \
+  node->attr.divmod.res_mode = mode;                    \
+}
+
+
 BINOP(Add)
 BINOP(Sub)
 UNOP(Minus)
 BINOP(Mul)
-BINOP_MEM(Quot)
-BINOP_MEM(DivMod)
-BINOP_MEM(Div)
-BINOP_MEM(Mod)
+BINOP(Mulh)
+DIVOP(Quot)
+DIVOP(DivMod)
+DIVOP(Div)
+DIVOP(Mod)
 UNOP(Abs)
 BINOP(And)
 BINOP(Or)
@@ -1415,7 +1504,7 @@ BINOP(Cmp)
 UNOP(Conv)
 UNOP(Cast)
 
-int get_Conv_strict(ir_node *node) {
+int get_Conv_strict(const ir_node *node) {
 	assert(node->op == op_Conv);
 	return node->attr.conv.strict;
 }
@@ -1428,6 +1517,7 @@ void set_Conv_strict(ir_node *node, int 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;
 }
 
@@ -1445,9 +1535,8 @@ set_Cast_type(ir_node *node, ir_type *to_tp) {
 int is_Cast_upcast(ir_node *node) {
 	ir_type *totype   = get_Cast_type(node);
 	ir_type *fromtype = get_irn_typeinfo_type(get_Cast_op(node));
-	ir_graph *myirg = get_irn_irg(node);
 
-	assert(get_irg_typeinfo_state(myirg) == ir_typeinfo_consistent);
+	assert(get_irg_typeinfo_state(get_irn_irg(node)) == ir_typeinfo_consistent);
 	assert(fromtype);
 
 	while (is_Pointer_type(totype) && is_Pointer_type(fromtype)) {
@@ -1489,7 +1578,7 @@ int
 }
 
 ir_node *
-get_unop_op(ir_node *node) {
+get_unop_op(const ir_node *node) {
 	if (node->op->opar == oparity_unary)
 		return get_irn_n(node, node->op->op_index);
 
@@ -1511,7 +1600,7 @@ int
 }
 
 ir_node *
-get_binop_left(ir_node *node) {
+get_binop_left(const ir_node *node) {
 	assert(node->op->opar == oparity_binary);
 	return get_irn_n(node, node->op->op_index);
 }
@@ -1523,7 +1612,7 @@ set_binop_left(ir_node *node, ir_node *left) {
 }
 
 ir_node *
-get_binop_right(ir_node *node) {
+get_binop_right(const ir_node *node) {
 	assert(node->op->opar == oparity_binary);
 	return get_irn_n(node, node->op->op_index + 1);
 }
@@ -1534,19 +1623,9 @@ 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) {
-	ir_op *op;
-
-	assert(n);
-	op = get_irn_op(n);
-
-	if (op == op_Filter) return get_interprocedural_view();
-
-	if (op == op_Phi)
-		return ((get_irg_phase_state(get_irn_irg(n)) !=  phase_building) ||
-		        (get_irn_arity(n) > 0));
-
-	return 0;
+int
+(is_Phi)(const ir_node *n) {
+	return _is_Phi(n);
 }
 
 int is_Phi0(const ir_node *n) {
@@ -1564,7 +1643,7 @@ get_Phi_preds_arr(ir_node *node) {
 }
 
 int
-get_Phi_n_preds(ir_node *node) {
+get_Phi_n_preds(const ir_node *node) {
 	assert(is_Phi(node) || is_Phi0(node));
 	return (get_irn_arity(node));
 }
@@ -1576,7 +1655,7 @@ void set_Phi_n_preds(ir_node *node, int n_preds) {
 */
 
 ir_node *
-get_Phi_pred(ir_node *node, int pos) {
+get_Phi_pred(const ir_node *node, int pos) {
 	assert(is_Phi(node) || is_Phi0(node));
 	return get_irn_n(node, pos);
 }
@@ -1660,6 +1739,18 @@ set_Load_volatility(ir_node *node, ir_volatility volatility) {
 	node->attr.load.volatility = volatility;
 }
 
+ir_align
+get_Load_align(ir_node *node) {
+	assert(node->op == op_Load);
+	return node->attr.load.aligned;
+}
+
+void
+set_Load_align(ir_node *node, ir_align align) {
+	assert(node->op == op_Load);
+	node->attr.load.aligned = align;
+}
+
 
 ir_node *
 get_Store_mem(ir_node *node) {
@@ -1709,6 +1800,18 @@ set_Store_volatility(ir_node *node, ir_volatility volatility) {
 	node->attr.store.volatility = volatility;
 }
 
+ir_align
+get_Store_align(ir_node *node) {
+	assert(node->op == op_Store);
+	return node->attr.store.aligned;
+}
+
+void
+set_Store_align(ir_node *node, ir_align align) {
+	assert(node->op == op_Store);
+	node->attr.store.aligned = align;
+}
+
 
 ir_node *
 get_Alloc_mem(ir_node *node) {
@@ -1895,16 +1998,6 @@ set_Proj_pred(ir_node *node, ir_node *pred) {
 	set_irn_n(node, 0, pred);
 }
 
-long get_VProj_proj(const ir_node *node)
-{
-	return node->attr.proj;
-}
-
-void set_VProj_proj(ir_node *node, long value)
-{
-	node->attr.proj = value;
-}
-
 long
 get_Proj_proj(const ir_node *node) {
 	assert(is_Proj(node));
@@ -1985,17 +2078,16 @@ void set_Confirm_bound(ir_node *node, ir_node *bound) {
 	set_irn_n(node, 0, bound);
 }
 
-pn_Cmp get_Confirm_cmp(ir_node *node) {
+pn_Cmp get_Confirm_cmp(const ir_node *node) {
 	assert(node->op == op_Confirm);
-	return node->attr.confirm_cmp;
+	return node->attr.confirm.cmp;
 }
 
 void set_Confirm_cmp(ir_node *node, pn_Cmp cmp) {
 	assert(node->op == op_Confirm);
-	node->attr.confirm_cmp = cmp;
+	node->attr.confirm.cmp = cmp;
 }
 
-
 ir_node *
 get_Filter_pred(ir_node *node) {
 	assert(node->op == op_Filter);
@@ -2113,30 +2205,26 @@ void set_Mux_true(ir_node *node, ir_node *ir_true) {
 
 /* Psi support */
 ir_node *get_Psi_cond(ir_node *node, int pos) {
-	int num_conds = get_Psi_n_conds(node);
 	assert(node->op == op_Psi);
-	assert(pos < num_conds);
+	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) {
-	int num_conds = get_Psi_n_conds(node);
 	assert(node->op == op_Psi);
-	assert(pos < num_conds);
+	assert(pos < get_Psi_n_conds(node));
 	set_irn_n(node, 2 * pos, cond);
 }
 
 ir_node *get_Psi_val(ir_node *node, int pos) {
-	int num_vals = get_Psi_n_conds(node);
 	assert(node->op == op_Psi);
-	assert(pos < num_vals);
+	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) {
-	int num_vals = get_Psi_n_conds(node);
 	assert(node->op == op_Psi);
-	assert(pos < num_vals);
+	assert(pos < get_Psi_n_conds(node));
 	set_irn_n(node, 2 * pos + 1, val);
 }
 
@@ -2306,7 +2394,7 @@ void set_Bound_upper(ir_node *bound, ir_node *upper) {
 }
 
 /* Return the operand of a Pin node. */
-ir_node *get_Pin_op(ir_node *pin) {
+ir_node *get_Pin_op(const ir_node *pin) {
 	assert(pin->op == op_Pin);
 	return get_irn_n(pin, 0);
 }
@@ -2316,6 +2404,47 @@ void set_Pin_op(ir_node *pin, ir_node *node) {
 	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);
+	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);
+	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);
+	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);
+	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);
+	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);
+	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);
+	return node->attr.assem.clobber;
+}
 
 /* returns the graph of a node */
 ir_graph *
@@ -2478,6 +2607,11 @@ int
 	return _is_NoMem(node);
 }
 
+int
+(is_Minus)(const ir_node *node) {
+	return _is_Minus(node);
+}
+
 int
 (is_Mod)(const ir_node *node) {
 	return _is_Mod(node);
@@ -2503,11 +2637,61 @@ int
 	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_Start)(const ir_node *node) {
   return _is_Start(node);
@@ -2528,6 +2712,16 @@ int
 	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);
@@ -2639,8 +2833,14 @@ int
 	return _is_Raise(node);
 }
 
+/* returns true if a node is an ASM node. */
 int
-is_Proj(const ir_node *node) {
+(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);
@@ -2669,7 +2869,7 @@ is_fragile_op(const ir_node *node) {
 ir_node *get_fragile_op_mem(ir_node *node) {
 	assert(node && is_fragile_op(node));
 
-	switch (get_irn_opcode (node)) {
+	switch (get_irn_opcode(node)) {
 	case iro_Call  :
 	case iro_Quot  :
 	case iro_DivMod:
@@ -2679,7 +2879,8 @@ ir_node *get_fragile_op_mem(ir_node *node) {
 	case iro_Store :
 	case iro_Alloc :
 	case iro_Bound :
-		return get_irn_n(node, 0);
+	case iro_CopyB :
+		return get_irn_n(node, pn_Generic_M_regular);
 	case iro_Bad   :
 	case iro_Unknown:
 		return node;
@@ -2689,6 +2890,19 @@ ir_node *get_fragile_op_mem(ir_node *node) {
 	}
 }
 
+/* Returns the result mode of a Div operation. */
+ir_mode *get_divop_resmod(const ir_node *node) {
+	switch (get_irn_opcode(node)) {
+	case iro_Quot  : return get_Quot_resmode(node);
+	case iro_DivMod: return get_DivMod_resmode(node);
+	case iro_Div   : return get_Div_resmode(node);
+	case iro_Mod   : return get_Mod_resmode(node);
+	default: ;
+		assert(0 && "should not be reached");
+		return NULL;
+	}
+}
+
 /* Returns true if the operation is a forking control flow operation. */
 int (is_irn_forking)(const ir_node *node) {
 	return _is_irn_forking(node);
@@ -2759,7 +2973,7 @@ const char *get_cond_jmp_predicate_name(cond_jmp_predicate pred) {
 }
 
 /* Returns the conditional jump prediction of a Cond node. */
-cond_jmp_predicate (get_Cond_jmp_pred)(ir_node *cond) {
+cond_jmp_predicate (get_Cond_jmp_pred)(const ir_node *cond) {
 	return _get_Cond_jmp_pred(cond);
 }
 
@@ -2770,6 +2984,7 @@ void (set_Cond_jmp_pred)(ir_node *cond, cond_jmp_predicate pred) {
 
 /** the get_type operation must be always implemented and return a firm type */
 static ir_type *get_Default_type(ir_node *n) {
+	(void) n;
 	return get_unknown_type();
 }
 
@@ -2807,6 +3022,7 @@ static ir_entity *get_SymConst_attr_entity(ir_node *self) {
 
 /** the get_type_attr operation must be always implemented */
 static ir_type *get_Null_type(ir_node *n) {
+	(void) n;
 	return firm_unknown_type;
 }
 
@@ -2829,6 +3045,7 @@ ir_op_ops *firm_set_default_get_type_attr(ir_opcode code, ir_op_ops *ops) {
 
 /** the get_entity_attr operation must be always implemented */
 static ir_entity *get_Null_ent(ir_node *n) {
+	(void) n;
 	return NULL;
 }
 
@@ -2846,6 +3063,22 @@ ir_op_ops *firm_set_default_get_entity_attr(ir_opcode code, ir_op_ops *ops) {
 	return ops;
 }
 
+/* Sets the debug information of a node. */
+void (set_irn_dbg_info)(ir_node *n, dbg_info *db) {
+	_set_irn_dbg_info(n, db);
+}
+
+/**
+ * Returns the debug information of an node.
+ *
+ * @param n   The node.
+ */
+dbg_info *(get_irn_dbg_info)(const ir_node *n) {
+	return _get_irn_dbg_info(n);
+}
+
+
+
 #ifdef DEBUG_libfirm
 void dump_irn(ir_node *n) {
 	int i, arity = get_irn_arity(n);
@@ -2864,5 +3097,5 @@ void dump_irn(ir_node *n) {
 }
 
 #else  /* DEBUG_libfirm */
-void dump_irn(ir_node *n) {}
+void dump_irn(ir_node *n) { (void) n; }
 #endif /* DEBUG_libfirm */