X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=e5dcddf5d8b0e7c6bf97969ced5b0d8755054873;hb=6dd417e1838c9319956dd3a658791ce413099b7f;hp=c02bffb203e7d90be5d2a3f89fc80df91bad9c1b;hpb=23109436cde61d7f7aee343a9609df8e3715be6b;p=libfirm

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index c02bffb20..e5dcddf5d 100644
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -30,6 +30,7 @@
 #include "iredges_t.h"
 
 #include "irhooks.h"
+#include "irtools.h"
 
 /* some constants fixing the positions of nodes predecessors
    in the in array */
@@ -40,10 +41,10 @@
 #define END_KEEPALIVE_OFFSET  0
 
 static const char *pnc_name_arr [] = {
-  "False", "Eq", "Lt", "Le",
-  "Gt", "Ge", "Lg", "Leg", "Uo",
-  "Ue", "Ul", "Ule", "Ug", "Uge",
-  "Ne", "True"
+  "pn_Cmp_False", "pn_Cmp_Eq", "pn_Cmp_Lt", "pn_Cmp_Le",
+  "pn_Cmp_Gt", "pn_Cmp_Ge", "pn_Cmp_Lg", "pn_Cmp_Leg",
+  "pn_Cmp_Uo", "pn_Cmp_Ue", "pn_Cmp_Ul", "pn_Cmp_Ule",
+  "pn_Cmp_Ug", "pn_Cmp_Uge", "pn_Cmp_Ne", "pn_Cmp_True"
 };
 
 /**
@@ -54,34 +55,21 @@ const char *get_pnc_string(int pnc) {
 }
 
 /*
- * Calculates the negated pnc condition.
+ * Calculates the negated (Complement(R)) pnc condition.
  */
-int
-get_negated_pnc(int pnc) {
-  switch (pnc) {
-  case pn_Cmp_False: return pn_Cmp_True;
-  case pn_Cmp_Eq:    return pn_Cmp_Ne;
-  case pn_Cmp_Lt:    return pn_Cmp_Uge;
-  case pn_Cmp_Le:    return pn_Cmp_Ug;
-  case pn_Cmp_Gt:    return pn_Cmp_Ule;
-  case pn_Cmp_Ge:    return pn_Cmp_Ul;
-  case pn_Cmp_Lg:    return pn_Cmp_Ue;
-  case pn_Cmp_Leg:   return pn_Cmp_Uo;
-  case pn_Cmp_Uo:    return pn_Cmp_Leg;
-  case pn_Cmp_Ue:    return pn_Cmp_Lg;
-  case pn_Cmp_Ul:    return pn_Cmp_Ge;
-  case pn_Cmp_Ule:   return pn_Cmp_Gt;
-  case pn_Cmp_Ug:    return pn_Cmp_Le;
-  case pn_Cmp_Uge:   return pn_Cmp_Lt;
-  case pn_Cmp_Ne:    return pn_Cmp_Eq;
-  case pn_Cmp_True:  return pn_Cmp_False;
-  }
-  return 99; /* to shut up gcc */
+int get_negated_pnc(int pnc, ir_mode *mode) {
+  pnc ^= pn_Cmp_True;
+
+  /* do NOT add the Uo bit for non-floating point values */
+  if (! mode_is_float(mode))
+    pnc &= ~pn_Cmp_Uo;
+
+  return pnc;
 }
 
-/* Calculates the swapped pnc condition, i.e., "<" --> ">" */
+/* Calculates the inversed (R^-1) pnc condition, i.e., "<" --> ">" */
 int
-get_swapped_pnc(int pnc) {
+get_inversed_pnc(int pnc) {
   int code    = pnc & ~(pn_Cmp_Lt|pn_Cmp_Gt);
   int lesser  = pnc & pn_Cmp_Lt;
   int greater = pnc & pn_Cmp_Gt;
@@ -142,18 +130,20 @@ new_ir_node (dbg_info *db, ir_graph *irg, ir_node *block, ir_op *op, ir_mode *mo
 {
   ir_node *res;
   size_t node_size = offsetof(ir_node, attr) + op->attr_size + firm_add_node_size;
-	char *p;
+  char *p;
+  int i, is_bl;
 
   assert(irg && op && mode);
   p = obstack_alloc (irg->obst, node_size);
   memset(p, 0, node_size);
-	res = (ir_node *) (p + firm_add_node_size);
-
-  res->kind    = k_ir_node;
-  res->op      = op;
-  res->mode    = mode;
-  res->visited = 0;
-  res->link    = NULL;
+  res = (ir_node *) (p + firm_add_node_size);
+
+  res->kind     = k_ir_node;
+  res->op       = op;
+  res->mode     = mode;
+  res->visited  = 0;
+  res->node_idx = irg_register_node_idx(irg, res);
+  res->link     = NULL;
   if (arity < 0) {
     res->in = NEW_ARR_F (ir_node *, 1);  /* 1: space for block */
   } else {
@@ -169,17 +159,14 @@ 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
 
-#if FIRM_EDGES_INPLACE
-  {
-    int i, n;
-    int not_a_block = is_no_Block(res);
+  INIT_LIST_HEAD(&res->edge_info.outs_head);
+  is_bl = is_Block(res);
+  if (is_bl)
+    INIT_LIST_HEAD(&res->attr.block.succ_head);
 
-    INIT_LIST_HEAD(&res->edge_info.outs_head);
 
-    for (i = 0, n = arity + not_a_block; i < n; ++i)
-      edges_notify_edge(res, i - not_a_block, res->in[i], NULL, irg);
-  }
-#endif
+  for (i = is_bl; i <= arity; ++i)
+    edges_notify_edge(res, i - 1, res->in[i], NULL, irg);
 
   hook_new_node(irg, res);
 
@@ -233,7 +220,9 @@ get_irn_in (const ir_node *node) {
 
 void
 set_irn_in (ir_node *node, int arity, ir_node **in) {
+  int i;
   ir_node *** arr;
+  ir_graph *irg = current_ir_graph;
   assert(node);
   if (get_interprocedural_view()) { /* handle Filter and Block specially */
     if (get_irn_opcode(node) == iro_Filter) {
@@ -247,12 +236,24 @@ set_irn_in (ir_node *node, int arity, ir_node **in) {
   } else {
     arr = &node->in;
   }
+
+  for (i = 0; i < arity; i++) {
+    if (i < ARR_LEN(*arr)-1)
+      edges_notify_edge(node, i, in[i], (*arr)[i+1], irg);
+    else
+      edges_notify_edge(node, i, in[i], NULL,        irg);
+  }
+  for(;i < ARR_LEN(*arr)-1; i++) {
+    edges_notify_edge(node, i, NULL, (*arr)[i+1], irg);
+  }
+
   if (arity != ARR_LEN(*arr) - 1) {
     ir_node * block = (*arr)[0];
-    *arr = NEW_ARR_D(ir_node *, current_ir_graph->obst, arity + 1);
+    *arr = NEW_ARR_D(ir_node *, irg->obst, arity + 1);
     (*arr)[0] = block;
   }
-  fix_backedges(current_ir_graph->obst, node);
+  fix_backedges(irg->obst, node);
+
   memcpy((*arr) + 1, in, sizeof(ir_node *) * arity);
 }
 
@@ -342,17 +343,14 @@ get_irn_modeident (const ir_node *node)
 }
 
 ir_op *
-(get_irn_op)(const ir_node *node)
-{
+(get_irn_op)(const ir_node *node) {
   return _get_irn_op(node);
 }
 
 /* should be private to the library: */
 void
-set_irn_op (ir_node *node, ir_op *op)
-{
-  assert (node);
-  node->op = op;
+(set_irn_op)(ir_node *node, ir_op *op) {
+	_set_irn_op(node, op);
 }
 
 opcode
@@ -420,6 +418,11 @@ op_pin_state
   return _get_irn_pinned(node);
 }
 
+op_pin_state
+(is_irn_pinned_in_irg) (const ir_node *node) {
+  return _is_irn_pinned_in_irg(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)
@@ -457,13 +460,12 @@ void firm_set_irn_section(ir_node *n, struct section *s) {}
 
 
 /* Outputs a unique number for this node */
-long
-get_irn_node_nr(const ir_node *node) {
+long get_irn_node_nr(const ir_node *node) {
   assert(node);
 #ifdef DEBUG_libfirm
   return node->node_nr;
 #else
-  return (long)node;
+  return (long)PTR_TO_INT(node);
 #endif
 }
 
@@ -485,24 +487,24 @@ alloc_attr
 get_irn_alloc_attr (ir_node *node)
 {
   assert (node->op == op_Alloc);
-  return node->attr.a;
+  return node->attr.alloc;
 }
 
 free_attr
 get_irn_free_attr     (ir_node *node)
 {
   assert (node->op == op_Free);
-  return node->attr.f;
+  return node->attr.free;
 }
 
 symconst_attr
 get_irn_symconst_attr (ir_node *node)
 {
   assert (node->op == op_SymConst);
-  return node->attr.i;
+  return node->attr.symc;
 }
 
-type *
+ir_type *
 get_irn_call_attr (ir_node *node)
 {
   assert (node->op == op_Call);
@@ -513,7 +515,7 @@ sel_attr
 get_irn_sel_attr (ir_node *node)
 {
   assert (node->op == op_Sel);
-  return node->attr.s;
+  return node->attr.sel;
 }
 
 int
@@ -552,12 +554,32 @@ get_irn_except_attr (ir_node *node)
   return node->attr.except;
 }
 
+void *
+get_irn_generic_attr (ir_node *node) {
+  return &node->attr;
+}
+
+unsigned (get_irn_idx)(const ir_node *node) {
+  assert(is_ir_node(node));
+  return _get_irn_idx(node);
+}
+
+int get_irn_pred_pos(ir_node *node, ir_node *arg) {
+  int i;
+  for (i = get_irn_arity(node) - 1; i >= 0; i--) {
+    if (get_irn_n(node, i) == arg)
+      return i;
+  }
+  return -1;
+}
+
 /** manipulate fields of individual nodes **/
 
 /* 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");
   return get_irn_n(node, -1);
 }
 
@@ -569,9 +591,8 @@ set_nodes_block (ir_node *node, ir_node *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. */
-type *is_frame_pointer(ir_node *n) {
-  if ((get_irn_op(n) == op_Proj) &&
-      (get_Proj_proj(n) == pn_Start_P_frame_base)) {
+ir_type *is_frame_pointer(ir_node *n) {
+  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));
@@ -582,9 +603,8 @@ 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. */
-type *is_globals_pointer(ir_node *n) {
-  if ((get_irn_op(n) == op_Proj) &&
-      (get_Proj_proj(n) == pn_Start_P_globals)) {
+ir_type *is_globals_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_glob_type();
@@ -593,6 +613,18 @@ 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) {
@@ -614,18 +646,14 @@ get_Block_cfgpred_arr (ir_node *node)
   return (ir_node **)&(get_irn_in(node)[1]);
 }
 
-
 int
-get_Block_n_cfgpreds (ir_node *node) {
-  assert ((node->op == op_Block));
-  return get_irn_arity(node);
+(get_Block_n_cfgpreds)(ir_node *node) {
+  return _get_Block_n_cfgpreds(node);
 }
 
 ir_node *
-get_Block_cfgpred (ir_node *node, int pos) {
-  assert(-1 <= pos && pos < get_irn_arity(node));
-  assert(node->op == op_Block);
-  return get_irn_n(node, pos);
+(get_Block_cfgpred)(ir_node *node, int pos) {
+  return _get_Block_cfgpred(node, pos);
 }
 
 void
@@ -634,14 +662,19 @@ set_Block_cfgpred (ir_node *node, int pos, ir_node *pred) {
   set_irn_n(node, pos, pred);
 }
 
-bool
+ir_node  *
+(get_Block_cfgpred_block)(ir_node *node, int pos) {
+  return _get_Block_cfgpred_block(node, pos);
+}
+
+int
 get_Block_matured (ir_node *node) {
   assert (node->op == op_Block);
-  return node->attr.block.matured;
+  return (int)node->attr.block.matured;
 }
 
 void
-set_Block_matured (ir_node *node, bool matured) {
+set_Block_matured (ir_node *node, int matured) {
   assert (node->op == op_Block);
   node->attr.block.matured = matured;
 }
@@ -686,10 +719,10 @@ void set_Block_cg_cfgpred_arr(ir_node * node, int arity, ir_node ** in) {
     node->attr.block.in_cg[0] = NULL;
     node->attr.block.cg_backedge = new_backedge_arr(current_ir_graph->obst, arity);
     {
-      /* Fix backedge array.  fix_backedges operates depending on
+      /* Fix backedge array.  fix_backedges() operates depending on
      interprocedural_view. */
       int ipv = get_interprocedural_view();
-      set_interprocedural_view(true);
+      set_interprocedural_view(1);
       fix_backedges(current_ir_graph->obst, node);
       set_interprocedural_view(ipv);
     }
@@ -732,11 +765,18 @@ int (is_Block_dead)(const ir_node *block) {
   return _is_Block_dead(block);
 }
 
-void
-set_Start_irg(ir_node *node, ir_graph *irg) {
-  assert(node->op == op_Start);
-  assert(is_ir_graph(irg));
-  assert(0 && " Why set irg? -- use set_irn_irg");
+ir_extblk *get_Block_extbb(const ir_node *block) {
+	ir_extblk *res;
+  assert(is_Block(block));
+	res = block->attr.block.extblk;
+	assert(res == NULL || is_ir_extbb(res));
+  return res;
+}
+
+void set_Block_extbb(ir_node *block, ir_extblk *extblk) {
+  assert(is_Block(block));
+	assert(extblk == NULL || is_ir_extbb(extblk));
+  block->attr.block.extblk = extblk;
 }
 
 int
@@ -753,8 +793,13 @@ get_End_keepalive(ir_node *end, int pos) {
 
 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
@@ -763,15 +808,43 @@ set_End_keepalive(ir_node *end, int pos, ir_node *ka) {
   set_irn_n(end, pos + END_KEEPALIVE_OFFSET, ka);
 }
 
+/* Set new keep-alives */
+void set_End_keepalives(ir_node *end, int n, ir_node *in[]) {
+  int i;
+  ir_graph *irg = get_irn_irg(end);
+
+  /* notify that edges are deleted */
+  for (i = 1 + END_KEEPALIVE_OFFSET; i < ARR_LEN(end->in); ++i) {
+    edges_notify_edge(end, i, end->in[i], NULL, irg);
+  }
+  ARR_RESIZE(ir_node *, end->in, n + 1 + END_KEEPALIVE_OFFSET);
+
+  for (i = 0; i < n; ++i) {
+    end->in[1 + END_KEEPALIVE_OFFSET + i] = in[i];
+    edges_notify_edge(end, END_KEEPALIVE_OFFSET + i, NULL, end->in[1 + END_KEEPALIVE_OFFSET + i], irg);
+  }
+}
+
 void
 free_End (ir_node *end) {
   assert (end->op == op_End);
   end->kind = k_BAD;
-  DEL_ARR_F(end->in);  /* GL @@@ tut nicht ! */
+  DEL_ARR_F(end->in);
   end->in = NULL;   /* @@@ make sure we get an error if we use the
                in array afterwards ... */
 }
 
+/* Return the target address of an IJmp */
+ir_node *get_IJmp_target(ir_node *ijmp) {
+  assert(ijmp->op == op_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);
+  set_irn_n(ijmp, 0, tgt);
+}
 
 /*
 > Implementing the case construct (which is where the constant Proj node is
@@ -819,19 +892,19 @@ set_Cond_selector (ir_node *node, ir_node *selector) {
 cond_kind
 get_Cond_kind (ir_node *node) {
   assert (node->op == op_Cond);
-  return node->attr.c.kind;
+  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;
+  node->attr.cond.kind = kind;
 }
 
 long
 get_Cond_defaultProj (ir_node *node) {
   assert (node->op == op_Cond);
-  return node->attr.c.default_proj;
+  return node->attr.cond.default_proj;
 }
 
 ir_node *
@@ -882,30 +955,6 @@ set_Return_res (ir_node *node, int pos, ir_node *res){
   set_irn_n(node, pos + RETURN_RESULT_OFFSET, res);
 }
 
-ir_node *
-get_Raise_mem (ir_node *node) {
-  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);
-  set_irn_n(node, 0, mem);
-}
-
-ir_node *
-get_Raise_exo_ptr (ir_node *node) {
-  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);
-  set_irn_n(node, 1, exo_ptr);
-}
-
 tarval *(get_Const_tarval)(ir_node *node) {
 	return _get_Const_tarval(node);
 }
@@ -925,14 +974,14 @@ cnst_classify_t (classify_Const)(ir_node *node)
 /* The source language type.  Must be an atomic type.  Mode of type must
    be mode of node. For tarvals from entities type must be pointer to
    entity type. */
-type *
+ir_type *
 get_Const_type (ir_node *node) {
   assert (node->op == op_Const);
   return node->attr.con.tp;
 }
 
 void
-set_Const_type (ir_node *node, type *tp) {
+set_Const_type (ir_node *node, ir_type *tp) {
   assert (node->op == op_Const);
   if (tp != firm_unknown_type) {
     assert (is_atomic_type(tp));
@@ -945,43 +994,41 @@ set_Const_type (ir_node *node, type *tp) {
 symconst_kind
 get_SymConst_kind (const ir_node *node) {
   assert (node->op == op_SymConst);
-  return node->attr.i.num;
+  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;
+  node->attr.symc.num = num;
 }
 
-type *
+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, 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;
+set_SymConst_type (ir_node *node, ir_type *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;
+  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;
+  node->attr.symc.sym.ident_p = name;
 }
 
 
@@ -989,39 +1036,38 @@ set_SymConst_name (ir_node *node, ident *name) {
 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;
+  return node->attr.symc.sym.entity_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;
+  node->attr.symc.sym.entity_p  = ent;
 }
 
 union symconst_symbol
 get_SymConst_symbol (ir_node *node) {
   assert (node->op == op_SymConst);
-  return node->attr.i.sym;
+  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;
+  node->attr.symc.sym = sym;
 }
 
-type *
+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;
+  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, type *tp) {
+set_SymConst_value_type (ir_node *node, ir_type *tp) {
   assert (node->op == op_SymConst);
-  node->attr.i.tp = tp;
+  node->attr.symc.tp = tp;
 }
 
 ir_node *
@@ -1079,49 +1125,13 @@ set_Sel_index (ir_node *node, int pos, ir_node *index) {
 entity *
 get_Sel_entity (ir_node *node) {
   assert (node->op == op_Sel);
-  return node->attr.s.ent;
+  return node->attr.sel.ent;
 }
 
 void
 set_Sel_entity (ir_node *node, entity *ent) {
   assert (node->op == op_Sel);
-  node->attr.s.ent = ent;
-}
-
-type *
-get_InstOf_ent (ir_node *node) {
-  assert (node->op = op_InstOf);
-  return (node->attr.io.ent);
-}
-
-void
-set_InstOf_ent (ir_node *node, type *ent) {
-  assert (node->op = op_InstOf);
-  node->attr.io.ent = ent;
-}
-
-ir_node *
-get_InstOf_store (ir_node *node) {
-  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);
-  set_irn_n (node, 0, obj);
-}
-
-ir_node *
-get_InstOf_obj (ir_node *node) {
-  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);
-  set_irn_n (node, 1, obj);
+  node->attr.sel.ent = ent;
 }
 
 
@@ -1193,14 +1203,14 @@ set_Call_param (ir_node *node, int pos, ir_node *param) {
   set_irn_n(node, pos + CALL_PARAM_OFFSET, param);
 }
 
-type *
+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);
 }
 
 void
-set_Call_type (ir_node *node, type *tp) {
+set_Call_type (ir_node *node, ir_type *tp) {
   assert (node->op == op_Call);
   assert ((get_unknown_type() == tp) || is_Method_type(tp));
   node->attr.call.cld_tp = tp;
@@ -1331,13 +1341,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);
 }
 
@@ -1354,15 +1364,25 @@ BINOP(Cmp)
 UNOP(Conv)
 UNOP(Cast)
 
-type *
+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, type *to_tp) {
-  assert (node->op == op_Cast);
+set_Cast_type (ir_node *node, ir_type *to_tp) {
+  assert(node->op == op_Cast);
   node->attr.cast.totype = to_tp;
 }
 
@@ -1372,8 +1392,8 @@ set_Cast_type (ir_node *node, type *to_tp) {
  * Returns true if the Cast node casts a class type to a super type.
  */
 int is_Cast_upcast(ir_node *node) {
-  type *totype   = get_Cast_type(node);
-  type *fromtype = get_irn_typeinfo_type(get_Cast_op(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);
@@ -1386,8 +1406,8 @@ int is_Cast_upcast(ir_node *node) {
 
   assert(fromtype);
 
-  if (!is_Class_type(totype)) return false;
-  return is_subclass_of(fromtype, totype);
+  if (!is_Class_type(totype)) return 0;
+  return is_SubClass_of(fromtype, totype);
 }
 
 /* Checks for downcast.
@@ -1395,8 +1415,8 @@ int is_Cast_upcast(ir_node *node) {
  * Returns true if the Cast node casts a class type to a sub type.
  */
 int is_Cast_downcast(ir_node *node) {
-  type *totype   = get_Cast_type(node);
-  type *fromtype = get_irn_typeinfo_type(get_Cast_op(node));
+  ir_type *totype   = get_Cast_type(node);
+  ir_type *fromtype = get_irn_typeinfo_type(get_Cast_op(node));
 
   assert(get_irg_typeinfo_state(get_irn_irg(node)) == ir_typeinfo_consistent);
   assert(fromtype);
@@ -1408,8 +1428,8 @@ int is_Cast_downcast(ir_node *node) {
 
   assert(fromtype);
 
-  if (!is_Class_type(totype)) return false;
-  return is_subclass_of(totype, fromtype);
+  if (!is_Class_type(totype)) return 0;
+  return is_SubClass_of(totype, fromtype);
 }
 
 int
@@ -1673,28 +1693,28 @@ set_Alloc_size (ir_node *node, ir_node *size) {
   set_irn_n(node, 1, size);
 }
 
-type  *
+ir_type  *
 get_Alloc_type (ir_node *node) {
   assert (node->op == op_Alloc);
-  return node->attr.a.type = skip_tid(node->attr.a.type);
+  return node->attr.alloc.type = skip_tid(node->attr.alloc.type);
 }
 
 void
-set_Alloc_type (ir_node *node, type *tp) {
+set_Alloc_type (ir_node *node, ir_type *tp) {
   assert (node->op == op_Alloc);
-  node->attr.a.type = tp;
+  node->attr.alloc.type = tp;
 }
 
 where_alloc
 get_Alloc_where (ir_node *node) {
   assert (node->op == op_Alloc);
-  return node->attr.a.where;
+  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;
+  node->attr.alloc.where = where;
 }
 
 
@@ -1734,64 +1754,71 @@ set_Free_size (ir_node *node, ir_node *size) {
   set_irn_n(node, 2, size);
 }
 
-type  *
+ir_type *
 get_Free_type (ir_node *node) {
   assert (node->op == op_Free);
-  return node->attr.f.type = skip_tid(node->attr.f.type);
+  return node->attr.free.type = skip_tid(node->attr.free.type);
 }
 
 void
-set_Free_type (ir_node *node, type *tp) {
+set_Free_type (ir_node *node, ir_type *tp) {
   assert (node->op == op_Free);
-  node->attr.f.type = tp;
+  node->attr.free.type = tp;
 }
 
 where_alloc
 get_Free_where (ir_node *node) {
   assert (node->op == op_Free);
-  return node->attr.f.where;
+  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;
+  node->attr.free.where = where;
 }
 
-ir_node **
-get_Sync_preds_arr (ir_node *node) {
+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) {
+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);
 }
 
-type *get_Proj_type(ir_node *n)
+/* 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)
 {
-  type *tp      = NULL;
+  ir_type *tp   = firm_unknown_type;
   ir_node *pred = get_Proj_pred(n);
 
   switch (get_irn_opcode(pred)) {
@@ -1801,10 +1828,10 @@ type *get_Proj_type(ir_node *n)
     assert(get_irn_mode(pred) == mode_T);
     pred_pred = get_Proj_pred(pred);
     if (get_irn_op(pred_pred) == op_Start)  {
-      type *mtp = get_entity_type(get_irg_entity(get_irn_irg(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) {
-      type *mtp = get_Call_type(pred_pred);
+      ir_type *mtp = get_Call_type(pred_pred);
       tp = get_method_res_type(mtp, get_Proj_proj(n));
     }
   } break;
@@ -1812,7 +1839,7 @@ type *get_Proj_type(ir_node *n)
   case iro_Call: break;
   case iro_Load: {
     ir_node *a = get_Load_ptr(pred);
-    if (get_irn_op(a) == op_Sel)
+    if (is_Sel(a))
       tp = get_entity_type(get_Sel_entity(a));
   } break;
   default:
@@ -1822,7 +1849,7 @@ type *get_Proj_type(ir_node *n)
 }
 
 ir_node *
-get_Proj_pred (ir_node *node) {
+get_Proj_pred (const ir_node *node) {
   assert (is_Proj(node));
   return get_irn_n(node, 0);
 }
@@ -1834,7 +1861,7 @@ set_Proj_pred (ir_node *node, ir_node *pred) {
 }
 
 long
-get_Proj_proj (ir_node *node) {
+get_Proj_proj (const ir_node *node) {
   assert (is_Proj(node));
   if (get_irn_opcode(node) == iro_Proj) {
     return node->attr.proj;
@@ -1973,39 +2000,269 @@ ir_node *get_Filter_cg_pred(ir_node *node, int pos) {
 
 /* Mux support */
 ir_node *get_Mux_sel   (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);
   return node->in[1];
 }
 void     set_Mux_sel   (ir_node *node, ir_node *sel) {
-  assert(node->op == op_Mux);
-  node->in[1] = 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;
+  }
 }
 
 ir_node *get_Mux_false (ir_node *node) {
+  if (node->op == op_Psi) {
+    assert(get_irn_arity(node) == 3);
+    return get_Psi_default(node);
+  }
   assert(node->op == op_Mux);
   return node->in[2];
 }
 void     set_Mux_false (ir_node *node, ir_node *ir_false) {
-  assert(node->op == op_Mux);
-  node->in[2] = 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;
+  }
 }
 
 ir_node *get_Mux_true  (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);
   return node->in[3];
 }
 void     set_Mux_true  (ir_node *node, ir_node *ir_true) {
-  assert(node->op == op_Mux);
-  node->in[3] = 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   (ir_node *node, int pos) {
+  int num_conds = get_Psi_n_conds(node);
+  assert(node->op == op_Psi);
+  assert(pos < num_conds);
+	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);
+	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);
+	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);
+	set_irn_n(node, 2 * pos + 1, val);
+}
+
+ir_node *get_Psi_default(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)(ir_node *node) {
+  return _get_Psi_n_conds(node);
+}
+
+/* CopyB support */
+ir_node *get_CopyB_mem (ir_node *node) {
+  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);
+  set_irn_n(node, 0, mem);
+}
 
+ir_node *get_CopyB_dst (ir_node *node) {
+  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);
+  set_irn_n(node, 1, dst);
+}
+
+ir_node *get_CopyB_src (ir_node *node) {
+  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);
+  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;
+}
+
+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;
+}
+
+
+ir_type *
+get_InstOf_type (ir_node *node) {
+  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.instof.type = type;
+}
+
+ir_node *
+get_InstOf_store (ir_node *node) {
+  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);
+  set_irn_n(node, 0, obj);
+}
+
+ir_node *
+get_InstOf_obj (ir_node *node) {
+  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);
+  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);
+  return get_irn_n(node, 0);
+}
+
+void
+set_Raise_mem (ir_node *node, ir_node *mem) {
+  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);
+  return get_irn_n(node, 1);
+}
+
+void
+set_Raise_exo_ptr (ir_node *node, ir_node *exo_ptr) {
+  assert (node->op == op_Raise);
+  set_irn_n(node, 1, exo_ptr);
+}
+
+/* Bound support */
+
+/* Returns the memory input of a Bound operation. */
+ir_node *get_Bound_mem(ir_node *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);
+  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);
+  return get_irn_n(bound, 1);
+}
+
+void     set_Bound_index(ir_node *bound, ir_node *idx) {
+  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);
+  return get_irn_n(bound, 2);
+}
+
+void     set_Bound_lower(ir_node *bound, ir_node *lower) {
+  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);
+  return get_irn_n(bound, 3);
+}
+
+void     set_Bound_upper(ir_node *bound, ir_node *upper) {
+  assert (bound->op == op_Bound);
+  set_irn_n(bound, 3, upper);
+}
+
+/* returns the graph of a node */
 ir_graph *
 get_irn_irg(const ir_node *node) {
+	/*
+	 * Do not use get_nodes_Block() here, because this
+	 * will check the pinned state.
+	 * However even a 'wrong' block is always in the proper
+	 * irg.
+	 */
   if (! is_Block(node))
-    node = get_nodes_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_nodes_block(node);
+    node = get_irn_n(node, -1);
   assert(get_irn_op(node) == op_Block);
   return node->attr.block.irg;
 }
@@ -2028,39 +2285,69 @@ skip_Proj (ir_node *node) {
 ir_node *
 skip_Tuple (ir_node *node) {
   ir_node *pred;
+  ir_op   *op;
 
   if (!get_opt_normalize()) return node;
 
+restart:
   node = skip_Id(node);
   if (get_irn_op(node) == op_Proj) {
     pred = skip_Id(get_Proj_pred(node));
-    if (get_irn_op(pred) == op_Proj) /* nested Tuple ? */
+    op   = get_irn_op(pred);
+
+    /*
+     * Looks strange but calls get_irn_op() only once
+     * in most often cases.
+     */
+    if (op == op_Proj) { /* nested Tuple ? */
       pred = skip_Id(skip_Tuple(pred));
-    if (get_irn_op(pred) == op_Tuple)
-      return get_Tuple_pred(pred, get_Proj_proj(node));
+      op   = get_irn_op(pred);
+
+      if (op == op_Tuple) {
+        node = get_Tuple_pred(pred, get_Proj_proj(node));
+        goto restart;
+      }
+    }
+    else if (op == op_Tuple) {
+      node = get_Tuple_pred(pred, get_Proj_proj(node));
+      goto restart;
+    }
   }
   return node;
 }
 
-/** returns operand of node if node is a Cast */
+/* returns operand of node if node is a Cast */
 ir_node *skip_Cast  (ir_node *node) {
-  if (node && get_irn_op(node) == op_Cast) {
-    return skip_Id(get_irn_n(node, 0));
-  } else {
-    return node;
-  }
+  if (node && get_irn_op(node) == op_Cast)
+    return get_Cast_op(node);
+  return node;
+}
+
+/* returns operand of node if node is a Confirm */
+ir_node *skip_Confirm  (ir_node *node) {
+  if (node && get_irn_op(node) == op_Confirm)
+    return get_Confirm_value(node);
+  return node;
+}
+
+/* skip all high-level ops */
+ir_node *skip_HighLevel(ir_node *node) {
+  if (node && is_op_highlevel(get_irn_op(node)))
+    return get_irn_n(node, 0);
+  return node;
 }
 
 #if 0
 /* This should compact Id-cycles to self-cycles. It has the same (or less?) complexity
-   than any other approach, as Id chains are resolved and all point to the real node, or
-   all id's are self loops. */
+ * than any other approach, as Id chains are resolved and all point to the real node, or
+ * all id's are self loops.
+ *
+ * Moreover, it CANNOT be switched off using get_opt_normalize() ...
+ */
 ir_node *
 skip_Id (ir_node *node) {
   /* don't assert node !!! */
 
-  if (!get_opt_normalize()) return node;
-
   /* Don't use get_Id_pred:  We get into an endless loop for
      self-referencing Ids. */
   if (node && (node->op == op_Id) && (node != node->in[0+1])) {
@@ -2081,8 +2368,14 @@ skip_Id (ir_node *node) {
 }
 #else
 /* This should compact Id-cycles to self-cycles. It has the same (or less?) complexity
-   than any other approach, as Id chains are resolved and all point to the real node, or
-   all id's are self loops. */
+ * than any other approach, as Id chains are resolved and all point to the real node, or
+ * all id's are self loops.
+ *
+ * Note: This function takes 10% of mostly ANY the compiler run, so it's
+ * a little bit "hand optimized".
+ *
+ * Moreover, it CANNOT be switched off using get_opt_normalize() ...
+ */
 ir_node *
 skip_Id (ir_node *node) {
   ir_node *pred;
@@ -2090,9 +2383,7 @@ skip_Id (ir_node *node) {
 
   if (!node || (node->op != op_Id)) return node;
 
-  if (!get_opt_normalize()) return node;
-
-  /* Don't use get_Id_pred:  We get into an endless loop for
+  /* Don't use get_Id_pred():  We get into an endless loop for
      self-referencing Ids. */
   pred = node->in[0+1];
 
@@ -2118,6 +2409,16 @@ skip_Id (ir_node *node) {
 }
 #endif
 
+void skip_Id_and_store(ir_node **node) {
+  ir_node *n = *node;
+
+  if (!n || (n->op != op_Id)) return;
+
+  /* Don't use get_Id_pred():  We get into an endless loop for
+     self-referencing Ids. */
+  *node = skip_Id(n);
+}
+
 int
 (is_Bad)(const ir_node *node) {
   return _is_Bad(node);
@@ -2138,12 +2439,54 @@ int
   return _is_Block(node);
 }
 
-/* returns true if node is a Unknown 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 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);
+}
+
 int
 is_Proj (const ir_node *node) {
   assert(node);
@@ -2194,31 +2537,157 @@ ir_node *get_fragile_op_mem(ir_node *node) {
 }
 
 /* Returns true if the operation is a forking control flow operation. */
-int
-is_forking_op(const ir_node *node) {
-  return is_op_forking(get_irn_op(node));
+int (is_irn_forking)(const ir_node *node) {
+  return _is_irn_forking(node);
 }
 
-type *(get_irn_type)(ir_node *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. */
+ir_type *(get_irn_type)(ir_node *node) {
   return _get_irn_type(node);
 }
 
-/** the get_type operation must be always implemented */
-static type *get_Null_type(ir_node *n) {
+/* Return the type attribute of a node n (SymConst, Call, Alloc, Free,
+   Cast) or NULL.*/
+ir_type *(get_irn_type_attr)(ir_node *node) {
+  return _get_irn_type_attr(node);
+}
+
+/* Return the entity attribute of a node n (SymConst, Sel) or NULL. */
+entity *(get_irn_entity_attr)(ir_node *node) {
+  return _get_irn_entity_attr(node);
+}
+
+/* Returns non-zero for constant-like nodes. */
+int (is_irn_constlike)(const ir_node *node) {
+  return _is_irn_constlike(node);
+}
+
+/*
+ * Returns non-zero for nodes that are allowed to have keep-alives and
+ * are neither Block nor PhiM.
+ */
+int (is_irn_keep)(const ir_node *node) {
+  return _is_irn_keep(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);
+}
+
+/* Returns non-zero for nodes that are machine operands. */
+int (is_irn_machine_operand)(const ir_node *node) {
+	return _is_irn_machine_operand(node);
+}
+
+/* Returns non-zero for nodes that have the n'th user machine flag set. */
+int (is_irn_machine_user)(const ir_node *node, unsigned n) {
+	return _is_irn_machine_user(node, n);
+}
+
+
+/* Gets the string representation of the jump prediction .*/
+const char *get_cond_jmp_predicate_name(cond_jmp_predicate pred)
+{
+  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";
+  }
+}
+
+/* Returns the conditional jump prediction of a Cond node. */
+cond_jmp_predicate (get_Cond_jmp_pred)(ir_node *cond) {
+  return _get_Cond_jmp_pred(cond);
+}
+
+/* Sets a new conditional jump prediction. */
+void (set_Cond_jmp_pred)(ir_node *cond, cond_jmp_predicate pred) {
+  _set_Cond_jmp_pred(cond, pred);
+}
+
+/** the get_type operation must be always implemented and return a firm type */
+static ir_type *get_Default_type(ir_node *n) {
+  return get_unknown_type();
+}
+
+/* Sets the get_type operation for an ir_op_ops. */
+ir_op_ops *firm_set_default_get_type(opcode code, ir_op_ops *ops)
+{
+  switch (code) {
+  case iro_Const:    ops->get_type = get_Const_type; break;
+  case iro_SymConst: ops->get_type = get_SymConst_value_type; break;
+  case iro_Cast:     ops->get_type = get_Cast_type; break;
+  case iro_Proj:     ops->get_type = get_Proj_type; break;
+  default:
+    /* not allowed to be NULL */
+    if (! ops->get_type)
+      ops->get_type = get_Default_type;
+    break;
+  }
+  return 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 (SYMCONST_HAS_TYPE(kind))
+    return get_SymConst_type(self);
   return NULL;
 }
 
-/* set the get_type operation */
-ir_op *firm_set_default_get_type(ir_op *op)
+/** Return the attribute entity of a SymConst node if exists */
+static entity *get_SymConst_attr_entity(ir_node *self) {
+  symconst_kind kind = get_SymConst_kind(self);
+  if (SYMCONST_HAS_ENT(kind))
+    return get_SymConst_entity(self);
+  return NULL;
+}
+
+/** the get_type_attr operation must be always implemented */
+static ir_type *get_Null_type(ir_node *n) {
+  return firm_unknown_type;
+}
+
+/* Sets the get_type operation for an ir_op_ops. */
+ir_op_ops *firm_set_default_get_type_attr(opcode code, ir_op_ops *ops)
 {
-  switch (op->code) {
-  case iro_Const:    op->get_type = get_Const_type; break;
-  case iro_SymConst: op->get_type = get_SymConst_value_type; break;
-  case iro_Cast:     op->get_type = get_Cast_type; break;
-  case iro_Proj:     op->get_type = get_Proj_type; break;
-  default:           op->get_type = get_Null_type; break;
+  switch (code) {
+  case iro_SymConst: ops->get_type_attr = get_SymConst_attr_type; break;
+  case iro_Call:     ops->get_type_attr = get_Call_type; break;
+  case iro_Alloc:    ops->get_type_attr = get_Alloc_type; break;
+  case iro_Free:     ops->get_type_attr = get_Free_type; break;
+  case iro_Cast:     ops->get_type_attr = get_Cast_type; break;
+  default:
+    /* not allowed to be NULL */
+    if (! ops->get_type_attr)
+      ops->get_type_attr = get_Null_type;
+    break;
+  }
+  return ops;
+}
+
+/** the get_entity_attr operation must be always implemented */
+static entity *get_Null_ent(ir_node *n) {
+  return NULL;
+}
+
+/* Sets the get_type operation for an ir_op_ops. */
+ir_op_ops *firm_set_default_get_entity_attr(opcode code, ir_op_ops *ops)
+{
+  switch (code) {
+  case iro_SymConst: ops->get_entity_attr = get_SymConst_attr_entity; break;
+  case iro_Sel:      ops->get_entity_attr = get_Sel_entity; break;
+  default:
+    /* not allowed to be NULL */
+    if (! ops->get_entity_attr)
+      ops->get_entity_attr = get_Null_ent;
+    break;
   }
-  return op;
+  return ops;
 }
 
 #ifdef DEBUG_libfirm