rot matcher incorrect

[libfirm] / ir / be / scripts / generate_new_opcodes.pl

diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index 363b56e..85e2627 100755 (executable)
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -158,7 +158,7 @@ foreach my $class_name (keys(%reg_classes)) {
 # for registering additional opcodes
 $n_opcodes += $additional_opcodes if (defined($additional_opcodes));
 
-push(@obst_header, "void ".$arch."_create_opcodes(void);\n");
+push(@obst_header, "void ".$arch."_create_opcodes(const arch_irn_ops_t *be_ops);\n");
 
 push(@obst_enum_op, "typedef enum _$arch\_opcodes {\n");
 foreach my $op (keys(%nodes)) {
@@ -562,6 +562,7 @@ foreach my $op (keys(%nodes)) {
 
 
        push(@obst_new_irop, "\n\tmemset(&ops, 0, sizeof(ops));\n");
+       push(@obst_new_irop, "\tops.be_ops        = be_ops;\n");
        push(@obst_new_irop, "\tops.dump_node     = $arch\_dump_node;\n");
 
        if (defined($cmp_attr_func)) {
@@ -583,10 +584,9 @@ foreach my $op (keys(%nodes)) {
        $temp  = "\top_$op = new_ir_op(cur_opcode + iro_$op, \"$op\", op_pin_state_".$n{"state"}.", ".$n{"op_flags"};
        $temp .= "|M, ".translate_arity($arity).", 0, sizeof(${attr_type}), &ops);\n";
        push(@obst_new_irop, $temp);
-       push(@obst_new_irop, "\tset_op_tag(op_$op, &$arch\_op_tag);\n");
+       push(@obst_new_irop, "\tset_op_tag(op_$op, $arch\_op_tag);\n");
        if(defined($default_op_attr_type)) {
-               push(@obst_new_irop, "\tattr = ($default_op_attr_type *) xmalloc(sizeof(attr[0]));\n");
-               push(@obst_new_irop, "\tmemset(attr, 0, sizeof(attr[0]));\n");
+               push(@obst_new_irop, "\tattr = &attrs[iro_$op];\n");
                if(defined($n{op_attr_init})) {
                        push(@obst_new_irop, "\t".$n{op_attr_init}."\n");
                }
@@ -644,7 +644,7 @@ if (length($arch) >= 4) {
 print OUT<<ENDOFISIRN;
 
 /** A tag for the $arch opcodes. Note that the address is used as a tag value, NOT the FOURCC code. */
-static unsigned $arch\_op_tag = FOURCC('$a', '$b', '$c', '$d');
+#define $arch\_op_tag FOURCC('$a', '$b', '$c', '$d')
 
 /** Return the opcode number of the first $arch opcode. */
 int get_$arch\_opcode_first(void) {
@@ -658,7 +658,7 @@ int get_$arch\_opcode_last(void) {
 
 /** Return 1 if the given opcode is a $arch machine op, 0 otherwise */
 int is_$arch\_op(const ir_op *op) {
-       return get_op_tag(op) == &$arch\_op_tag;
+       return get_op_tag(op) == $arch\_op_tag;
 }
 
 /** Return 1 if the given node is a $arch machine node, 0 otherwise */
@@ -695,7 +695,7 @@ print OUT<<ENDOFMAIN;
  * Creates the $arch specific Firm machine operations
  * needed for the assembler irgs.
  */
-void $arch\_create_opcodes(void) {
+void $arch\_create_opcodes(const arch_irn_ops_t *be_ops) {
 #define N   irop_flag_none
 #define L   irop_flag_labeled
 #define C   irop_flag_commutative
@@ -713,10 +713,11 @@ void $arch\_create_opcodes(void) {
        ir_op_ops  ops;
        int        cur_opcode;
        static int run_once = 0;
+       int        i;
 ENDOFMAIN
 
-       if(defined($default_op_attr_type)) {
-               print OUT "\t$default_op_attr_type *attr;\n";
+       if (defined($default_op_attr_type)) {
+               print OUT "\t$default_op_attr_type *attr, *attrs;\n";
        }
 
 print OUT<<ENDOFMAIN;
@@ -725,11 +726,23 @@ print OUT<<ENDOFMAIN;
                return;
        run_once = 1;
 
+       /* we handle all middleend nodes as well that have no other handler */
+       for (i = 0; i <= iro_Last; ++i) {
+               ir_op *op      = get_irp_opcode(i);
+               if (op->ops.be_ops == NULL)
+                       op->ops.be_ops = be_ops;
+       }
+
        cur_opcode = get_next_ir_opcodes(iro_$arch\_last);
 
        $arch\_opcode_start = cur_opcode;
 ENDOFMAIN
 
+       if (defined($default_op_attr_type)) {
+               print OUT "\tattrs = xmalloc(sizeof(attr[0]) * iro_$arch\_last);\n";
+               print OUT "\tmemset(attrs, 0, sizeof(attr[0]) * iro_$arch\_last);\n";
+       }
+
 print OUT @obst_new_irop;
 print OUT "\n";
 print OUT "\t$arch\_register_additional_opcodes(cur_opcode);\n" if (defined($additional_opcodes));