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

diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index 23ef60c16..0602ae5c0 100755
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -35,6 +35,7 @@ my $target_c = $target_dir."/gen_".$arch."_new_nodes.c.inl";
 my $target_h = $target_dir."/gen_".$arch."_new_nodes.h";
 
 #print Dumper(%nodes);
+#print Dumper(%operands);
 
 # create c code file from specs
 
@@ -42,25 +43,30 @@ my @obst_opvar;       # stack for the "ir_op *op_<arch>_<op-name> = NULL;" state
 my @obst_get_opvar;   # stack for the get_op_<arch>_<op-name>() functions
 my @obst_constructor; # stack for node constructor functions
 my @obst_new_irop;    # stack for the new_ir_op calls
+my @obst_enum_op;     # stack for creating the <arch>_opcode enum
 my @obst_header;      # stack for function prototypes
 my @obst_is_archirn;  # stack for the is_$arch_irn() function
 my @obst_cmp_attr;    # stack for the compare attribute functions
+my @obst_proj;        # stack for the pn_ numbers
 my $orig_op;
 my $arity;
 my $cmp_attr_func;
 my $temp;
-my $n_opcodes = 2;    # we have two additional border opcodes (lowest/highest)
+my $n_opcodes = 0;    # number of opcodes
 
 # for registering additional opcodes
 $n_opcodes += $additional_opcodes if (defined($additional_opcodes));
 
 push(@obst_header, "void ".$arch."_create_opcodes(void);\n");
 
+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"} });
 	}
@@ -69,9 +75,20 @@ foreach my $op (keys(%nodes)) {
 	$op      = $arch."_".$op;
 	$temp    = "";
 
+	if (exists($n{"outs"})) {
+		undef my @outs;
+		@outs = @{ $n{"outs"} };
+		push(@obst_proj, "\nenum pn_$op {\n");
+		for (my $idx = 0; $idx <= $#outs; $idx++) {
+			push(@obst_proj, "  pn_$op\_".$outs[$idx]." = $idx,\n");
+		}
+		push(@obst_proj, "};\n");
+		$tuple = 1;
+	}
+
 	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)");
 
@@ -115,8 +132,10 @@ foreach my $op (keys(%nodes)) {
 				$complete_args .= ", ir_node *op".$i;
 				$arg_names     .= ", op".$i;
 			}
-			$complete_args .= ", ir_mode *mode";
-			$arg_names     .= ", mode";
+			if ($tuple == 0) {
+				$complete_args .= ", ir_mode *mode";
+				$arg_names     .= ", mode";
+			}
 		}
 		else { # user defined args
 			for my $href (@{ $n{"args"} }) {
@@ -131,9 +150,10 @@ foreach my $op (keys(%nodes)) {
 			$complete_args .= ", ".$n{"attr"};
 		}
 
-		$complete_args = substr($complete_args, 2);
-		$temp .= ", $complete_args)";
+		# $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
@@ -194,7 +214,7 @@ foreach my $op (keys(%nodes)) {
 			if (exists($n{"irn_flags"})) {
 				foreach my $flag (split(/\|/, $n{"irn_flags"})) {
 					if ($flag eq "R") {
-						$temp .= "  flags |= arch_irn_flags_rematerializable;   /* op can be easily recalulated */\n";
+						$temp .= "  flags |= arch_irn_flags_rematerializable;   /* op can be easily recalculated */\n";
 					}
 					elsif ($flag eq "N") {
 						$temp .= "  flags |= arch_irn_flags_dont_spill;         /* op is NOT spillable */\n";
@@ -225,13 +245,22 @@ 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";
-			$temp .= "  res = new_ir_node(db, irg, block, op_$op, mode, $arity, ".($arity > 0 ? "in" : "NULL").");\n";
+			my $mode = "mode";
+			if ($tuple == 1) {
+				$mode = "mode_T";
+			}
+			$temp .= "  res = new_ir_node(db, irg, block, op_$op, $mode, $arity, ".($arity > 0 ? "in" : "NULL").");\n";
 
 			$temp .= "\n  /* init node attributes */\n";
 			$temp .= "  init_$arch\_attributes(res, flags, $in_param, $out_param);\n";
@@ -255,25 +284,33 @@ 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");
 	}
 
 	$n_opcodes++;
-	$temp  = "  op_$op = new_ir_op(cur_opcode++, \"$op\", op_pin_state_".$n{"state"}.", ".$n{"op_flags"};
-	$temp .= ", ".translate_arity($arity).", 0, sizeof($arch\_attr_t), &ops);\n";
+	$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) + $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");
+push(@obst_enum_op, " + $additional_opcodes") if (defined($additional_opcodes));
+push(@obst_enum_op, "\n} $arch\_opcodes;\n\n");
 
 # emit the code
 
@@ -287,21 +324,56 @@ print OUT "\n";
 print OUT @obst_get_opvar;
 print OUT "\n";
 
-print OUT<<ENDOFISIRN;
+print OUT<<EOF;
 
-static opcode $arch\_opcode_start = -1;
-static opcode $arch\_opcode_end   = -1;
+static int $arch\_opcode_start = -1;
+static int $arch\_opcode_end   = -1;
 
-int is_$arch\_irn(const ir_node *node) {
-  opcode opc = get_irn_opcode(node);
+EOF
+
+# build the FOURCC arguments from $arch
 
-  assert($arch\_opcode_start > 0 && "missing opcode init");
-  assert($arch\_opcode_end > 0 && "missing opcode init");
+my ($a, $b, $c, $d) = ('\0', '\0', '\0', '\0');
 
-  if (opc > $arch\_opcode_start && opc < $arch\_opcode_end)
-    return 1;
+if (length($arch) >= 1) {
+	$a = uc(substr($arch, 0, 1));
+}
+
+if (length($arch) >= 2) {
+	$b = uc(substr($arch, 1, 1));
+}
 
-  return 0;
+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;
+}
+
+/** Return the opcode number of the last $arch opcode + 1. */
+int get_$arch\_opcode_last(void) {
+  return $arch\_opcode_end;
+}
+
+/** Return 1 if the given node is a $arch machine node, 0 otherwise */
+int is_$arch\_irn(const ir_node *node) {
+  return get_op_tag(get_irn_op(node)) == &$arch\_op_tag;
+}
+
+int get_$arch\_irn_opcode(const ir_node *node) {
+  if (is_$arch\_irn(node))
+	return get_irn_opcode(node) - $arch\_opcode_start;
+  return -1;
 }
 
 ENDOFISIRN
@@ -310,7 +382,7 @@ print OUT @obst_constructor;
 
 print OUT<<ENDOFMAIN;
 /**
- * Creates the $arch specific firm operations
+ * Creates the $arch specific Firm machine operations
  * needed for the assembler irgs.
  */
 void $arch\_create_opcodes(void) {
@@ -324,17 +396,20 @@ void $arch\_create_opcodes(void) {
 #define H   irop_flag_highlevel
 #define c   irop_flag_constlike
 #define K   irop_flag_keep
+#define M   irop_flag_machine
+#define O   irop_flag_machine_op
+#define R   (irop_flag_user << 0)
 
   ir_op_ops ops;
-  int cur_opcode = get_next_ir_opcodes($n_opcodes);
-
-  $arch\_opcode_start = cur_opcode++;
+  int cur_opcode = get_next_ir_opcodes(iro_$arch\_last);
 
+  $arch\_opcode_start = cur_opcode;
 ENDOFMAIN
 
 print OUT @obst_new_irop;
-print OUT "\n  $arch\_register_additional_opcodes(cur_opcode);\n";
-print OUT "  $arch\_opcode_end = cur_opcode";
+print OUT "\n";
+print OUT "  $arch\_register_additional_opcodes(cur_opcode);\n" if (defined($additional_opcodes));
+print OUT "  $arch\_opcode_end = cur_opcode + iro_$arch\_last";
 print OUT " + $additional_opcodes" if (defined($additional_opcodes));
 print OUT ";\n";
 print OUT "}\n";
@@ -343,8 +418,16 @@ close(OUT);
 
 open(OUT, ">$target_h") || die("Could not open $target_h, reason: $!\n");
 
-print OUT "int is_$arch\_irn(const ir_node *node);\n";
+print OUT "#ifndef __GEN_$arch\_NEW_NODES_H__\n";
+print OUT "#define __GEN_$arch\_NEW_NODES_H__\n\n";
+print OUT @obst_enum_op;
+print OUT "int is_$arch\_irn(const ir_node *node);\n\n";
+print OUT "int get_$arch\_opcode_first(void);\n";
+print OUT "int get_$arch\_opcode_last(void);\n";
+print OUT "int get_$arch\_irn_opcode(const ir_node *node);\n";
 print OUT @obst_header;
+print OUT @obst_proj;
+print OUT "\n#endif /* __GEN_$arch\_NEW_NODES_H__ */\n";
 
 close(OUT);