Rename arch_register_req_type_should_be_different to the more appropriate arch_regist...

[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 b691e79..578d5b0 100755 (executable)
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -265,6 +265,12 @@ foreach my $op (keys(%nodes)) {
                $attr_type = $default_attr_type;
        }
 
+       # determine hash function
+       my $hash_func;
+       if (exists($n{"hash_func"})) {
+               $hash_func = $n{"hash_func"};
+       }
+
        # determine compare function
        my $cmp_attr_func;
        if (exists($n{"cmp_attr"})) {
@@ -575,6 +581,9 @@ foreach my $op (keys(%nodes)) {
        if (defined($copy_attr_func)) {
                push(@obst_new_irop, "\tops.copy_attr = ${copy_attr_func};\n");
        }
+       if (defined($hash_func)) {
+               push(@obst_new_irop, "\tops.hash = ${hash_func};\n");
+       }
 
        $n_opcodes++;
        my $n_res = $out_arity;
@@ -586,8 +595,7 @@ foreach my $op (keys(%nodes)) {
        push(@obst_new_irop, $temp);
        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");
                }
@@ -709,6 +717,8 @@ void $arch\_create_opcodes(const arch_irn_ops_t *be_ops) {
 #define K   irop_flag_keep
 #define M   irop_flag_machine
 #define O   irop_flag_machine_op
+#define NB  irop_flag_dump_noblock
+#define NI  irop_flag_dump_noinput
 #define R   (irop_flag_user << 0)
 
        ir_op_ops  ops;
@@ -717,8 +727,8 @@ void $arch\_create_opcodes(const arch_irn_ops_t *be_ops) {
        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;
@@ -739,6 +749,11 @@ print OUT<<ENDOFMAIN;
        $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));
@@ -1214,7 +1229,7 @@ EOF
                        push(@req_type_mask, "arch_register_req_type_should_be_same");
                }
                if ($different_pos != 0) {
-                       push(@req_type_mask, "arch_register_req_type_should_be_different");
+                       push(@req_type_mask, "arch_register_req_type_must_be_different");
                }
                my $reqtype      = join(" | ", @req_type_mask);