never set the startblock to bad (even without the self-referencing loop)

[libfirm] / ir / ir / irop.c

diff --git a/ir/ir/irop.c b/ir/ir/irop.c
index 4a0ae54..e14aab7 100644 (file)
--- a/ir/ir/irop.c
+++ b/ir/ir/irop.c
@@ -21,6 +21,7 @@
 #include "irop_t.h"
 #include "irnode_t.h"
 #include "irhooks.h"
+#include "irbackedge_t.h"
 
 #include "iropt_t.h"             /* for firm_set_default_operations */
 #include "irvrfy_t.h"
@@ -131,10 +132,36 @@ call_copy_attr(const ir_node *old_node, ir_node *new_node) {
  */
 static void
 block_copy_attr(const ir_node *old_node, ir_node *new_node) {
+  ir_graph *irg = current_ir_graph;
+
   default_copy_attr(old_node, new_node);
+  new_node->attr.block.cg_backedge = NULL;
+  new_node->attr.block.backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node));
   INIT_LIST_HEAD(&new_node->attr.block.succ_head);
 }  /* block_copy_attr */
 
+/**
+ * Copies all phi attributes stored in old node to the new node
+ */
+static void
+phi_copy_attr(const ir_node *old_node, ir_node *new_node) {
+  ir_graph *irg = current_ir_graph;
+
+  default_copy_attr(old_node, new_node);
+  new_node->attr.phi_backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node));
+}
+
+/**
+ * Copies all filter attributes stored in old node to the new node
+ */
+static void
+filter_copy_attr(const ir_node *old_node, ir_node *new_node) {
+  ir_graph *irg = current_ir_graph;
+
+  default_copy_attr(old_node, new_node);
+  new_node->attr.filter.backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node));
+}
+
 /**
  * Sets the default copy_attr operation for an ir_ops
  *
@@ -144,11 +171,15 @@ block_copy_attr(const ir_node *old_node, ir_node *new_node) {
  * @return
  *    The operations.
  */
-static ir_op_ops *firm_set_default_copy_attr(opcode code, ir_op_ops *ops) {
+static ir_op_ops *firm_set_default_copy_attr(ir_opcode code, ir_op_ops *ops) {
   if (code == iro_Call)
     ops->copy_attr = call_copy_attr;
   else if (code == iro_Block)
     ops->copy_attr = block_copy_attr;
+  else if (code == iro_Phi)
+    ops->copy_attr = phi_copy_attr;
+  else if (code == iro_Filter)
+    ops->copy_attr = filter_copy_attr;
   else {
     /* not allowed to be NULL */
     if (! ops->copy_attr)
@@ -159,7 +190,7 @@ static ir_op_ops *firm_set_default_copy_attr(opcode code, ir_op_ops *ops) {
 
 /* Creates a new ir operation. */
 ir_op *
-new_ir_op(opcode code, const char *name, op_pin_state p,
+new_ir_op(ir_opcode code, const char *name, op_pin_state p,
           unsigned flags, op_arity opar, int op_index, size_t attr_size,
           const ir_op_ops *ops)
 {
@@ -223,7 +254,7 @@ init_op(void)
   op_Jmp       = new_ir_op(iro_Jmp,       "Jmp",       op_pin_state_pinned, X,       oparity_zero,     -1, 0, NULL);
   op_IJmp      = new_ir_op(iro_IJmp,      "IJmp",      op_pin_state_pinned, X|K,     oparity_unary,    -1, 0, NULL);
   op_Cond      = new_ir_op(iro_Cond,      "Cond",      op_pin_state_pinned, X|Y,     oparity_any,      -1, sizeof(cond_attr), NULL);
-  op_Return    = new_ir_op(iro_Return,    "Return",    op_pin_state_pinned, X,       oparity_zero,     -1, 0, NULL);
+  op_Return    = new_ir_op(iro_Return,    "Return",    op_pin_state_pinned, X,       oparity_variable, -1, 0, NULL);
 
   op_Const     = new_ir_op(iro_Const,     "Const",     op_pin_state_floats, c|S,     oparity_zero,     -1, sizeof(const_attr), NULL);
   op_SymConst  = new_ir_op(iro_SymConst,  "SymConst",  op_pin_state_floats, c|S,     oparity_zero,     -1, sizeof(symconst_attr), NULL);
@@ -262,7 +293,7 @@ init_op(void)
   op_Free      = new_ir_op(iro_Free,      "Free",      op_pin_state_pinned, N,       oparity_any,      -1, sizeof(free_attr), NULL);
   op_Sync      = new_ir_op(iro_Sync,      "Sync",      op_pin_state_pinned, N,       oparity_any,      -1, 0, NULL);
 
-  op_Proj      = new_ir_op(iro_Proj,      "Proj",      op_pin_state_floats, N,       oparity_any,      -1, sizeof(long), NULL);
+  op_Proj      = new_ir_op(iro_Proj,      "Proj",      op_pin_state_floats, N,       oparity_unary,    -1, sizeof(long), NULL);
   op_Tuple     = new_ir_op(iro_Tuple,     "Tuple",     op_pin_state_floats, L,       oparity_variable, -1, 0, NULL);
   op_Id        = new_ir_op(iro_Id,        "Id",        op_pin_state_floats, N,       oparity_any,      -1, 0, NULL);
   op_Bad       = new_ir_op(iro_Bad,       "Bad",       op_pin_state_pinned, X|F|S,   oparity_zero,     -1, 0, NULL);
@@ -374,7 +405,7 @@ const char *get_op_name (const ir_op *op) {
   return get_id_str(op->name);
 }  /* get_op_name */
 
-opcode (get_op_code)(const ir_op *op){
+ir_opcode (get_op_code)(const ir_op *op){
   return _get_op_code(op);
 }  /* get_op_code */