When checking PhiM's, ignore Bad predecessors

[libfirm] / ir / ir / irnode.c

diff --git a/ir/ir/irnode.c b/ir/ir/irnode.c
index 37f320e..7b29f20 100644 (file)
--- a/ir/ir/irnode.c
+++ b/ir/ir/irnode.c
@@ -592,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));
@@ -605,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();
@@ -615,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) {
@@ -783,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
@@ -806,7 +821,7 @@ 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);
   }
 }
 
@@ -990,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;
 }
 
@@ -1756,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)) {
@@ -2440,6 +2460,24 @@ 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 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);
@@ -2587,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;
 }
@@ -2595,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;
 }