X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fscripts%2Fgenerate_new_opcodes.pl;h=0602ae5c0d2457e7561214b21894d35b8cad10f5;hb=ea061cce0888de9a7e09b594a2666176f6aa7f79;hp=c1828baf107b788b5ad5029c3c4c0b13e3570f09;hpb=16430cee170cabb1c131fbb1b3147a750a1e8e23;p=libfirm

diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index c1828baf1..0602ae5c0 100755
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -63,9 +63,10 @@ push(@obst_enum_op, "typedef enum _$arch\_opcodes {\n");
 foreach my $op (keys(%nodes)) {
 	my %n = %{ $nodes{"$op"} };
 	my $tuple = 0;
+	my $n_res = 0;
 
 	# determine arity from in requirements
-	$arity = 0;
+	$arity = exists($n{"arity"}) ? $n{"arity"} : 0;
 	if (exists($n{"reg_req"}) && exists($n{"reg_req"}{"in"})) {
 		$arity = scalar(@{ $n{"reg_req"}{"in"} });
 	}
@@ -87,7 +88,7 @@ foreach my $op (keys(%nodes)) {
 
 	push(@obst_opvar, "ir_op *op_$op = NULL;\n");
 	push(@obst_get_opvar, "ir_op *get_op_$op(void)         { return op_$op; }\n");
-	push(@obst_get_opvar, "int    is_$op(const ir_node *n) { return get_irn_op(n) == op_$op; }\n\n");
+	push(@obst_get_opvar, "int    is_$op(const ir_node *n) { return get_$arch\_irn_opcode(n) == iro_$op; }\n\n");
 
 	push(@obst_is_archirn, "is_$op(node)");
 
@@ -152,6 +153,7 @@ foreach my $op (keys(%nodes)) {
 		# $complete_args = substr($complete_args, 2);
 		$temp .= "$complete_args)";
 		push(@obst_constructor, $temp." {\n");
+		push(@obst_header, $n{"comment"});
 		push(@obst_header, $temp.";\n");
 
 		# emit constructor code
@@ -243,11 +245,16 @@ foreach my $op (keys(%nodes)) {
 
 				if (@out) {
 					$out_param = $out_req_var.", ".($#out + 1);
+					$n_res     = $#out;
 				}
 				else {
 					$out_param = "NULL, 0";
 				}
 			}
+			else {
+				$in_param = "NULL";
+				$out_param = "NULL, 0";
+			}
 			$temp .= "\n  /* create node */\n";
 			my $mode = "mode";
 			if ($tuple == 1) {
@@ -277,15 +284,15 @@ foreach my $op (keys(%nodes)) {
 
 		# close constructor function
 		push(@obst_constructor, "}\n\n");
-
 	} # constructor creation
 
 	# set default values for state and flags if not given
 	$n{"state"}    = "floats" if (! exists($n{"state"}));
 	$n{"op_flags"} = "N"      if (! exists($n{"op_flags"}));
 
+
 	push(@obst_new_irop, "\n  memset(&ops, 0, sizeof(ops));\n");
-	push(@obst_new_irop, "  ops.dump_node     = dump_node_$arch;\n");
+	push(@obst_new_irop, "  ops.dump_node     = $arch\_dump_node;\n");
 
 	if ($cmp_attr_func) {
 		push(@obst_new_irop, "  ops.node_cmp_attr = cmp_attr_$op;\n");
@@ -293,9 +300,12 @@ foreach my $op (keys(%nodes)) {
 
 	$n_opcodes++;
 	$temp  = "  op_$op = new_ir_op(cur_opcode + iro_$op, \"$op\", op_pin_state_".$n{"state"}.", ".$n{"op_flags"};
-	$temp .= "|M, ".translate_arity($arity).", 0, sizeof($arch\_attr_t), &ops);\n";
+	$temp .= "|M, ".translate_arity($arity).", 0, sizeof($arch\_attr_t) + $n_res * sizeof(arch_register_t *), &ops);\n";
 	push(@obst_new_irop, $temp);
+	push(@obst_new_irop, "  set_op_tag(op_$op, &$arch\_op_tag);\n");
 	push(@obst_enum_op, "  iro_$op,\n");
+
+	push(@obst_header, "\n");
 }
 push(@obst_enum_op, "  iro_$arch\_last_generated,\n");
 push(@obst_enum_op, "  iro_$arch\_last = iro_$arch\_last_generated");
@@ -314,11 +324,37 @@ print OUT "\n";
 print OUT @obst_get_opvar;
 print OUT "\n";
 
-print OUT<<ENDOFISIRN;
+print OUT<<EOF;
 
 static int $arch\_opcode_start = -1;
 static int $arch\_opcode_end   = -1;
 
+EOF
+
+# build the FOURCC arguments from $arch
+
+my ($a, $b, $c, $d) = ('\0', '\0', '\0', '\0');
+
+if (length($arch) >= 1) {
+	$a = uc(substr($arch, 0, 1));
+}
+
+if (length($arch) >= 2) {
+	$b = uc(substr($arch, 1, 1));
+}
+
+if (length($arch) >= 3) {
+	$c = uc(substr($arch, 2, 1));
+}
+
+if (length($arch) >= 4) {
+	$d = uc(substr($arch, 3, 1));
+}
+
+print OUT "static unsigned $arch\_op_tag = FOURCC('$a', '$b', '$c', '$d');\n";
+
+print OUT<<ENDOFISIRN;
+
 /** Return the opcode number of the first $arch opcode. */
 int get_$arch\_opcode_first(void) {
   return $arch\_opcode_start;
@@ -329,22 +365,15 @@ int get_$arch\_opcode_last(void) {
   return $arch\_opcode_end;
 }
 
-/** Return non-zero if the given node is a $arch machine node. */
+/** Return 1 if the given node is a $arch machine node, 0 otherwise */
 int is_$arch\_irn(const ir_node *node) {
-  unsigned opc = (unsigned)get_irn_opcode(node);
-
-  assert($arch\_opcode_start > 0 && "missing opcode init");
-  assert($arch\_opcode_end > 0 && "missing opcode init");
-
-  if (opc - (unsigned)$arch\_opcode_start < (unsigned)($arch\_opcode_end - $arch\_opcode_start))
-    return 1;
-
-  return 0;
+  return get_op_tag(get_irn_op(node)) == &$arch\_op_tag;
 }
 
 int get_$arch\_irn_opcode(const ir_node *node) {
-  assert(is_$arch\_irn(node));
-  return get_irn_opcode(node) - $arch\_opcode_start;
+  if (is_$arch\_irn(node))
+	return get_irn_opcode(node) - $arch\_opcode_start;
+  return -1;
 }
 
 ENDOFISIRN