X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fscripts%2Fgenerate_new_opcodes.pl;h=9f40503d8ba8ffbcfcbe64a26fdaf5fb9fff9493;hb=df2faee01a5832057bb3ca0ba5f67e979c916e19;hp=e10460e2e2939f80aab95279f849472c51da2d05;hpb=f46792d0e49d452ef92de2a802ae894c0ce30bbb;p=libfirm

diff --git a/ir/be/scripts/generate_new_opcodes.pl b/ir/be/scripts/generate_new_opcodes.pl
index e10460e2e..9f40503d8 100755
--- a/ir/be/scripts/generate_new_opcodes.pl
+++ b/ir/be/scripts/generate_new_opcodes.pl
@@ -23,23 +23,15 @@
 # their coresponding node constructors for all operations in a given spec
 # so they can be used as normal firm nodes.
 # Creation: 2005/10/19
-# $Id$
 
 use strict;
 use Data::Dumper;
 
 my $specfile   = $ARGV[0];
 my $target_dir = $ARGV[1];
-my $state      = 1;
-my $cur_op     = "";
-my $line_nr    = 0;
 
 our $arch;
-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;
@@ -68,60 +60,33 @@ my $target_h = $target_dir."/gen_".$arch."_new_nodes.h";
 if(!defined($default_attr_type)) {
 	$default_attr_type = "${arch}_attr_t";
 }
-if(!defined(%init_attr)) {
+if(! %init_attr) {
 	%init_attr = (
-		"$default_attr_type" => "\tinit_${arch}_attributes(res, flags, in_reqs, exec_units, n_res);",
+		"$default_attr_type" => "\tinit_${arch}_attributes(res, irn_flags_, in_reqs, n_res);",
 	);
 }
 if(!defined($default_cmp_attr)) {
 	$default_cmp_attr = "${arch}_compare_attr";
 }
-if(!defined(%compare_attr)) {
+if(! %compare_attr) {
 	%compare_attr = (
 		"${default_attr_type}" => "${default_cmp_attr}",
 	);
 }
 
-# Operands are really just nodes with some special constraints, we check
-# these and create new entries in the nodes hashmap
-foreach my $op (keys(%operands)) {
-	my %operand = %{ $operands{"$op"} };
-	my %op_node;
-
-	# constraints
-	if(defined($operand{op_flags})) { die "Fatal error: operands can't have op_flags ($op)"; }
-	if(defined($operand{cmp_attr})) { die "Fatal error: cmp_attr not allowed for operands ($op)"; }
-	if(defined($operand{mode})) { die "Operand must not have a mode defined ($op)"; }
-	if(defined($operand{out_arity})) { die "operand must not have out_arity defined ($op)"; }
-	if(defined($nodes{$op})) { die "$op defined as operand and as node"; };
-
-
-	foreach my $flag (keys(%operand)) {
-		$op_node{$flag} = $operand{$flag};
-	}
-	$op_node{op_flags} = "O";
-	$op_node{cmp_attr} = 'return 1;';
-	$op_node{mode}     = 'mode_ANY';
-
-	$nodes{$op} = \%op_node;
-}
-
-#print Dumper(%nodes);
-#print Dumper(%operands);
-
 # create c code file from specs
 
-my @obst_limit_func;
-my @obst_reg_reqs;
-my @obst_opvar;       # stack for the "ir_op *op_<arch>_<op-name> = NULL;" statements
-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 $obst_limit_func  = ""; #
+my $obst_reg_reqs    = ""; #
+my $obst_opvar       = ""; # buffer for the "ir_op *op_<arch>_<op-name> = NULL;" statements
+my $obst_get_opvar   = ""; # buffer for the get_op_<arch>_<op-name>() functions
+my $obst_constructor = ""; # buffer for node constructor functions
+my $obst_new_irop    = ""; # buffer for the new_ir_op calls
+my $obst_free_irop   = ""; # buffer for free_ir_op calls
+my $obst_enum_op     = ""; # buffer for creating the <arch>_opcode enum
+my $obst_header      = ""; # buffer for function prototypes
+my $obst_cmp_attr    = ""; # buffer for the compare attribute functions
+my $obst_proj        = ""; # buffer for the pn_ numbers
 my $orig_op;
 my $arity;
 my $cmp_attr_func;
@@ -156,10 +121,8 @@ foreach my $class_name (keys(%reg_classes)) {
 }
 
 
-# for registering additional opcodes
-$n_opcodes += $additional_opcodes if (defined($additional_opcodes));
-
 $obst_header .= "void ${arch}_create_opcodes(const arch_irn_ops_t *be_ops);\n";
+$obst_header .= "void ${arch}_free_opcodes(void);\n";
 
 sub create_constructor {
 	my $op   = shift;
@@ -270,10 +233,11 @@ sub create_constructor {
 
 	# emit constructor code
 	$temp = <<EOF;
-	ir_node        *res;
-	ir_op          *op      = op_${arch}_${op};
-	int             flags   = 0;
-	backend_info_t *info;
+	ir_graph         *irg        = get_irn_irg(block);
+	ir_op            *op         = op_${arch}_${op};
+	arch_irn_flags_t  irn_flags_ = arch_irn_flags_none;
+	ir_node          *res;
+	backend_info_t   *info;
 EOF
 
 	if($arity == $ARITY_DYNAMIC) {
@@ -313,15 +277,6 @@ EOF
 EOF
 	}
 
-	# set up static variables for cpu execution unit assigments
-	if (exists($n->{"units"})) {
-		$temp .= gen_execunit_list_initializer($n->{"units"});
-	} else {
-		$temp .= <<EOF;
-	static const be_execution_unit_t ***exec_units = NULL;
-EOF
-	}
-
 	undef my $in_req_var;
 	undef my $out_req_var;
 
@@ -375,7 +330,7 @@ EOF
 				my $req = $out[$idx];
 				my $reqstruct = generate_requirements($req, $n, "${arch}_${op}", $idx, 0);
 				$set_out_reqs .= <<EOF;
-info->out_infos[${idx}].req = &${reqstruct};
+	info->out_infos[${idx}].req = &${reqstruct};
 EOF
 			}
 		} else {
@@ -418,23 +373,26 @@ EOF
 			"simple_jump"      => "arch_irn_flags_simple_jump",
 			"not_scheduled"    => "arch_irn_flags_not_scheduled",
 		);
-		if (defined(%custom_irn_flags)) {
+		if (%custom_irn_flags) {
 			%known_irn_flags = (%known_irn_flags, %custom_irn_flags);
 		}
 		foreach my $flag (@{$n->{"irn_flags"}}) {
 			if (not defined($known_irn_flags{$flag})) {
 				print STDERR "WARNING: irn_flag '$flag' in opcode $op is unknown\n";
 			} else {
-				$temp .= "\tflags |= " . $known_irn_flags{$flag} . ";\n";
+				$temp .= "\tirn_flags_ |= " . $known_irn_flags{$flag} . ";\n";
 			}
 		}
 		$temp .= "\n";
 	}
 
 	# lookup init function
-	my $attr_init_code = $init_attr{$attr_type};
-	if(!defined($attr_init_code)) {
-		die "Fatal error: Couldn't find attribute initialisation code for type '${attr_type}'";
+	my $attr_init_code = "(void)in;(void)irn_flags_;(void)in_reqs;(void)n_res;";
+	if ($attr_type ne "") {
+		$attr_init_code = $init_attr{$attr_type};
+		if(!defined($attr_init_code)) {
+			die "Fatal error: Couldn't find attribute initialisation code for type '${attr_type}'";
+		}
 	}
 	my $custominit = "";
 	if(defined($custom_init_attr_func)) {
@@ -447,26 +405,27 @@ EOF
 	$temp .= <<EOF;
 	/* create node */
 	assert(op != NULL);
-	res = new_ir_node(dbgi, current_ir_graph, block, op, mode, arity, in);
+	res = new_ir_node(dbgi, irg, block, op, mode, arity, in);
 
 	/* init node attributes */
 	${attr_init_code}
 	${custominit}
 	info = be_get_info(res);
 	(void) info; /* avoid potential warning */
-	${set_out_reqs}
+${set_out_reqs}
 
 EOF
 
 	if (exists($n->{"init_attr"})) {
-		$temp .= "\tattr = get_irn_generic_attr(res);\n";
+		$temp .= "\tattr = (${attr_type}*)get_irn_generic_attr(res);\n";
+		$temp .= "\t(void) attr; /* avoid potential warning */\n";
 		$temp .= "\t".$n->{"init_attr"}."\n";
 	}
 
 	$temp .= <<EOF;
 	/* optimize node */
 	res = optimize_node(res);
-	irn_verify_irg(res, current_ir_graph);
+	irn_verify_irg(res, irg);
 
 	return res;
 EOF
@@ -477,7 +436,22 @@ EOF
 	$obst_constructor .= "}\n\n";
 }
 
-push(@obst_enum_op, "typedef enum ${arch}_opcodes {\n");
+my @node_attrs = (
+	"args",
+	"arity",
+	"attr",
+	"comment",
+	"custominit",
+	"init_attr",
+	"ins",
+	"irn_flags",
+	"mode",
+	"out_arity",
+	"outs",
+	"reg_req",
+);
+
+$obst_enum_op .= "typedef enum ${arch}_opcodes {\n";
 foreach my $op (keys(%nodes)) {
 	my %n        = %{ $nodes{"$op"} };
 	my $known_mode;
@@ -530,18 +504,20 @@ foreach my $op (keys(%nodes)) {
 
 		$num_outs = $#outs + 1;
 
-		$obst_proj .= "\nenum pn_${op} {\n";
+		if ($num_outs > 0) {
+			$obst_proj .= "\nenum pn_${op} {\n";
 
-		for (my $idx = 0; $idx <= $#outs; $idx++) {
-			# check, if we have additional flags annotated to out
-			if ($outs[$idx] =~ /:((S|I)(\|(S|I))*)/) {
-				push(@out_flags, $1);
-				$outs[$idx] =~ s/:((S|I)(\|(S|I))*)//;
+			for (my $idx = 0; $idx <= $#outs; $idx++) {
+				# check, if we have additional flags annotated to out
+				if ($outs[$idx] =~ /:((S|I)(\|(S|I))*)/) {
+					push(@out_flags, $1);
+					$outs[$idx] =~ s/:((S|I)(\|(S|I))*)//;
+				}
+				$obst_proj .= "\tpn_${op}_".$outs[$idx]." = ${idx},\n";
 			}
-			$obst_proj .= "\tpn_${op}_".$outs[$idx]." = ${idx},\n";
-		}
 
-		$obst_proj .= "};\n";
+			$obst_proj .= "};\n";
+		}
 		# outs have names, it must be a mode_T node
 		if (!defined($n{mode})) {
 			$n{mode} = "mode_T";
@@ -555,19 +531,19 @@ foreach my $op (keys(%nodes)) {
 			die "Fatal error: Op ${op} has different number of ins and arity\n";
 		}
 
-		$obst_proj .= "\nenum n_$op {\n";
-		for (my $idx = 0; $idx <= $#ins; $idx++) {
-			$obst_proj .= "\tn_${op}_".$ins[$idx]." = ${idx},\n";
+		if ($#ins >= 0) {
+			$obst_proj .= "\nenum n_$op {\n";
+			for (my $idx = 0; $idx <= $#ins; $idx++) {
+				$obst_proj .= "\tn_${op}_".$ins[$idx]." = ${idx},\n";
+			}
+			$obst_proj .= "};\n";
 		}
-		$obst_proj .= "};\n";
 	}
 
 	# Create opcode
-	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_$arch\_irn_opcode(n) == iro_$op; }\n\n");
-
-	push(@obst_is_archirn, "is_$op(node)");
+	$obst_opvar     .= "ir_op *op_$op = NULL;\n";
+	$obst_get_opvar .= "ir_op *get_op_$op(void)         { return op_$op; }\n";
+	$obst_get_opvar .= "int    is_$op(const ir_node *n) { return get_$arch\_irn_opcode(n) == iro_$op; }\n\n";
 
 	$obst_header .= <<EOF;
 extern ir_op *op_${op};
@@ -592,21 +568,23 @@ EOF
 	if (exists($n{"cmp_attr"})) {
 		my $cmpcode = $n{"cmp_attr"};
 
-		push(@obst_cmp_attr, "static int cmp_attr_$op(ir_node *a, ir_node *b) {\n");
+		$obst_cmp_attr .= "static int cmp_attr_$op(const ir_node *a, const ir_node *b) {\n";
 		if($cmpcode =~ m/attr_a/) {
-			push(@obst_cmp_attr, "\t${attr_type} *attr_a = get_irn_generic_attr(a);\n");
+			$obst_cmp_attr .= "\tconst ${attr_type} *attr_a = get_irn_generic_attr_const(a);\n";
 		} else {
-			push(@obst_cmp_attr, "\t(void) a;\n");
+			$obst_cmp_attr .= "\t(void) a;\n";
 		}
 		if($cmpcode =~ m/attr_b/) {
-			push(@obst_cmp_attr, "\t${attr_type} *attr_b = get_irn_generic_attr(b);\n");
+			$obst_cmp_attr .= "\tconst ${attr_type} *attr_b = get_irn_generic_attr_const(b);\n";
 		} else {
-			push(@obst_cmp_attr, "\t(void) b;\n");
+			$obst_cmp_attr .= "\t(void) b;\n";
 		}
-		push(@obst_cmp_attr, "\t${cmpcode}\n");
-		push(@obst_cmp_attr, "}\n\n");
+		$obst_cmp_attr .= "\t${cmpcode}\n";
+		$obst_cmp_attr .= "}\n\n";
 
 		$cmp_attr_func = "cmp_attr_${op}";
+	} elsif ($attr_type eq "") {
+		$cmp_attr_func = "NULL";
 	} else {
 		if(defined($compare_attr{${attr_type}})) {
 			$cmp_attr_func = $compare_attr{${attr_type}};
@@ -621,9 +599,7 @@ EOF
 	} else {
 		# Create 1 default constructor
 		my %constructor = ();
-		foreach my $a ("comment", "ins", "outs", "args", "attr", "units",
-				"reg_req", "init_attr", "irn_flags", "mode", "arity",
-				"out_arity", "custominit") {
+		foreach my $a (@node_attrs) {
 			if (defined($n{$a})) {
 				$constructor{$a} = $n{$a};
 			}
@@ -634,8 +610,7 @@ EOF
 	foreach my $constr (keys(%constructors)) {
 		my %cstr = %{ $constructors{$constr} };
 		# Copy some values from outer node if they don't exists in the constr
-		foreach my $a ("ins", "outs", "irn_flags", "mode", "args", "attr",
-		               "custominit") {
+		foreach my $a (@node_attrs) {
 			if (!defined($cstr{$a}) && defined($n{$a})) {
 				$cstr{$a} = $n{$a};
 			}
@@ -644,78 +619,87 @@ EOF
 	}
 
 	# set default values for state and flags if not given
-	$n{"state"}    = "floats" if (! exists($n{"state"}));
-	$n{"op_flags"} = ["none"] if (! exists($n{"op_flags"}));
-
-	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");
-	}
-	if (defined($hash_func)) {
-		push(@obst_new_irop, "\tops.hash = ${hash_func};\n");
-	}
+	$n{"state"}     = "floats" if (! exists($n{"state"}));
+	$n{"op_flags"}  = ["none"] if (! exists($n{"op_flags"}));
+	$n{"dump_func"} = "${arch}_dump_node" if (!exists($n{"dump_func"}));
+	my $dump_func = $n{"dump_func"};
 
 	my %known_flags = map { $_ => 1 } (
-		"none", "labeled", "commutative", "cfopcode", "op_cfopcode",
-		"fragile", "forking", "highlevel", "constlike", "always_opt",
-		"keep", "start_block", "uses_memory", "dump_noblock",
-		"dump_noinput", "machine", "machine_op", "cse_neutral"
+		"none", "commutative", "cfopcode", "unknown_jump", "fragile",
+		"forking", "highlevel", "constlike", "keep", "start_block",
+		"uses_memory", "dump_noblock", "cse_neutral"
 	);
+	my $is_fragile = 0;
 	foreach my $flag (@{$n{"op_flags"}}) {
 		if (not defined($known_flags{$flag})) {
 			print STDERR "WARNING: Flag '$flag' in opcode $op is unknown\n";
 		}
+		if ($flag eq "fragile") {
+			$is_fragile = 1;
+		}
 	}
 	my @mapped = map { "irop_flag_$_" } @{$n{"op_flags"}};
 	my $op_flags = join('|', @mapped);
 
+	my $attr_size = "0";
+	if ($attr_type ne "") {
+		$attr_size = "sizeof(${attr_type})"
+	}
+
 	$n_opcodes++;
-	$temp  = "\top_$op = new_ir_op(cur_opcode + iro_$op, \"$op\", op_pin_state_".$n{"state"}.", $op_flags";
-	$temp .= "|irop_flag_machine, ".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 = &attrs[iro_$op];\n");
-		if(defined($n{op_attr_init})) {
-			push(@obst_new_irop, "\t".$n{op_attr_init}."\n");
+	$temp  = "\top = new_ir_op(cur_opcode + iro_$op, \"$op\", op_pin_state_".$n{"state"}.", $op_flags";
+	$temp .= ", ".translate_arity($arity).", 0, ${attr_size});\n";
+	$obst_new_irop .= $temp;
+	$obst_new_irop .= "\top->ops.be_ops        = be_ops;\n";
+	$obst_new_irop .= "\top->ops.dump_node     = ${dump_func};\n";
+	if (defined($cmp_attr_func)) {
+		$obst_new_irop .= "\top->ops.node_cmp_attr = ${cmp_attr_func};\n";
+	}
+	my $copy_attr_func = $copy_attr{$attr_type};
+	if (!defined($copy_attr_func)) {
+		# don't set a copy_attr function if the node has no additional attributes.
+		if ($attr_type ne "") {
+			$copy_attr_func = $default_copy_attr;
 		}
-		push(@obst_new_irop, "\tset_op_attr(op_$op, attr);\n");
 	}
+	if (defined($copy_attr_func)) {
+		$obst_new_irop .= "\top->ops.copy_attr     = ${copy_attr_func};\n";
+	}
+	if (defined($hash_func)) {
+		$obst_new_irop .= "\top->ops.hash          = ${hash_func};\n";
+	}
+
+	if ($is_fragile) {
+		$obst_new_irop .= "\tir_op_set_memory_index(op, n_${op}_mem);\n";
+		$obst_new_irop .= "\tir_op_set_fragile_indices(op, pn_${op}_X_regular, pn_${op}_X_except);\n";
+	}
+	$obst_new_irop .= "\tset_op_tag(op, $arch\_op_tag);\n";
+	if(defined($n{op_attr_init})) {
+		$obst_new_irop .= "\t".$n{op_attr_init}."\n";
+	}
+	$obst_new_irop .= "\top_${op} = op;\n";
 
-	push(@obst_enum_op, "\tiro_$op,\n");
+	$obst_free_irop .= "\tfree_ir_op(op_$op); op_$op = NULL;\n";
+
+	$obst_enum_op .= "\tiro_$op,\n";
 
 	$obst_header .= "\n";
 }
-push(@obst_enum_op, "\tiro_$arch\_last_generated,\n");
-push(@obst_enum_op, "\tiro_$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");
+$obst_enum_op .= "\tiro_$arch\_last\n";
+$obst_enum_op .= "} $arch\_opcodes;\n\n";
 
 # emit the code
 
 open(OUT, ">$target_c") || die("Fatal error: Could not open $target_c, reason: $!\n");
 
-print OUT "#include \"gen_$arch\_regalloc_if.h\"\n";
-print OUT "#include \"irverify_t.h\"\n";
-print OUT "\n";
-print OUT @obst_cmp_attr;
-print OUT "\n";
-print OUT @obst_opvar;
-print OUT "\n";
-print OUT @obst_get_opvar;
-print OUT "\n";
-
 print OUT<<EOF;
+#include "gen_$arch\_regalloc_if.h"
+#include "irverify_t.h"
+#include "fourcc.h"
+
+$obst_cmp_attr
+$obst_opvar
+$obst_get_opvar
 
 static int $arch\_opcode_start = -1;
 static int $arch\_opcode_end   = -1;
@@ -742,7 +726,7 @@ if (length($arch) >= 4) {
 	$d = uc(substr($arch, 3, 1));
 }
 
-print OUT<<ENDOFISIRN;
+print OUT <<END;
 
 /** A tag for the $arch opcodes. Note that the address is used as a tag value, NOT the FOURCC code. */
 #define $arch\_op_tag FOURCC('$a', '$b', '$c', '$d')
@@ -773,78 +757,34 @@ int get_$arch\_irn_opcode(const ir_node *node) {
 	return -1;
 }
 
-ENDOFISIRN
-
-print OUT <<END;
 #ifdef BIT
 #undef BIT
 #endif
-#define BIT(x)  (1 << (x % 32))
+#define BIT(x)  (1 << (x))
 
-END
-
-print OUT @obst_limit_func;
-print OUT "\n";
-
-print OUT @obst_reg_reqs;
-print OUT "\n";
-
-print OUT<<ENDOFMAIN;
+$obst_limit_func
+$obst_reg_reqs
 $obst_constructor
 
 /**
  * Creates the $arch specific Firm machine operations
  * needed for the assembler irgs.
  */
-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
-#define X   irop_flag_cfopcode
-#define F   irop_flag_fragile
-#define Y   irop_flag_forking
-#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 NB  irop_flag_dump_noblock
-#define NI  irop_flag_dump_noinput
-#define n   irop_flag_cse_neutral
-#define R   (irop_flag_user << 0)
-
-	ir_op_ops  ops;
-	int        cur_opcode;
-	static int run_once = 0;
-ENDOFMAIN
-
-	if (defined($default_op_attr_type)) {
-		print OUT "\t$default_op_attr_type *attr, *attrs;\n";
-	}
-
-print OUT<<ENDOFMAIN;
-
-	if (run_once)
-		return;
-	run_once = 1;
-
-	cur_opcode = get_next_ir_opcodes(iro_$arch\_last);
+void $arch\_create_opcodes(const arch_irn_ops_t *be_ops)
+{
+	ir_op *op;
+	int    cur_opcode = get_next_ir_opcodes(iro_$arch\_last);
 
 	$arch\_opcode_start = cur_opcode;
-ENDOFMAIN
-
-	if (defined($default_op_attr_type)) {
-		print OUT "\tattrs = xmalloc(sizeof(attr[0]) * iro_$arch\_last);\n";
-		print OUT "\tmemset(attrs, 0, sizeof(attr[0]) * iro_$arch\_last);\n";
-	}
+$obst_new_irop
+	$arch\_opcode_end = cur_opcode + iro_$arch\_last;
+}
 
-print OUT @obst_new_irop;
-print OUT "\n";
-print OUT "\t$arch\_register_additional_opcodes(cur_opcode);\n" if (defined($additional_opcodes));
-print OUT "\t$arch\_opcode_end = cur_opcode + iro_$arch\_last";
-print OUT " + $additional_opcodes" if (defined($additional_opcodes));
-print OUT ";\n";
-print OUT "}\n";
+void $arch\_free_opcodes(void)
+{
+$obst_free_irop
+}
+END
 
 close(OUT);
 
@@ -865,10 +805,7 @@ print OUT<<EOF;
 #ifndef FIRM_BE_${tmp}_GEN_${tmp}_NEW_NODES_H
 #define FIRM_BE_${tmp}_GEN_${tmp}_NEW_NODES_H
 
-EOF
-
-print OUT @obst_enum_op;
-print OUT <<EOF;
+$obst_enum_op
 int is_${arch}_irn(const ir_node *node);
 int is_${arch}_op(const ir_op *op);
 
@@ -914,74 +851,6 @@ sub translate_arity {
 	}
 }
 
-###
-# Return the list of pointers for the given execution units.
-###
-sub gen_execunit_list_initializer {
-	my $units   = shift;
-	my $uc_arch = uc($arch);
-	my $ret     = "";
-	my $ret2    = "";
-	my %init;
-
-	foreach my $unit (@{ $units }) {
-		if ($unit eq "DUMMY") {
-			push(@{ $init{"DUMMY"} }, "\t\t&be_machine_execution_units_DUMMY[0]");
-		}
-		elsif (exists($cpu{"$unit"})) {
-			# operation can be executed on all units of this type
-			# -> add them all
-			my $tp_name = "$arch\_execution_units_$unit";
-			my $idx     = 0;
-			foreach (@{ $cpu{"$unit"} }) {
-				next if ($idx++ == 0);  # skip first element (it's not a unit)
-				my $unit_name = "$uc_arch\_EXECUNIT_TP_$unit\_$_";
-				push(@{ $init{"$unit"} }, "\t\t&".$tp_name."[".$unit_name."]");
-			}
-		}
-		else {
-			# operation can be executed only a certain unit
-			# -> find corresponding unit type
-			my $found = 0;
-TP_SEARCH:	foreach my $cur_type (keys(%cpu)) {
-				foreach my $cur_unit (@{ $cpu{"$cur_type"} }) {
-					if ($unit eq $cur_unit) {
-						my $tp_name   = "$arch\_execution_units_$cur_type";
-						my $unit_name = "$uc_arch\_EXECUNIT_TP_$cur_type\_$unit";
-						push(@{ $init{"$unit"} }, "\t\t&".$tp_name."[".$unit_name."]");
-						$found = 1;
-						last TP_SEARCH;
-					}
-				}
-			}
-
-			if (! $found) {
-				print STDERR "Invalid execution unit $unit specified!\n";
-			}
-		}
-	}
-
-	# prepare the 2-dim array init
-	foreach my $key (keys(%init)) {
-		$ret .= "\tstatic const be_execution_unit_t *allowed_units_".$key."[] =\n";
-		$ret .= "\t{\n";
-		foreach (@{ $init{"$key"} }) {
-			$ret .= "$_,\n";
-		}
-		$ret .= "\t\tNULL\n";
-		$ret .= "\t};\n";
-		$ret2 .= "\t\tallowed_units_$key,\n";
-	}
-	$ret2 .= "\t\tNULL\n";
-
-	$ret .= "\tstatic const be_execution_unit_t **exec_units[] =\n";
-	$ret .= "\t{\n";
-	$ret .= $ret2;
-	$ret .= "\t};\n";
-
-	return $ret;
-}
-
 sub mangle_requirements {
 	my $reqs  = shift;
 	my $class = shift;
@@ -1025,7 +894,7 @@ sub get_reg_class {
 }
 
 ###
-# Returns the index of a given register within it's register class.
+# Returns the index of a given register within its register class.
 # @return index or undef
 ###
 sub get_reg_index {
@@ -1218,7 +1087,7 @@ CHECK_REQS: foreach (@regs) {
 
 		$limit_bitsets{$limit_name} = $limit_name;
 
-		push(@obst_limit_func, "static const unsigned " . $limit_name . "[] = { ");
+		$obst_limit_func .= "static const unsigned $limit_name\[] = { ";
 		my $first = 1;
 		my $limitbitsetlen = $regclass2len{$class};
 		my $limitarraylen = ($limitbitsetlen+31) / 32;
@@ -1228,7 +1097,7 @@ CHECK_REQS: foreach (@regs) {
 			if($first) {
 				$first = 0;
 			} else {
-				push(@obst_limit_func, ", ");
+				$obst_limit_func .= ", ";
 			}
 			my $temp;
 			if($neg) {
@@ -1240,15 +1109,14 @@ CHECK_REQS: foreach (@regs) {
 				} elsif(defined($temp)) {
 					$temp .= " | ";
 				}
-				$temp .= "BIT(REG_".uc(${reg}).")";
-			}
-			if(defined($temp)) {
-				push(@obst_limit_func, "${temp}");
-			} else {
-				push(@obst_limit_func, "0");
+				my $firstreg = uc($reg_classes{$class}[0]->{"name"});
+				my $classuc = uc($class);
+				my $reguc = uc($reg);
+				$temp .= "BIT(REG_${classuc}_${reguc})";
 			}
+			$obst_limit_func .= $temp || "0";
 		}
-		push(@obst_limit_func, " };\n");
+		$obst_limit_func .= " };\n";
 	}
 
 	return ($class, $limit_name, $same_pos, $different_pos);
@@ -1353,9 +1221,7 @@ EOF
 		return $name;
 	}
 	$requirements{$name} = $name;
-	push(@obst_reg_reqs, <<EOF);
-static const arch_register_req_t ${name} = ${result}
-EOF
+	$obst_reg_reqs .= "static const arch_register_req_t ${name} = ${result}\n";
 
 	return $name;
 }