Fixed warnings

[libfirm] / ir / ir / irop.c

diff --git a/ir/ir/irop.c b/ir/ir/irop.c
index 0c48bf9..7878b8a 100644 (file)
--- a/ir/ir/irop.c
+++ b/ir/ir/irop.c
@@ -177,6 +177,19 @@ filter_copy_attr(const ir_node *old_node, ir_node *new_node) {
        new_node->attr.filter.backedge = new_backedge_arr(irg->obst, get_irn_arity(new_node));
 }
 
+/**
+ * Copies all ASM attributes stored in old node to the new node
+ */
+static void
+ASM_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.assem.inputs  = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.inputs);
+       new_node->attr.assem.outputs = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.outputs);
+       new_node->attr.assem.clobber = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.clobber);
+}
+
 /**
  * Sets the default copy_attr operation for an ir_ops
  *
@@ -187,15 +200,23 @@ filter_copy_attr(const ir_node *old_node, ir_node *new_node) {
  *    The operations.
  */
 static ir_op_ops *firm_set_default_copy_attr(ir_opcode code, ir_op_ops *ops) {
-       if (code == iro_Call)
+       switch(code) {
+       case iro_Call:
                ops->copy_attr = call_copy_attr;
-       else if (code == iro_Block)
+               break;
+       case iro_Block:
                ops->copy_attr = block_copy_attr;
-       else if (code == iro_Phi)
+               break;
+       case iro_Phi:
                ops->copy_attr = phi_copy_attr;
-       else if (code == iro_Filter)
+               break;
+       case iro_Filter:
                ops->copy_attr = filter_copy_attr;
-       else {
+               break;
+       case iro_ASM:
+               ops->copy_attr = ASM_copy_attr;
+               break;
+       default:
                /* not allowed to be NULL */
                if (! ops->copy_attr)
                        ops->copy_attr = default_copy_attr;
@@ -205,7 +226,7 @@ static ir_op_ops *firm_set_default_copy_attr(ir_opcode code, ir_op_ops *ops) {
 
 /* Creates a new ir operation. */
 ir_op *
-new_ir_op(ir_opcode code, const char *name, op_pin_state p,
+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)
 {
@@ -278,8 +299,8 @@ init_op(void)
 
        op_Call      = new_ir_op(iro_Call,      "Call",      op_pin_state_mem_pinned, F,   oparity_variable, -1, sizeof(call_attr), NULL);
        op_Add       = new_ir_op(iro_Add,       "Add",       op_pin_state_floats, C,       oparity_binary,    0, 0, NULL);
-       op_Minus     = new_ir_op(iro_Minus,     "Minus",     op_pin_state_floats, N,       oparity_unary,     0, 0, NULL);
        op_Sub       = new_ir_op(iro_Sub,       "Sub",       op_pin_state_floats, N,       oparity_binary,    0, 0, NULL);
+       op_Minus     = new_ir_op(iro_Minus,     "Minus",     op_pin_state_floats, N,       oparity_unary,     0, 0, NULL);
        op_Mul       = new_ir_op(iro_Mul,       "Mul",       op_pin_state_floats, C,       oparity_binary,    0, 0, NULL);
        op_Quot      = new_ir_op(iro_Quot,      "Quot",      op_pin_state_exc_pinned, F,   oparity_binary,    1, sizeof(divmod_attr), NULL);
        op_DivMod    = new_ir_op(iro_DivMod,    "DivMod",    op_pin_state_exc_pinned, F,   oparity_binary,    1, sizeof(divmod_attr), NULL);
@@ -423,7 +444,7 @@ const char *get_op_name (const ir_op *op) {
        return get_id_str(op->name);
 }  /* get_op_name */
 
-ir_opcode (get_op_code)(const ir_op *op){
+unsigned (get_op_code)(const ir_op *op){
   return _get_op_code(op);
 }  /* get_op_code */