X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firnode.c;h=7b29f206312d157cc09769b44161424c51b3ae1e;hb=54473f46aefff029b5dc2908ec4d9ec0765221a5;hp=cec30c774b640b7fcf3fc9c95d02ac5455199b01;hpb=ef2b291b6f9191c63684513962ea516cba8f94e5;p=libfirm

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index cec30c774..7b29f2063 100644
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -130,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 {
@@ -157,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);
 
@@ -241,17 +237,17 @@ 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], irg);
-		else
-	    edges_notify_edge(node, i, in[i], NULL,        irg);
+  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], irg);
-	}
 
-	if (arity != ARR_LEN(*arr) - 1) {
+  if (arity != ARR_LEN(*arr) - 1) {
     ir_node * block = (*arr)[0];
     *arr = NEW_ARR_D(ir_node *, irg->obst, arity + 1);
     (*arr)[0] = block;
@@ -347,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
@@ -566,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 */
@@ -585,8 +592,7 @@ 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. */
 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));
@@ -598,8 +604,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();
@@ -608,6 +613,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) {
@@ -776,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
@@ -786,11 +808,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, 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 ... */
 }
@@ -966,17 +1005,15 @@ set_SymConst_kind (ir_node *node, symconst_kind 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));
+  assert(   (node->op == op_SymConst)
+         && (SYMCONST_HAS_TYPE(get_SymConst_kind(node))));
   return node->attr.i.sym.type_p = skip_tid(node->attr.i.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));
+  assert(   (node->op == op_SymConst)
+         && (SYMCONST_HAS_TYPE(get_SymConst_kind(node))));
   node->attr.i.sym.type_p = tp;
 }
 
@@ -1732,40 +1769,47 @@ set_Free_where (ir_node *node, where_alloc where) {
   node->attr.f.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);
 }
 
+/* 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)) {
@@ -2005,43 +2049,47 @@ void     set_Mux_true  (ir_node *node, ir_node *ir_true) {
 
 /* Psi support */
 ir_node *get_Psi_cond   (ir_node *node, int pos) {
-  int num_conds = get_irn_arity(node) >> 1;
+  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_irn_arity(node) >> 1;
+  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_irn_arity(node) >> 1;
+  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_irn_arity(node) >> 1;
+  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) {
+  return _get_Psi_n_conds(node);
 }
 
 /* CopyB support */
@@ -2406,6 +2454,30 @@ int
   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);
@@ -2491,6 +2563,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)
 {
@@ -2537,7 +2625,7 @@ 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;
 }
@@ -2545,7 +2633,7 @@ static ir_type *get_SymConst_attr_type(ir_node *self) {
 /** 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 (kind == symconst_addr_ent)
+  if (SYMCONST_HAS_ENT(kind))
     return get_SymConst_entity(self);
   return NULL;
 }