X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=1c659e133daf3ec4e21126cf97316e353d27ee2d;hb=0a94cad2debcb79eee8a8148650bf50057bdcbb5;hp=37f320e4388e9b283e90730d5ec991230b21dfa4;hpb=6708a4bc2bbc035dcc84752a1e34c2edeef07c2d;p=libfirm

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index 37f320e43..1c659e133 100644
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -3,10 +3,10 @@
  * File name:   ir/ir/irnode.c
  * Purpose:     Representation of an intermediate operation.
  * Author:      Martin Trapp, Christian Schaefer
- * Modified by: Goetz Lindenmaier
+ * Modified by: Goetz Lindenmaier, Michael Beck
  * Created:
  * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2003 Universität Karlsruhe
+ * Copyright:   (c) 1998-2006 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 
@@ -27,6 +27,7 @@
 #include "irdump.h"
 #include "irop_t.h"
 #include "irprog_t.h"
+#include "iredgekinds.h"
 #include "iredges_t.h"
 
 #include "irhooks.h"
@@ -114,8 +115,8 @@ unsigned register_additional_node_data(unsigned size) {
 
 void
 init_irnode(void) {
-	/* Forbid the addition of new data to an ir node. */
-	forbid_new_data = 1;
+  /* Forbid the addition of new data to an ir node. */
+  forbid_new_data = 1;
 }
 
 /*
@@ -144,6 +145,8 @@ new_ir_node (dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mo
   res->visited  = 0;
   res->node_idx = irg_register_node_idx(irg, res);
   res->link     = NULL;
+  res->deps     = NULL;
+
   if (arity < 0) {
     res->in = NEW_ARR_F (ir_node *, 1);  /* 1: space for block */
   } else {
@@ -159,12 +162,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
 
-  INIT_LIST_HEAD(&res->edge_info.outs_head);
-  is_bl = is_Block(res);
-  if (is_bl)
-    INIT_LIST_HEAD(&res->attr.block.succ_head);
-
+  for(i = 0; i < EDGE_KIND_LAST; ++i)
+	  INIT_LIST_HEAD(&res->edge_info[i].outs_head);
 
+  is_bl = is_Block(res);
   for (i = is_bl; i <= arity; ++i)
     edges_notify_edge(res, i - 1, res->in[i], NULL, irg);
 
@@ -309,6 +310,69 @@ set_irn_n (ir_node *node, int n, ir_node *in) {
   node->in[n + 1] = in;
 }
 
+int
+(get_irn_deps)(const ir_node *node)
+{
+	return _get_irn_deps(node);
+}
+
+ir_node *
+(get_irn_dep)(const ir_node *node, int pos)
+{
+	return _get_irn_dep(node, pos);
+}
+
+void
+(set_irn_dep)(ir_node *node, int pos, ir_node *dep)
+{
+	_set_irn_dep(node, pos, dep);
+}
+
+int add_irn_dep(ir_node *node, ir_node *dep)
+{
+	int res = 0;
+
+	if (node->deps == NULL) {
+		node->deps = NEW_ARR_F(ir_node *, 1);
+		node->deps[0] = dep;
+	}
+	else {
+		int i, n;
+		int first_zero = -1;
+
+		for(i = 0, n = ARR_LEN(node->deps); i < n; ++i) {
+			if(node->deps[i] == NULL)
+				first_zero = i;
+
+			if(node->deps[i] == dep)
+				return i;
+		}
+
+		if(first_zero >= 0) {
+			node->deps[first_zero] = dep;
+			res = first_zero;
+		}
+
+		else {
+			ARR_APP1(ir_node *, node->deps, dep);
+			res = n;
+		}
+	}
+
+	edges_notify_edge_kind(node, res, dep, NULL, EDGE_KIND_DEP, get_irn_irg(node));
+
+	return res;
+}
+
+void add_irn_deps(ir_node *tgt, ir_node *src)
+{
+	int i, n;
+
+	for(i = 0, n = get_irn_deps(src); i < n; ++i)
+		add_irn_dep(tgt, get_irn_dep(src, i));
+}
+
+
 ir_mode *
 (get_irn_mode)(const ir_node *node) {
   return _get_irn_mode(node);
@@ -323,7 +387,7 @@ void
 modecode
 get_irn_modecode (const ir_node *node)
 {
-  assert (node);
+  assert(node);
   return node->mode->code;
 }
 
@@ -472,84 +536,84 @@ long get_irn_node_nr(const ir_node *node) {
 const_attr
 get_irn_const_attr (ir_node *node)
 {
-  assert (node->op == op_Const);
+  assert(node->op == op_Const);
   return node->attr.con;
 }
 
 long
 get_irn_proj_attr (ir_node *node)
 {
-  assert (node->op == op_Proj);
+  assert(node->op == op_Proj);
   return node->attr.proj;
 }
 
 alloc_attr
 get_irn_alloc_attr (ir_node *node)
 {
-  assert (node->op == op_Alloc);
-  return node->attr.a;
+  assert(node->op == op_Alloc);
+  return node->attr.alloc;
 }
 
 free_attr
 get_irn_free_attr     (ir_node *node)
 {
-  assert (node->op == op_Free);
-  return node->attr.f;
+  assert(node->op == op_Free);
+  return node->attr.free;
 }
 
 symconst_attr
 get_irn_symconst_attr (ir_node *node)
 {
-  assert (node->op == op_SymConst);
-  return node->attr.i;
+  assert(node->op == op_SymConst);
+  return node->attr.symc;
 }
 
 ir_type *
 get_irn_call_attr (ir_node *node)
 {
-  assert (node->op == op_Call);
+  assert(node->op == op_Call);
   return node->attr.call.cld_tp = skip_tid(node->attr.call.cld_tp);
 }
 
 sel_attr
 get_irn_sel_attr (ir_node *node)
 {
-  assert (node->op == op_Sel);
-  return node->attr.s;
+  assert(node->op == op_Sel);
+  return node->attr.sel;
 }
 
 int
 get_irn_phi_attr (ir_node *node)
 {
-  assert (node->op == op_Phi);
+  assert(node->op == op_Phi);
   return node->attr.phi0_pos;
 }
 
 block_attr
 get_irn_block_attr (ir_node *node)
 {
-  assert (node->op == op_Block);
+  assert(node->op == op_Block);
   return node->attr.block;
 }
 
 load_attr
 get_irn_load_attr (ir_node *node)
 {
-  assert (node->op == op_Load);
+  assert(node->op == op_Load);
   return node->attr.load;
 }
 
 store_attr
 get_irn_store_attr (ir_node *node)
 {
-  assert (node->op == op_Store);
+  assert(node->op == op_Store);
   return node->attr.store;
 }
 
 except_attr
 get_irn_except_attr (ir_node *node)
 {
-  assert (node->op == op_Div || node->op == op_Quot ||
+  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;
 }
@@ -578,22 +642,21 @@ int get_irn_pred_pos(ir_node *node, ir_node *arg) {
 /* this works for all except Block */
 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");
+  assert(!(node->op == op_Block));
+	assert(is_irn_pinned_in_irg(node) && "block info may be incorrect");
   return get_irn_n(node, -1);
 }
 
 void
 set_nodes_block (ir_node *node, ir_node *block) {
-  assert (!(node->op == op_Block));
+  assert(!(node->op == op_Block));
   set_irn_n(node, -1, block);
 }
 
 /* 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) {
-  if ((get_irn_op(n) == op_Proj) &&
-      (get_Proj_proj(n) == pn_Start_P_frame_base)) {
+  if (is_Proj(n) && (get_Proj_proj(n) == pn_Start_P_frame_base)) {
     ir_node *start = get_Proj_pred(n);
     if (get_irn_op(start) == op_Start) {
       return get_irg_frame_type(get_irn_irg(start));
@@ -605,8 +668,7 @@ ir_type *is_frame_pointer(ir_node *n) {
 /* Test whether arbitrary node is globals pointer, i.e. Proj(pn_Start_P_globals)
  * from Start.  If so returns global type, else Null. */
 ir_type *is_globals_pointer(ir_node *n) {
-  if ((get_irn_op(n) == op_Proj) &&
-      (get_Proj_proj(n) == pn_Start_P_globals)) {
+  if (is_Proj(n) && (get_Proj_proj(n) == pn_Start_P_globals)) {
     ir_node *start = get_Proj_pred(n);
     if (get_irn_op(start) == op_Start) {
       return get_glob_type();
@@ -615,6 +677,18 @@ ir_type *is_globals_pointer(ir_node *n) {
   return NULL;
 }
 
+/* Test whether arbitrary node is tls pointer, i.e. Proj(pn_Start_P_tls)
+ * from Start.  If so returns tls type, else Null. */
+ir_type *is_tls_pointer(ir_node *n) {
+  if (is_Proj(n) && (get_Proj_proj(n) == pn_Start_P_globals)) {
+      ir_node *start = get_Proj_pred(n);
+      if (get_irn_op(start) == op_Start) {
+        return get_tls_type();
+      }
+  }
+  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(ir_node *n) {
@@ -632,12 +706,12 @@ int is_value_arg_pointer(ir_node *n) {
 ir_node **
 get_Block_cfgpred_arr (ir_node *node)
 {
-  assert ((node->op == op_Block));
+  assert((node->op == op_Block));
   return (ir_node **)&(get_irn_in(node)[1]);
 }
 
 int
-(get_Block_n_cfgpreds)(ir_node *node) {
+(get_Block_n_cfgpreds)(const ir_node *node) {
   return _get_Block_n_cfgpreds(node);
 }
 
@@ -648,7 +722,7 @@ ir_node *
 
 void
 set_Block_cfgpred (ir_node *node, int pos, ir_node *pred) {
-  assert (node->op == op_Block);
+  assert(node->op == op_Block);
   set_irn_n(node, pos, pred);
 }
 
@@ -659,13 +733,13 @@ ir_node  *
 
 int
 get_Block_matured (ir_node *node) {
-  assert (node->op == op_Block);
+  assert(node->op == op_Block);
   return (int)node->attr.block.matured;
 }
 
 void
 set_Block_matured (ir_node *node, int matured) {
-  assert (node->op == op_Block);
+  assert(node->op == op_Block);
   node->attr.block.matured = matured;
 }
 
@@ -692,13 +766,13 @@ int
 
 ir_node *
 get_Block_graph_arr (ir_node *node, int pos) {
-  assert (node->op == op_Block);
+  assert(node->op == op_Block);
   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(node->op == op_Block);
   node->attr.block.graph_arr[pos+1] = value;
 }
 
@@ -771,25 +845,30 @@ void set_Block_extbb(ir_node *block, ir_extblk *extblk) {
 
 int
 get_End_n_keepalives(ir_node *end) {
-  assert (end->op == op_End);
+  assert(end->op == op_End);
   return (get_irn_arity(end) - END_KEEPALIVE_OFFSET);
 }
 
 ir_node *
 get_End_keepalive(ir_node *end, int pos) {
-  assert (end->op == op_End);
+  assert(end->op == op_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);
-  ARR_APP1 (ir_node *, end->in, ka);
+  int l;
+  ir_graph *irg = get_irn_irg(end);
+
+  assert(end->op == op_End);
+  l = ARR_LEN(end->in);
+  ARR_APP1(ir_node *, end->in, ka);
+  edges_notify_edge(end, l - 1, end->in[l], NULL, irg);
 }
 
 void
 set_End_keepalive(ir_node *end, int pos, ir_node *ka) {
-  assert (end->op == op_End);
+  assert(end->op == op_End);
   set_irn_n(end, pos + END_KEEPALIVE_OFFSET, ka);
 }
 
@@ -806,13 +885,32 @@ void set_End_keepalives(ir_node *end, int n, ir_node *in[]) {
 
   for (i = 0; i < n; ++i) {
     end->in[1 + END_KEEPALIVE_OFFSET + i] = in[i];
-    edges_notify_edge(end, 1 + END_KEEPALIVE_OFFSET + i, NULL, end->in[1 + END_KEEPALIVE_OFFSET + i], irg);
+    edges_notify_edge(end, END_KEEPALIVE_OFFSET + i, NULL, end->in[1 + END_KEEPALIVE_OFFSET + i], irg);
+  }
+}
+/* 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;
+
+  NEW_ARR_A(ir_node *, in, n);
+
+  for (idx = i = 0; i < n; ++i) {
+    ir_node *old_ka = get_End_keepalive(end, i);
+
+    /* skip irn */
+    if (old_ka != irn)
+      in[idx++] = old_ka;
   }
+
+  /* set new keep-alives */
+  set_End_keepalives(end, idx, in);
 }
 
 void
 free_End (ir_node *end) {
-  assert (end->op == op_End);
+  assert(end->op == op_End);
   end->kind = k_BAD;
   DEL_ARR_F(end->in);
   end->in = NULL;   /* @@@ make sure we get an error if we use the
@@ -864,56 +962,56 @@ dataflow analysis and 3) does not allow to convert the representation to
 */
 ir_node *
 get_Cond_selector (ir_node *node) {
-  assert (node->op == op_Cond);
+  assert(node->op == op_Cond);
   return get_irn_n(node, 0);
 }
 
 void
 set_Cond_selector (ir_node *node, ir_node *selector) {
-  assert (node->op == op_Cond);
+  assert(node->op == op_Cond);
   set_irn_n(node, 0, selector);
 }
 
 cond_kind
 get_Cond_kind (ir_node *node) {
-  assert (node->op == op_Cond);
-  return node->attr.c.kind;
+  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.c.kind = kind;
+  assert(node->op == op_Cond);
+  node->attr.cond.kind = kind;
 }
 
 long
 get_Cond_defaultProj (ir_node *node) {
-  assert (node->op == op_Cond);
-  return node->attr.c.default_proj;
+  assert(node->op == op_Cond);
+  return node->attr.cond.default_proj;
 }
 
 ir_node *
 get_Return_mem (ir_node *node) {
-  assert (node->op == op_Return);
+  assert(node->op == op_Return);
   return get_irn_n(node, 0);
 }
 
 void
 set_Return_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Return);
+  assert(node->op == op_Return);
   set_irn_n(node, 0, mem);
 }
 
 int
 get_Return_n_ress (ir_node *node) {
-  assert (node->op == op_Return);
+  assert(node->op == op_Return);
   return (get_irn_arity(node) - RETURN_RESULT_OFFSET);
 }
 
 ir_node **
 get_Return_res_arr (ir_node *node)
 {
-  assert ((node->op == op_Return));
+  assert((node->op == op_Return));
   if (get_Return_n_ress(node) > 0)
     return (ir_node **)&(get_irn_in(node)[1 + RETURN_RESULT_OFFSET]);
   else
@@ -923,20 +1021,20 @@ get_Return_res_arr (ir_node *node)
 /*
 void
 set_Return_n_res (ir_node *node, int results) {
-  assert (node->op == op_Return);
+  assert(node->op == op_Return);
 }
 */
 
 ir_node *
 get_Return_res (ir_node *node, int pos) {
-  assert (node->op == op_Return);
-  assert (get_Return_n_ress(node) > pos);
+  assert(node->op == op_Return);
+  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(node->op == op_Return);
   set_irn_n(node, pos + RETURN_RESULT_OFFSET, res);
 }
 
@@ -946,7 +1044,7 @@ tarval *(get_Const_tarval)(ir_node *node) {
 
 void
 set_Const_tarval (ir_node *node, tarval *con) {
-  assert (node->op == op_Const);
+  assert(node->op == op_Const);
   node->attr.con.tv = con;
 }
 
@@ -961,16 +1059,16 @@ cnst_classify_t (classify_Const)(ir_node *node)
    entity type. */
 ir_type *
 get_Const_type (ir_node *node) {
-  assert (node->op == op_Const);
+  assert(node->op == op_Const);
   return node->attr.con.tp;
 }
 
 void
 set_Const_type (ir_node *node, ir_type *tp) {
-  assert (node->op == op_Const);
+  assert(node->op == op_Const);
   if (tp != firm_unknown_type) {
-    assert (is_atomic_type(tp));
-    assert (get_type_mode(tp) == get_irn_mode(node));
+    assert(is_atomic_type(tp));
+    assert(get_type_mode(tp) == get_irn_mode(node));
   }
   node->attr.con.tp = tp;
 }
@@ -978,120 +1076,123 @@ 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.i.num;
+  assert(node->op == op_SymConst);
+  return node->attr.symc.num;
 }
 
 void
 set_SymConst_kind (ir_node *node, symconst_kind num) {
-  assert (node->op == op_SymConst);
-  node->attr.i.num = num;
+  assert(node->op == op_SymConst);
+  node->attr.symc.num = num;
 }
 
 ir_type *
 get_SymConst_type (ir_node *node) {
-  assert (   (node->op == op_SymConst)
-          && (   get_SymConst_kind(node) == symconst_type_tag
-              || get_SymConst_kind(node) == symconst_size));
-  return node->attr.i.sym.type_p = skip_tid(node->attr.i.sym.type_p);
+  assert(   (node->op == op_SymConst)
+         && (SYMCONST_HAS_TYPE(get_SymConst_kind(node))));
+  return node->attr.symc.sym.type_p = skip_tid(node->attr.symc.sym.type_p);
 }
 
 void
 set_SymConst_type (ir_node *node, ir_type *tp) {
-  assert (   (node->op == op_SymConst)
-          && (   get_SymConst_kind(node) == symconst_type_tag
-              || get_SymConst_kind(node) == symconst_size));
-  node->attr.i.sym.type_p = tp;
+  assert(   (node->op == op_SymConst)
+         && (SYMCONST_HAS_TYPE(get_SymConst_kind(node))));
+  node->attr.symc.sym.type_p = tp;
 }
 
 ident *
 get_SymConst_name (ir_node *node) {
-  assert (   (node->op == op_SymConst)
-          && (get_SymConst_kind(node) == symconst_addr_name));
-  return node->attr.i.sym.ident_p;
+  assert(node->op == op_SymConst && 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)
-          && (get_SymConst_kind(node) == symconst_addr_name));
-  node->attr.i.sym.ident_p = name;
+  assert(node->op == op_SymConst && 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: */
-entity   *get_SymConst_entity (ir_node *node) {
-  assert (   (node->op == op_SymConst)
-          && (get_SymConst_kind (node) == symconst_addr_ent));
-  return node->attr.i.sym.entity_p;
+ir_entity *get_SymConst_entity (ir_node *node) {
+  assert(node->op == op_SymConst && 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)));
+  node->attr.symc.sym.entity_p  = ent;
+}
+
+ir_enum_const *get_SymConst_enum (ir_node *node) {
+  assert(node->op == op_SymConst && SYMCONST_HAS_ENUM(get_SymConst_kind(node)));
+  return node->attr.symc.sym.enum_p;
 }
 
-void     set_SymConst_entity (ir_node *node, entity *ent) {
-  assert (   (node->op == op_SymConst)
-          && (get_SymConst_kind(node) == symconst_addr_ent));
-  node->attr.i.sym.entity_p  = ent;
+void           set_SymConst_enum (ir_node *node, ir_enum_const *ec) {
+  assert(node->op == op_SymConst && SYMCONST_HAS_ENUM(get_SymConst_kind(node)));
+  node->attr.symc.sym.enum_p  = ec;
 }
 
 union symconst_symbol
 get_SymConst_symbol (ir_node *node) {
-  assert (node->op == op_SymConst);
-  return node->attr.i.sym;
+  assert(node->op == op_SymConst);
+  return node->attr.symc.sym;
 }
 
 void
 set_SymConst_symbol (ir_node *node, union symconst_symbol sym) {
-  assert (node->op == op_SymConst);
-  //memcpy (&(node->attr.i.sym), sym, sizeof(type_or_id));
-  node->attr.i.sym = sym;
+  assert(node->op == op_SymConst);
+  node->attr.symc.sym = sym;
 }
 
 ir_type *
 get_SymConst_value_type (ir_node *node) {
-  assert (node->op == op_SymConst);
-  if (node->attr.i.tp) node->attr.i.tp = skip_tid(node->attr.i.tp);
-  return node->attr.i.tp;
+  assert(node->op == op_SymConst);
+  if (node->attr.symc.tp) node->attr.symc.tp = skip_tid(node->attr.symc.tp);
+  return node->attr.symc.tp;
 }
 
 void
 set_SymConst_value_type (ir_node *node, ir_type *tp) {
-  assert (node->op == op_SymConst);
-  node->attr.i.tp = tp;
+  assert(node->op == op_SymConst);
+  node->attr.symc.tp = tp;
 }
 
 ir_node *
 get_Sel_mem (ir_node *node) {
-  assert (node->op == op_Sel);
+  assert(node->op == op_Sel);
   return get_irn_n(node, 0);
 }
 
 void
 set_Sel_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Sel);
+  assert(node->op == op_Sel);
   set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Sel_ptr (ir_node *node) {
-  assert (node->op == op_Sel);
+  assert(node->op == op_Sel);
   return get_irn_n(node, 1);
 }
 
 void
 set_Sel_ptr (ir_node *node, ir_node *ptr) {
-  assert (node->op == op_Sel);
+  assert(node->op == op_Sel);
   set_irn_n(node, 1, ptr);
 }
 
 int
 get_Sel_n_indexs (ir_node *node) {
-  assert (node->op == op_Sel);
+  assert(node->op == op_Sel);
   return (get_irn_arity(node) - SEL_INDEX_OFFSET);
 }
 
 ir_node **
 get_Sel_index_arr (ir_node *node)
 {
-  assert ((node->op == op_Sel));
+  assert((node->op == op_Sel));
   if (get_Sel_n_indexs(node) > 0)
     return (ir_node **)& get_irn_in(node)[SEL_INDEX_OFFSET + 1];
   else
@@ -1100,26 +1201,26 @@ get_Sel_index_arr (ir_node *node)
 
 ir_node *
 get_Sel_index (ir_node *node, int pos) {
-  assert (node->op == op_Sel);
+  assert(node->op == op_Sel);
   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(node->op == op_Sel);
   set_irn_n(node, pos + SEL_INDEX_OFFSET, index);
 }
 
-entity *
+ir_entity *
 get_Sel_entity (ir_node *node) {
-  assert (node->op == op_Sel);
-  return node->attr.s.ent;
+  assert(node->op == op_Sel);
+  return node->attr.sel.ent;
 }
 
 void
-set_Sel_entity (ir_node *node, entity *ent) {
-  assert (node->op == op_Sel);
-  node->attr.s.ent = ent;
+set_Sel_entity (ir_node *node, ir_entity *ent) {
+  assert(node->op == op_Sel);
+  node->attr.sel.ent = ent;
 }
 
 
@@ -1133,74 +1234,74 @@ set_Sel_entity (ir_node *node, entity *ent) {
 
 ir_node *
 get_Call_mem (ir_node *node) {
-  assert (node->op == op_Call);
+  assert(node->op == op_Call);
   return get_irn_n(node, 0);
 }
 
 void
 set_Call_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Call);
+  assert(node->op == op_Call);
   set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Call_ptr (ir_node *node) {
-  assert (node->op == op_Call);
+  assert(node->op == op_Call);
   return get_irn_n(node, 1);
 }
 
 void
 set_Call_ptr (ir_node *node, ir_node *ptr) {
-  assert (node->op == op_Call);
+  assert(node->op == op_Call);
   set_irn_n(node, 1, ptr);
 }
 
 ir_node **
 get_Call_param_arr (ir_node *node) {
-  assert (node->op == op_Call);
+  assert(node->op == op_Call);
   return (ir_node **)&get_irn_in(node)[CALL_PARAM_OFFSET + 1];
 }
 
 int
 get_Call_n_params (ir_node *node)  {
-  assert (node->op == op_Call);
+  assert(node->op == op_Call);
   return (get_irn_arity(node) - CALL_PARAM_OFFSET);
 }
 
 int
 get_Call_arity (ir_node *node) {
-  assert (node->op == op_Call);
+  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);
+  assert(node->op == op_Call);
 }
 */
 
 ir_node *
 get_Call_param (ir_node *node, int pos) {
-  assert (node->op == op_Call);
+  assert(node->op == op_Call);
   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(node->op == op_Call);
   set_irn_n(node, pos + CALL_PARAM_OFFSET, param);
 }
 
 ir_type *
 get_Call_type (ir_node *node) {
-  assert (node->op == op_Call);
+  assert(node->op == op_Call);
   return node->attr.call.cld_tp = skip_tid(node->attr.call.cld_tp);
 }
 
 void
 set_Call_type (ir_node *node, ir_type *tp) {
-  assert (node->op == op_Call);
-  assert ((get_unknown_type() == tp) || is_Method_type(tp));
+  assert(node->op == op_Call);
+  assert((get_unknown_type() == tp) || is_Method_type(tp));
   node->attr.call.cld_tp = tp;
 }
 
@@ -1215,17 +1316,17 @@ int get_Call_n_callees(ir_node * node) {
   return ARR_LEN(node->attr.call.callee_arr);
 }
 
-entity * get_Call_callee(ir_node * node, int pos) {
+ir_entity * get_Call_callee(ir_node * node, int pos) {
   assert(pos >= 0 && pos < get_Call_n_callees(node));
   return node->attr.call.callee_arr[pos];
 }
 
-void set_Call_callee_arr(ir_node * node, const int n, entity ** arr) {
+void set_Call_callee_arr(ir_node * node, const int n, ir_entity ** arr) {
   assert(node->op == op_Call);
   if (node->attr.call.callee_arr == NULL || get_Call_n_callees(node) != n) {
-    node->attr.call.callee_arr = NEW_ARR_D(entity *, current_ir_graph->obst, n);
+    node->attr.call.callee_arr = NEW_ARR_D(ir_entity *, current_ir_graph->obst, n);
   }
-  memcpy(node->attr.call.callee_arr, arr, n * sizeof(entity *));
+  memcpy(node->attr.call.callee_arr, arr, n * sizeof(ir_entity *));
 }
 
 void remove_Call_callee_arr(ir_node * node) {
@@ -1287,13 +1388,13 @@ BINOP(Quot)
 
 ir_node *
 get_Quot_mem (ir_node *node) {
-  assert (node->op == op_Quot);
+  assert(node->op == op_Quot);
   return get_irn_n(node, 0);
 }
 
 void
 set_Quot_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Quot);
+  assert(node->op == op_Quot);
   set_irn_n(node, 0, mem);
 }
 
@@ -1301,13 +1402,13 @@ BINOP(DivMod)
 
 ir_node *
 get_DivMod_mem (ir_node *node) {
-  assert (node->op == op_DivMod);
+  assert(node->op == op_DivMod);
   return get_irn_n(node, 0);
 }
 
 void
 set_DivMod_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_DivMod);
+  assert(node->op == op_DivMod);
   set_irn_n(node, 0, mem);
 }
 
@@ -1315,13 +1416,13 @@ BINOP(Div)
 
 ir_node *
 get_Div_mem (ir_node *node) {
-  assert (node->op == op_Div);
+  assert(node->op == op_Div);
   return get_irn_n(node, 0);
 }
 
 void
 set_Div_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Div);
+  assert(node->op == op_Div);
   set_irn_n(node, 0, mem);
 }
 
@@ -1329,13 +1430,13 @@ BINOP(Mod)
 
 ir_node *
 get_Mod_mem (ir_node *node) {
-  assert (node->op == op_Mod);
+  assert(node->op == op_Mod);
   return get_irn_n(node, 0);
 }
 
 void
 set_Mod_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Mod);
+  assert(node->op == op_Mod);
   set_irn_n(node, 0, mem);
 }
 
@@ -1352,15 +1453,25 @@ BINOP(Cmp)
 UNOP(Conv)
 UNOP(Cast)
 
+int get_Conv_strict(ir_node *node) {
+  assert(node->op == op_Conv);
+  return node->attr.conv.strict;
+}
+
+void set_Conv_strict(ir_node *node, int strict_flag) {
+  assert(node->op == op_Conv);
+  node->attr.conv.strict = (char)strict_flag;
+}
+
 ir_type *
 get_Cast_type (ir_node *node) {
-  assert (node->op == op_Cast);
+  assert(node->op == op_Cast);
   return node->attr.cast.totype;
 }
 
 void
 set_Cast_type (ir_node *node, ir_type *to_tp) {
-  assert (node->op == op_Cast);
+  assert(node->op == op_Cast);
   node->attr.cast.totype = to_tp;
 }
 
@@ -1451,7 +1562,7 @@ set_binop_left (ir_node *node, ir_node *left) {
   if (node->op->opar == oparity_binary)
     set_irn_n(node, node->op->op_index, left);
 
-  assert (node->op->opar == oparity_binary);
+  assert(node->op->opar == oparity_binary);
 }
 
 ir_node *
@@ -1468,7 +1579,7 @@ set_binop_right (ir_node *node, ir_node *right) {
   if (node->op->opar == oparity_binary)
     set_irn_n(node, node->op->op_index + 1, right);
 
-  assert (node->op->opar == oparity_binary);
+  assert(node->op->opar == oparity_binary);
 }
 
 int is_Phi (const ir_node *n) {
@@ -1496,31 +1607,31 @@ int is_Phi0 (const ir_node *n) {
 
 ir_node **
 get_Phi_preds_arr (ir_node *node) {
-  assert (node->op == op_Phi);
+  assert(node->op == op_Phi);
   return (ir_node **)&(get_irn_in(node)[1]);
 }
 
 int
 get_Phi_n_preds (ir_node *node) {
-  assert (is_Phi(node) || is_Phi0(node));
+  assert(is_Phi(node) || is_Phi0(node));
   return (get_irn_arity(node));
 }
 
 /*
 void set_Phi_n_preds (ir_node *node, int n_preds) {
-  assert (node->op == op_Phi);
+  assert(node->op == op_Phi);
 }
 */
 
 ir_node *
 get_Phi_pred (ir_node *node, int pos) {
-  assert (is_Phi(node) || is_Phi0(node));
+  assert(is_Phi(node) || is_Phi0(node));
   return get_irn_n(node, pos);
 }
 
 void
 set_Phi_pred (ir_node *node, int pos, ir_node *pred) {
-  assert (is_Phi(node) || is_Phi0(node));
+  assert(is_Phi(node) || is_Phi0(node));
   set_irn_n(node, pos, pred);
 }
 
@@ -1551,245 +1662,252 @@ void     set_memop_ptr (ir_node *node, ir_node *ptr) {
 
 ir_node *
 get_Load_mem (ir_node *node) {
-  assert (node->op == op_Load);
+  assert(node->op == op_Load);
   return get_irn_n(node, 0);
 }
 
 void
 set_Load_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Load);
+  assert(node->op == op_Load);
   set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Load_ptr (ir_node *node) {
-  assert (node->op == op_Load);
+  assert(node->op == op_Load);
   return get_irn_n(node, 1);
 }
 
 void
 set_Load_ptr (ir_node *node, ir_node *ptr) {
-  assert (node->op == op_Load);
+  assert(node->op == op_Load);
   set_irn_n(node, 1, ptr);
 }
 
 ir_mode *
 get_Load_mode (ir_node *node) {
-  assert (node->op == op_Load);
+  assert(node->op == op_Load);
   return node->attr.load.load_mode;
 }
 
 void
 set_Load_mode (ir_node *node, ir_mode *mode) {
-  assert (node->op == op_Load);
+  assert(node->op == op_Load);
   node->attr.load.load_mode = mode;
 }
 
-ent_volatility
+ir_volatility
 get_Load_volatility (ir_node *node) {
-  assert (node->op == op_Load);
+  assert(node->op == op_Load);
   return node->attr.load.volatility;
 }
 
 void
-set_Load_volatility (ir_node *node, ent_volatility volatility) {
-  assert (node->op == op_Load);
+set_Load_volatility (ir_node *node, ir_volatility volatility) {
+  assert(node->op == op_Load);
   node->attr.load.volatility = volatility;
 }
 
 
 ir_node *
 get_Store_mem (ir_node *node) {
-  assert (node->op == op_Store);
+  assert(node->op == op_Store);
   return get_irn_n(node, 0);
 }
 
 void
 set_Store_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Store);
+  assert(node->op == op_Store);
   set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Store_ptr (ir_node *node) {
-  assert (node->op == op_Store);
+  assert(node->op == op_Store);
   return get_irn_n(node, 1);
 }
 
 void
 set_Store_ptr (ir_node *node, ir_node *ptr) {
-  assert (node->op == op_Store);
+  assert(node->op == op_Store);
   set_irn_n(node, 1, ptr);
 }
 
 ir_node *
 get_Store_value (ir_node *node) {
-  assert (node->op == op_Store);
+  assert(node->op == op_Store);
   return get_irn_n(node, 2);
 }
 
 void
 set_Store_value (ir_node *node, ir_node *value) {
-  assert (node->op == op_Store);
+  assert(node->op == op_Store);
   set_irn_n(node, 2, value);
 }
 
-ent_volatility
+ir_volatility
 get_Store_volatility (ir_node *node) {
-  assert (node->op == op_Store);
+  assert(node->op == op_Store);
   return node->attr.store.volatility;
 }
 
 void
-set_Store_volatility (ir_node *node, ent_volatility volatility) {
-  assert (node->op == op_Store);
+set_Store_volatility (ir_node *node, ir_volatility volatility) {
+  assert(node->op == op_Store);
   node->attr.store.volatility = volatility;
 }
 
 
 ir_node *
 get_Alloc_mem (ir_node *node) {
-  assert (node->op == op_Alloc);
+  assert(node->op == op_Alloc);
   return get_irn_n(node, 0);
 }
 
 void
 set_Alloc_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Alloc);
+  assert(node->op == op_Alloc);
   set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Alloc_size (ir_node *node) {
-  assert (node->op == op_Alloc);
+  assert(node->op == op_Alloc);
   return get_irn_n(node, 1);
 }
 
 void
 set_Alloc_size (ir_node *node, ir_node *size) {
-  assert (node->op == op_Alloc);
+  assert(node->op == op_Alloc);
   set_irn_n(node, 1, size);
 }
 
 ir_type  *
 get_Alloc_type (ir_node *node) {
-  assert (node->op == op_Alloc);
-  return node->attr.a.type = skip_tid(node->attr.a.type);
+  assert(node->op == op_Alloc);
+  return node->attr.alloc.type = skip_tid(node->attr.alloc.type);
 }
 
 void
 set_Alloc_type (ir_node *node, ir_type *tp) {
-  assert (node->op == op_Alloc);
-  node->attr.a.type = tp;
+  assert(node->op == op_Alloc);
+  node->attr.alloc.type = tp;
 }
 
 where_alloc
 get_Alloc_where (ir_node *node) {
-  assert (node->op == op_Alloc);
-  return node->attr.a.where;
+  assert(node->op == op_Alloc);
+  return node->attr.alloc.where;
 }
 
 void
 set_Alloc_where (ir_node *node, where_alloc where) {
-  assert (node->op == op_Alloc);
-  node->attr.a.where = where;
+  assert(node->op == op_Alloc);
+  node->attr.alloc.where = where;
 }
 
 
 ir_node *
 get_Free_mem (ir_node *node) {
-  assert (node->op == op_Free);
+  assert(node->op == op_Free);
   return get_irn_n(node, 0);
 }
 
 void
 set_Free_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Free);
+  assert(node->op == op_Free);
   set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Free_ptr (ir_node *node) {
-  assert (node->op == op_Free);
+  assert(node->op == op_Free);
   return get_irn_n(node, 1);
 }
 
 void
 set_Free_ptr (ir_node *node, ir_node *ptr) {
-  assert (node->op == op_Free);
+  assert(node->op == op_Free);
   set_irn_n(node, 1, ptr);
 }
 
 ir_node *
 get_Free_size (ir_node *node) {
-  assert (node->op == op_Free);
+  assert(node->op == op_Free);
   return get_irn_n(node, 2);
 }
 
 void
 set_Free_size (ir_node *node, ir_node *size) {
-  assert (node->op == op_Free);
+  assert(node->op == op_Free);
   set_irn_n(node, 2, size);
 }
 
 ir_type *
 get_Free_type (ir_node *node) {
-  assert (node->op == op_Free);
-  return node->attr.f.type = skip_tid(node->attr.f.type);
+  assert(node->op == op_Free);
+  return node->attr.free.type = skip_tid(node->attr.free.type);
 }
 
 void
 set_Free_type (ir_node *node, ir_type *tp) {
-  assert (node->op == op_Free);
-  node->attr.f.type = tp;
+  assert(node->op == op_Free);
+  node->attr.free.type = tp;
 }
 
 where_alloc
 get_Free_where (ir_node *node) {
-  assert (node->op == op_Free);
-  return node->attr.f.where;
+  assert(node->op == op_Free);
+  return node->attr.free.where;
 }
 
 void
 set_Free_where (ir_node *node, where_alloc where) {
-  assert (node->op == op_Free);
-  node->attr.f.where = where;
+  assert(node->op == op_Free);
+  node->attr.free.where = where;
 }
 
-ir_node **
-get_Sync_preds_arr (ir_node *node) {
-  assert (node->op == op_Sync);
+ir_node **get_Sync_preds_arr (ir_node *node) {
+  assert(node->op == op_Sync);
   return (ir_node **)&(get_irn_in(node)[1]);
 }
 
-int
-get_Sync_n_preds (ir_node *node) {
-  assert (node->op == op_Sync);
+int get_Sync_n_preds (ir_node *node) {
+  assert(node->op == op_Sync);
   return (get_irn_arity(node));
 }
 
 /*
-void
-set_Sync_n_preds (ir_node *node, int n_preds) {
-  assert (node->op == op_Sync);
+void set_Sync_n_preds (ir_node *node, int n_preds) {
+  assert(node->op == op_Sync);
 }
 */
 
-ir_node *
-get_Sync_pred (ir_node *node, int pos) {
-  assert (node->op == op_Sync);
+ir_node *get_Sync_pred (ir_node *node, int pos) {
+  assert(node->op == op_Sync);
   return get_irn_n(node, pos);
 }
 
-void
-set_Sync_pred (ir_node *node, int pos, ir_node *pred) {
-  assert (node->op == op_Sync);
+void set_Sync_pred (ir_node *node, int pos, ir_node *pred) {
+  assert(node->op == op_Sync);
   set_irn_n(node, pos, pred);
 }
 
+/* Add a new Sync predecessor */
+void add_Sync_pred (ir_node *node, ir_node *pred) {
+  int l;
+  ir_graph *irg = get_irn_irg(node);
+
+  assert(node->op == op_Sync);
+  l = ARR_LEN(node->in);
+  ARR_APP1(ir_node *, node->in, pred);
+  edges_notify_edge(node, l, node->in[l], NULL, irg);
+}
+
+/* Returns the source language type of a Proj node. */
 ir_type *get_Proj_type(ir_node *n)
 {
-  ir_type *tp   = NULL;
+  ir_type *tp   = firm_unknown_type;
   ir_node *pred = get_Proj_pred(n);
 
   switch (get_irn_opcode(pred)) {
@@ -1821,19 +1939,19 @@ ir_type *get_Proj_type(ir_node *n)
 
 ir_node *
 get_Proj_pred (const ir_node *node) {
-  assert (is_Proj(node));
+  assert(is_Proj(node));
   return get_irn_n(node, 0);
 }
 
 void
 set_Proj_pred (ir_node *node, ir_node *pred) {
-  assert (is_Proj(node));
+  assert(is_Proj(node));
   set_irn_n(node, 0, pred);
 }
 
 long
 get_Proj_proj (const ir_node *node) {
-  assert (is_Proj(node));
+  assert(is_Proj(node));
   if (get_irn_opcode(node) == iro_Proj) {
     return node->attr.proj;
   } else {
@@ -1844,75 +1962,75 @@ get_Proj_proj (const ir_node *node) {
 
 void
 set_Proj_proj (ir_node *node, long proj) {
-  assert (node->op == op_Proj);
+  assert(node->op == op_Proj);
   node->attr.proj = proj;
 }
 
 ir_node **
 get_Tuple_preds_arr (ir_node *node) {
-  assert (node->op == op_Tuple);
+  assert(node->op == op_Tuple);
   return (ir_node **)&(get_irn_in(node)[1]);
 }
 
 int
 get_Tuple_n_preds (ir_node *node) {
-  assert (node->op == op_Tuple);
+  assert(node->op == op_Tuple);
   return (get_irn_arity(node));
 }
 
 /*
 void
 set_Tuple_n_preds (ir_node *node, int n_preds) {
-  assert (node->op == op_Tuple);
+  assert(node->op == op_Tuple);
 }
 */
 
 ir_node *
 get_Tuple_pred (ir_node *node, int pos) {
-  assert (node->op == op_Tuple);
+  assert(node->op == op_Tuple);
   return get_irn_n(node, pos);
 }
 
 void
 set_Tuple_pred (ir_node *node, int pos, ir_node *pred) {
-  assert (node->op == op_Tuple);
+  assert(node->op == op_Tuple);
   set_irn_n(node, pos, pred);
 }
 
 ir_node *
 get_Id_pred (ir_node *node) {
-  assert (node->op == op_Id);
+  assert(node->op == op_Id);
   return get_irn_n(node, 0);
 }
 
 void
 set_Id_pred (ir_node *node, ir_node *pred) {
-  assert (node->op == op_Id);
+  assert(node->op == op_Id);
   set_irn_n(node, 0, pred);
 }
 
 ir_node *get_Confirm_value (ir_node *node) {
-  assert (node->op == op_Confirm);
+  assert(node->op == op_Confirm);
   return get_irn_n(node, 0);
 }
 void     set_Confirm_value (ir_node *node, ir_node *value) {
-  assert (node->op == op_Confirm);
+  assert(node->op == op_Confirm);
   set_irn_n(node, 0, value);
 }
 ir_node *get_Confirm_bound (ir_node *node) {
-  assert (node->op == op_Confirm);
+  assert(node->op == op_Confirm);
   return get_irn_n(node, 1);
 }
 void     set_Confirm_bound (ir_node *node, ir_node *bound) {
-  assert (node->op == op_Confirm);
+  assert(node->op == op_Confirm);
   set_irn_n(node, 0, bound);
 }
 pn_Cmp   get_Confirm_cmp   (ir_node *node) {
-  assert (node->op == op_Confirm);
+  assert(node->op == op_Confirm);
   return node->attr.confirm_cmp;
 }
 void     set_Confirm_cmp   (ir_node *node, pn_Cmp cmp) {
-  assert (node->op == op_Confirm);
+  assert(node->op == op_Confirm);
   node->attr.confirm_cmp = cmp;
 }
 
@@ -2074,104 +2192,104 @@ int (get_Psi_n_conds)(ir_node *node) {
 
 /* CopyB support */
 ir_node *get_CopyB_mem (ir_node *node) {
-  assert (node->op == op_CopyB);
+  assert(node->op == op_CopyB);
   return get_irn_n(node, 0);
 }
 
 void     set_CopyB_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_CopyB);
+  assert(node->op == op_CopyB);
   set_irn_n(node, 0, mem);
 }
 
 ir_node *get_CopyB_dst (ir_node *node) {
-  assert (node->op == op_CopyB);
+  assert(node->op == op_CopyB);
   return get_irn_n(node, 1);
 }
 
 void     set_CopyB_dst (ir_node *node, ir_node *dst) {
-  assert (node->op == op_CopyB);
+  assert(node->op == op_CopyB);
   set_irn_n(node, 1, dst);
 }
 
 ir_node *get_CopyB_src (ir_node *node) {
-  assert (node->op == op_CopyB);
+  assert(node->op == op_CopyB);
   return get_irn_n(node, 2);
 }
 
 void     set_CopyB_src (ir_node *node, ir_node *src) {
-  assert (node->op == op_CopyB);
+  assert(node->op == op_CopyB);
   set_irn_n(node, 2, src);
 }
 
 ir_type *get_CopyB_type(ir_node *node) {
-  assert (node->op == op_CopyB);
+  assert(node->op == op_CopyB);
   return node->attr.copyb.data_type;
 }
 
 void     set_CopyB_type(ir_node *node, ir_type *data_type) {
-  assert (node->op == op_CopyB && data_type);
+  assert(node->op == op_CopyB && data_type);
   node->attr.copyb.data_type = data_type;
 }
 
 
 ir_type *
 get_InstOf_type (ir_node *node) {
-  assert (node->op = op_InstOf);
-  return node->attr.io.type;
+  assert(node->op = op_InstOf);
+  return node->attr.instof.type;
 }
 
 void
 set_InstOf_type (ir_node *node, ir_type *type) {
-  assert (node->op = op_InstOf);
-  node->attr.io.type = type;
+  assert(node->op = op_InstOf);
+  node->attr.instof.type = type;
 }
 
 ir_node *
 get_InstOf_store (ir_node *node) {
-  assert (node->op = op_InstOf);
+  assert(node->op = op_InstOf);
   return get_irn_n(node, 0);
 }
 
 void
 set_InstOf_store (ir_node *node, ir_node *obj) {
-  assert (node->op = op_InstOf);
+  assert(node->op = op_InstOf);
   set_irn_n(node, 0, obj);
 }
 
 ir_node *
 get_InstOf_obj (ir_node *node) {
-  assert (node->op = op_InstOf);
+  assert(node->op = op_InstOf);
   return get_irn_n(node, 1);
 }
 
 void
 set_InstOf_obj (ir_node *node, ir_node *obj) {
-  assert (node->op = op_InstOf);
+  assert(node->op = op_InstOf);
   set_irn_n(node, 1, obj);
 }
 
 /* Returns the memory input of a Raise operation. */
 ir_node *
 get_Raise_mem (ir_node *node) {
-  assert (node->op == op_Raise);
+  assert(node->op == op_Raise);
   return get_irn_n(node, 0);
 }
 
 void
 set_Raise_mem (ir_node *node, ir_node *mem) {
-  assert (node->op == op_Raise);
+  assert(node->op == op_Raise);
   set_irn_n(node, 0, mem);
 }
 
 ir_node *
 get_Raise_exo_ptr (ir_node *node) {
-  assert (node->op == op_Raise);
+  assert(node->op == op_Raise);
   return get_irn_n(node, 1);
 }
 
 void
 set_Raise_exo_ptr (ir_node *node, ir_node *exo_ptr) {
-  assert (node->op == op_Raise);
+  assert(node->op == op_Raise);
   set_irn_n(node, 1, exo_ptr);
 }
 
@@ -2179,48 +2297,60 @@ set_Raise_exo_ptr (ir_node *node, ir_node *exo_ptr) {
 
 /* Returns the memory input of a Bound operation. */
 ir_node *get_Bound_mem(ir_node *bound) {
-  assert (bound->op == op_Bound);
+  assert(bound->op == op_Bound);
   return get_irn_n(bound, 0);
 }
 
 void     set_Bound_mem (ir_node *bound, ir_node *mem) {
-  assert (bound->op == op_Bound);
+  assert(bound->op == op_Bound);
   set_irn_n(bound, 0, mem);
 }
 
 /* Returns the index input of a Bound operation. */
 ir_node *get_Bound_index(ir_node *bound) {
-  assert (bound->op == op_Bound);
+  assert(bound->op == op_Bound);
   return get_irn_n(bound, 1);
 }
 
 void     set_Bound_index(ir_node *bound, ir_node *idx) {
-  assert (bound->op == op_Bound);
+  assert(bound->op == op_Bound);
   set_irn_n(bound, 1, idx);
 }
 
 /* Returns the lower bound input of a Bound operation. */
 ir_node *get_Bound_lower(ir_node *bound) {
-  assert (bound->op == op_Bound);
+  assert(bound->op == op_Bound);
   return get_irn_n(bound, 2);
 }
 
 void     set_Bound_lower(ir_node *bound, ir_node *lower) {
-  assert (bound->op == op_Bound);
+  assert(bound->op == op_Bound);
   set_irn_n(bound, 2, lower);
 }
 
 /* Returns the upper bound input of a Bound operation. */
 ir_node *get_Bound_upper(ir_node *bound) {
-  assert (bound->op == op_Bound);
+  assert(bound->op == op_Bound);
   return get_irn_n(bound, 3);
 }
 
 void     set_Bound_upper(ir_node *bound, ir_node *upper) {
-  assert (bound->op == op_Bound);
+  assert(bound->op == op_Bound);
   set_irn_n(bound, 3, upper);
 }
 
+/* Return the operand of a Pin node. */
+ir_node *get_Pin_op(ir_node *pin) {
+  assert(pin->op == op_Pin);
+  return get_irn_n(pin, 0);
+}
+
+void    set_Pin_op(ir_node *pin, ir_node *node) {
+  assert(pin->op == op_Pin);
+  set_irn_n(pin, 0, node);
+}
+
+
 /* returns the graph of a node */
 ir_graph *
 get_irn_irg(const ir_node *node) {
@@ -2246,11 +2376,25 @@ get_irn_irg(const ir_node *node) {
 ir_node *
 skip_Proj (ir_node *node) {
   /* don't assert node !!! */
-  if (node && is_Proj(node)) {
-    return get_Proj_pred(node);
-  } else {
-    return node;
-  }
+  if (node == NULL)
+    return NULL;
+
+  if (is_Proj(node))
+	node = get_Proj_pred(node);
+
+  return node;
+}
+
+const ir_node *
+skip_Proj_const (const ir_node *node) {
+  /* don't assert node !!! */
+  if (node == NULL)
+    return NULL;
+
+  if (is_Proj(node))
+	node = get_Proj_pred(node);
+
+  return node;
 }
 
 ir_node *
@@ -2325,7 +2469,7 @@ skip_Id (ir_node *node) {
     ir_node *rem_pred = node->in[0+1];
     ir_node *res;
 
-    assert (get_irn_arity (node) > 0);
+    assert(get_irn_arity (node) > 0);
 
     node->in[0+1] = node;
     res = skip_Id(rem_pred);
@@ -2366,7 +2510,7 @@ skip_Id (ir_node *node) {
     if (pred->op != op_Id) return pred; /* shortcut */
     rem_pred = pred;
 
-    assert (get_irn_arity (node) > 0);
+    assert(get_irn_arity (node) > 0);
 
     node->in[0+1] = node;   /* turn us into a self referencing Id:  shorten Id cycles. */
     res = skip_Id(rem_pred);
@@ -2395,6 +2539,36 @@ int
   return _is_Bad(node);
 }
 
+int
+(is_NoMem)(const ir_node *node) {
+	return _is_NoMem(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_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);
@@ -2440,6 +2614,72 @@ int
   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 Cond node. */
+int
+(is_Cond)(const ir_node *node) {
+  return _is_Cond(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);
+}
+
 int
 is_Proj (const ir_node *node) {
   assert(node);
@@ -2479,6 +2719,7 @@ ir_node *get_fragile_op_mem(ir_node *node) {
   case iro_Load  :
   case iro_Store :
   case iro_Alloc :
+  case iro_Bound :
     return get_irn_n(node, 0);
   case iro_Bad   :
   case iro_Unknown:
@@ -2508,7 +2749,7 @@ ir_type *(get_irn_type_attr)(ir_node *node) {
 }
 
 /* Return the entity attribute of a node n (SymConst, Sel) or NULL. */
-entity *(get_irn_entity_attr)(ir_node *node) {
+ir_entity *(get_irn_entity_attr)(ir_node *node) {
   return _get_irn_entity_attr(node);
 }
 
@@ -2525,6 +2766,13 @@ int (is_irn_keep)(const ir_node *node) {
   return _is_irn_keep(node);
 }
 
+/*
+ * Returns non-zero for nodes that are always placed in the start block.
+ */
+int (is_irn_start_block_placed)(const ir_node *node) {
+  return _is_irn_start_block_placed(node);
+}
+
 /* Returns non-zero for nodes that are machine operations. */
 int (is_irn_machine_op)(const ir_node *node) {
 	return _is_irn_machine_op(node);
@@ -2587,15 +2835,15 @@ ir_op_ops *firm_set_default_get_type(opcode code, ir_op_ops *ops)
 /** Return the attribute type of a SymConst node if exists */
 static ir_type *get_SymConst_attr_type(ir_node *self) {
   symconst_kind kind = get_SymConst_kind(self);
-  if (kind == symconst_type_tag || kind == symconst_size)
+  if (SYMCONST_HAS_TYPE(kind))
     return get_SymConst_type(self);
   return NULL;
 }
 
 /** Return the attribute entity of a SymConst node if exists */
-static entity *get_SymConst_attr_entity(ir_node *self) {
+static ir_entity *get_SymConst_attr_entity(ir_node *self) {
   symconst_kind kind = get_SymConst_kind(self);
-  if (kind == symconst_addr_ent)
+  if (SYMCONST_HAS_ENT(kind))
     return get_SymConst_entity(self);
   return NULL;
 }
@@ -2624,7 +2872,7 @@ ir_op_ops *firm_set_default_get_type_attr(opcode code, ir_op_ops *ops)
 }
 
 /** the get_entity_attr operation must be always implemented */
-static entity *get_Null_ent(ir_node *n) {
+static ir_entity *get_Null_ent(ir_node *n) {
   return NULL;
 }