X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fscripts%2Fgenerate_new_opcodes.pl;h=a97cacdb88573742ec83f0513c82c749dde9bc7b;hb=c23b55879df97f49fc6f1e95651f9f28a980b620;hp=0e153368a1bf44da81e5077e09b32d6ec7d51cee;hpb=e830cecd3c6a78682fec44ffa180b184639a4944;p=libfirm

diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index 0e153368a..a97cacdb8 100755
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #
-# Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+# Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
 #
 # This file is part of libFirm.
 #
@@ -39,10 +39,14 @@ our $additional_opcodes;
 our %nodes;
 our %operands;
 our %cpu;
+our $default_op_attr_type;
 our $default_attr_type;
 our $default_cmp_attr;
+our $default_copy_attr;
 our %init_attr;
+our $custom_init_attr_func;
 our %compare_attr;
+our %copy_attr;
 our %reg_classes;
 
 # include spec file
@@ -65,7 +69,7 @@ if(!defined($default_attr_type)) {
 }
 if(!defined(%init_attr)) {
 	%init_attr = (
-		"$default_attr_type" => "\tinit_${arch}_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res, latency);",
+		"$default_attr_type" => "\tinit_${arch}_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);",
 	);
 }
 if(!defined($default_cmp_attr)) {
@@ -154,7 +158,7 @@ foreach my $class_name (keys(%reg_classes)) {
 # for registering additional opcodes
 $n_opcodes += $additional_opcodes if (defined($additional_opcodes));
 
-push(@obst_header, "void ".$arch."_create_opcodes(void);\n");
+push(@obst_header, "void ".$arch."_create_opcodes(const arch_irn_ops_t *be_ops);\n");
 
 push(@obst_enum_op, "typedef enum _$arch\_opcodes {\n");
 foreach my $op (keys(%nodes)) {
@@ -373,12 +377,6 @@ foreach my $op (keys(%nodes)) {
 				$temp .= "\tint       n_res   = ${out_arity};\n";
 			}
 
-			my $latency = $n{"latency"};
-			if (!defined($latency)) {
-				$latency = 1;
-			}
-			$temp .= "\tunsigned  latency = ${latency};\n";
-
 			if (defined($known_mode)) {
 				$temp .= "\tir_mode  *mode    = ${known_mode};\n";
 			}
@@ -504,32 +502,38 @@ foreach my $op (keys(%nodes)) {
 				die "Fatal error: Couldn't find attribute initialisation code for type '${attr_type}'";
 			}
 			$temp .= "${attr_init_code}\n";
+			if(defined($custom_init_attr_func)) {
+				$temp .= &$custom_init_attr_func(\%n, $op);
+			}
 			$temp .= "\n";
 
 			# set flags for outs
-			if ($#out_flags >= 0) {
-				$temp .= "\t/* set flags for outs */\n";
-				for (my $idx = 0; $idx <= $#out_flags; $idx++) {
-					my $flags  = "";
-					my $prefix = "";
-
-					foreach my $flag (split(/\|/, $out_flags[$idx])) {
-						if ($flag eq "I") {
-							$flags .= $prefix."arch_irn_flags_ignore";
-							$prefix = " | ";
+			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 = " | ";
+							}
 						}
-						elsif ($flag eq "S") {
-							$flags .= $prefix."arch_irn_flags_modify_sp";
-							$prefix = " | ";
-						}
-					}
 
-					$temp .= "\tset_$arch\_out_flags(res, $flags, $idx);\n";
+						$temp .= "\tset_$arch\_out_flags(res, $flags, $idx);\n";
+					}
 				}
-				$temp .= "\n";
 			}
 
-
 			if (exists($n{"init_attr"})) {
 				$temp .= "\tattr = get_irn_generic_attr(res);\n";
 				$temp .= "\t".$n{"init_attr"}."\n";
@@ -558,11 +562,19 @@ foreach my $op (keys(%nodes)) {
 
 
 	push(@obst_new_irop, "\n\tmemset(&ops, 0, sizeof(ops));\n");
+	push(@obst_new_irop, "\tops.be_ops        = be_ops;\n");
 	push(@obst_new_irop, "\tops.dump_node     = $arch\_dump_node;\n");
 
 	if (defined($cmp_attr_func)) {
 		push(@obst_new_irop, "\tops.node_cmp_attr = ${cmp_attr_func};\n");
 	}
+	my $copy_attr_func = $copy_attr{$attr_type};
+	if (!defined($copy_attr_func)) {
+		$copy_attr_func = $default_copy_attr;
+	}
+	if (defined($copy_attr_func)) {
+		push(@obst_new_irop, "\tops.copy_attr = ${copy_attr_func};\n");
+	}
 
 	$n_opcodes++;
 	my $n_res = $out_arity;
@@ -573,6 +585,15 @@ foreach my $op (keys(%nodes)) {
 	$temp .= "|M, ".translate_arity($arity).", 0, sizeof(${attr_type}), &ops);\n";
 	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");
+		if(defined($n{op_attr_init})) {
+			push(@obst_new_irop, "\t".$n{op_attr_init}."\n");
+		}
+		push(@obst_new_irop, "\tset_op_attr(op_$op, attr);\n");
+	}
+
 	push(@obst_enum_op, "\tiro_$op,\n");
 
 	push(@obst_header, "\n");
@@ -675,7 +696,7 @@ print OUT<<ENDOFMAIN;
  * Creates the $arch specific Firm machine operations
  * needed for the assembler irgs.
  */
-void $arch\_create_opcodes(void) {
+void $arch\_create_opcodes(const arch_irn_ops_t *be_ops) {
 #define N   irop_flag_none
 #define L   irop_flag_labeled
 #define C   irop_flag_commutative
@@ -693,6 +714,20 @@ void $arch\_create_opcodes(void) {
 	ir_op_ops  ops;
 	int        cur_opcode;
 	static int run_once = 0;
+	int        i;
+
+	/* we handle all middleend nodes as well */
+	for (i = 0; i <= iro_Last; ++i) {
+		ir_op *op      = get_irp_opcode(i);
+		op->ops.be_ops = be_ops;
+	}
+ENDOFMAIN
+
+	if(defined($default_op_attr_type)) {
+		print OUT "\t$default_op_attr_type *attr;\n";
+	}
+
+print OUT<<ENDOFMAIN;
 
 	if (run_once)
 		return;
@@ -846,7 +881,8 @@ TP_SEARCH:	foreach my $cur_type (keys(%cpu)) {
 }
 
 sub mangle_requirements {
-	my $reqs = shift;
+	my $reqs  = shift;
+	my $class = shift;
 
 	my @alternatives = split(/ /, $reqs);
 	for(my $idx = 0; $idx < scalar(@alternatives); $idx++) {
@@ -855,7 +891,7 @@ sub mangle_requirements {
 
 	@alternatives = sort @alternatives;
 
-	my $name = join('_', @alternatives);
+	my $name = $class."_".join('_', @alternatives);
 
 	return $name;
 }
@@ -948,8 +984,8 @@ sub build_subset_class_func {
 	my $class         = undef;
 	my $has_limit     = 0;
 	my $limit_name;
-	my $same_pos      = undef;
-	my $different_pos = undef;
+	my $same_pos      = 0;
+	my $different_pos = 0;
 	my $temp;
 	my @obst_init;
 	my @obst_limits;
@@ -964,29 +1000,38 @@ sub build_subset_class_func {
 	my $is_in = shift;
 	my @regs  = split(/ /, shift);
 
-	my $outin = $is_in ? "out" : "in";
-
 	my @idx_class = build_inout_idx_class($node, $op, !$is_in);
 
 	# set/unset registers
 CHECK_REQS: foreach (@regs) {
-		if (/(!)?$outin\_r(\d+)/) {
-			if (($1 && defined($different_pos)) || (!$1 && defined($same_pos))) {
-				print STDERR "Multiple in/out references of same type in one requirement not allowed.\n";
+		if (!$is_in && /(!)?in_r(\d+)/) {
+			my $bit_pos = 1 << ($2 - 1);
+			if ($different_pos & $bit_pos) {
+				if ($1) {
+					print STDERR "duplicate !in constraint\n";
+				} else {
+					print STDERR "conflicting !in and in constraints\n";
+				}
+				return (undef, undef, undef, undef);
+			}
+
+			if ($same_pos & $bit_pos) {
+				if ($1) {
+					print STDERR "conflicting !in and in constraints\n";
+				} else {
+					print STDERR "duplicate in constraint\n";
+				}
 				return (undef, undef, undef, undef);
 			}
 
 			if ($1) {
-				$different_pos = $is_in ? -$2 : $2 - 1;
+				$different_pos |= $bit_pos;
 			} else {
-				$same_pos = $is_in ? -$2 : $2 - 1;
+				$same_pos      |= $bit_pos;
 			}
 
 			$class = $idx_class[$2 - 1];
 			next CHECK_REQS;
-		} elsif (/!in/) {
-			$class = $idx_class[0];
-			return ($class, "NULL", undef, 666);
 		}
 
 		# check for negate
@@ -1045,8 +1090,8 @@ 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)) {
-				my $reg = $cur_class[$idx]{"name"};
-				my $regix = get_reg_index($reg);
+				my $reg    = $cur_class[$idx]{"name"};
+				my $regix  = get_reg_index($reg);
 				my $arrayp = $regix / 32;
 				push(@{$limit_array[$arrayp]}, $reg);
 				$limit_reqs .= "$reg ";
@@ -1055,10 +1100,11 @@ CHECK_REQS: foreach (@regs) {
 	}
 
 	if ($has_limit == 1) {
-		$limit_name = "${arch}_limit_".mangle_requirements($limit_reqs);
+		$limit_name = "${arch}_limit_".mangle_requirements($limit_reqs, $class);
 
 		if(defined($limit_bitsets{$limit_name})) {
-			return $limit_bitsets{$limit_name};
+			$limit_name = $limit_bitsets{$limit_name};
+			return ($class, $limit_name, $same_pos, $different_pos);
 		}
 
 		$limit_bitsets{$limit_name} = $limit_name;
@@ -1108,21 +1154,18 @@ sub generate_requirements {
 	my $op    = shift;
 	my $idx   = shift;
 	my $is_in = shift;
-
-	my $name = "${arch}_requirements_".mangle_requirements($reqs);
-	if(defined($requirements{$name})) {
-		return $name;
-	}
-	$requirements{$name} = $name;
+	my $class = "";
+	my $result;
 
 	if ($reqs eq "none") {
-		push(@obst_reg_reqs, <<EOF);
-static const arch_register_req_t $name = {
+
+		$result = <<EOF;
+{
 	arch_register_req_type_none,
 	NULL,                         /* regclass */
 	NULL,                         /* limit bitset */
-	-1,                           /* same pos */
-	-1                            /* different pos */
+	0,                            /* same pos */
+	0                             /* different pos */
 };
 
 EOF
@@ -1130,70 +1173,75 @@ EOF
 		if(!is_reg_class($1)) {
 			die "$1 is not a register class in requirements for $op\n";
 		}
-		push(@obst_reg_reqs, <<EOF);
-static const arch_register_req_t $name = {
+		$class  = $1;
+		$result = <<EOF;
+{
 	arch_register_req_type_should_be_different_from_all,
-	& ${arch}_reg_classes[CLASS_${arch}_$1],
+	& ${arch}_reg_classes[CLASS_${arch}_${class}],
 	NULL,        /* limit bitset */
-	-1,          /* same pos */
-	-1           /* different pos */
+	0,           /* same pos */
+	0            /* different pos */
 };
 
 EOF
 	} elsif (is_reg_class($reqs)) {
-		push(@obst_reg_reqs, <<EOF);
-static const arch_register_req_t $name = {
+		$class  = $reqs;
+		$result = <<EOF;
+{
 	arch_register_req_type_normal,
-	& ${arch}_reg_classes[CLASS_${arch}_${reqs}],
+	& ${arch}_reg_classes[CLASS_${arch}_${class}],
 	NULL,        /* limit bitset */
-	-1,          /* same pos */
-	-1           /* different pos */
+	0,           /* same pos */
+	0            /* different pos */
 };
 
 EOF
 
 	} else {
 		my @req_type_mask;
-		my ($class, $limit_bitset, $same_pos, $different_pos)
+		my ($regclass, $limit_bitset, $same_pos, $different_pos)
 			= build_subset_class_func($node, $op, $idx, $is_in, $reqs);
 
-		if (!defined($class)) {
+		if (!defined($regclass)) {
 			die("Fatal error: Could not build subset for requirements '$reqs' of '$op' pos $idx ... exiting.\n");
 		}
 
 		if (defined($limit_bitset) && $limit_bitset ne "NULL") {
 			push(@req_type_mask, "arch_register_req_type_limited");
 		}
-		if (defined($same_pos)) {
+		if ($same_pos != 0) {
 			push(@req_type_mask, "arch_register_req_type_should_be_same");
 		}
-		if (defined($different_pos)) {
-			if ($different_pos == 666) {
-				push(@req_type_mask, "arch_register_req_type_should_be_different_from_all");
-				undef $different_pos;
-			} else {
-				push(@req_type_mask, "arch_register_req_type_should_be_different");
-			}
+		if ($different_pos != 0) {
+			push(@req_type_mask, "arch_register_req_type_should_be_different");
 		}
 		my $reqtype      = join(" | ", @req_type_mask);
 
  		if(!defined($limit_bitset)) {
 			$limit_bitset = "NULL";
 		}
-		my $same_pos_str      = (defined($same_pos) ? $same_pos : "-1");
-		my $different_pos_str = (defined($different_pos) ? $different_pos : "-1");
 
-		push(@obst_reg_reqs, <<EOF);
-static const arch_register_req_t $name = {
-	$reqtype,
+		$class  = $regclass;
+		$result = <<EOF;
+{
+	${reqtype},
 	& ${arch}_reg_classes[CLASS_${arch}_${class}],
-	$limit_bitset,
-	$same_pos_str,       /* same pos */
-	$different_pos_str,  /* different pos */
+	${limit_bitset},
+	${same_pos},        /* same pos */
+	${different_pos}        /* different pos */
 };
 
 EOF
 	}
 
+	my $name = "${arch}_requirements_".mangle_requirements($reqs, $class);
+	if(defined($requirements{$name})) {
+		return $name;
+	}
+	$requirements{$name} = $name;
+	push(@obst_reg_reqs, <<EOF);
+static const arch_register_req_t ${name} = ${result}
+EOF
+
 	return $name;
 }