X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fscripts%2Fgenerate_regalloc_if.pl;h=21f336b2465bc3672461594b670dc1fc8a230869;hb=ea061cce0888de9a7e09b594a2666176f6aa7f79;hp=45c1054a777b851612596f85a4e199adaab8d547;hpb=0ecc82d4ade99a9561adc8ec3fc15e05a3386071;p=libfirm

diff --git a/ir/be/scripts/generate_regalloc_if.pl b/ir/be/scripts/generate_regalloc_if.pl
index 45c1054a7..21f336b24 100755
--- a/ir/be/scripts/generate_regalloc_if.pl
+++ b/ir/be/scripts/generate_regalloc_if.pl
@@ -59,7 +59,8 @@ sub translate_reg_type {
 }
 
 # stacks for output
-my @obst_regtypes;     # stack for the register type variables
+my @obst_regtypes_def; # stack for the register type variables definitions
+my @obst_regtypes_decl;# stack for the register type variables declarations
 my @obst_regclasses;   # stack for the register class variables
 my @obst_classdef;     # stack to define a name for a class index
 my @obst_regdef;       # stack to define a name for a register index
@@ -95,7 +96,7 @@ $tmp .= "};\n\n";
 push(@obst_req, $tmp);
 push(@obst_header_all, "extern const $arch\_register_req_t $arch\_default_req_none;\n");
 
-push(@obst_classdef, "#define N_CLASSES ".scalar(keys(%reg_classes))."\n");
+push(@obst_classdef, "enum reg_classes {\n");
 
 my $class_mode;
 
@@ -109,10 +110,10 @@ foreach my $class_name (keys(%reg_classes)) {
 	$class_ptr  = "&".$arch."_reg_classes[CLASS_".$class_name."]";
 	$class_mode = pop(@class)->{"mode"};
 
-	push(@obst_regtypes, "#define $numregs ".($#class + 1)."\n");
-	push(@obst_regtypes, "arch_register_t ".$class_name."_regs[$numregs];\n\n");
+	push(@obst_regtypes_decl, "extern arch_register_t ".$class_name."_regs[$numregs];\n");
+	push(@obst_regtypes_def, "arch_register_t ".$class_name."_regs[$numregs];\n");
 
-	push(@obst_classdef, "#define CLASS_$class_name $class_idx\n");
+	push(@obst_classdef, "  CLASS_$class_name = $class_idx,\n");
 	push(@obst_regclasses, "{ \"$class_name\", $numregs, NULL, ".$class_name."_regs }");
 
 	# there is a default NORMAL requirement for each class
@@ -136,6 +137,7 @@ foreach my $class_name (keys(%reg_classes)) {
 	push(@obst_reginit, "  /* Init of all registers in class '$class_name' */\n\n");
 	push(@obst_reginit, "  /* set largest possible mode for '$class_name' */\n");
 	push(@obst_reginit, "  $arch\_reg_classes[CLASS_".$class_name."].mode = $class_mode;\n\n");
+	push(@obst_regdef, "enum reg_".$class_name."_values {\n");
 	foreach (@class) {
 		# For each class we build for each of it's member registers a limit function
 		# which limits the class to this particular register. We also build the
@@ -173,7 +175,7 @@ foreach my $class_name (keys(%reg_classes)) {
 		push(@obst_header_all,"extern const $arch\_register_req_t $arch\_default_req_$class_name\_".$_->{"name"}.";\n");
 
 		$reg2class{$_->{"name"}} = { "class" => $old_classname, "index" => $idx }; # remember reg to class for later use
-		push(@obst_regdef, "#define REG_".uc($_->{"name"})." $idx\n");
+		push(@obst_regdef, "  REG_".uc($_->{"name"})." = $idx,\n");
 		push(@obst_reginit, "  ".$class_name."_regs[$idx].name      = \"".$_->{"name"}."\";\n");
 		push(@obst_reginit, "  ".$class_name."_regs[$idx].reg_class = $class_ptr;\n");
 		push(@obst_reginit, "  ".$class_name."_regs[$idx].index     = $idx;\n");
@@ -181,10 +183,15 @@ foreach my $class_name (keys(%reg_classes)) {
 		push(@obst_reginit, "\n");
 		$idx++;
 	}
+	push(@obst_regdef, "  $numregs = $idx\n");
+	push(@obst_regdef, "};\n\n");
 
 	$class_idx++;
 }
 
+push(@obst_classdef, "  N_CLASSES = ".scalar(keys(%reg_classes))."\n");
+push(@obst_classdef, "};\n\n");
+
 # generate node-register constraints
 foreach my $op (keys(%nodes)) {
 	my %n = %{ $nodes{"$op"} };
@@ -263,7 +270,7 @@ print OUT @obst_regdef, "\n";
 
 print OUT @obst_classdef, "\n";
 
-print OUT @obst_regtypes, "\n";
+print OUT @obst_regtypes_decl, "\n";
 
 print OUT "extern arch_register_class_t $arch\_reg_classes[N_CLASSES];\n\n";
 
@@ -297,16 +304,17 @@ print OUT<<EOF;
  */
 
 #include "gen_$arch\_regalloc_if.h"
-#include "bearch_ia32_t.h"   /* we need this to put the caller saved registers into the isa set */
-#include "ia32_map_regs.h"
+#include "bearch_$arch\_t.h"   /* we need this to put the caller saved registers into the isa set */
+#include "$arch\_map_regs.h"
 #include "irmode.h"
 
 EOF
 
 print OUT "arch_register_class_t $arch\_reg_classes[] = {\n  ".join(",\n  ", @obst_regclasses)."\n};\n\n";
 
+print OUT @obst_regtypes_def, "\n";
+
 print OUT "void ".$arch."_register_init(void *isa_ptr) {\n";
-print OUT "  ia32_isa_t *isa = (ia32_isa_t *)isa_ptr;\n\n";
 print OUT @obst_reginit;
 print OUT "}\n\n";
 
@@ -386,6 +394,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 +477,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 +522,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);
 			}
@@ -565,6 +597,14 @@ CHECK_REQS: foreach (@regs) {
 		}
 	}
 
+	my @cur_class = @{ $reg_classes{"$class"} };
+	for (my $idx = 0; $idx <= $#cur_class; $idx++) {
+		if (defined($cur_class[$idx]{"type"}) && ($cur_class[$idx]{"type"} & 4)) {
+			push(@temp_obst, "  bitset_clear(bs, ".get_reg_index($cur_class[$idx]{"name"}).");");
+			push(@temp_obst, "         /* disallow ignore reg ".$cur_class[$idx]{"name"}." */\n");
+		}
+	}
+
 	if ($has_limit == 1) {
 		push(@obst_header_all, "void limit_reg_".$op."_".($in ? "in" : "out")."_".$idx."(void *_unused, bitset_t *bs);\n");