Added index -> node map to irgs

[libfirm] / ir / ir / irnode.c

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index e1a3880..37f320e 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -130,18 +130,19 @@ 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 = (ir_node *) (p + firm_add_node_size);
 
   res->kind     = k_ir_node;
   res->op       = op;
   res->mode     = mode;
   res->visited  = 0;
-  res->node_idx = get_irg_next_node_idx(irg);
+  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 */
@@ -158,20 +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;
-    int is_bl = is_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);
-    if(is_bl)
-      INIT_LIST_HEAD(&res->attr.block.succ_head);
 
-
-    for (i = is_bl; i <= arity; ++i)
-      edges_notify_edge(res, i - 1, 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);
 
@@ -569,6 +564,15 @@ unsigned (get_irn_idx)(const 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 */
@@ -795,8 +799,8 @@ void set_End_keepalives(ir_node *end, int n, ir_node *in[]) {
   ir_graph *irg = get_irn_irg(end);
 
   /* notify that edges are deleted */
-  for (i = END_KEEPALIVE_OFFSET; i < ARR_LEN(end->in); ++i) {
-    edges_notify_edge(end, i, in[i], NULL, irg);
+  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);
 
@@ -2028,40 +2032,40 @@ 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 node->in[1 + 2 * pos];
+       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);
-  node->in[1 + 2 * pos] = cond;
+       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 node->in[1 + 2 * pos + 1];
+       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);
-  node->in[1 + 2 * pos + 1] = val;
+       set_irn_n(node, 2 * pos + 1, val);
 }
 
 ir_node *get_Psi_default(ir_node *node) {
-  int def_pos = get_irn_arity(node);
+  int def_pos = get_irn_arity(node) - 1;
   assert(node->op == op_Psi);
-  return node->in[def_pos];
+       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);
-  node->in[def_pos] = node;
+       set_irn_n(node, def_pos, val);
 }
 
 int (get_Psi_n_conds)(ir_node *node) {