Remove the unused attribute const arch_env_t *arch_env from struct draw_chordal_env_t.
[libfirm] / ir / ir / irop.c
index 5cdf185..5ffa77b 100644 (file)
@@ -79,7 +79,7 @@ ir_op *op_Cmp;         ir_op *get_op_Cmp       (void) { return op_Cmp;       }
 ir_op *op_Shl;         ir_op *get_op_Shl       (void) { return op_Shl;       }
 ir_op *op_Shr;         ir_op *get_op_Shr       (void) { return op_Shr;       }
 ir_op *op_Shrs;        ir_op *get_op_Shrs      (void) { return op_Shrs;      }
-ir_op *op_Rot;         ir_op *get_op_Rot       (void) { return op_Rot;       }
+ir_op *op_Rotl;        ir_op *get_op_Rotl      (void) { return op_Rotl;      }
 ir_op *op_Conv;        ir_op *get_op_Conv      (void) { return op_Conv;      }
 ir_op *op_Cast;        ir_op *get_op_Cast      (void) { return op_Cast;      }
 ir_op *op_Carry;       ir_op *get_op_Carry     (void) { return op_Carry;     }
@@ -108,7 +108,8 @@ ir_op *op_EndExcept;   ir_op *get_op_EndExcept (void) { return op_EndExcept; }
 
 ir_op *op_NoMem;       ir_op *get_op_NoMem     (void) { return op_NoMem;     }
 ir_op *op_Mux;         ir_op *get_op_Mux       (void) { return op_Mux;       }
-ir_op *op_Psi;         ir_op *get_op_Psi       (void) { return op_Psi;       }
+ir_op *op_Min;         ir_op *get_op_Min       (void) { return op_Max;       }
+ir_op *op_Max;         ir_op *get_op_Max       (void) { return op_Max;       }
 ir_op *op_CopyB;       ir_op *get_op_CopyB     (void) { return op_CopyB;     }
 
 ir_op *op_Raise;       ir_op *get_op_Raise     (void) { return op_Raise;     }
@@ -152,6 +153,7 @@ 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.phis        = NULL;
        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);
@@ -165,7 +167,8 @@ 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));
+       new_node->attr.phi.next       = NULL;
+       new_node->attr.phi.u.backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node));
 }
 
 /**
@@ -232,10 +235,7 @@ new_ir_op(unsigned 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)
 {
-       ir_op *res;
-
-       res = (ir_op *)xmalloc(sizeof(*res));
-       memset(res, 0, sizeof(*res));
+       ir_op *res = XMALLOCZ(ir_op);
 
        res->code      = code;
        res->name      = new_id_from_chars(name, strlen(name));
@@ -244,7 +244,7 @@ new_ir_op(unsigned code, const char *name, op_pin_state p,
        res->flags     = flags;
        res->opar      = opar;
        res->op_index  = op_index;
-       res->tag       = NULL;
+       res->tag       = 0;
 
        if (ops)
                memcpy(&res->ops, ops, sizeof(res->ops));
@@ -284,6 +284,8 @@ init_op(void)
 #define K   irop_flag_keep
 #define S   irop_flag_start_block
 #define M   irop_flag_uses_memory
+#define NB  irop_flag_dump_noblock
+#define NI  irop_flag_dump_noinput
 
        /* Caution: A great deal of Firm optimizations depend an right operations flags. */
        op_Block     = new_ir_op(iro_Block,     "Block",     op_pin_state_pinned, L,       oparity_variable, -1, sizeof(block_attr), NULL);
@@ -319,37 +321,38 @@ init_op(void)
        op_Shl       = new_ir_op(iro_Shl,       "Shl",       op_pin_state_floats, N,       oparity_binary,    0, 0, NULL);
        op_Shr       = new_ir_op(iro_Shr,       "Shr",       op_pin_state_floats, N,       oparity_binary,    0, 0, NULL);
        op_Shrs      = new_ir_op(iro_Shrs,      "Shrs",      op_pin_state_floats, N,       oparity_binary,    0, 0, NULL);
-       op_Rot       = new_ir_op(iro_Rot,       "Rot",       op_pin_state_floats, N,       oparity_binary,    0, 0, NULL);
+       op_Rotl      = new_ir_op(iro_Rotl,      "Rotl",      op_pin_state_floats, N,       oparity_binary,    0, 0, NULL);
        op_Conv      = new_ir_op(iro_Conv,      "Conv",      op_pin_state_floats, N,       oparity_unary,     0, sizeof(conv_attr), NULL);
        op_Cast      = new_ir_op(iro_Cast,      "Cast",      op_pin_state_floats, H,       oparity_unary,     0, sizeof(cast_attr), NULL);
        op_Carry     = new_ir_op(iro_Carry,     "Carry",     op_pin_state_floats, C,       oparity_binary,    0, 0, NULL);
        op_Borrow    = new_ir_op(iro_Borrow,    "Borrow",    op_pin_state_floats, N,       oparity_binary,    0, 0, NULL);
 
-       op_Phi       = new_ir_op(iro_Phi,       "Phi",       op_pin_state_pinned, N,       oparity_variable, -1, sizeof(phi0_attr), NULL);
+       op_Phi       = new_ir_op(iro_Phi,       "Phi",       op_pin_state_pinned, N,       oparity_variable, -1, sizeof(phi_attr), NULL);
 
-       op_Load      = new_ir_op(iro_Load,      "Load",      op_pin_state_exc_pinned, F|M,   oparity_any,      -1, sizeof(load_attr), NULL);
-       op_Store     = new_ir_op(iro_Store,     "Store",     op_pin_state_exc_pinned, F|M,   oparity_any,      -1, sizeof(store_attr), NULL);
-       op_Alloc     = new_ir_op(iro_Alloc,     "Alloc",     op_pin_state_pinned, F|M,       oparity_any,      -1, sizeof(alloc_attr), NULL);
-       op_Free      = new_ir_op(iro_Free,      "Free",      op_pin_state_pinned, N|M,       oparity_any,      -1, sizeof(free_attr), NULL);
-       op_Sync      = new_ir_op(iro_Sync,      "Sync",      op_pin_state_pinned, N,       oparity_dynamic,  -1, 0, NULL);
+       op_Load      = new_ir_op(iro_Load,      "Load",      op_pin_state_exc_pinned, F|M, oparity_any,      -1, sizeof(load_attr), NULL);
+       op_Store     = new_ir_op(iro_Store,     "Store",     op_pin_state_exc_pinned, F|M, oparity_any,      -1, sizeof(store_attr), NULL);
+       op_Alloc     = new_ir_op(iro_Alloc,     "Alloc",     op_pin_state_pinned, F|M,     oparity_any,      -1, sizeof(alloc_attr), NULL);
+       op_Free      = new_ir_op(iro_Free,      "Free",      op_pin_state_pinned, N|M,     oparity_any,      -1, sizeof(free_attr), NULL);
+       op_Sync      = new_ir_op(iro_Sync,      "Sync",      op_pin_state_floats, N,       oparity_dynamic,  -1, 0, 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);
+       op_Bad       = new_ir_op(iro_Bad,       "Bad",       op_pin_state_pinned, X|F|S|NB,oparity_zero,     -1, 0, NULL);
        op_Confirm   = new_ir_op(iro_Confirm,   "Confirm",   op_pin_state_pinned, H,       oparity_any,      -1, sizeof(confirm_attr), NULL);
 
-       op_Unknown   = new_ir_op(iro_Unknown,   "Unknown",   op_pin_state_pinned, X|F|S|c,   oparity_zero,     -1, 0, NULL);
+       op_Unknown   = new_ir_op(iro_Unknown,   "Unknown",   op_pin_state_pinned, X|F|S|c|NB,oparity_zero,   -1, 0, NULL);
        op_Filter    = new_ir_op(iro_Filter,    "Filter",    op_pin_state_pinned, N,       oparity_variable, -1, sizeof(filter_attr), NULL);
        op_Break     = new_ir_op(iro_Break,     "Break",     op_pin_state_pinned, X,       oparity_zero,     -1, 0, NULL);
        op_CallBegin = new_ir_op(iro_CallBegin, "CallBegin", op_pin_state_pinned, X|I,     oparity_any,      -1, sizeof(callbegin_attr), NULL);
        op_EndReg    = new_ir_op(iro_EndReg,    "EndReg",    op_pin_state_pinned, X|I,     oparity_dynamic,  -1, 0, NULL);
        op_EndExcept = new_ir_op(iro_EndExcept, "EndExcept", op_pin_state_pinned, X|I,     oparity_dynamic,  -1, 0, NULL);
 
-       op_NoMem     = new_ir_op(iro_NoMem,     "NoMem",     op_pin_state_pinned, N,       oparity_zero,     -1, 0, NULL);
+       op_NoMem     = new_ir_op(iro_NoMem,     "NoMem",     op_pin_state_pinned, N|NB|NI, oparity_zero,     -1, 0, NULL);
        op_Mux       = new_ir_op(iro_Mux,       "Mux",       op_pin_state_floats, N,       oparity_trinary,  -1, 0, NULL);
-       op_Psi       = new_ir_op(iro_Psi,       "Psi",       op_pin_state_floats, N,       oparity_variable, -1, 0, NULL);
-       op_CopyB     = new_ir_op(iro_CopyB,     "CopyB",     op_pin_state_mem_pinned, F|H|M, oparity_trinary,  -1, sizeof(copyb_attr), NULL);
+       op_Min       = new_ir_op(iro_Min,       "Min",       op_pin_state_floats, N,       oparity_binary,   -1, 0, NULL);
+       op_Max       = new_ir_op(iro_Max,       "Max",       op_pin_state_floats, N,       oparity_binary,   -1, 0, NULL);
+       op_CopyB     = new_ir_op(iro_CopyB,     "CopyB",     op_pin_state_mem_pinned, F|H|M, oparity_trinary,-1, sizeof(copyb_attr), NULL);
 
        op_InstOf    = new_ir_op(iro_InstOf,    "InstOf",    op_pin_state_mem_pinned, H,   oparity_unary,    -1, sizeof(io_attr), NULL);
        op_Raise     = new_ir_op(iro_Raise,     "Raise",     op_pin_state_pinned,     H|X, oparity_any,      -1, 0, NULL);
@@ -359,7 +362,7 @@ init_op(void)
 
        op_ASM       = new_ir_op(iro_ASM,       "ASM",       op_pin_state_mem_pinned, K|M, oparity_variable, -1, sizeof(asm_attr), NULL);
 
-       op_Anchor    = new_ir_op(iro_Anchor,    "Anchor",    op_pin_state_pinned, N,       oparity_variable, -1, 0, NULL);
+       op_Anchor    = new_ir_op(iro_Anchor,    "Anchor",    op_pin_state_pinned, N|NB,    oparity_variable, -1, 0, NULL);
 
 #undef S
 #undef H
@@ -370,6 +373,8 @@ init_op(void)
 #undef C
 #undef L
 #undef E
+#undef NB
+#undef NI
 }  /* init_op */
 
 
@@ -407,7 +412,7 @@ void finish_op(void) {
        free_ir_op (op_Shl      ); op_Shl       = NULL;
        free_ir_op (op_Shr      ); op_Shr       = NULL;
        free_ir_op (op_Shrs     ); op_Shrs      = NULL;
-       free_ir_op (op_Rot      ); op_Rot       = NULL;
+       free_ir_op (op_Rotl     ); op_Rotl      = NULL;
        free_ir_op (op_Conv     ); op_Conv      = NULL;
        free_ir_op (op_Cast     ); op_Cast      = NULL;
        free_ir_op (op_Carry    ); op_Carry     = NULL;
@@ -435,7 +440,8 @@ void finish_op(void) {
        free_ir_op (op_EndExcept); op_EndExcept = NULL;
 
        free_ir_op (op_NoMem    ); op_NoMem     = NULL;
-       free_ir_op (op_Psi      ); op_Psi       = NULL;
+       free_ir_op (op_Max      ); op_Max       = NULL;
+       free_ir_op (op_Min      ); op_Min       = NULL;
        free_ir_op (op_Mux      ); op_Mux       = NULL;
        free_ir_op (op_CopyB    ); op_CopyB     = NULL;
 
@@ -510,3 +516,7 @@ void (set_generic_function_ptr)(ir_op *op, op_func func) {
 const ir_op_ops *(get_op_ops)(const ir_op *op) {
        return _get_op_ops(op);
 }  /* get_op_ops */
+
+irop_flags get_op_flags(const ir_op *op) {
+       return op->flags;
+}