Added phi handler

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

diff --git a/ir/be/scripts/generate_regalloc_if.pl b/ir/be/scripts/generate_regalloc_if.pl
index 4d014c5..ba1499a 100755 (executable)
--- a/ir/be/scripts/generate_regalloc_if.pl
+++ b/ir/be/scripts/generate_regalloc_if.pl
@@ -306,7 +306,6 @@ EOF
 print OUT "arch_register_class_t $arch\_reg_classes[] = {\n  ".join(",\n  ", @obst_regclasses)."\n};\n\n";
 
 print OUT "void ".$arch."_register_init(void *isa_ptr) {\n";
-print OUT "  $arch\_isa_t *isa = ($arch\_isa_t *)isa_ptr;\n\n";
 print OUT @obst_reginit;
 print OUT "}\n\n";
 
@@ -386,6 +385,29 @@ sub generate_requirements {
                if ($reqs[$idx] eq "none") {
                        $tmp .= "&$arch\_default_req_none\n";
                }
+               elsif ($reqs[$idx] =~ /^new_reg_(.*)$/) {
+                       if (is_reg_class($1)) {
+                               $tmp  .=  "&_".$op."_reg_req_$inout\_$idx\n";
+                               $tmp2 .= "{\n";
+                               $tmp2 .= "  {\n";
+                               $tmp2 .= "    arch_register_req_type_should_be_different_from_all,\n";
+                               $tmp2 .= "    &$arch\_reg_classes[CLASS_$arch\_".$1."],\n";
+                               $tmp2 .= "    NULL,        /* limit function */\n";
+                               $tmp2 .= "    NULL,        /* limit environment */\n";
+                               $tmp2 .= "    NULL,        /* same node */\n";
+                               $tmp2 .= "    NULL         /* different node */\n";
+                               $tmp2 .= "  },\n";
+                               $tmp2 .= "  0,\n";
+                               $tmp2 .= "  0\n";
+                               $tmp2 .= "};\n";
+
+                               push(@obst_req, $tmp2."\n");
+                               push(@obst_header_all, "extern const $arch\_register_req_t _".$op."_reg_req_$inout\_$idx;\n");
+                       }
+                       else {
+                               print STDERR "Invalid register class '$1' given in OUT requirement $idx for '$op'.\n";
+                       }
+               }
                elsif (is_reg_class($reqs[$idx])) {
                        $tmp .= "&$arch\_default_req_".$arch."_".$reqs[$idx]."\n";
                }
@@ -446,6 +468,7 @@ sub is_reg_class {
 ###
 sub get_reg_class {
        my $reg = shift;
+       $reg = substr($reg, 1) if ($reg =~ /!.*/);
        return $reg2class{"$reg"}{"class"} if (exists($reg2class{"$reg"}));
        return undef;
 }
@@ -490,7 +513,7 @@ sub build_subset_class_func {
        # set/unset registers
 CHECK_REQS: foreach (@regs) {
                if (/(!)?$outin\_r(\d+)/) {
-                       if (($1 && defined($different_pos)) || defined($same_pos)) {
+                       if (($1 && defined($different_pos)) || (!$1 && defined($same_pos))) {
                                print STDERR "Multiple in/out references of same type in one requirement not allowed.\n";
                                return (undef, undef, undef, undef);
                        }