X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fscripts%2Fgenerate_new_opcodes.pl;h=0e89197cdff872bbd2dd2d483ed6db5da6d63cbd;hb=8544304305897e5f2b5752fc243fd45c4f95a38c;hp=e88d96454b33bf6867ac23b9771584279343c278;hpb=bdacb3b5e66c308504ca356338a802bf7cd89395;p=libfirm

diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index e88d96454..0e89197cd 100755
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -16,6 +16,7 @@ my $cur_op     = "";
 my $line_nr    = 0;
 
 our $arch;
+our $additional_opcodes;
 our %nodes;
 
 # include spec file
@@ -41,6 +42,7 @@ 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
@@ -48,10 +50,14 @@ 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"} };
 
@@ -71,6 +77,7 @@ foreach my $op (keys(%nodes)) {
 
 	push(@obst_is_archirn, "is_$op(node)");
 
+	push(@obst_header, "extern ir_op *op_$op;\n");
 	push(@obst_header, "ir_op *get_op_$op(void);\n");
 	push(@obst_header, "int is_$op(const ir_node *n);\n");
 
@@ -120,6 +127,12 @@ foreach my $op (keys(%nodes)) {
 				$arg_names      .= ", ".$href->{"name"};
 			}
 		}
+
+		# we have additional attribute arguements
+		if (exists($n{"attr"})) {
+			$complete_args .= ", ".$n{"attr"};
+		}
+
 		$complete_args = substr($complete_args, 2);
 		$temp .= ", $complete_args)";
 		push(@obst_constructor, $temp." {\n");
@@ -135,6 +148,7 @@ foreach my $op (keys(%nodes)) {
 			$temp  = "  ir_node *res;\n";
 			$temp .= "  ir_node *in[$arity];\n" if ($arity > 0);
 			$temp .= "  int flags = 0;\n";
+			$temp .= "  $arch\_attr_t *attr;\n" if (exists($n{"init_attr"}));
 
 			undef my $in_req_var;
 			undef my $out_req_var;
@@ -177,15 +191,12 @@ foreach my $op (keys(%nodes)) {
 			for (my $i = 1; $i <= $arity; $i++) {
 				$temp .= "  in[".($i - 1)."] = op".$i.";\n";
 			}
-			$temp .= "  res = new_ir_node(db, irg, block, op_$op, mode, $arity, ".($arity > 0 ? "in" : "NULL").");\n";
-			$temp .= "  res = optimize_node(res);\n";
-			$temp .= "  irn_vrfy_irg(res, irg);\n\n";
 
 			# set flags
 			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";
@@ -221,9 +232,21 @@ foreach my $op (keys(%nodes)) {
 					$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";
+
 			$temp .= "\n  /* init node attributes */\n";
 			$temp .= "  init_$arch\_attributes(res, flags, $in_param, $out_param);\n";
 
+			if (exists($n{"init_attr"})) {
+				$temp .= "  attr = get_$arch\_attr(res);\n";
+				$temp .= $n{"init_attr"}."\n";
+			}
+
+			$temp .= "\n  /* optimize node */\n";
+			$temp .= "  res = optimize_node(res);\n";
+			$temp .= "  irn_vrfy_irg(res, irg);\n\n";
+
 			$temp .= "\n  return res;\n";
 
 			push(@obst_constructor, $temp);
@@ -249,10 +272,15 @@ foreach my $op (keys(%nodes)) {
 	}
 
 	$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), &ops);\n";
 	push(@obst_new_irop, $temp);
+	push(@obst_enum_op, "  iro_$op,\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
 
@@ -268,28 +296,44 @@ print OUT "\n";
 
 print OUT<<ENDOFISIRN;
 
-static opcode $arch\_opcode_start = -1;
-static opcode $arch\_opcode_end   = -1;
+static int $arch\_opcode_start = -1;
+static int $arch\_opcode_end   = -1;
 
+/** 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 non-zero if the given node is a $arch machine node. */
 int is_$arch\_irn(const ir_node *node) {
-  opcode opc = get_irn_opcode(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 > $arch\_opcode_start && opc < $arch\_opcode_end)
+  if (opc - (unsigned)$arch\_opcode_start < (unsigned)($arch\_opcode_end - $arch\_opcode_start))
     return 1;
 
   return 0;
 }
 
+int get_$arch\_irn_opcode(const ir_node *node) {
+  assert(is_$arch\_irn(node));
+  return get_irn_opcode(node) - $arch\_opcode_start;
+}
+
 ENDOFISIRN
 
 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) {
@@ -303,24 +347,36 @@ 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 R   (irop_flag_machine<<1)
 
   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\_opcode_end = cur_opcode;\n";
+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";
 
 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 "\n#endif /* __GEN_$arch\_NEW_NODES_H__ */\n";
 
 close(OUT);