scripts: Use a string instead of magic numbers for register types.

[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 755913d..bfc88ff 100755 (executable)
--- a/ir/be/scripts/generate_regalloc_if.pl
+++ b/ir/be/scripts/generate_regalloc_if.pl
@@ -50,33 +50,10 @@ my $target_c   = $target_dir."/gen_".$arch."_regalloc_if.c";
 my $target_h   = $target_dir."/gen_".$arch."_regalloc_if.h";
 
 # helper function
-sub translate_reg_type {
-       my $t = shift;
-
-       if ($t == 0) {
-               return "arch_register_type_none";
-       }
-       else {
-               my @types;
-
-               if ($t & 1) {
-                       push(@types, "arch_register_type_ignore");
-               }
-
-               if ($t & 2) {
-                       push(@types, "arch_register_type_joker");
-               }
-
-               if ($t & 4) {
-                       push(@types, "arch_register_type_virtual");
-               }
-
-               if ($t & 8) {
-                       push(@types, "arch_register_type_state");
-               }
-
-               return join(" | ", @types);
-       }
+sub map_flags {
+       my $prefix = shift;
+       my $flags  = shift || "none";
+       return join(" | ", map { "$prefix$_" } split(/\s*\|\s*/, $flags));
 }
 
 # stacks for output
@@ -158,22 +135,7 @@ foreach my $class_name (keys(%reg_classes)) {
        $class_ptr  = "&".$arch."_reg_classes[CLASS_".$class_name."]";
        my $flags = pop(@class);
        $class_mode  = $flags->{"mode"};
-       my $class_flags = $flags->{"flags"};
-       my $flags_prepared = "";
-
-       if(defined($class_flags)) {
-               my $first = 1;
-               foreach my $flag (split(/\|/, $class_flags)) {
-                       if(!$first) {
-                               $flags_prepared .= "|";
-                       } else {
-                               $first = 0;
-                       }
-                       $flags_prepared .= "arch_register_class_flag_$flag";
-               }
-       } else {
-               $flags_prepared = "arch_register_class_flag_none";
-       }
+       my $flags_prepared = map_flags("arch_register_class_flag_", $flags->{"flags"});
 
        $single_constraints .= <<EOF;
 static const arch_register_req_t ${arch}_class_reg_req_${old_classname} = {
@@ -197,8 +159,7 @@ EOF
        foreach (@class) {
                my $name   = $_->{"name"};
                my $ucname = uc($name);
-               my $type   = "arch_register_type_none";
-               $type = translate_reg_type($_->{"type"}) if (exists($_->{"type"}));
+               my $type   = map_flags("arch_register_type_", $_->{"type"});
                # realname is name if not set by user
                $_->{"realname"} = $_->{"name"} if (! exists($_->{"realname"}));
                my $realname = $_->{realname};
@@ -206,6 +167,10 @@ EOF
 
                $regdef  .= "\tREG_${ucname},\n";
                $regdef2 .= "\tREG_${classuc}_${ucname} = $idx,\n";
+               my $dwarf_number = 0;
+               if (defined($_->{dwarf})) {
+                       $dwarf_number = $_->{dwarf};
+               }
 
                $regtypes_def .= <<EOF;
        {
@@ -214,7 +179,8 @@ EOF
                REG_${classuc}_${ucname},
                REG_${ucname},
                ${type},
-               &${arch}_single_reg_req_${old_classname}_${name}
+               &${arch}_single_reg_req_${old_classname}_${name},
+               ${dwarf_number}
        },
 EOF
 
@@ -310,7 +276,6 @@ print OUT<<EOF;
 #include "config.h"
 
 #include "gen_${arch}_regalloc_if.h"
-#include "gen_${arch}_machine.h"
 #include "bearch_${arch}_t.h"
 #include "irmode.h"
 
@@ -335,33 +300,3 @@ ${reginit}
 }
 EOF
 close(OUT);
-
-###
-# Gets the variable name for the execution unit assigned to this register.
-###
-sub get_execunit_variable_name {
-       my $unit    = shift;
-       my $name    = "NULL";
-       my $uc_arch = uc($arch);
-
-       if ($unit) {
-               my $found = 0;
-SRCH:  foreach my $cur_type (keys(%cpu)) {
-                       foreach my $cur_unit (@{ $cpu{"$cur_type"} }) {
-                               if ($unit eq $cur_unit) {
-                                       my $tp_name   = "$arch\_execution_units_$cur_type";
-                                       my $unit_name = "$uc_arch\_EXECUNIT_TP_$cur_type\_$unit";
-                                       $name  = "&".$tp_name."[".$unit_name."]";
-                                       $found = 1;
-                                       last SRCH;
-                               }
-                       }
-               }
-
-               if (! $found) {
-                       print STDERR "Invalid execution unit $unit specified!\n";
-               }
-       }
-
-       return $name;
-}