X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firop.c;h=450dd475d33d98d5e637c5c2f087c5a752063f57;hb=67553de44f77855233fb2dfb0251eb9098f2b467;hp=fbb2ed61ae83e269bbb0f8bd6478f6e00fe1fab3;hpb=2807bb5b1ed34c23dc30d228ab0686c6fc9d6ae3;p=libfirm

diff --git a/ir/ir/irop.c b/ir/ir/irop.c
index fbb2ed61a..450dd475d 100644
--- a/ir/ir/irop.c
+++ b/ir/ir/irop.c
@@ -33,7 +33,7 @@
 #include "irbackedge_t.h"
 
 #include "iropt_t.h"
-#include "irvrfy_t.h"
+#include "irverify_t.h"
 #include "reassoc_t.h"
 
 #include "xmalloc.h"
@@ -104,16 +104,6 @@ static void phi_copy_attr(ir_graph *irg, const ir_node *old_node,
 	new_node->attr.phi.u.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(ir_graph *irg, const ir_node *old_node,
-                             ir_node *new_node)
-{
-	default_copy_attr(irg, old_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
  */
@@ -121,9 +111,9 @@ static void ASM_copy_attr(ir_graph *irg, const ir_node *old_node,
                           ir_node *new_node)
 {
 	default_copy_attr(irg, 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);
+	new_node->attr.assem.input_constraints  = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.input_constraints);
+	new_node->attr.assem.output_constraints = DUP_ARR_D(ir_asm_constraint, irg->obst, old_node->attr.assem.output_constraints);
+	new_node->attr.assem.clobbers = DUP_ARR_D(ident*, irg->obst, old_node->attr.assem.clobbers);
 }
 
 /**
@@ -135,7 +125,7 @@ static void ASM_copy_attr(ir_graph *irg, const ir_node *old_node,
  * @return
  *    The operations.
  */
-static ir_op_ops *firm_set_default_copy_attr(ir_opcode code, ir_op_ops *ops)
+static ir_op_ops *firm_set_default_copy_attr(unsigned code, ir_op_ops *ops)
 {
 	switch (code) {
 	case iro_Call:
@@ -147,9 +137,6 @@ static ir_op_ops *firm_set_default_copy_attr(ir_opcode code, ir_op_ops *ops)
 	case iro_Phi:
 		ops->copy_attr = phi_copy_attr;
 		break;
-	case iro_Filter:
-		ops->copy_attr = filter_copy_attr;
-		break;
 	case iro_ASM:
 		ops->copy_attr = ASM_copy_attr;
 		break;
@@ -277,7 +264,7 @@ const ir_op_ops *(get_op_ops)(const ir_op *op)
 
 irop_flags get_op_flags(const ir_op *op)
 {
-	return op->flags;
+	return (irop_flags)op->flags;
 }
 
 #include "gen_irop.c.inl"