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

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index 8e184cd21..37f320e43 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 */
@@ -129,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 {
@@ -156,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, 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);
-    if(!not_a_block)
-      INIT_LIST_HEAD(&res->attr.block.succ_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);
 
@@ -225,6 +222,7 @@ 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) {
@@ -239,22 +237,22 @@ set_irn_in (ir_node *node, int arity, ir_node **in) {
     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], current_ir_graph);
-		else
-	    edges_notify_edge(node, i, in[i], NULL,        current_ir_graph);
+  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);
   }
-	for(;i < ARR_LEN(*arr)-1; i++) {
-		edges_notify_edge(node, i, NULL, (*arr)[i+1], current_ir_graph);
-	}
 
-	if (arity != ARR_LEN(*arr) - 1) {
+  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);
 }
@@ -345,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
@@ -465,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
 }
 
@@ -565,6 +559,20 @@ 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 */
@@ -630,12 +638,12 @@ get_Block_cfgpred_arr (ir_node *node)
 
 int
 (get_Block_n_cfgpreds)(ir_node *node) {
-  return get_Block_n_cfgpreds(node);
+  return _get_Block_n_cfgpreds(node);
 }
 
 ir_node *
 (get_Block_cfgpred)(ir_node *node, int pos) {
-  return get_Block_cfgpred(node, pos);
+  return _get_Block_cfgpred(node, pos);
 }
 
 void
@@ -748,22 +756,19 @@ int (is_Block_dead)(const ir_node *block) {
 }
 
 ir_extblk *get_Block_extbb(const ir_node *block) {
+	ir_extblk *res;
   assert(is_Block(block));
-  return block->attr.block.extblk;
+	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;
 }
 
-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");
-}
-
 int
 get_End_n_keepalives(ir_node *end) {
   assert (end->op == op_End);
@@ -788,11 +793,28 @@ 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, 1 + 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 ... */
 }
@@ -1788,7 +1810,7 @@ ir_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:
@@ -1949,30 +1971,105 @@ 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 */
@@ -2313,12 +2410,36 @@ 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);
+}
+
 int
 is_Proj (const ir_node *node) {
   assert(node);
@@ -2404,6 +2525,22 @@ 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)
 {