X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fscripts%2Fgenerate_new_opcodes.pl;h=cfc566987b9766ef2a155bf12c4565c6b8731315;hb=86f48a6622b8b66a7aaf50f5aacbed836465b4eb;hp=0e89197cdff872bbd2dd2d483ed6db5da6d63cbd;hpb=5bf18fe098247dbca8357bb70a328b98d676737d;p=libfirm

diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index 0e89197cd..cfc566987 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
 
@@ -46,6 +47,7 @@ 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;
@@ -60,9 +62,11 @@ 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"} });
 	}
@@ -71,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)");
 
@@ -117,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"} }) {
@@ -133,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
@@ -227,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";
@@ -257,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");
@@ -273,9 +300,11 @@ 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_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");
@@ -323,8 +352,9 @@ int is_$arch\_irn(const ir_node *node) {
 }
 
 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
@@ -348,7 +378,8 @@ void $arch\_create_opcodes(void) {
 #define c   irop_flag_constlike
 #define K   irop_flag_keep
 #define M   irop_flag_machine
-#define R   (irop_flag_machine<<1)
+#define O   irop_flag_machine_op
+#define R   (irop_flag_user << 0)
 
   ir_op_ops ops;
   int cur_opcode = get_next_ir_opcodes(iro_$arch\_last);
@@ -376,6 +407,7 @@ 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);