Start block isn't a special case anymore (and now get the old node nr).
[libfirm] / ir / be / scripts / generate_new_opcodes.pl
index 59d784b..6890d53 100755 (executable)
@@ -317,7 +317,7 @@ foreach my $op (keys(%nodes)) {
                my $complete_args = "";
                $temp             = "";
 
-               $temp = "ir_node *new_rd_$op(dbg_info *db, ir_graph *irg, ir_node *block";
+               $temp = "ir_node *new_bd_$op(dbg_info *db, ir_node *block";
                if (!exists($n{"args"})) { # default args
                        if ($arity == $ARITY_VARIABLE) {
                                $complete_args = ", int arity, ir_node *in[]";
@@ -487,10 +487,8 @@ foreach my $op (keys(%nodes)) {
                                                $temp .= "\tflags |= arch_irn_flags_rematerializable;\n";
                                        } elsif ($flag eq "N") {
                                                $temp .= "\tflags |= arch_irn_flags_dont_spill;\n";
-                                       } elsif ($flag eq "I") {
-                                               $temp .= "\tflags |= arch_irn_flags_ignore;\n";
-                                       } elsif ($flag eq "S") {
-                                               $temp .= "\tflags |= arch_irn_flags_modify_sp;\n";
+                                       } else {
+                                               die "Fatal error: unknown flag $flag for ${op}\n";
                                        }
                                }
                                $temp .= "\n";
@@ -498,7 +496,7 @@ foreach my $op (keys(%nodes)) {
 
                        $temp .= "\t/* create node */\n";
                        $temp .= "\tassert(op != NULL);\n";
-                       $temp .= "\tres = new_ir_node(db, irg, block, op, mode, arity, in);\n";
+                       $temp .= "\tres = new_ir_node(db, current_ir_graph, block, op, mode, arity, in);\n";
                        $temp .= "\n";
 
                        $temp .= "\t/* init node attributes */\n";
@@ -513,33 +511,6 @@ foreach my $op (keys(%nodes)) {
                        }
                        $temp .= "\n";
 
-                       # set flags for outs
-                       if (exists($n{"outs"})) {
-                               undef my @outs;
-                               @outs     = @{ $n{"outs"} };
-
-                               for (my $idx = 0; $idx <= $#outs; $idx++) {
-                                       # check, if we have additional flags annotated to out
-                                       if ($outs[$idx] =~ /:((S|I)(\|(S|I))*)/) {
-                                               my $flag_string = $1;
-                                               my $prefix = "";
-                                               my $flags  = "";
-
-                                               foreach my $flag (split(/\|/, $flag_string)) {
-                                                       if ($flag eq "I") {
-                                                               $flags .= $prefix."arch_irn_flags_ignore";
-                                                               $prefix = " | ";
-                                                       } elsif ($flag eq "S") {
-                                                               $flags .= $prefix."arch_irn_flags_modify_sp";
-                                                               $prefix = " | ";
-                                                       }
-                                               }
-
-                                               $temp .= "\tset_$arch\_out_flags(res, $flags, $idx);\n";
-                                       }
-                               }
-                       }
-
                        if (exists($n{"init_attr"})) {
                                $temp .= "\tattr = get_irn_generic_attr(res);\n";
                                $temp .= "\t".$n{"init_attr"}."\n";
@@ -547,7 +518,7 @@ foreach my $op (keys(%nodes)) {
 
                        $temp .= "\t/* optimize node */\n";
                        $temp .= "\tres = optimize_node(res);\n";
-                       $temp .= "\tirn_vrfy_irg(res, irg);\n";
+                       $temp .= "\tirn_vrfy_irg(res, current_ir_graph);\n";
                        $temp .= "\n";
 
                        $temp .= "\treturn res;\n";
@@ -724,7 +695,6 @@ void $arch\_create_opcodes(const arch_irn_ops_t *be_ops) {
        ir_op_ops  ops;
        int        cur_opcode;
        static int run_once = 0;
-       int        i;
 ENDOFMAIN
 
        if (defined($default_op_attr_type)) {
@@ -737,13 +707,6 @@ 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;
@@ -899,6 +862,7 @@ TP_SEARCH:  foreach my $cur_type (keys(%cpu)) {
 sub mangle_requirements {
        my $reqs  = shift;
        my $class = shift;
+       my $flags = shift;
 
        my @alternatives = split(/ /, $reqs);
        for(my $idx = 0; $idx < scalar(@alternatives); $idx++) {
@@ -908,6 +872,10 @@ sub mangle_requirements {
        @alternatives = sort @alternatives;
 
        my $name = $class."_".join('_', @alternatives);
+       if (defined($flags)) {
+               $flags =~ s/\|/_/g;
+               $name .= "_$flags";
+       }
 
        return $name;
 }
@@ -961,13 +929,14 @@ sub build_inout_idx_class {
 
                for (my $idx = 0; $idx <= $#reqs; $idx++) {
                        my $class = undef;
+                       my ($req,) = split(/:/, $reqs[$idx]);
 
-                       if ($reqs[$idx] eq "none") {
+                       if ($req eq "none") {
                                $class = "none";
-                       } elsif (is_reg_class($reqs[$idx])) {
-                               $class = $reqs[$idx];
+                       } elsif (is_reg_class($req)) {
+                               $class = $req;
                        } else {
-                               my @regs = split(/ /, $reqs[$idx]);
+                               my @regs = split(/ /, $req);
 GET_CLASS:             foreach my $reg (@regs) {
                                        if ($reg =~ /!?(in|out)\_r\d+/ || $reg =~ /!in/) {
                                                $class = "UNKNOWN_CLASS";
@@ -1015,6 +984,7 @@ sub build_subset_class_func {
        my $idx   = shift;
        my $is_in = shift;
        my @regs  = split(/ /, shift);
+       my $flags = shift;
 
        my @idx_class = build_inout_idx_class($node, $op, !$is_in);
 
@@ -1165,7 +1135,7 @@ CHECK_REQS: foreach (@regs) {
 # Generate register requirements structure
 ###
 sub generate_requirements {
-       my $reqs  = shift;
+       my ($reqs, $flags) = split(/:/, shift);
        my $node  = shift;
        my $op    = shift;
        my $idx   = shift;
@@ -1173,6 +1143,17 @@ sub generate_requirements {
        my $class = "";
        my $result;
 
+       my @req_type_mask;
+       if (defined($flags)) {
+               foreach my $f (split(/|/, $flags)) {
+                       if ($f eq "I") {
+                               push(@req_type_mask, "arch_register_req_type_ignore");
+                       } elsif ($f eq "S") {
+                               push(@req_type_mask, "arch_register_req_type_produces_sp");
+                       }
+               }
+       }
+
        if ($reqs eq "none") {
 
                $result = <<EOF;
@@ -1184,27 +1165,14 @@ sub generate_requirements {
        0                             /* different pos */
 };
 
-EOF
-       } elsif ($reqs =~ /^new_reg_(.*)$/) {
-               if(!is_reg_class($1)) {
-                       die "$1 is not a register class in requirements for $op\n";
-               }
-               $class  = $1;
-               $result = <<EOF;
-{
-       arch_register_req_type_should_be_different_from_all,
-       & ${arch}_reg_classes[CLASS_${arch}_${class}],
-       NULL,        /* limit bitset */
-       0,           /* same pos */
-       0            /* different pos */
-};
-
 EOF
        } elsif (is_reg_class($reqs)) {
+               push(@req_type_mask, "arch_register_req_type_normal");
+               my $reqtype = join(" | ", @req_type_mask);
                $class  = $reqs;
                $result = <<EOF;
 {
-       arch_register_req_type_normal,
+       ${reqtype},
        & ${arch}_reg_classes[CLASS_${arch}_${class}],
        NULL,        /* limit bitset */
        0,           /* same pos */
@@ -1214,9 +1182,8 @@ EOF
 EOF
 
        } else {
-               my @req_type_mask;
                my ($regclass, $limit_bitset, $same_pos, $different_pos)
-                       = build_subset_class_func($node, $op, $idx, $is_in, $reqs);
+                       = build_subset_class_func($node, $op, $idx, $is_in, $reqs, $flags);
 
                if (!defined($regclass)) {
                        die("Fatal error: Could not build subset for requirements '$reqs' of '$op' pos $idx ... exiting.\n");
@@ -1229,9 +1196,9 @@ 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);
+               my $reqtype = join(" | ", @req_type_mask);
 
                if(!defined($limit_bitset)) {
                        $limit_bitset = "NULL";
@@ -1250,7 +1217,7 @@ EOF
 EOF
        }
 
-       my $name = "${arch}_requirements_".mangle_requirements($reqs, $class);
+       my $name = "${arch}_requirements_".mangle_requirements($reqs, $class, $flags);
        if(defined($requirements{$name})) {
                return $name;
        }