draft for register width specifications
[libfirm] / ir / be / scripts / generate_new_opcodes.pl
index 663c82f..f08371d 100755 (executable)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl -w
 
 #
-# Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+# Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
 #
 # This file is part of libFirm.
 #
@@ -39,6 +39,7 @@ 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;
@@ -47,6 +48,7 @@ our $custom_init_attr_func;
 our %compare_attr;
 our %copy_attr;
 our %reg_classes;
+our %custom_irn_flags;
 
 # include spec file
 
@@ -68,7 +70,7 @@ if(!defined($default_attr_type)) {
 }
 if(!defined(%init_attr)) {
        %init_attr = (
-               "$default_attr_type" => "\tinit_${arch}_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res, latency);",
+               "$default_attr_type" => "\tinit_${arch}_attributes(res, flags, in_reqs, exec_units, n_res);",
        );
 }
 if(!defined($default_cmp_attr)) {
@@ -113,13 +115,13 @@ 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_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_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_proj = "";   # stack for the pn_ numbers
 my $orig_op;
 my $arity;
 my $cmp_attr_func;
@@ -157,9 +159,324 @@ foreach my $class_name (keys(%reg_classes)) {
 # for registering additional opcodes
 $n_opcodes += $additional_opcodes if (defined($additional_opcodes));
 
-push(@obst_header, "void ".$arch."_create_opcodes(void);\n");
+$obst_header .= "void ${arch}_create_opcodes(const arch_irn_ops_t *be_ops);\n";
 
-push(@obst_enum_op, "typedef enum _$arch\_opcodes {\n");
+sub create_constructor {
+       my $op   = shift;
+       my $name = shift;
+       my $n    = shift;
+       my $on   = shift;
+       my $known_mode;
+
+       my $suffix = "";
+       if ($name ne "") {
+               $suffix = "_${name}";
+       }
+
+       # determine mode
+       if (exists($n->{mode})) {
+               $known_mode = $n->{mode};
+       }
+
+       # determine arity
+       my $arity = 0;
+       if(exists($n->{"arity"})) {
+               $arity = $n->{"arity"};
+       } elsif (exists($n->{"reg_req"}) && exists($n->{"reg_req"}{"in"})) {
+               $arity = scalar(@{ $n->{"reg_req"}{"in"} });
+       } elsif (exists($n->{"ins"})) {
+               $arity = scalar(@{ $n->{"ins"} });
+       }
+       if($arity eq "variable") {
+               $arity = $ARITY_VARIABLE;
+       } elsif($arity eq "dynamic") {
+               $arity = $ARITY_DYNAMIC;
+       }
+
+       # determine out arity
+       my $out_arity = 0;
+       if(exists($n->{"out_arity"})) {
+               $out_arity = $n->{"out_arity"};
+       } elsif (exists($n->{"reg_req"}) && exists($n->{"reg_req"}{"out"})) {
+               $out_arity = scalar(@{ $n->{"reg_req"}{"out"} });
+       } elsif (exists($n->{"outs"})) {
+               $out_arity = scalar(@{ $n->{"outs"} });
+       }
+       if($out_arity eq "variable") {
+               $out_arity = $ARITY_VARIABLE;
+       } elsif($out_arity eq "dynamic") {
+               $out_arity = $ARITY_DYNAMIC;
+       }
+       if ($out_arity != 0 && $out_arity != 1 && !defined($known_mode)) {
+               $known_mode = "mode_T";
+       }
+
+       my $comment = $n->{"comment"};
+       if(!exists($n->{"comment"})) {
+               $comment = "construct ${orig_op} node";
+       }
+       $comment =
+               "/**\n".
+               " * ${comment}\n".
+               " */\n";
+
+       $obst_constructor .= $comment;
+
+       # create constructor head
+       my $complete_args = "";
+       $temp             = "";
+
+       $temp = "ir_node *new_bd_${arch}_${op}${suffix}(dbg_info *dbgi, ir_node *block";
+       if (!exists($n->{"args"})) { # default args
+               if ($arity == $ARITY_VARIABLE) {
+                       $complete_args = ", int arity, ir_node *in[]";
+               } elsif ($arity == $ARITY_DYNAMIC) {
+                       $complete_args = "";
+               } else {
+                       for (my $i = 0; $i < $arity; $i++) {
+                               my $opname = "op${i}";
+                               if (exists($n->{"ins"})) {
+                                       my @ins = @{ $n->{"ins"} };
+                                       $opname = $ins[$i];
+                               }
+
+                               $complete_args .= ", ir_node *${opname}";
+                       }
+               }
+               if ($out_arity == $ARITY_VARIABLE) {
+                       $complete_args .= ", int n_res";
+               }
+
+               if (!defined($known_mode)) {
+                       $complete_args .= ", ir_mode *mode";
+               }
+       } else { # user defined args
+               for my $href (@{ $n->{"args"} }) {
+                       $href->{"type"} .= " " if ($href->{"type"} !~ / [*]?$/); # put a space between name and type if there is none at the end
+                       $complete_args  .= ", ".$href->{"type"}.$href->{"name"};
+               }
+       }
+
+       # we have additional attribute arguements
+       if (exists($n->{"attr"})) {
+               $complete_args .= ", ".$n->{"attr"};
+       }
+
+       $temp .= "$complete_args)";
+       $obst_constructor .= "${temp}\n{\n";
+
+       $obst_header .= $comment;
+       $obst_header .= "${temp};\n";
+
+       # emit constructor code
+       $temp = <<EOF;
+       ir_node        *res;
+       ir_op          *op      = op_${arch}_${op};
+       int             flags   = 0;
+       backend_info_t *info;
+EOF
+
+       if($arity == $ARITY_DYNAMIC) {
+               $temp .= <<EOF;
+       int             arity   = -1;
+       ir_node       **in      = NULL;
+EOF
+       } elsif($arity == $ARITY_VARIABLE) {
+       } else {
+               $temp .= <<EOF;
+       int             arity   = $arity;
+EOF
+               if($arity > 0) {
+                       $temp .= <<EOF;
+       ir_node        *in[$arity];
+EOF
+               } else {
+                       $temp .= <<EOF;
+       ir_node       **in      = NULL;
+EOF
+               }
+       }
+       if($out_arity == $ARITY_DYNAMIC) {
+               $temp .= <<EOF;
+       int             n_res   = -1;
+EOF
+       } elsif($out_arity == $ARITY_VARIABLE) {
+       } else {
+               $temp .= <<EOF;
+       int             n_res   = ${out_arity};
+EOF
+       }
+
+       if (defined($known_mode)) {
+               $temp .= <<EOF;
+       ir_mode        *mode    = ${known_mode};
+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;
+
+       my $set_out_reqs = "";
+
+       # set up static variables for requirements and registers
+       if (exists($n->{"reg_req"})) {
+               my %req = %{ $n->{"reg_req"} };
+               my $idx;
+
+               undef my @in;
+               @in = @{ $req{"in"} } if (exists($req{"in"}));
+               undef my @out;
+               @out = @{ $req{"out"} } if exists(($req{"out"}));
+
+               for(my $idx = 0; $idx < $#in; $idx++) {
+                       my $req = $in[$idx];
+                       generate_requirements($req, $n, "${arch}_${op}", $idx, 1);
+               }
+               for(my $idx = 0; $idx < $#out; $idx++) {
+                       my $req = $out[$idx];
+                       generate_requirements($req, $n, "${arch}_${op}", $idx, 0);
+               }
+
+               if (@in) {
+                       if($arity >= 0 && scalar(@in) != $arity) {
+                               die "Fatal error: Arity and number of in requirements don't match for ${op}\n";
+                       }
+
+                       $temp .= "\tstatic const arch_register_req_t *in_reqs[] =\n";
+                       $temp .= "\t{\n";
+                       for ($idx = 0; $idx <= $#in; $idx++) {
+                               my $req = $in[$idx];
+                               my $reqstruct = generate_requirements($req, $n, "${arch}_${op}", $idx, 1);
+                               $temp .= "\t\t& ${reqstruct},\n";
+                       }
+                       $temp .= "\t};\n";
+               } else {
+                       if($arity > 0) {
+                               die "Fatal error: need in requirements for ${op}\n";
+                       }
+                       $temp .= "\tstatic const arch_register_req_t **in_reqs = NULL;\n";
+               }
+
+               if (@out) {
+                       if($out_arity >= 0 && scalar(@out) != $out_arity) {
+                               die "Fatal error: Out-Arity and number of out requirements don't match for ${op}\n";
+                       }
+
+                       for ($idx = 0; $idx <= $#out; $idx++) {
+                               my $req = $out[$idx];
+                               my $reqstruct = generate_requirements($req, $n, "${arch}_${op}", $idx, 0);
+                               $set_out_reqs .= <<EOF;
+info->out_infos[${idx}].req = &${reqstruct};
+EOF
+                       }
+               } else {
+                       if($out_arity > 0) {
+                               die "Fatal error: need out requirements for ${op}\n";
+                       }
+               }
+       } else {
+               $temp .= "\tstatic const arch_register_req_t **in_reqs = NULL;\n";
+       }
+       my $attr_type = $on->{attr_type};
+       if(exists($n->{"init_attr"})) {
+               $temp .= "\t${attr_type} *attr;\n";
+       }
+
+       $temp .= "\n";
+
+       if($arity > 0) {
+               $temp .= "\t/* construct in array */\n";
+               for (my $i = 0; $i < $arity; $i++) {
+                       my $opname = "op${i}";
+                       if (exists($n->{"ins"})) {
+                               my @ins = @{ $n->{"ins"} };
+                               $opname = $ins[$i];
+                       }
+
+                       $temp .= "\tin[${i}] = ${opname};\n";
+               }
+               $temp .= "\n";
+       }
+
+       # set flags
+       if (exists($n->{"irn_flags"})) {
+               $temp .= "\t/* flags */\n";
+               my %known_irn_flags = (
+                       "none"             => "arch_irn_flags_none",
+                       "dont_spill"       => "arch_irn_flags_dont_spill",
+                       "rematerializable" => "arch_irn_flags_rematerializable",
+                       "modify_flags"     => "arch_irn_flags_modify_flags",
+                       "simple_jump"      => "arch_irn_flags_simple_jump",
+               );
+               if (defined(%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 .= "\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 $custominit = "";
+       if(defined($custom_init_attr_func)) {
+               $custominit .= &$custom_init_attr_func($n, $on, "${arch}_${op}");
+       }
+       if(defined($n->{custominit})) {
+               $custominit .= $n->{custominit};
+       }
+
+       $temp .= <<EOF;
+       /* create node */
+       assert(op != NULL);
+       res = new_ir_node(dbgi, current_ir_graph, 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}
+
+EOF
+
+       if (exists($n->{"init_attr"})) {
+               $temp .= "\tattr = get_irn_generic_attr(res);\n";
+               $temp .= "\t".$n->{"init_attr"}."\n";
+       }
+
+       $temp .= <<EOF;
+       /* optimize node */
+       res = optimize_node(res);
+       irn_vrfy_irg(res, current_ir_graph);
+
+       return res;
+EOF
+
+       $obst_constructor .= $temp;
+
+       # close constructor function
+       $obst_constructor .= "}\n\n";
+}
+
+push(@obst_enum_op, "typedef enum _${arch}_opcodes {\n");
 foreach my $op (keys(%nodes)) {
        my %n        = %{ $nodes{"$op"} };
        my $known_mode;
@@ -205,14 +522,14 @@ foreach my $op (keys(%nodes)) {
        if (exists($n{"outs"})) {
                undef my @outs;
 
-               @outs     = @{ $n{"outs"} };
+               @outs = @{ $n{"outs"} };
                if($out_arity >= 0 && scalar(@outs) != $out_arity) {
                        die "Fatal error: Op ${op} has different number of outs and out_arity\n";
                }
 
                $num_outs = $#outs + 1;
 
-               push(@obst_proj, "\nenum pn_$op {\n");
+               $obst_proj .= "\nenum pn_${op} {\n";
 
                for (my $idx = 0; $idx <= $#outs; $idx++) {
                        # check, if we have additional flags annotated to out
@@ -220,12 +537,14 @@ foreach my $op (keys(%nodes)) {
                                push(@out_flags, $1);
                                $outs[$idx] =~ s/:((S|I)(\|(S|I))*)//;
                        }
-                       push(@obst_proj, "\tpn_$op\_".$outs[$idx]." = $idx,\n");
+                       $obst_proj .= "\tpn_${op}_".$outs[$idx]." = ${idx},\n";
                }
 
-               push(@obst_proj, "};\n");
+               $obst_proj .= "};\n";
                # outs have names, it must be a mode_T node
-               $known_mode = "mode_T";
+               if (!defined($n{mode})) {
+                       $n{mode} = "mode_T";
+               }
        }
        if (exists($n{"ins"})) {
                undef my @ins;
@@ -235,33 +554,36 @@ foreach my $op (keys(%nodes)) {
                        die "Fatal error: Op ${op} has different number of ins and arity\n";
                }
 
-               push(@obst_proj, "\nenum n_$op {\n");
-
+               $obst_proj .= "\nenum n_$op {\n";
                for (my $idx = 0; $idx <= $#ins; $idx++) {
-                       push(@obst_proj, "\tn_${op}_".$ins[$idx]." = $idx,\n");
+                       $obst_proj .= "\tn_${op}_".$ins[$idx]." = ${idx},\n";
                }
-
-               push(@obst_proj, "};\n");
-       }
-
-       # determine mode
-       if (exists($n{"mode"})) {
-               $known_mode = $n{"mode"};
+               $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)");
 
-       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");
+       $obst_header .= <<EOF;
+extern ir_op *op_${op};
+ir_op *get_op_${op}(void);
+int is_${op}(const ir_node *n);
+EOF
 
-       my $attr_type= $n{"attr_type"};
+       my $attr_type= $n{attr_type};
        if(!defined($attr_type)) {
                $attr_type = $default_attr_type;
+               $n{attr_type} = $attr_type;
+       }
+
+       # determine hash function
+       my $hash_func;
+       if (exists($n{"hash_func"})) {
+               $hash_func = $n{"hash_func"};
        }
 
        # determine compare function
@@ -292,278 +614,40 @@ foreach my $op (keys(%nodes)) {
                }
        }
 
-       if (exists($n{"rd_constructor"}) && $n{"rd_constructor"} =~ /^NONE$/i) {
-               # we explicitly skip the constructor if the specification entry says NONE
+       my %constructors;
+       if (exists($n{constructors})) {
+               %constructors = %{ $n{constructors} };
        } else {
-               my $comment = $n{"comment"};
-               if(!exists($n{"comment"})) {
-                       $comment = "construct ${orig_op} node";
-               }
-               $comment =
-                       "/**\n".
-                       " * ${comment}\n".
-                       " */\n";
-
-               push(@obst_constructor, $comment);
-
-               # create constructor head
-               my $complete_args = "";
-               $temp             = "";
-
-               $temp = "ir_node *new_rd_$op(dbg_info *db, ir_graph *irg, ir_node *block";
-               if (!exists($n{"args"})) { # default args
-                       if ($arity == $ARITY_VARIABLE) {
-                               $complete_args = ", int arity, ir_node *in[]";
-                       } elsif ($arity == $ARITY_DYNAMIC) {
-                               $complete_args = "";
-                       } else {
-                               for (my $i = 0; $i < $arity; $i++) {
-                                       my $opname = "op${i}";
-                                       if (exists($n{"ins"})) {
-                                               my @ins = @{ $n{"ins"} };
-                                               $opname = $ins[$i];
-                                       }
-
-                                       $complete_args .= ", ir_node *${opname}";
-                               }
-                       }
-                       if ($out_arity == $ARITY_VARIABLE) {
-                               $complete_args .= ", int n_res";
+               # 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") {
+                       if (defined($n{$a})) {
+                               $constructor{$a} = $n{$a};
                        }
-
-                       if (!defined($known_mode)) {
-                               $complete_args .= ", ir_mode *mode";
-                       }
-               } else { # user defined args
-                       for my $href (@{ $n{"args"} }) {
-                               $href->{"type"} .= " " if ($href->{"type"} !~ / [*]?$/); # put a space between name and type if there is none at the end
-                               $complete_args  .= ", ".$href->{"type"}.$href->{"name"};
-                       }
-               }
-
-               # we have additional attribute arguements
-               if (exists($n{"attr"})) {
-                       $complete_args .= ", ".$n{"attr"};
                }
+               %constructors = ( "" => \%constructor );
+       }
 
-               $temp .= "$complete_args)";
-               push(@obst_constructor, $temp."\n{\n");
-               push(@obst_header, $comment);
-               push(@obst_header, $temp.";\n");
-
-               # emit constructor code
-               if (!exists($n{"rd_constructor"})) { # default constructor
-                       $temp  = "\tir_node  *res;\n";
-                       $temp .= "\tir_op    *op      = op_${op};\n";
-                       $temp .= "\tint       flags   = 0;\n";
-
-                       if($arity == $ARITY_DYNAMIC) {
-                               $temp .= "\tint        arity   = -1;\n";
-                               $temp .= "\tir_node  **in      = NULL;\n";
-                       } elsif($arity == $ARITY_VARIABLE) {
-                       } else {
-                               $temp .= "\tint       arity   = $arity;\n";
-                               if($arity > 0) {
-                                       $temp .= "\tir_node  *in[$arity];\n";
-                               } else {
-                                       $temp .= "\tir_node **in    = NULL;\n";
-                               }
-                       }
-                       if($out_arity == $ARITY_DYNAMIC) {
-                               $temp .= "\tint       n_res   = -1;\n";
-                       } elsif($out_arity == $ARITY_VARIABLE) {
-                       } else {
-                               $temp .= "\tint       n_res   = ${out_arity};\n";
-                       }
-
-                       my $latency = $n{"latency"};
-                       if (!defined($latency)) {
-                               $latency = 1;
-                       }
-                       $temp .= "\tunsigned  latency = ${latency};\n";
-
-                       if (defined($known_mode)) {
-                               $temp .= "\tir_mode  *mode    = ${known_mode};\n";
-                       }
-
-                       # set up static variables for cpu execution unit assigments
-                       if (exists($n{"units"})) {
-                               $temp .= gen_execunit_list_initializer($n{"units"});
-                       } else {
-                               $temp .= "\tstatic const be_execution_unit_t ***exec_units = NULL;\n";
-                       }
-
-                       undef my $in_req_var;
-                       undef my $out_req_var;
-
-                       # set up static variables for requirements and registers
-                       if (exists($n{"reg_req"})) {
-                               my %req = %{ $n{"reg_req"} };
-                               my $idx;
-
-                               undef my @in;
-                               @in = @{ $req{"in"} } if (exists($req{"in"}));
-                               undef my @out;
-                               @out = @{ $req{"out"} } if exists(($req{"out"}));
-
-                               for(my $idx = 0; $idx < $#in; $idx++) {
-                                       my $req = $in[$idx];
-                                       generate_requirements($req, \%n, $op, $idx, 1);
-                               }
-                               for(my $idx = 0; $idx < $#out; $idx++) {
-                                       my $req = $out[$idx];
-                                       generate_requirements($req, \%n, $op, $idx, 0);
-                               }
-
-                               if (@in) {
-                                       if($arity >= 0 && scalar(@in) != $arity) {
-                                               die "Fatal error: Arity and number of in requirements don't match for ${op}\n";
-                                       }
-
-                                       $temp .= "\tstatic const arch_register_req_t *in_reqs[] =\n";
-                                       $temp .= "\t{\n";
-                                       for ($idx = 0; $idx <= $#in; $idx++) {
-                                               my $req = $in[$idx];
-                                               my $reqstruct = generate_requirements($req, \%n, $op, $idx, 1);
-                                               $temp .= "\t\t& ${reqstruct},\n";
-                                       }
-                                       $temp .= "\t};\n";
-                               } else {
-                                       if($arity > 0) {
-                                               die "Fatal error: need in requirements for ${op}\n";
-                                       }
-                                       $temp .= "\tstatic const arch_register_req_t **in_reqs = NULL;\n";
-                               }
-
-                               if (@out) {
-                                       if($out_arity >= 0 && scalar(@out) != $out_arity) {
-                                               die "Fatal error: Out-Arity and number of out requirements don't match for ${op}\n";
-                                       }
-
-                                       $temp .= "\tstatic const arch_register_req_t *out_reqs[] =\n";
-                                       $temp .= "\t{\n";
-                                       for ($idx = 0; $idx <= $#out; $idx++) {
-                                               my $req = $out[$idx];
-                                               my $reqstruct = generate_requirements($req, \%n, $op, $idx, 0);
-                                               $temp .= "\t\t& ${reqstruct},\n";
-                                       }
-                                       $temp .= "\t};\n";
-                               } else {
-                                       if($out_arity > 0) {
-                                               die "Fatal error: need out requirements for ${op}\n";
-                                       }
-                                       $temp .= "\tstatic const arch_register_req_t **out_reqs = NULL;\n";
-                               }
-                       } else {
-                               $temp .= "\tstatic const arch_register_req_t **in_reqs = NULL;\n";
-                               $temp .= "\tstatic const arch_register_req_t **out_reqs = NULL;\n";
-                       }
-                       if(exists($n{"init_attr"})) {
-                               $temp .= "\t${attr_type} *attr;\n";
-                       }
-
-                       $temp .= "\n";
-
-                       if($arity > 0) {
-                               $temp .= "\t/* construct in array */\n";
-                               for (my $i = 0; $i < $arity; $i++) {
-                                       my $opname = "op${i}";
-                                       if (exists($n{"ins"})) {
-                                               my @ins = @{ $n{"ins"} };
-                                               $opname = $ins[$i];
-                                       }
-
-                                       $temp .= "\tin[${i}] = ${opname};\n";
-                               }
-                               $temp .= "\n";
-                       }
-
-                       # set flags
-                       if (exists($n{"irn_flags"})) {
-                               $temp .= "\t/* flags */\n";
-                               foreach my $flag (split(/\|/, $n{"irn_flags"})) {
-                                       if ($flag eq "R") {
-                                               $temp .= "\tflags |= arch_irn_flags_rematerializable;\n";
-                                       } elsif ($flag eq "N") {
-                                               $temp .= "\tflags |= arch_irn_flags_dont_spill;\n";
-                                       } elsif ($flag eq "I") {
-                                               $temp .= "\tflags |= arch_irn_flags_ignore;\n";
-                                       } elsif ($flag eq "S") {
-                                               $temp .= "\tflags |= arch_irn_flags_modify_sp;\n";
-                                       }
-                               }
-                               $temp .= "\n";
-                       }
-
-                       $temp .= "\t/* create node */\n";
-                       $temp .= "\tassert(op != NULL);\n";
-                       $temp .= "\tres = new_ir_node(db, irg, block, op, mode, arity, in);\n";
-                       $temp .= "\n";
-
-                       $temp .= "\t/* init node attributes */\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}'";
-                       }
-                       $temp .= "${attr_init_code}\n";
-                       if(defined($custom_init_attr_func)) {
-                               $temp .= &$custom_init_attr_func(\%n);
-                       }
-                       $temp .= "\n";
-
-                       # set flags for outs
-                       if ($#out_flags >= 0) {
-                               $temp .= "\t/* set flags for outs */\n";
-                               for (my $idx = 0; $idx <= $#out_flags; $idx++) {
-                                       my $flags  = "";
-                                       my $prefix = "";
-
-                                       foreach my $flag (split(/\|/, $out_flags[$idx])) {
-                                               if ($flag eq "I") {
-                                                       $flags .= $prefix."arch_irn_flags_ignore";
-                                                       $prefix = " | ";
-                                               }
-                                               elsif ($flag eq "S") {
-                                                       $flags .= $prefix."arch_irn_flags_modify_sp";
-                                                       $prefix = " | ";
-                                               }
-                                       }
-
-                                       $temp .= "\tset_$arch\_out_flags(res, $flags, $idx);\n";
-                               }
-                               $temp .= "\n";
-                       }
-
-
-                       if (exists($n{"init_attr"})) {
-                               $temp .= "\tattr = get_irn_generic_attr(res);\n";
-                               $temp .= "\t".$n{"init_attr"}."\n";
+       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") {
+                       if (!defined($cstr{$a}) && defined($n{$a})) {
+                               $cstr{$a} = $n{$a};
                        }
-
-                       $temp .= "\t/* optimize node */\n";
-                       $temp .= "\tres = optimize_node(res);\n";
-                       $temp .= "\tirn_vrfy_irg(res, irg);\n";
-                       $temp .= "\n";
-
-                       $temp .= "\treturn res;\n";
-
-                       push(@obst_constructor, $temp);
                }
-               else { # user defined constructor
-                       push(@obst_constructor, $n{"rd_constructor"});
-               }
-
-               # close constructor function
-               push(@obst_constructor, "}\n\n");
-       } # constructor creation
+               create_constructor($orig_op, $constr, \%cstr, \%n);
+       }
 
        # 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"}));
-
+       $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)) {
@@ -576,19 +660,40 @@ foreach my $op (keys(%nodes)) {
        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_opcodes++;
-       my $n_res = $out_arity;
-       if($n_res < 0) {
-               $n_res = "20"; # hacky....
+       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"
+       );
+       foreach my $flag (@{$n{"op_flags"}}) {
+               if (not defined($known_flags{$flag})) {
+                       print STDERR "WARNING: Flag '$flag' in opcode $op is unknown\n";
+               }
        }
-       $temp  = "\top_$op = new_ir_op(cur_opcode + iro_$op, \"$op\", op_pin_state_".$n{"state"}.", ".$n{"op_flags"};
-       $temp .= "|M, ".translate_arity($arity).", 0, sizeof(${attr_type}), &ops);\n";
+       my @mapped = map { "irop_flag_$_" } @{$n{"op_flags"}};
+       my $op_flags = join('|', @mapped);
+
+       $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");
+       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");
+               }
+               push(@obst_new_irop, "\tset_op_attr(op_$op, attr);\n");
+       }
+
        push(@obst_enum_op, "\tiro_$op,\n");
 
-       push(@obst_header, "\n");
+       $obst_header .= "\n";
 }
 push(@obst_enum_op, "\tiro_$arch\_last_generated,\n");
 push(@obst_enum_op, "\tiro_$arch\_last = iro_$arch\_last_generated");
@@ -637,7 +742,7 @@ if (length($arch) >= 4) {
 print OUT<<ENDOFISIRN;
 
 /** A tag for the $arch opcodes. Note that the address is used as a tag value, NOT the FOURCC code. */
-static unsigned $arch\_op_tag = FOURCC('$a', '$b', '$c', '$d');
+#define $arch\_op_tag FOURCC('$a', '$b', '$c', '$d')
 
 /** Return the opcode number of the first $arch opcode. */
 int get_$arch\_opcode_first(void) {
@@ -651,7 +756,7 @@ int get_$arch\_opcode_last(void) {
 
 /** Return 1 if the given opcode is a $arch machine op, 0 otherwise */
 int is_$arch\_op(const ir_op *op) {
-       return get_op_tag(op) == &$arch\_op_tag;
+       return get_op_tag(op) == $arch\_op_tag;
 }
 
 /** Return 1 if the given node is a $arch machine node, 0 otherwise */
@@ -681,19 +786,18 @@ print OUT "\n";
 print OUT @obst_reg_reqs;
 print OUT "\n";
 
-print OUT @obst_constructor;
-
 print OUT<<ENDOFMAIN;
+$obst_constructor
+
 /**
  * Creates the $arch specific Firm machine operations
  * needed for the assembler irgs.
  */
-void $arch\_create_opcodes(void) {
+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 I   irop_flag_ip_cfopcode
 #define F   irop_flag_fragile
 #define Y   irop_flag_forking
 #define H   irop_flag_highlevel
@@ -701,11 +805,21 @@ void $arch\_create_opcodes(void) {
 #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;
@@ -716,6 +830,11 @@ void $arch\_create_opcodes(void) {
        $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";
+       }
+
 print OUT @obst_new_irop;
 print OUT "\n";
 print OUT "\t$arch\_register_additional_opcodes(cur_opcode);\n" if (defined($additional_opcodes));
@@ -746,14 +865,16 @@ print OUT<<EOF;
 EOF
 
 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 <<EOF;
+int is_${arch}_irn(const ir_node *node);
+int is_${arch}_op(const ir_op *op);
+
+int get_${arch}_opcode_first(void);
+int get_${arch}_opcode_last(void);
+int get_${arch}_irn_opcode(const ir_node *node);
+${obst_header}
+${obst_proj}
+
 #endif
 EOF
 
@@ -861,6 +982,7 @@ TP_SEARCH:  foreach my $cur_type (keys(%cpu)) {
 sub mangle_requirements {
        my $reqs  = shift;
        my $class = shift;
+       my $flags = shift;
 
        my @alternatives = split(/ /, $reqs);
        for(my $idx = 0; $idx < scalar(@alternatives); $idx++) {
@@ -870,6 +992,10 @@ sub mangle_requirements {
        @alternatives = sort @alternatives;
 
        my $name = $class."_".join('_', @alternatives);
+       if (defined($flags)) {
+               $flags =~ s/\|/_/g;
+               $name .= "_$flags";
+       }
 
        return $name;
 }
@@ -923,13 +1049,14 @@ sub build_inout_idx_class {
 
                for (my $idx = 0; $idx <= $#reqs; $idx++) {
                        my $class = undef;
+                       my ($req,) = split(/:/, $reqs[$idx]);
 
-                       if ($reqs[$idx] eq "none") {
+                       if ($req eq "none") {
                                $class = "none";
-                       } elsif (is_reg_class($reqs[$idx])) {
-                               $class = $reqs[$idx];
+                       } elsif (is_reg_class($req)) {
+                               $class = $req;
                        } else {
-                               my @regs = split(/ /, $reqs[$idx]);
+                               my @regs = split(/ /, $req);
 GET_CLASS:             foreach my $reg (@regs) {
                                        if ($reg =~ /!?(in|out)\_r\d+/ || $reg =~ /!in/) {
                                                $class = "UNKNOWN_CLASS";
@@ -962,8 +1089,8 @@ sub build_subset_class_func {
        my $class         = undef;
        my $has_limit     = 0;
        my $limit_name;
-       my $same_pos      = undef;
-       my $different_pos = undef;
+       my $same_pos      = 0;
+       my $different_pos = 0;
        my $temp;
        my @obst_init;
        my @obst_limits;
@@ -977,30 +1104,40 @@ sub build_subset_class_func {
        my $idx   = shift;
        my $is_in = shift;
        my @regs  = split(/ /, shift);
-
-       my $outin = $is_in ? "out" : "in";
+       my $flags = shift;
 
        my @idx_class = build_inout_idx_class($node, $op, !$is_in);
 
        # set/unset registers
 CHECK_REQS: foreach (@regs) {
-               if (/(!)?$outin\_r(\d+)/) {
-                       if (($1 && defined($different_pos)) || (!$1 && defined($same_pos))) {
-                               print STDERR "Multiple in/out references of same type in one requirement not allowed.\n";
+               if (!$is_in && /(!)?in_r(\d+)/) {
+                       my $bit_pos = 1 << ($2 - 1);
+                       if ($different_pos & $bit_pos) {
+                               if ($1) {
+                                       print STDERR "duplicate !in constraint\n";
+                               } else {
+                                       print STDERR "conflicting !in and in constraints\n";
+                               }
+                               return (undef, undef, undef, undef);
+                       }
+
+                       if ($same_pos & $bit_pos) {
+                               if ($1) {
+                                       print STDERR "conflicting !in and in constraints\n";
+                               } else {
+                                       print STDERR "duplicate in constraint\n";
+                               }
                                return (undef, undef, undef, undef);
                        }
 
                        if ($1) {
-                               $different_pos = $is_in ? -$2 : $2 - 1;
+                               $different_pos |= $bit_pos;
                        } else {
-                               $same_pos = $is_in ? -$2 : $2 - 1;
+                               $same_pos      |= $bit_pos;
                        }
 
                        $class = $idx_class[$2 - 1];
                        next CHECK_REQS;
-               } elsif (/!in/) {
-                       $class = $idx_class[0];
-                       return ($class, "NULL", undef, 666);
                }
 
                # check for negate
@@ -1081,7 +1218,7 @@ CHECK_REQS: foreach (@regs) {
                push(@obst_limit_func, "static const unsigned " . $limit_name . "[] = { ");
                my $first = 1;
                my $limitbitsetlen = $regclass2len{$class};
-               my $limitarraylen = $limitbitsetlen / 32 + ($limitbitsetlen % 32 > 0 ? 1 : 0);
+               my $limitarraylen = ($limitbitsetlen+31) / 32;
                for(my $i = 0; $i < $limitarraylen; $i++) {
 
                        my $limitarraypart = $limit_array[$i];
@@ -1118,7 +1255,7 @@ CHECK_REQS: foreach (@regs) {
 # Generate register requirements structure
 ###
 sub generate_requirements {
-       my $reqs  = shift;
+       my ($reqs, $flags) = split(/:/, shift);
        my $node  = shift;
        my $op    = shift;
        my $idx   = shift;
@@ -1126,6 +1263,17 @@ sub generate_requirements {
        my $class = "";
        my $result;
 
+       my @req_type_mask;
+       if (defined($flags)) {
+               foreach my $f (split(/|/, $flags)) {
+                       if ($f eq "I") {
+                               push(@req_type_mask, "arch_register_req_type_ignore");
+                       } elsif ($f eq "S") {
+                               push(@req_type_mask, "arch_register_req_type_produces_sp");
+                       }
+               }
+       }
+
        if ($reqs eq "none") {
 
                $result = <<EOF;
@@ -1133,43 +1281,31 @@ sub generate_requirements {
        arch_register_req_type_none,
        NULL,                         /* regclass */
        NULL,                         /* limit bitset */
-       -1,                           /* same pos */
-       -1                            /* different pos */
-};
-
-EOF
-       } elsif ($reqs =~ /^new_reg_(.*)$/) {
-               if(!is_reg_class($1)) {
-                       die "$1 is not a register class in requirements for $op\n";
-               }
-               $class  = $1;
-               $result = <<EOF;
-{
-       arch_register_req_type_should_be_different_from_all,
-       & ${arch}_reg_classes[CLASS_${arch}_${class}],
-       NULL,        /* limit bitset */
-       -1,          /* same pos */
-       -1           /* different pos */
+       0,                            /* same pos */
+       0,                            /* different pos */
+       0                             /* width */
 };
 
 EOF
        } elsif (is_reg_class($reqs)) {
+               push(@req_type_mask, "arch_register_req_type_normal");
+               my $reqtype = join(" | ", @req_type_mask);
                $class  = $reqs;
                $result = <<EOF;
 {
-       arch_register_req_type_normal,
+       ${reqtype},
        & ${arch}_reg_classes[CLASS_${arch}_${class}],
        NULL,        /* limit bitset */
-       -1,          /* same pos */
-       -1           /* different pos */
+       0,           /* same pos */
+       0,           /* different pos */
+       1            /* width */
 };
 
 EOF
 
        } else {
-               my @req_type_mask;
                my ($regclass, $limit_bitset, $same_pos, $different_pos)
-                       = build_subset_class_func($node, $op, $idx, $is_in, $reqs);
+                       = build_subset_class_func($node, $op, $idx, $is_in, $reqs, $flags);
 
                if (!defined($regclass)) {
                        die("Fatal error: Could not build subset for requirements '$reqs' of '$op' pos $idx ... exiting.\n");
@@ -1178,24 +1314,17 @@ EOF
                if (defined($limit_bitset) && $limit_bitset ne "NULL") {
                        push(@req_type_mask, "arch_register_req_type_limited");
                }
-               if (defined($same_pos)) {
+               if ($same_pos != 0) {
                        push(@req_type_mask, "arch_register_req_type_should_be_same");
                }
-               if (defined($different_pos)) {
-                       if ($different_pos == 666) {
-                               push(@req_type_mask, "arch_register_req_type_should_be_different_from_all");
-                               undef $different_pos;
-                       } else {
-                               push(@req_type_mask, "arch_register_req_type_should_be_different");
-                       }
+               if ($different_pos != 0) {
+                       push(@req_type_mask, "arch_register_req_type_must_be_different");
                }
-               my $reqtype      = join(" | ", @req_type_mask);
+               my $reqtype = join(" | ", @req_type_mask);
 
                if(!defined($limit_bitset)) {
                        $limit_bitset = "NULL";
                }
-               my $same_pos_str      = (defined($same_pos) ? $same_pos : "-1");
-               my $different_pos_str = (defined($different_pos) ? $different_pos : "-1");
 
                $class  = $regclass;
                $result = <<EOF;
@@ -1203,14 +1332,15 @@ EOF
        ${reqtype},
        & ${arch}_reg_classes[CLASS_${arch}_${class}],
        ${limit_bitset},
-       ${same_pos_str},       /* same pos */
-       ${different_pos_str}        /* different pos */
+       ${same_pos},        /* same pos */
+       ${different_pos},       /* different pos */
+       1             /* width */
 };
 
 EOF
        }
 
-       my $name = "${arch}_requirements_".mangle_requirements($reqs, $class);
+       my $name = "${arch}_requirements_".mangle_requirements($reqs, $class, $flags);
        if(defined($requirements{$name})) {
                return $name;
        }