Remove classify_tarval(). Use tarval_is_null(), tarval_is_one() and tarval_is_all_one...

[libfirm] / ir / be / ia32 / ia32_spec.pl

diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index 1655d44..9abf467 100644 (file)
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -255,6 +255,7 @@ $arch = "ia32";
        S5 => "${arch}_emit_source_register(env, node, 5);",
        SB1 => "${arch}_emit_8bit_source_register(env, node, 1);",
        SB2 => "${arch}_emit_8bit_source_register(env, node, 2);",
+       SB3 => "${arch}_emit_8bit_source_register(env, node, 3);",
        SW0 => "${arch}_emit_16bit_source_register(env, node, 0);",
        SI0 => "${arch}_emit_source_register_or_immediate(env, node, 0);",
        SI1 => "${arch}_emit_source_register_or_immediate(env, node, 1);",
@@ -282,8 +283,9 @@ $arch = "ia32";
        unop2 => "${arch}_emit_unop(env, node, 2);",
        unop3 => "${arch}_emit_unop(env, node, 3);",
        unop4 => "${arch}_emit_unop(env, node, 4);",
+       unop5 => "${arch}_emit_unop(env, node, 5);",
        DAM0  => "${arch}_emit_am_or_dest_register(env, node, 0);",
-       DAM1  => "${arch}_emit_am_or_dest_register(env, node, 0);",
+       DAM1  => "${arch}_emit_am_or_dest_register(env, node, 1);",
        binop => "${arch}_emit_binop(env, node);",
        x87_binop => "${arch}_emit_x87_binop(env, node);",
 );
@@ -302,6 +304,39 @@ $arch = "ia32";
 $default_attr_type = "ia32_attr_t";
 $default_copy_attr = "ia32_copy_attr";
 
+sub ia32_custom_init_attr {
+       my $node = shift;
+       my $name = shift;
+       my $res = "";
+       if(defined($node->{modified_flags})) {
+               $res .= "\tset_ia32_flags(res, get_ia32_flags(res) | arch_irn_flags_modify_flags);\n";
+       }
+       if(defined($node->{am})) {
+               my $am = $node->{am};
+               if($am eq "full,binary") {
+                       $res .= "\tset_ia32_am_support(res, ia32_am_Full, ia32_am_binary);";
+               } elsif($am eq "full,unary") {
+                       $res .= "\tset_ia32_am_support(res, ia32_am_Full, ia32_am_unary);";
+               } elsif($am eq "source,binary") {
+                       $res .= "\tset_ia32_am_support(res, ia32_am_Source, ia32_am_binary);";
+               } elsif($am eq "dest,unary") {
+                       $res .= "\tset_ia32_am_support(res, ia32_am_Dest, ia32_am_unary);";
+               } elsif($am eq "dest,binary") {
+                       $res .= "\tset_ia32_am_support(res, ia32_am_Dest, ia32_am_binary);";
+               } elsif($am eq "dest,ternary") {
+                       $res .= "\tset_ia32_am_support(res, ia32_am_Dest, ia32_am_ternary);";
+               } elsif($am eq "source,ternary") {
+                       $res .= "\tset_ia32_am_support(res, ia32_am_Source, ia32_am_ternary);";
+               } elsif($am eq "none") {
+                       # nothing to do
+               } else {
+                       die("Invalid address mode '$am' specified on op $name");
+               }
+       }
+       return $res;
+}
+$custom_init_attr_func = \&ia32_custom_init_attr;
+
 %init_attr = (
        ia32_attr_t     => "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res, latency);",
        ia32_x87_attr_t =>
@@ -378,20 +413,12 @@ ProduceVal => {
 
 # commutative operations
 
-# NOTE:
-# All nodes supporting Addressmode have 5 INs:
-# 1 - base    r1 == NoReg in case of no AM or no base
-# 2 - index   r2 == NoReg in case of no AM or no index
-# 3 - op1     r3 == always present
-# 4 - op2     r4 == NoReg in case of immediate operation
-# 5 - mem     NoMem in case of no AM otherwise it takes the mem from the Load
-
 Add => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ], out => [ "in_r3" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ], out => [ "in_r4", "none", "flags" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. add%M %binop',
-       init_attr => "set_ia32_am_support(res, ia32_am_Full, ia32_am_binary);",
+       am        => "full,binary",
        units     => [ "GP" ],
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -399,23 +426,35 @@ Add => {
 
 AddMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "val", "mem" ],
-       emit      => ". add%M %SI2, %AM",
+       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "val" ],
+       emit      => ". add%M %SI3, %AM",
        units     => [ "GP" ],
        mode      => "mode_M",
        modified_flags => $status_flags
 },
 
 Adc => {
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ], out => [ "in_r3" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp", "flags" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right", "eflags" ],
        emit      => '. adc%M %binop',
-       init_attr => "set_ia32_am_support(res, ia32_am_Full, ia32_am_binary);",
+       am        => "full,binary",
        units     => [ "GP" ],
        mode      => $mode_gp,
        modified_flags => $status_flags
 },
 
+l_Add => {
+       op_flags  => "C",
+       reg_req   => { in => [ "none", "none" ], out => [ "none" ] },
+       ins       => [ "left", "right" ],
+},
+
+l_Adc => {
+       reg_req   => { in => [ "none", "none", "none" ], out => [ "none" ] },
+       ins       => [ "left", "right", "eflags" ],
+},
+
 Add64Bit => {
        irn_flags => "R",
        arity     => 4,
@@ -431,27 +470,14 @@ Add64Bit => {
        modified_flags => $status_flags
 },
 
-l_Add => {
-       op_flags  => "C",
-       irn_flags => "R",
-       cmp_attr  => "return 1;",
-       arity     => 2,
-},
-
-l_Adc => {
-       op_flags  => "C",
-       cmp_attr  => "return 1;",
-       arity     => 2,
-},
-
 Mul => {
        # we should not rematrialize this node. It produces 2 results and has
        # very strict constrains
-       reg_req   => { in => [ "gp", "gp", "eax", "gp", "none" ], out => [ "eax", "edx", "none" ] },
-       emit      => '. mul%M %unop3',
+       reg_req   => { in => [ "gp", "gp", "none", "eax", "gp" ], out => [ "eax", "edx", "none" ] },
+       ins       => [ "base", "index", "mem", "val_high", "val_low" ],
+       emit      => '. mul%M %unop4',
        outs      => [ "EAX", "EDX", "M" ],
-       ins       => [ "base", "index", "val_high", "val_low", "mem" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       am        => "source,binary",
        latency   => 10,
        units     => [ "GP" ],
        modified_flags => $status_flags
@@ -468,10 +494,10 @@ l_Mul => {
 
 IMul => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ], out => [ "in_r3" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. imul%M %binop',
-       init_attr => "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       am        => "source,binary",
        latency   => 5,
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -480,11 +506,11 @@ IMul => {
 
 IMul1OP => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "eax", "gp", "none" ], out => [ "eax", "edx", "none" ] },
-       emit      => '. imul%M %unop3',
+       reg_req   => { in => [ "gp", "gp", "none", "eax", "gp" ], out => [ "eax", "edx", "none" ] },
+       ins       => [ "base", "index", "mem", "val_high", "val_low" ],
+       emit      => '. imul%M %unop4',
        outs      => [ "EAX", "EDX", "M" ],
-       ins       => [ "base", "index", "val_high", "val_low", "mem" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       am        => "source,binary",
        latency   => 5,
        units     => [ "GP" ],
        modified_flags => $status_flags
@@ -501,9 +527,9 @@ l_IMul => {
 
 And => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ], out => [ "in_r3" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Full, ia32_am_binary);",
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
+       am        => "full,binary",
        emit      => '. and%M %binop',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -512,8 +538,9 @@ And => {
 
 AndMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "none" ], out => [ "none" ] },
-       emit      => '. and%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "val" ],
+       emit      => '. and%M %SI3, %AM',
        units     => [ "GP" ],
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -521,9 +548,9 @@ AndMem => {
 
 Or => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ], out => [ "in_r3" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Full, ia32_am_binary);",
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
+       am        => "full,binary",
        emit      => '. or%M %binop',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -532,9 +559,9 @@ Or => {
 
 OrMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "val", "mem" ],
-       emit      => '. or%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "val" ],
+       emit      => '. or%M %SI3, %AM',
        units     => [ "GP" ],
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -542,9 +569,9 @@ OrMem => {
 
 Xor => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ], out => [ "in_r3" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Full, ia32_am_binary);",
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
+       am        => "full,binary",
        emit      => '. xor%M %binop',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -553,28 +580,21 @@ Xor => {
 
 XorMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "val", "mem" ],
-       emit      => '. xor%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "val" ],
+       emit      => '. xor%M %SI3, %AM',
        units     => [ "GP" ],
        mode      => "mode_M",
        modified_flags => $status_flags
 },
 
-l_Xor => {
-       op_flags  => "C",
-       cmp_attr  => "return 1;",
-       arity     => 2,
-       modified_flags => $status_flags
-},
-
 # not commutative operations
 
 Sub => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ], out => [ "in_r3" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Full, ia32_am_binary);",
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
+       am        => "full,binary",
        emit      => '. sub%M %binop',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -583,18 +603,18 @@ Sub => {
 
 SubMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "val", "mem" ],
-       emit      => '. sub%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "val" ],
+       emit      => '. sub%M %SI3, %AM',
        units     => [ "GP" ],
        mode      => 'mode_M',
        modified_flags => $status_flags
 },
 
 Sbb => {
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ], out => [ "in_r3 !in_r4" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Full, ia32_am_binary);",
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ], out => [ "in_r4 !in_r5" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
+       am        => "full,binary",
        emit      => '. sbb%M %binop',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -608,37 +628,24 @@ Sub64Bit => {
        emit      => '
 . movl %S0, %D0
 . movl %S1, %D1
-. subl %S2, %D0
-. sbbl %S3, %D1
+. subl %SI2, %D0
+. sbbl %SI3, %D1
 ',
        outs      => [ "low_res", "high_res" ],
        units     => [ "GP" ],
        modified_flags => $status_flags
 },
 
-l_Sub => {
-       irn_flags => "R",
-       cmp_attr  => "return 1;",
-       arity     => 2,
-},
-
-l_Sbb => {
-       cmp_attr  => "return 1;",
-       arity     => 2,
-},
-
 IDiv => {
        op_flags  => "F|L",
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "eax", "edx", "gp", "none" ],
-                      out => [ "eax", "edx", "none" ] },
-       ins       => [ "base", "index", "left_low", "left_high", "right", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "eax", "edx", "gp" ], out => [ "eax", "edx", "none" ] },
+       ins       => [ "base", "index", "mem", "left_low", "left_high", "right" ],
        outs      => [ "div_res", "mod_res", "M" ],
        attr      => "ia32_op_flavour_t dm_flav",
-       init_attr =>
-               "attr->data.op_flav = dm_flav;".
-               "set_ia32_am_support(res, ia32_am_Full, ia32_am_ternary);",
-       emit      => ". idiv%M %unop4",
+       am        => "source,ternary",
+       init_attr => "attr->data.op_flav = dm_flav;",
+       emit      => ". idiv%M %unop5",
        latency   => 25,
        units     => [ "GP" ],
        modified_flags => $status_flags
@@ -647,15 +654,13 @@ IDiv => {
 Div => {
        op_flags  => "F|L",
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "eax", "edx", "gp", "none" ],
-                      out => [ "eax", "edx", "none" ] },
-       ins       => [ "base", "index", "left_low", "left_high", "right", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "eax", "edx", "gp" ], out => [ "eax", "edx", "none" ] },
+       ins       => [ "base", "index", "mem", "left_low", "left_high", "right" ],
        outs      => [ "div_res", "mod_res", "M" ],
        attr      => "ia32_op_flavour_t dm_flav",
-       init_attr =>
-               "attr->data.op_flav = dm_flav;".
-               "set_ia32_am_support(res, ia32_am_Full, ia32_am_ternary);",
-       emit      => ". div%M %unop4",
+       am        => "source,ternary",
+       init_attr => "attr->data.op_flav = dm_flav;",
+       emit      => ". div%M %unop5",
        latency   => 25,
        units     => [ "GP" ],
        modified_flags => $status_flags
@@ -665,7 +670,7 @@ Shl => {
        irn_flags => "R",
        reg_req   => { in => [ "gp", "ecx" ], out => [ "in_r1 !in_r2" ] },
        ins       => [ "left", "right" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_binary);",
+       am        => "dest,binary",
        emit      => '. shl %SB1, %S0',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -674,9 +679,9 @@ Shl => {
 
 ShlMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "ecx", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "count", "mem" ],
-       emit      => '. shl%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "count" ],
+       emit      => '. shl%M %SB3, %AM',
        units     => [ "GP" ],
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -704,7 +709,7 @@ ShlD => {
        irn_flags => "R",
        reg_req   => { in => [ "gp", "gp", "ecx" ], out => [ "in_r1 !in_r3" ] },
        ins       => [ "left_high", "left_low", "right" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_ternary);",
+       am        => "dest,ternary",
        emit      => '. shld%M %SB2, %S1, %S0',
        latency   => 6,
        units     => [ "GP" ],
@@ -721,7 +726,7 @@ Shr => {
        irn_flags => "R",
        reg_req   => { in => [ "gp", "ecx" ], out => [ "in_r1 !in_r2" ] },
        ins       => [ "val", "count" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_binary);",
+       am        => "dest,binary",
        emit      => '. shr %SB1, %S0',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -730,9 +735,9 @@ Shr => {
 
 ShrMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "ecx", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "count", "mem" ],
-       emit      => '. shr%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "count" ],
+       emit      => '. shr%M %SB3, %AM',
        units     => [ "GP" ],
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -760,7 +765,7 @@ ShrD => {
        irn_flags => "R",
        reg_req   => { in => [ "gp", "gp", "ecx" ], out => [ "in_r1 !in_r3" ] },
        ins       => [ "left_high", "left_low", "right" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_ternary);",
+       am        => "dest,ternary",
        emit      => '. shrd%M %SB2, %S1, %S0',
        latency   => 6,
        units     => [ "GP" ],
@@ -777,7 +782,7 @@ Sar => {
        irn_flags => "R",
        reg_req   => { in => [ "gp", "ecx" ], out => [ "in_r1 !in_r2" ] },
        ins       => [ "val", "count" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_binary);",
+       am        => "dest,binary",
        emit      => '. sar %SB1, %S0',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -786,9 +791,9 @@ Sar => {
 
 SarMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "ecx", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "count", "mem" ],
-       emit      => '. sar%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "count" ],
+       emit      => '. sar%M %SB3, %AM',
        units     => [ "GP" ],
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -810,7 +815,7 @@ Ror => {
        irn_flags => "R",
        reg_req   => { in => [ "gp", "ecx" ], out => [ "in_r1 !in_r2" ] },
        ins       => [ "val", "count" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_binary);",
+       am        => "dest,binary",
        emit      => '. ror %SB1, %S0',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -819,9 +824,9 @@ Ror => {
 
 RorMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "ecx", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "count", "mem" ],
-       emit      => '. ror%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "count" ],
+       emit      => '. ror%M %SB3, %AM',
        units     => [ "GP" ],
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -831,7 +836,7 @@ Rol => {
        irn_flags => "R",
        reg_req   => { in => [ "gp", "ecx" ], out => [ "in_r1 !in_r2" ] },
        ins       => [ "val", "count" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_binary);",
+       am        => "dest,binary",
        emit      => '. rol %SB1, %S0',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -840,9 +845,9 @@ Rol => {
 
 RolMem => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "ecx", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "count", "mem" ],
-       emit      => '. rol%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "count" ],
+       emit      => '. rol%M %SB3, %AM',
        units     => [ "GP" ],
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -855,7 +860,7 @@ Neg => {
        reg_req   => { in => [ "gp" ], out => [ "in_r1" ] },
        emit      => '. neg %S0',
        ins       => [ "val" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_unary);",
+       am        => "dest,unary",
        units     => [ "GP" ],
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -873,13 +878,7 @@ NegMem => {
 
 Minus64Bit => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp" ], out => [ "!in", "!in" ] },
-       emit      => '
-. movl %S0, %D0
-. movl %S0, %D1
-. subl %S1, %D0
-. sbbl %S2, %D1
-',
+       reg_req   => { in => [ "gp", "gp" ], out => [ "in_r1", "gp" ] },
        outs      => [ "low_res", "high_res" ],
        units     => [ "GP" ],
        modified_flags => $status_flags
@@ -894,7 +893,7 @@ l_Neg => {
 Inc => {
        irn_flags => "R",
        reg_req   => { in => [ "gp" ], out => [ "in_r1" ] },
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_unary);",
+       am        => "dest,unary",
        emit      => '. inc %S0',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -914,7 +913,7 @@ IncMem => {
 Dec => {
        irn_flags => "R",
        reg_req   => { in => [ "gp" ], out => [ "in_r1" ] },
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_unary);",
+       am        => "dest,unary",
        emit      => '. dec %S0',
        units     => [ "GP" ],
        mode      => $mode_gp,
@@ -935,11 +934,10 @@ Not => {
        irn_flags => "R",
        reg_req   => { in => [ "gp" ], out => [ "in_r1" ] },
        ins       => [ "val" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_unary);",
+       am        => "dest,unary",
        emit      => '. not %S0',
        units     => [ "GP" ],
        mode      => $mode_gp,
-       modified_flags => []
 },
 
 NotMem => {
@@ -949,7 +947,6 @@ NotMem => {
        emit      => '. not%M %AM',
        units     => [ "GP" ],
        mode      => "mode_M",
-       modified_flags => [],
 },
 
 # other operations
@@ -957,14 +954,12 @@ NotMem => {
 CmpJmp => {
        state     => "pinned",
        op_flags  => "L|X|Y",
-       reg_req   => { in  => [ "gp", "gp", "gp", "gp", "none" ],
-                      out => [ "none", "none"] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
+       reg_req   => { in  => [ "gp", "gp", "none", "gp", "gp" ], out => [ "none", "none"] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        outs      => [ "false", "true" ],
        attr      => "long pnc",
-       init_attr =>
-               "attr->pn_code = pnc;".
-               "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       am        => "source,binary",
+       init_attr => "attr->pn_code = pnc;",
        latency   => 3,
        units     => [ "BRANCH" ],
 },
@@ -972,15 +967,12 @@ CmpJmp => {
 CmpJmp8Bit => {
        state     => "pinned",
        op_flags  => "L|X|Y",
-       reg_req   => { in  => [ "gp", "gp", "eax ebx ecx edx", "eax ebx ecx edx",
-                               "none" ],
-                      out => [ "none", "none"] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
+       reg_req   => { in  => [ "gp", "gp", "none", "eax ebx ecx edx", "eax ebx ecx edx" ], out => [ "none", "none"] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        outs      => [ "false", "true" ],
        attr      => "long pnc",
-       init_attr =>
-               "attr->pn_code = pnc;".
-               "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       am        => "source,binary",
+       init_attr => "attr->pn_code = pnc;",
        latency   => 3,
        units     => [ "BRANCH" ],
 },
@@ -988,14 +980,12 @@ CmpJmp8Bit => {
 TestJmp => {
        state     => "pinned",
        op_flags  => "L|X|Y",
-       reg_req   => { in  => [ "gp", "gp", "gp", "gp", "none" ],
-                      out => [ "none", "none" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
+       reg_req   => { in  => [ "gp", "gp", "none", "gp", "gp" ], out => [ "none", "none" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        outs      => [ "false", "true" ],
        attr      => "long pnc",
-       init_attr =>
-               "attr->pn_code = pnc;".
-               "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       am        => "source,binary",
+       init_attr => "attr->pn_code = pnc;",
        latency   => 3,
        units     => [ "BRANCH" ],
 },
@@ -1003,15 +993,12 @@ TestJmp => {
 TestJmp8Bit => {
        state     => "pinned",
        op_flags  => "L|X|Y",
-       reg_req   => { in  => [ "gp", "gp", "eax ebx ecx edx", "eax ebx ecx edx",
-                               "none" ],
-                      out => [ "none", "none" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
+       reg_req   => { in  => [ "gp", "gp", "none", "eax ebx ecx edx", "eax ebx ecx edx" ], out => [ "none", "none" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        outs      => [ "false", "true" ],
        attr      => "long pnc",
-       init_attr =>
-               "attr->pn_code = pnc;".
-               "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       am        => "source,binary",
+       init_attr => "attr->pn_code = pnc;",
        latency   => 3,
        units     => [ "BRANCH" ],
 },
@@ -1032,7 +1019,6 @@ IJmp => {
        emit      => '. jmp *%S0',
        units     => [ "BRANCH" ],
        mode      => "mode_X",
-       modified_flags => []
 },
 
 Const => {
@@ -1133,8 +1119,8 @@ FldCW => {
 FnstCW => {
        op_flags  => "L|F",
        state     => "pinned",
-       reg_req   => { in => [ "gp", "gp", "fp_cw", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "fpcw", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "fp_cw" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "fpcw" ],
        latency   => 5,
        emit      => ". fnstcw %AM",
        mode      => "mode_M",
@@ -1185,9 +1171,9 @@ l_Store => {
 Store => {
        op_flags  => "L|F",
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "gp", "none" ], out => [ "none" ] },
-       ins       => [ "base", "index", "val", "mem" ],
-       emit      => '. mov%M %SI2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
+       ins       => [ "base", "index", "mem", "val" ],
+       emit      => '. mov%M %SI3, %AM',
        latency   => 2,
        units     => [ "GP" ],
        mode      => "mode_M",
@@ -1196,8 +1182,9 @@ Store => {
 Store8Bit => {
        op_flags  => "L|F",
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "eax ebx ecx edx", "none" ], out => ["none" ] },
-       emit      => '. mov%M %SB2, %AM',
+       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ], out => ["none" ] },
+       ins       => [ "base", "index", "mem", "val" ],
+       emit      => '. mov%M %SB3, %AM',
        latency   => 2,
        units     => [ "GP" ],
        mode      => "mode_M",
@@ -1211,29 +1198,26 @@ Lea => {
        latency   => 2,
        units     => [ "GP" ],
        mode      => $mode_gp,
-       modified_flags => [],
 },
 
 Push => {
-       reg_req   => { in => [ "gp", "gp", "gp", "esp", "none" ], out => [ "esp", "none" ] },
-       emit      => '. push%M %unop2',
-       ins       => [ "base", "index", "val", "stack", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "esp" ], out => [ "esp", "none" ] },
+       ins       => [ "base", "index", "mem", "val", "stack" ],
+       emit      => '. push%M %unop3',
        outs      => [ "stack:I|S", "M" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       am        => "source,binary",
        latency   => 2,
        units     => [ "GP" ],
-       modified_flags => [],
 },
 
 Pop => {
-       reg_req   => { in => [ "gp", "gp", "esp", "none" ], out => [ "esp", "gp", "none" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "esp" ], out => [ "esp", "gp", "none" ] },
        emit      => '. pop%M %DAM1',
        outs      => [ "stack:I|S", "res", "M" ],
-       ins       => [ "base", "index", "stack", "mem" ],
-       init_attr => "set_ia32_am_support(res, ia32_am_Dest, ia32_am_unary);",
+       ins       => [ "base", "index", "mem", "stack" ],
+       am        => "dest,unary",
        latency   => 3, # Pop is more expensive than Push on Athlon
        units     => [ "GP" ],
-       modified_flags => [],
 },
 
 Enter => {
@@ -1255,8 +1239,9 @@ Leave => {
 AddSP => {
        irn_flags => "I",
        state     => "pinned",
-       reg_req   => { in => [ "gp", "gp", "esp", "gp", "none" ], out => [ "in_r3", "none" ] },
-       init_attr => "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       reg_req   => { in => [ "gp", "gp", "none", "esp", "gp" ], out => [ "in_r4", "none" ] },
+       ins       => [ "base", "index", "mem", "stack", "size" ],
+       am        => "source,binary",
        emit      => '. addl %binop',
        outs      => [ "stack:S", "M" ],
        units     => [ "GP" ],
@@ -1266,8 +1251,9 @@ AddSP => {
 SubSP => {
 #irn_flags => "I",
        state     => "pinned",
-       reg_req   => { in => [ "gp", "gp", "esp", "gp", "none" ], out => [ "in_r3", "gp", "none" ] },
-       init_attr => "set_ia32_am_support(res, ia32_am_Source, ia32_am_binary);",
+       reg_req   => { in => [ "gp", "gp", "none", "esp", "gp" ], out => [ "in_r4", "gp", "none" ] },
+       ins       => [ "base", "index", "mem", "stack", "size" ],
+       am        => "source,binary",
        emit      => ". subl %binop\n".
                     ". movl %%esp, %D1",
        outs      => [ "stack:I|S", "addr", "M" ],
@@ -1313,7 +1299,8 @@ xZero => {
 
 xAdd => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. add%XXM %binop',
        latency   => 4,
        units     => [ "SSE" ],
@@ -1322,7 +1309,8 @@ xAdd => {
 
 xMul => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. mul%XXM %binop',
        latency   => 4,
        units     => [ "SSE" ],
@@ -1331,7 +1319,8 @@ xMul => {
 
 xMax => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. max%XXM %binop',
        latency   => 2,
        units     => [ "SSE" ],
@@ -1340,7 +1329,8 @@ xMax => {
 
 xMin => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. min%XXM %binop',
        latency   => 2,
        units     => [ "SSE" ],
@@ -1349,7 +1339,8 @@ xMin => {
 
 xAnd => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. andp%XSD %binop',
        latency   => 3,
        units     => [ "SSE" ],
@@ -1358,7 +1349,8 @@ xAnd => {
 
 xOr => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. orp%XSD %binop',
        units     => [ "SSE" ],
        mode      => "mode_E",
@@ -1366,7 +1358,8 @@ xOr => {
 
 xXor => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. xorp%XSD %binop',
        latency   => 3,
        units     => [ "SSE" ],
@@ -1377,7 +1370,8 @@ xXor => {
 
 xAndNot => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3 !in_r4" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4 !in_r5" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. andnp%XSD %binop',
        latency   => 3,
        units     => [ "SSE" ],
@@ -1386,7 +1380,8 @@ xAndNot => {
 
 xSub => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. sub%XXM %binop',
        latency   => 4,
        units     => [ "SSE" ],
@@ -1395,7 +1390,8 @@ xSub => {
 
 xDiv => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3 !in_r4", "none" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4 !in_r5", "none" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        outs      => [ "res", "M" ],
        emit      => '. div%XXM %binop',
        latency   => 16,
@@ -1406,7 +1402,8 @@ xDiv => {
 
 xCmp => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "in_r3 !in_r4" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "in_r4 !in_r5" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        latency   => 3,
        units     => [ "SSE" ],
        mode      => "mode_E",
@@ -1415,8 +1412,8 @@ xCmp => {
 xCmpJmp => {
        state     => "pinned",
        op_flags  => "L|X|Y",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "none", "none" ] },
-       ins       => [ "base", "index", "left", "right", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "none", "none" ] },
+       ins       => [ "base", "index", "mem", "left", "right" ],
        outs      => [ "false", "true" ],
        attr      => "long pnc",
        init_attr => "attr->pn_code = pnc;",
@@ -1430,6 +1427,7 @@ xLoad => {
        op_flags  => "L|F",
        state     => "exc_pinned",
        reg_req   => { in => [ "gp", "gp", "none" ], out => [ "xmm", "none" ] },
+       ins       => [ "base", "index", "mem" ],
        emit      => '. mov%XXM %AM, %D0',
        attr      => "ir_mode *load_mode",
        init_attr => "attr->ls_mode = load_mode;",
@@ -1441,8 +1439,9 @@ xLoad => {
 xStore => {
        op_flags => "L|F",
        state    => "exc_pinned",
-       reg_req  => { in => [ "gp", "gp", "xmm", "none" ] },
-       emit     => '. mov%XXM %S2, %AM',
+       reg_req  => { in => [ "gp", "gp", "none", "xmm" ] },
+       ins       => [ "base", "index", "mem", "val" ],
+       emit     => '. mov%XXM %S3, %AM',
        latency  => 0,
        units    => [ "SSE" ],
        mode     => "mode_M",
@@ -1451,9 +1450,9 @@ xStore => {
 xStoreSimple => {
        op_flags => "L|F",
        state    => "exc_pinned",
-       reg_req  => { in => [ "gp", "gp", "xmm", "none" ] },
-       ins      => [ "base", "index", "val", "mem" ],
-       emit     => '. mov%XXM %S2, %AM',
+       reg_req  => { in => [ "gp", "gp", "none", "xmm" ] },
+       ins      => [ "base", "index", "mem", "val" ],
+       emit     => '. mov%XXM %S3, %AM',
        latency  => 0,
        units    => [ "SSE" ],
        mode     => "mode_M",
@@ -1461,7 +1460,8 @@ xStoreSimple => {
 
 CvtSI2SS => {
        op_flags => "L|F",
-       reg_req  => { in => [ "gp", "gp", "gp", "none" ], out => [ "xmm" ] },
+       reg_req  => { in => [ "gp", "gp", "none", "gp" ], out => [ "xmm" ] },
+       ins      => [ "base", "index", "mem", "val" ],
        emit     => '. cvtsi2ss %D0, %AM',
        latency  => 2,
        units    => [ "SSE" ],
@@ -1470,8 +1470,9 @@ CvtSI2SS => {
 
 CvtSI2SD => {
        op_flags => "L|F",
-       reg_req  => { in => [ "gp", "gp", "gp", "none" ], out => [ "xmm" ] },
-       emit     => '. cvtsi2sd %unop2',
+       reg_req  => { in => [ "gp", "gp", "none", "gp" ], out => [ "xmm" ] },
+       ins      => [ "base", "index", "mem", "val" ],
+       emit     => '. cvtsi2sd %unop3',
        latency  => 2,
        units    => [ "SSE" ],
        mode     => $mode_xmm
@@ -1498,7 +1499,8 @@ CopyB => {
        reg_req  => { in => [ "edi", "esi", "ecx", "none" ], out => [ "edi", "esi", "ecx", "none" ] },
        outs     => [ "DST", "SRC", "CNT", "M" ],
        units    => [ "GP" ],
-       modified_flags => [ "DF" ]
+# we don't care about this flag, so no need to mark this node
+#      modified_flags => [ "DF" ]
 },
 
 CopyB_i => {
@@ -1507,16 +1509,17 @@ CopyB_i => {
        reg_req  => { in => [ "edi", "esi", "none" ], out => [  "edi", "esi", "none" ] },
        outs     => [ "DST", "SRC", "M" ],
        units    => [ "GP" ],
-       modified_flags => [ "DF" ]
+# we don't care about this flag, so no need to mark this node
+#      modified_flags => [ "DF" ]
 },
 
 # Conversions
 
 Conv_I2I => {
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "gp", "none" ], out => [ "in_r3", "none" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "in_r4", "none" ] },
+       ins       => [ "base", "index", "mem", "val" ],
        units     => [ "GP" ],
-       ins       => [ "base", "index", "val", "mem" ],
        attr      => "ir_mode *smaller_mode",
        init_attr => "attr->ls_mode = smaller_mode;",
        mode      => $mode_gp,
@@ -1525,8 +1528,8 @@ Conv_I2I => {
 
 Conv_I2I8Bit => {
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "eax ebx ecx edx", "none" ], out => [ "in_r3", "none" ] },
-       ins       => [ "base", "index", "val", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ], out => [ "in_r4", "none" ] },
+       ins       => [ "base", "index", "mem", "val" ],
        units     => [ "GP" ],
        attr      => "ir_mode *smaller_mode",
        init_attr => "attr->ls_mode = smaller_mode;",
@@ -1535,21 +1538,24 @@ Conv_I2I8Bit => {
 },
 
 Conv_I2FP => {
-       reg_req  => { in => [ "gp", "gp", "gp", "none" ], out => [ "xmm", "none" ] },
+       reg_req  => { in => [ "gp", "gp", "none", "gp" ], out => [ "xmm", "none" ] },
+       ins      => [ "base", "index", "mem", "val" ],
        latency  => 10,
        units    => [ "SSE" ],
        mode     => "mode_E",
 },
 
 Conv_FP2I => {
-       reg_req  => { in => [ "gp", "gp", "xmm", "none" ], out => [ "gp", "none" ] },
+       reg_req  => { in => [ "gp", "gp", "none", "xmm" ], out => [ "gp", "none" ] },
+       ins      => [ "base", "index", "mem", "val" ],
        latency  => 10,
        units    => [ "SSE" ],
        mode     => $mode_gp,
 },
 
 Conv_FP2FP => {
-       reg_req  => { in => [ "gp", "gp", "xmm", "none" ], out => [ "xmm", "none" ] },
+       reg_req  => { in => [ "gp", "gp", "none", "xmm" ], out => [ "xmm", "none" ] },
+       ins      => [ "base", "index", "mem", "val" ],
        latency  => 8,
        units    => [ "SSE" ],
        mode     => "mode_E",
@@ -1557,8 +1563,8 @@ Conv_FP2FP => {
 
 CmpCMov => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none", "gp", "gp" ], out => [ "in_r7" ] },
-       ins       => [ "base", "index", "cmp_left", "cmp_right", "mem", "val_true", "val_false" ],
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp", "gp", "gp" ], out => [ "in_r7" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right", "val_true", "val_false" ],
        attr      => "pn_Cmp pn_code",
        init_attr => "attr->pn_code = pn_code;",
        latency   => 2,
@@ -1568,8 +1574,8 @@ CmpCMov => {
 
 CmpCMov8Bit => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none", "gp", "gp" ], out => [ "in_r7" ] },
-       ins       => [ "base", "index", "cmp_left", "cmp_right", "mem", "val_true", "val_false" ],
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp", "gp", "gp" ], out => [ "in_r7" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right", "val_true", "val_false" ],
        attr      => "pn_Cmp pn_code",
        init_attr => "attr->pn_code = pn_code;",
        latency   => 2,
@@ -1579,10 +1585,8 @@ CmpCMov8Bit => {
 
 TestCMov => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none", "gp", "gp" ],
-                      out => [ "in_r7" ] },
-       ins       => [ "base", "index", "cmp_left", "cmp_right", "mem", "val_true",
-                      "val_false" ],
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp", "gp", "gp" ], out => [ "in_r7" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right", "val_true", "val_false" ],
        attr      => "pn_Cmp pn_code",
        init_attr => "attr->pn_code = pn_code;",
        latency   => 2,
@@ -1592,10 +1596,8 @@ TestCMov => {
 
 TestCMov8Bit => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none", "gp", "gp" ],
-                      out => [ "in_r7" ] },
-       ins       => [ "base", "index", "cmp_left", "cmp_right", "mem", "val_true",
-                      "val_false" ],
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp", "gp", "gp" ], out => [ "in_r7" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right", "val_true", "val_false" ],
        attr      => "pn_Cmp pn_code",
        init_attr => "attr->pn_code = pn_code;",
        latency   => 2,
@@ -1613,10 +1615,8 @@ xCmpCMov => {
 
 vfCmpCMov => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "vfp", "vfp", "none", "gp", "gp" ],
-                      out => [ "in_r7" ] },
-       ins       => [ "base", "index", "cmp_left", "cmp_right", "mem", "val_true",
-                      "val_false" ],
+       reg_req   => { in => [ "gp", "gp", "none", "vfp", "vfp", "gp", "gp" ], out => [ "in_r7" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right", "val_true", "val_false" ],
        latency   => 10,
        units     => [ "VFP", "GP" ],
        mode      => $mode_gp,
@@ -1625,9 +1625,8 @@ vfCmpCMov => {
 
 CmpSet => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ],
-                      out => [ "eax ebx ecx edx" ] },
-       ins       => [ "base", "index", "cmp_left", "cmp_right", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ], out => [ "eax ebx ecx edx" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right" ],
        attr      => "pn_Cmp pn_code",
        init_attr => "attr->pn_code = pn_code;",
        latency   => 2,
@@ -1637,10 +1636,8 @@ CmpSet => {
 
 CmpSet8Bit => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "eax ebx ecx edx", "eax ebx ecx edx",
-                              "none" ],
-                      out => [ "eax ebx ecx edx" ] },
-       ins       => [ "base", "index", "cmp_left", "cmp_right", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx", "eax ebx ecx edx" ], out => [ "eax ebx ecx edx" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right" ],
        attr      => "pn_Cmp pn_code",
        init_attr => "attr->pn_code = pn_code;",
        latency   => 2,
@@ -1650,9 +1647,8 @@ CmpSet8Bit => {
 
 TestSet => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "gp", "gp", "none" ],
-                      out => [ "eax ebx ecx edx" ] },
-       ins       => [ "base", "index", "cmp_left", "cmp_right", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ], out => [ "eax ebx ecx edx" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right" ],
        attr      => "pn_Cmp pn_code",
        init_attr => "attr->pn_code = pn_code;",
        latency   => 2,
@@ -1662,10 +1658,8 @@ TestSet => {
 
 TestSet8Bit => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "eax ebx ecx edx", "eax ebx ecx edx",
-                              "none" ],
-                      out => [ "eax ebx ecx edx" ] },
-       ins       => [ "base", "index", "cmp_left", "cmp_right", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx", "eax ebx ecx edx" ], out => [ "eax ebx ecx edx" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right" ],
        attr      => "pn_Cmp pn_code",
        init_attr => "attr->pn_code = pn_code;",
        latency   => 2,
@@ -1675,7 +1669,8 @@ TestSet8Bit => {
 
 xCmpSet => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "xmm", "xmm", "none" ], out => [ "eax ebx ecx edx" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "xmm", "xmm" ], out => [ "eax ebx ecx edx" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right" ],
        latency   => 5,
        units     => [ "SSE" ],
        mode      => $mode_gp,
@@ -1683,7 +1678,8 @@ xCmpSet => {
 
 vfCmpSet => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "vfp", "vfp", "none" ], out => [ "eax ebx ecx edx" ] },
+       reg_req   => { in => [ "gp", "gp", "none", "vfp", "vfp" ], out => [ "eax ebx ecx edx" ] },
+       ins       => [ "base", "index", "mem", "cmp_left", "cmp_right" ],
        latency   => 10,
        units     => [ "VFP" ],
        mode      => $mode_gp,
@@ -1715,8 +1711,8 @@ vfCMov => {
 
 vfadd => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "vfp", "vfp", "none", "fpcw" ], out => [ "vfp" ] },
-       ins       => [ "base", "index", "left", "right", "mem", "fpcw" ],
+       reg_req   => { in => [ "gp", "gp", "none", "vfp", "vfp", "fpcw" ], out => [ "vfp" ] },
+       ins       => [ "base", "index", "mem", "left", "right", "fpcw" ],
        latency   => 4,
        units     => [ "VFP" ],
        mode      => "mode_E",
@@ -1725,8 +1721,8 @@ vfadd => {
 
 vfmul => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "vfp", "vfp", "none", "fpcw" ], out => [ "vfp" ] },
-       ins       => [ "base", "index", "left", "right", "mem", "fpcw" ],
+       reg_req   => { in => [ "gp", "gp", "none", "vfp", "vfp", "fpcw" ], out => [ "vfp" ] },
+       ins       => [ "base", "index", "mem", "left", "right", "fpcw" ],
        latency   => 4,
        units     => [ "VFP" ],
        mode      => "mode_E",
@@ -1741,8 +1737,8 @@ l_vfmul => {
 
 vfsub => {
        irn_flags => "R",
-       reg_req   => { in => [ "gp", "gp", "vfp", "vfp", "none", "fpcw" ], out => [ "vfp" ] },
-       ins       => [ "base", "index", "left", "right", "mem", "fpcw" ],
+       reg_req   => { in => [ "gp", "gp", "none", "vfp", "vfp", "fpcw" ], out => [ "vfp" ] },
+       ins       => [ "base", "index", "mem", "left", "right", "fpcw" ],
        latency   => 4,
        units     => [ "VFP" ],
        mode      => "mode_E",
@@ -1755,8 +1751,8 @@ l_vfsub => {
 },
 
 vfdiv => {
-       reg_req   => { in => [ "gp", "gp", "vfp", "vfp", "none", "fpcw" ], out => [ "vfp", "none" ] },
-       ins       => [ "base", "index", "left", "right", "mem", "fpcw" ],
+       reg_req   => { in => [ "gp", "gp", "none", "vfp", "vfp", "fpcw" ], out => [ "vfp", "none" ] },
+       ins       => [ "base", "index", "mem", "left", "right", "fpcw" ],
        outs      => [ "res", "M" ],
        latency   => 20,
        units     => [ "VFP" ],
@@ -1770,8 +1766,8 @@ l_vfdiv => {
 },
 
 vfprem => {
-       reg_req   => { in => [ "gp", "gp", "vfp", "vfp", "none", "fpcw" ], out => [ "vfp" ] },
-       ins       => [ "base", "index", "left", "right", "mem", "fpcw" ],
+       reg_req   => { in => [ "gp", "gp", "none", "vfp", "vfp", "fpcw" ], out => [ "vfp" ] },
+       ins       => [ "base", "index", "mem", "left", "right", "fpcw" ],
        latency   => 20,
        units     => [ "VFP" ],
        mode      => "mode_E",
@@ -1821,8 +1817,8 @@ vfld => {
 vfst => {
        op_flags  => "L|F",
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "vfp", "none" ] },
-       ins       => [ "base", "index", "val", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "vfp" ] },
+       ins       => [ "base", "index", "mem", "val" ],
        attr      => "ir_mode *store_mode",
        init_attr => "attr->attr.ls_mode = store_mode;",
        latency   => 2,
@@ -1851,8 +1847,8 @@ l_vfild => {
 
 vfist => {
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "vfp", "fpcw", "none" ] },
-       ins       => [ "base", "index", "val", "fpcw", "mem" ],
+       reg_req   => { in => [ "gp", "gp", "none", "vfp", "fpcw" ] },
+       ins       => [ "base", "index", "mem", "val", "fpcw" ],
        latency   => 4,
        units     => [ "VFP" ],
        mode      => "mode_M",
@@ -2242,13 +2238,37 @@ fpushCopy => {
 },
 
 fpop => {
-       op_flags  => "R|K",
+       op_flags  => "K",
        reg_req   => { },
        cmp_attr  => "return 1;",
        emit      => '. fstp %X0',
        attr_type => "ia32_x87_attr_t",
 },
 
+ffreep => {
+       op_flags  => "K",
+       reg_req   => { },
+       cmp_attr  => "return 1;",
+       emit      => '. ffreep %X0',
+       attr_type => "ia32_x87_attr_t",
+},
+
+emms => {
+       op_flags  => "K",
+       reg_req   => { },
+       cmp_attr  => "return 1;",
+       emit      => '. emms',
+       attr_type => "ia32_x87_attr_t",
+},
+
+femms => {
+       op_flags  => "K",
+       reg_req   => { },
+       cmp_attr  => "return 1;",
+       emit      => '. femms',
+       attr_type => "ia32_x87_attr_t",
+},
+
 # compare
 
 fcomJmp => {
@@ -2312,7 +2332,8 @@ xxLoad => {
 xxStore => {
        op_flags => "L|F",
        state    => "exc_pinned",
-       reg_req  => { in => [ "gp", "gp", "xmm", "none" ] },
+       reg_req  => { in => [ "gp", "gp", "none", "xmm" ] },
+       ins      => [ "base", "index", "mem", "val" ],
        emit     => '. movdqu %binop',
        units    => [ "SSE" ],
        mode     => "mode_M",