bechordal: Remove the write-only attribute pressure from struct border_t.

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

diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index bedbeb1..19cb342 100644 (file)
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -58,7 +58,7 @@ $mode_fpcw          = "ia32_mode_fpcw";
                { mode => $mode_fp87 }
        ],
        fp_cw => [      # the floating point control word
-               { name => "fpcw", dwarf => 37, type => "ignore | state" },
+               { name => "fpcw", dwarf => 37, type => "state" },
                { mode => $mode_fpcw, flags => "manual_ra | state" }
        ],
        flags => [
@@ -67,21 +67,8 @@ $mode_fpcw          = "ia32_mode_fpcw";
        ],
 ); # %reg_classes
 
-%cpu = (
-       GP     => [ 1, "GP_EAX", "GP_EBX", "GP_ECX", "GP_EDX", "GP_ESI", "GP_EDI", "GP_EBP" ],
-       SSE    => [ 1, "SSE_XMM0", "SSE_XMM1", "SSE_XMM2", "SSE_XMM3", "SSE_XMM4", "SSE_XMM5", "SSE_XMM6", "SSE_XMM7" ],
-       VFP    => [ 1, "VFP_VF0", "VFP_VF1", "VFP_VF2", "VFP_VF3", "VFP_VF4", "VFP_VF5", "VFP_VF6", "VFP_VF7" ],
-       BRANCH => [ 1, "BRANCH1", "BRANCH2" ],
-); # %cpu
-
-%vliw = (
-       bundle_size       => 1,
-       bundels_per_cycle => 1
-); # vliw
-
-$default_op_attr_type = "ia32_op_attr_t";
-$default_attr_type    = "ia32_attr_t";
-$default_copy_attr    = "ia32_copy_attr";
+$default_attr_type = "ia32_attr_t";
+$default_copy_attr = "ia32_copy_attr";
 
 sub ia32_custom_init_attr {
        my $constr = shift;
@@ -117,7 +104,6 @@ $custom_init_attr_func = \&ia32_custom_init_attr;
 %init_attr = (
        ia32_asm_attr_t =>
                "\tinit_ia32_attributes(res, irn_flags_, in_reqs, n_res);\n".
-               "\tinit_ia32_x87_attributes(res);".
                "\tinit_ia32_asm_attributes(res);",
        ia32_attr_t     =>
                "\tinit_ia32_attributes(res, irn_flags_, in_reqs, n_res);",
@@ -161,6 +147,22 @@ $status_flags_wo_cf = [       "PF", "AF", "ZF", "SF", "OF" ];
 $fpcw_flags         = [ "FP_IM", "FP_DM", "FP_ZM", "FP_OM", "FP_UM", "FP_PM",
                         "FP_PC0", "FP_PC1", "FP_RC0", "FP_RC1", "FP_X" ];
 
+my %binop_flags_constructors = (
+       "" => {
+         reg_req => { in => [ "gp", "gp", "none", "gp", "gp" ],
+                     out => [ "flags", "none", "none" ] },
+       },
+       "8bit" => {
+         reg_req => { in => [ "gp", "gp", "none", "eax ebx ecx edx", "eax ebx ecx edx" ],
+                     out => [ "flags", "none", "none" ] },
+       }
+);
+
+my %binop_mem_constructors = (
+       ""     => { reg_req   => { in => [ "gp", "gp", "none", "gp" ],              out => [ "none" ] } },
+       "8bit" => { reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ], out => [ "none" ] } },
+);
+
 %nodes = (
 
 Immediate => {
@@ -193,7 +195,6 @@ ProduceVal => {
        irn_flags => [ "rematerializable" ],
        reg_req   => { out => [ "gp" ] },
        emit      => "",
-       units     => [ ],
        latency   => 0,
        mode      => $mode_gp,
        cmp_attr  => "return 1;",
@@ -208,7 +209,6 @@ Add => {
        outs      => [ "res", "flags", "M" ],
        emit      => 'add%M %B',
        am        => "source,binary",
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -217,22 +217,9 @@ Add => {
 AddMem => {
        irn_flags => [ "rematerializable" ],
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
-       ins       => [ "base", "index", "mem", "val" ],
-       emit      => "add%M %#S3, %AM",
-       units     => [ "GP" ],
-       latency   => 1,
-       mode      => "mode_M",
-       modified_flags => $status_flags
-},
-
-AddMem8Bit => {
-       irn_flags => [ "rematerializable" ],
-       state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ], out => [ "none" ] },
+       constructors => \%binop_mem_constructors,
        ins       => [ "base", "index", "mem", "val" ],
        emit      => "add%M %#S3, %AM",
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -246,7 +233,6 @@ Adc => {
        outs      => [ "res", "flags", "M" ],
        emit      => 'adc%M %B',
        am        => "source,binary",
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -275,7 +261,6 @@ Mul => {
        outs      => [ "res_low", "flags", "M", "res_high" ],
        am        => "source,binary",
        latency   => 10,
-       units     => [ "GP" ],
        modified_flags => $status_flags
 },
 
@@ -297,7 +282,6 @@ IMul => {
        outs      => [ "res", "flags", "M" ],
        am        => "source,binary",
        latency   => 5,
-       units     => [ "GP" ],
        mode      => $mode_gp,
        modified_flags => $status_flags
 },
@@ -312,7 +296,6 @@ IMul1OP => {
        outs      => [ "res_low", "flags", "M", "res_high" ],
        am        => "source,binary",
        latency   => 5,
-       units     => [ "GP" ],
        modified_flags => $status_flags
 },
 
@@ -332,7 +315,6 @@ And => {
        outs      => [ "res", "flags", "M" ],
        am        => "source,binary",
        emit      => 'and%M %B',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -341,22 +323,9 @@ And => {
 AndMem => {
        irn_flags => [ "rematerializable" ],
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
-       ins       => [ "base", "index", "mem", "val" ],
-       emit      => 'and%M %#S3, %AM',
-       units     => [ "GP" ],
-       latency   => 1,
-       mode      => "mode_M",
-       modified_flags => $status_flags
-},
-
-AndMem8Bit => {
-       irn_flags => [ "rematerializable" ],
-       state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none",  "eax ebx ecx edx" ], out => [ "none" ] },
+       constructors => \%binop_mem_constructors,
        ins       => [ "base", "index", "mem", "val" ],
        emit      => 'and%M %#S3, %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -371,7 +340,6 @@ Or => {
        outs      => [ "res", "flags", "M" ],
        am        => "source,binary",
        emit      => 'or%M %B',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -380,22 +348,9 @@ Or => {
 OrMem => {
        irn_flags => [ "rematerializable" ],
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
+       constructors => \%binop_mem_constructors,
        ins       => [ "base", "index", "mem", "val" ],
        emit      => 'or%M %#S3, %AM',
-       units     => [ "GP" ],
-       latency   => 1,
-       mode      => "mode_M",
-       modified_flags => $status_flags
-},
-
-OrMem8Bit => {
-       irn_flags => [ "rematerializable" ],
-       state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ], out => [ "none" ] },
-       ins       => [ "base", "index", "mem", "val" ],
-       emit      => 'or%M %#S3, %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -410,7 +365,6 @@ Xor => {
        outs      => [ "res", "flags", "M" ],
        am        => "source,binary",
        emit      => 'xor%M %B',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -422,7 +376,6 @@ Xor0 => {
        reg_req   => { out => [ "gp", "flags" ] },
        outs      => [ "res", "flags" ],
        emit      => "xor%M %D0, %D0",
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -431,22 +384,9 @@ Xor0 => {
 XorMem => {
        irn_flags => [ "rematerializable" ],
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
+       constructors => \%binop_mem_constructors,
        ins       => [ "base", "index", "mem", "val" ],
        emit      => 'xor%M %#S3, %AM',
-       units     => [ "GP" ],
-       latency   => 1,
-       mode      => "mode_M",
-       modified_flags => $status_flags
-},
-
-XorMem8Bit => {
-       irn_flags => [ "rematerializable" ],
-       state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ], out => [ "none" ] },
-       ins       => [ "base", "index", "mem", "val" ],
-       emit      => 'xor%M %#S3, %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -461,7 +401,6 @@ Sub => {
        outs      => [ "res", "flags", "M" ],
        am        => "source,binary",
        emit      => 'sub%M %B',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -470,22 +409,9 @@ Sub => {
 SubMem => {
        irn_flags => [ "rematerializable" ],
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "gp" ], out => [ "none" ] },
+       constructors => \%binop_mem_constructors,
        ins       => [ "base", "index", "mem", "subtrahend" ],
        emit      => 'sub%M %#S3, %AM',
-       units     => [ "GP" ],
-       latency   => 1,
-       mode      => 'mode_M',
-       modified_flags => $status_flags
-},
-
-SubMem8Bit => {
-       irn_flags => [ "rematerializable" ],
-       state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ], out => [ "none" ] },
-       ins       => [ "base", "index", "mem", "subtrahend" ],
-       emit      => 'sub%M %#S3, %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => 'mode_M',
        modified_flags => $status_flags
@@ -499,7 +425,6 @@ Sbb => {
        outs      => [ "res", "flags", "M" ],
        am        => "source,binary",
        emit      => 'sbb%M %B',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -511,7 +436,6 @@ Sbb0 => {
        reg_req   => { in => [ "flags" ], out => [ "gp", "flags" ] },
        outs      => [ "res", "flags" ],
        emit      => "sbb%M %D0, %D0",
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -539,7 +463,6 @@ IDiv => {
        am        => "source,unary",
        emit      => "idiv%M %AS3",
        latency   => 25,
-       units     => [ "GP" ],
        modified_flags => $status_flags
 },
 
@@ -553,7 +476,6 @@ Div => {
        am        => "source,unary",
        emit      => "div%M %AS3",
        latency   => 25,
-       units     => [ "GP" ],
        modified_flags => $status_flags
 },
 
@@ -564,7 +486,6 @@ Shl => {
        ins       => [ "val", "count" ],
        outs      => [ "res", "flags" ],
        emit      => 'shl%M %<S1, %S0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -576,7 +497,6 @@ ShlMem => {
        reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
        ins       => [ "base", "index", "mem", "count" ],
        emit      => 'shl%M %<S3, %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -590,7 +510,6 @@ ShlD => {
        outs      => [ "res", "flags" ],
        emit      => "shld%M %<S2, %S1, %D0",
        latency   => 6,
-       units     => [ "GP" ],
        mode      => $mode_gp,
        modified_flags => $status_flags
 },
@@ -602,7 +521,6 @@ Shr => {
        ins       => [ "val", "count" ],
        outs      => [ "res", "flags" ],
        emit      => 'shr%M %<S1, %S0',
-       units     => [ "GP" ],
        mode      => $mode_gp,
        latency   => 1,
        modified_flags => $status_flags
@@ -614,7 +532,6 @@ ShrMem => {
        reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
        ins       => [ "base", "index", "mem", "count" ],
        emit      => 'shr%M %<S3, %AM',
-       units     => [ "GP" ],
        mode      => "mode_M",
        latency   => 1,
        modified_flags => $status_flags
@@ -628,7 +545,6 @@ ShrD => {
        outs      => [ "res", "flags" ],
        emit      => "shrd%M %<S2, %S1, %D0",
        latency   => 6,
-       units     => [ "GP" ],
        mode      => $mode_gp,
        modified_flags => $status_flags
 },
@@ -640,7 +556,6 @@ Sar => {
        ins       => [ "val", "count" ],
        outs      => [ "res", "flags" ],
        emit      => 'sar%M %<S1, %S0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -652,7 +567,6 @@ SarMem => {
        reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
        ins       => [ "base", "index", "mem", "count" ],
        emit      => 'sar%M %<S3, %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -665,7 +579,6 @@ Ror => {
        ins       => [ "val", "count" ],
        outs      => [ "res", "flags" ],
        emit      => 'ror%M %<S1, %S0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -677,7 +590,6 @@ RorMem => {
        reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
        ins       => [ "base", "index", "mem", "count" ],
        emit      => 'ror%M %<S3, %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -690,7 +602,6 @@ Rol => {
        ins       => [ "val", "count" ],
        outs      => [ "res", "flags" ],
        emit      => 'rol%M %<S1, %D0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -702,7 +613,6 @@ RolMem => {
        reg_req   => { in => [ "gp", "gp", "none", "ecx" ], out => [ "none" ] },
        ins       => [ "base", "index", "mem", "count" ],
        emit      => 'rol%M %<S3, %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -715,7 +625,6 @@ Neg => {
        emit      => 'neg%M %S0',
        ins       => [ "val" ],
        outs      => [ "res", "flags" ],
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -727,7 +636,6 @@ NegMem => {
        reg_req   => { in => [ "gp", "gp", "none" ], out => [ "none" ] },
        ins       => [ "base", "index", "mem" ],
        emit      => 'neg%M %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        modified_flags => $status_flags
@@ -737,7 +645,6 @@ Minus64Bit => {
        irn_flags => [ "rematerializable" ],
        reg_req   => { in => [ "gp", "gp" ], out => [ "in_r1", "in_r2" ] },
        outs      => [ "low_res", "high_res" ],
-       units     => [ "GP" ],
        latency   => 3,
        modified_flags => $status_flags
 },
@@ -750,7 +657,6 @@ Inc => {
        ins       => [ "val" ],
        outs      => [ "res", "flags" ],
        emit      => 'inc%M %S0',
-       units     => [ "GP" ],
        mode      => $mode_gp,
        latency   => 1,
        modified_flags => $status_flags_wo_cf
@@ -762,7 +668,6 @@ IncMem => {
        reg_req   => { in => [ "gp", "gp", "none" ], out => [ "none" ] },
        ins       => [ "base", "index", "mem" ],
        emit      => 'inc%M %AM',
-       units     => [ "GP" ],
        mode      => "mode_M",
        latency   => 1,
        modified_flags => $status_flags_wo_cf
@@ -775,7 +680,6 @@ Dec => {
        ins       => [ "val" ],
        outs      => [ "res", "flags" ],
        emit      => 'dec%M %S0',
-       units     => [ "GP" ],
        mode      => $mode_gp,
        latency   => 1,
        modified_flags => $status_flags_wo_cf
@@ -787,7 +691,6 @@ DecMem => {
        reg_req   => { in => [ "gp", "gp", "none" ], out => [ "none" ] },
        ins       => [ "base", "index", "mem" ],
        emit      => 'dec%M %AM',
-       units     => [ "GP" ],
        mode      => "mode_M",
        latency   => 1,
        modified_flags => $status_flags_wo_cf
@@ -800,7 +703,6 @@ Not => {
        ins       => [ "val" ],
        outs      => [ "res" ],
        emit      => 'not%M %S0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        # no flags modified
@@ -812,7 +714,6 @@ NotMem => {
        reg_req   => { in => [ "gp", "gp", "none" ], out => [ "none" ] },
        ins       => [ "base", "index", "mem" ],
        emit      => 'not%M %AM',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => "mode_M",
        # no flags modified
@@ -821,7 +722,6 @@ NotMem => {
 Cmc => {
        reg_req   => { in => [ "flags" ], out => [ "flags" ] },
        emit      => 'cmc',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_flags,
        modified_flags => $status_flags
@@ -830,7 +730,6 @@ Cmc => {
 Stc => {
        reg_req   => { out => [ "flags" ] },
        emit      => 'stc',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_flags,
        modified_flags => $status_flags
@@ -839,8 +738,7 @@ Stc => {
 Cmp => {
        irn_flags => [ "rematerializable" ],
        state     => "exc_pinned",
-       reg_req   => { in  => [ "gp", "gp", "none", "gp", "gp" ],
-                      out => [ "flags", "none", "none" ] },
+       constructors => \%binop_flags_constructors,
        ins       => [ "base", "index", "mem", "left", "right" ],
        outs      => [ "eflags", "unused", "M" ],
        am        => "source,binary",
@@ -848,24 +746,6 @@ Cmp => {
        attr      => "bool ins_permuted",
        init_attr => "attr->data.ins_permuted   = ins_permuted;",
        latency   => 1,
-       units     => [ "GP" ],
-       mode      => $mode_flags,
-       modified_flags => $status_flags
-},
-
-Cmp8Bit => {
-       irn_flags => [ "rematerializable" ],
-       state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx", "eax ebx ecx edx" ] ,
-                      out => [ "flags", "none", "none" ] },
-       ins       => [ "base", "index", "mem", "left", "right" ],
-       outs      => [ "eflags", "unused", "M" ],
-       am        => "source,binary",
-       emit      => 'cmpb %B',
-       attr      => "bool ins_permuted",
-       init_attr => "attr->data.ins_permuted   = ins_permuted;",
-       latency   => 1,
-       units     => [ "GP" ],
        mode      => $mode_flags,
        modified_flags => $status_flags
 },
@@ -878,7 +758,6 @@ XorHighLow => {
        emit      => 'xorb %>S0, %<S0',
        ins       => [ "value" ],
        outs      => [ "res", "flags" ],
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags,
@@ -887,8 +766,7 @@ XorHighLow => {
 Test => {
        irn_flags => [ "rematerializable" ],
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "gp", "gp" ] ,
-                      out => [ "flags", "none", "none" ] },
+       constructors => \%binop_flags_constructors,
        ins       => [ "base", "index", "mem", "left", "right" ],
        outs      => [ "eflags", "unused", "M" ],
        am        => "source,binary",
@@ -896,24 +774,6 @@ Test => {
        attr      => "bool ins_permuted",
        init_attr => "attr->data.ins_permuted = ins_permuted;",
        latency   => 1,
-       units     => [ "GP" ],
-       mode      => $mode_flags,
-       modified_flags => $status_flags
-},
-
-Test8Bit => {
-       irn_flags => [ "rematerializable" ],
-       state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx", "eax ebx ecx edx" ] ,
-                      out => [ "flags", "none", "none" ] },
-       ins       => [ "base", "index", "mem", "left", "right" ],
-       outs      => [ "eflags", "unused", "M" ],
-       am        => "source,binary",
-       emit      => 'testb %B',
-       attr      => "bool ins_permuted",
-       init_attr => "attr->data.ins_permuted = ins_permuted;",
-       latency   => 1,
-       units     => [ "GP" ],
        mode      => $mode_flags,
        modified_flags => $status_flags
 },
@@ -933,7 +793,6 @@ Setcc => {
                . "\t\t/* attr->latency = 3; */\n"
                . "\t}\n",
        latency   => 1,
-       units     => [ "GP" ],
        mode      => $mode_gp,
 },
 
@@ -947,7 +806,6 @@ SetccMem => {
        init_attr => "set_ia32_ls_mode(res, mode_Bu);\n",
        emit      => 'set%P3 %AM',
        latency   => 1,
-       units     => [ "GP" ],
        mode      => 'mode_M',
 },
 
@@ -964,7 +822,6 @@ CMovcc => {
        attr_type => "ia32_condcode_attr_t",
        attr      => "ia32_condition_code_t condition_code",
        latency   => 1,
-       units     => [ "GP" ],
        mode      => $mode_gp,
 },
 
@@ -977,7 +834,6 @@ Jcc => {
        attr_type => "ia32_condcode_attr_t",
        attr      => "ia32_condition_code_t condition_code",
        latency   => 2,
-       units     => [ "BRANCH" ],
 },
 
 SwitchJmp => {
@@ -989,7 +845,6 @@ SwitchJmp => {
        attr_type => "ia32_switch_attr_t",
        attr      => "const ir_switch_table *switch_table",
        latency   => 2,
-       units     => [ "BRANCH" ],
 },
 
 Jmp => {
@@ -998,7 +853,6 @@ Jmp => {
        op_flags  => [ "cfopcode" ],
        reg_req   => { out => [ "none" ] },
        latency   => 1,
-       units     => [ "BRANCH" ],
        mode      => "mode_X",
 },
 
@@ -1012,7 +866,6 @@ IJmp => {
        am        => "source,unary",
        emit      => 'jmp %*AS3',
        latency   => 1,
-       units     => [ "BRANCH" ],
        mode      => "mode_X",
 },
 
@@ -1021,7 +874,6 @@ Const => {
        irn_flags => [ "rematerializable" ],
        reg_req   => { out => [ "gp" ] },
        emit      => "movl %I, %D0",
-       units     => [ "GP" ],
        attr      => "ir_entity *symconst, int symconst_sign, int no_pic_adjust, long offset",
        attr_type => "ia32_immediate_attr_t",
        latency   => 1,
@@ -1040,7 +892,6 @@ Unknown => {
 GetEIP => {
        op_flags => [ "constlike" ],
        reg_req  => { out => [ "gp" ] },
-       units    => [ "GP" ],
        latency  => 5,
        mode     => $mode_gp,
        modified_flags => $status_flags,
@@ -1051,8 +902,6 @@ NoReg_GP => {
        op_flags  => [ "constlike", "dump_noblock" ],
        irn_flags => [ "not_scheduled" ],
        reg_req   => { out => [ "gp_NOREG:I" ] },
-       units     => [],
-       emit      => "",
        latency   => 0,
        mode      => $mode_gp
 },
@@ -1062,8 +911,6 @@ NoReg_FP => {
        op_flags  => [ "constlike", "dump_noblock" ],
        irn_flags => [ "not_scheduled" ],
        reg_req   => { out => [ "fp_NOREG:I" ] },
-       units     => [],
-       emit      => "",
        mode      => $mode_fp87,
        latency   => 0,
        attr_type => "ia32_x87_attr_t",
@@ -1074,8 +921,6 @@ NoReg_XMM => {
        op_flags  => [ "constlike", "dump_noblock" ],
        irn_flags => [ "not_scheduled" ],
        reg_req   => { out => [ "xmm_NOREG:I" ] },
-       units     => [],
-       emit      => "",
        latency   => 0,
        mode      => $mode_xmm,
 },
@@ -1084,22 +929,20 @@ ChangeCW => {
        state     => "pinned",
        op_flags  => [ "constlike" ],
        irn_flags => [ "not_scheduled" ],
-       reg_req   => { out => [ "fpcw:I" ] },
+       reg_req   => { out => [ "fpcw" ] },
        mode      => $mode_fpcw,
        latency   => 3,
-       units     => [ "GP" ],
        modified_flags => $fpcw_flags
 },
 
 FldCW => {
        op_flags  => [ "uses_memory" ],
        state     => "pinned",
-       reg_req   => { in => [ "gp", "gp", "none" ], out => [ "fpcw:I" ] },
+       reg_req   => { in => [ "gp", "gp", "none" ], out => [ "fpcw" ] },
        ins       => [ "base", "index", "mem" ],
        latency   => 5,
        emit      => "fldcw %AM",
        mode      => $mode_fpcw,
-       units     => [ "GP" ],
        modified_flags => $fpcw_flags
 },
 
@@ -1111,7 +954,6 @@ FnstCW => {
        latency   => 5,
        emit      => "fnstcw %AM",
        mode      => "mode_M",
-       units     => [ "GP" ],
 },
 
 FnstCWNOP => {
@@ -1131,7 +973,6 @@ Cltd => {
        emit      => 'cltd',
        latency   => 1,
        mode      => $mode_gp,
-       units     => [ "GP" ],
 },
 
 # Load / Store
@@ -1148,31 +989,25 @@ Load => {
        outs      => [ "res", "unused", "M", "X_regular", "X_except" ],
        latency   => 0,
        emit      => "mov%#Ml %AM, %D0",
-       units     => [ "GP" ],
 },
 
 Store => {
        op_flags  => [ "uses_memory", "fragile" ],
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "gp" ],
-                      out => [ "none", "none", "none" ] },
-       ins       => [ "base", "index", "mem", "val" ],
-       outs      => [ "M", "X_regular", "X_except" ],
-       emit      => 'mov%M %#S3, %AM',
-       latency   => 2,
-       units     => [ "GP" ],
-},
-
-Store8Bit => {
-       op_flags  => [ "uses_memory", "fragile" ],
-       state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ],
-                      out => ["none", "none", "none" ] },
+       constructors => {
+               ""     => {
+                       reg_req => { in => [ "gp", "gp", "none", "gp" ],
+                                   out => [ "none", "none", "none" ] }
+               },
+               "8bit" => {
+                       reg_req => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ],
+                                   out => [ "none", "none", "none" ] }
+               }
+       },
        ins       => [ "base", "index", "mem", "val" ],
        outs      => [ "M", "X_regular", "X_except" ],
        emit      => 'mov%M %#S3, %AM',
        latency   => 2,
-       units     => [ "GP" ],
 },
 
 Lea => {
@@ -1181,7 +1016,6 @@ Lea => {
        ins       => [ "base", "index" ],
        emit      => 'leal %AM, %D0',
        latency   => 2,
-       units     => [ "GP" ],
        mode      => $mode_gp,
 # lea doesn't modify the flags, but setting this seems advantageous since it
 # increases chances that the Lea is transformed back to an Add
@@ -1196,7 +1030,6 @@ Push => {
        outs      => [ "stack", "M" ],
        am        => "source,unary",
        latency   => 2,
-       units     => [ "GP" ],
 },
 
 PushEax => {
@@ -1206,7 +1039,6 @@ PushEax => {
        outs    => [ "stack" ],
        emit    => 'pushl %%eax',
        latency => 2,
-       units   => [ "GP" ],
        mode    => $mode_gp,
 },
 
@@ -1217,7 +1049,6 @@ Pop => {
        outs      => [ "res", "M", "unused", "stack" ],
        emit      => 'pop%M %D0',
        latency   => 3, # Pop is more expensive than Push on Athlon
-       units     => [ "GP" ],
 },
 
 PopEbp => {
@@ -1227,7 +1058,6 @@ PopEbp => {
        outs      => [ "res", "M", "unused", "stack" ],
        emit      => 'pop%M %D0',
        latency   => 3, # Pop is more expensive than Push on Athlon
-       units     => [ "GP" ],
 },
 
 CopyEbpEsp => {
@@ -1237,7 +1067,6 @@ CopyEbpEsp => {
        outs      => [ "esp" ],
        emit      => 'movl %S0, %D0',
        latency   => 1,
-       units     => [ "GP" ],
        mode      => $mode_gp,
 },
 
@@ -1248,7 +1077,6 @@ PopMem => {
        outs      => [ "unused0", "M", "unused1", "stack" ],
        emit      => 'pop%M %AM',
        latency   => 3, # Pop is more expensive than Push on Athlon
-       units     => [ "GP" ],
 },
 
 Enter => {
@@ -1256,7 +1084,6 @@ Enter => {
        emit      => 'enter',
        outs      => [ "frame", "stack", "M" ],
        latency   => 15,
-       units     => [ "GP" ],
 },
 
 Leave => {
@@ -1264,7 +1091,6 @@ Leave => {
        emit      => 'leave',
        outs      => [ "frame", "stack" ],
        latency   => 3,
-       units     => [ "GP" ],
        state     => "exc_pinned",
 },
 
@@ -1276,7 +1102,6 @@ AddSP => {
        emit      => 'addl %B',
        latency   => 1,
        outs      => [ "stack", "M" ],
-       units     => [ "GP" ],
        modified_flags => $status_flags
 },
 
@@ -1289,7 +1114,6 @@ SubSP => {
                     "movl %%esp, %D1",
        latency   => 2,
        outs      => [ "stack", "addr", "M" ],
-       units     => [ "GP" ],
        modified_flags => $status_flags
 },
 
@@ -1304,7 +1128,6 @@ RepPrefix => {
 LdTls => {
        irn_flags => [ "rematerializable" ],
        reg_req   => { out => [ "gp" ] },
-       units     => [ "GP" ],
        emit      => "movl %%gs:0, %D0",
        mode      => $mode_gp,
        latency   => 1,
@@ -1319,7 +1142,6 @@ Bt => {
        reg_req   => { in => [ "gp", "gp" ], out => [ "flags" ] },
        ins       => [ "left", "right" ],
        emit      => 'bt%M %S1, %S0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_flags,
        modified_flags => $status_flags  # only CF is set, but the other flags are undefined
@@ -1334,7 +1156,6 @@ Bsf => {
        outs      => [ "res", "flags", "M" ],
        am        => "source,binary",
        emit      => 'bsf%M %AS3, %D0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -1349,7 +1170,6 @@ Bsr => {
        outs      => [ "res", "flags", "M" ],
        am        => "source,binary",
        emit      => 'bsr%M %AS3, %D0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -1367,7 +1187,6 @@ Popcnt => {
        outs      => [ "res", "flags", "M" ],
        am        => "source,binary",
        emit      => 'popcnt%M %AS3, %D0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
        modified_flags => $status_flags
@@ -1378,7 +1197,7 @@ Call => {
        state     => "exc_pinned",
        reg_req   => {
                in  => [ "gp", "gp", "none", "gp", "esp", "fpcw", "eax", "ecx", "edx" ],
-               out => [ "esp:I|S", "fpcw:I", "none", "eax", "ecx", "edx", "st0", "st1", "st2", "st3", "st4", "st5", "st6", "st7", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "none", "none" ]
+               out => [ "esp:I|S", "fpcw", "none", "eax", "ecx", "edx", "st0", "st1", "st2", "st3", "st4", "st5", "st6", "st7", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "none", "none" ]
        },
        ins       => [ "base", "index", "mem", "addr", "stack", "fpcw", "eax", "ecx", "edx" ],
        outs      => [ "stack", "fpcw", "M", "eax", "ecx", "edx", "st0", "st1", "st2", "st3", "st4", "st5", "st6", "st7", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7", "X_regular", "X_except" ],
@@ -1386,7 +1205,6 @@ Call => {
        attr_type => "ia32_call_attr_t",
        attr      => "unsigned pop, ir_type *call_tp",
        am        => "source,unary",
-       units     => [ "BRANCH" ],
        latency   => 4, # random number
        modified_flags => $status_flags
 },
@@ -1403,7 +1221,6 @@ ClimbFrame => {
        latency   => 4, # random number
        attr_type => "ia32_climbframe_attr_t",
        attr      => "unsigned count",
-       units     => [ "GP" ],
        mode      => $mode_gp
 },
 
@@ -1417,7 +1234,6 @@ Bswap => {
        outs      => [ "res" ],
        emit      => 'bswap%M %S0',
        ins       => [ "val" ],
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
 },
@@ -1431,7 +1247,6 @@ Bswap16 => {
                       out => [ "in_r1" ] },
        emit      => 'xchg %<S0, %>S0',
        ins       => [ "val" ],
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
 },
@@ -1445,7 +1260,6 @@ Breakpoint => {
        ins       => [ "mem" ],
        latency   => 0,
        emit      => "int3",
-       units     => [ "GP" ],
        mode      => mode_M,
 },
 
@@ -1458,7 +1272,6 @@ UD2 => {
        ins       => [ "mem" ],
        latency   => 0,
        emit      => "ud2",
-       units     => [ "GP" ],
        mode      => mode_M,
 },
 
@@ -1471,7 +1284,6 @@ Outport => {
        reg_req   => { in => [ "edx", "eax", "none" ], out => [ "none" ] },
        ins       => [ "port", "value", "mem" ],
        emit      => 'out%M %^S0, %#S1',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => mode_M,
        modified_flags => $status_flags
@@ -1487,7 +1299,6 @@ Inport => {
        ins       => [ "port", "mem" ],
        outs      => [ "res", "M" ],
        emit      => 'in%M %#D0, %^S0',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => mode_T,
        modified_flags => $status_flags
@@ -1504,7 +1315,6 @@ Prefetch0 => {
        outs      => [ "M" ],
        latency   => 0,
        emit      => "prefetcht0 %AM",
-       units     => [ "GP" ],
 },
 
 Prefetch1 => {
@@ -1515,7 +1325,6 @@ Prefetch1 => {
        outs      => [ "M" ],
        latency   => 0,
        emit      => "prefetcht1 %AM",
-       units     => [ "GP" ],
 },
 
 Prefetch2 => {
@@ -1526,7 +1335,6 @@ Prefetch2 => {
        outs      => [ "M" ],
        latency   => 0,
        emit      => "prefetcht2 %AM",
-       units     => [ "GP" ],
 },
 
 PrefetchNTA => {
@@ -1537,7 +1345,6 @@ PrefetchNTA => {
        outs      => [ "M" ],
        latency   => 0,
        emit      => "prefetchnta %AM",
-       units     => [ "GP" ],
 },
 
 #
@@ -1551,7 +1358,6 @@ Prefetch => {
        outs      => [ "M" ],
        latency   => 0,
        emit      => "prefetch %AM",
-       units     => [ "GP" ],
 },
 
 PrefetchW => {
@@ -1562,7 +1368,6 @@ PrefetchW => {
        outs      => [ "M" ],
        latency   => 0,
        emit      => "prefetchw %AM",
-       units     => [ "GP" ],
 },
 
 # produces a 0/+0.0
@@ -1571,7 +1376,6 @@ xZero => {
        reg_req   => { out => [ "xmm" ] },
        emit      => 'xorp%FX %D0, %D0',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1589,7 +1393,6 @@ xPzero => {
        reg_req   => { out => [ "xmm" ] },
        emit      => 'pxor %D0, %D0',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1599,7 +1402,6 @@ xAllOnes => {
        reg_req   => { out => [ "xmm" ] },
        emit      => 'pcmpeqb %D0, %D0',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1609,7 +1411,6 @@ xPslld => {
        reg_req   => { in => [ "xmm", "xmm" ], out => [ "in_r1 !in_r2" ] },
        emit      => 'pslld %#S1, %D0',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1619,7 +1420,6 @@ xPsllq => {
        reg_req   => { in => [ "xmm", "xmm" ], out => [ "in_r1 !in_r2" ] },
        emit      => 'psllq %#S1, %D0',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1629,7 +1429,6 @@ xPsrld => {
        reg_req   => { in => [ "xmm", "xmm" ], out => [ "in_r1 !in_r2" ] },
        emit      => 'psrld %#S1, %D0',
        latency   => 1,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1639,7 +1438,6 @@ xMovd  => {
        reg_req   => { in => [ "gp" ], out => [ "xmm" ] },
        emit      => 'movd %S0, %D0',
        latency   => 1,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1653,7 +1451,6 @@ xAdd => {
        am        => "source,binary",
        emit      => 'adds%FX %B',
        latency   => 4,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1667,7 +1464,6 @@ xMul => {
        am        => "source,binary",
        emit      => 'muls%FX %B',
        latency   => 4,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1681,7 +1477,6 @@ xMax => {
        am        => "source,binary",
        emit      => 'maxs%FX %B',
        latency   => 2,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1695,7 +1490,6 @@ xMin => {
        am        => "source,binary",
        emit      => 'mins%FX %B',
        latency   => 2,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1709,7 +1503,6 @@ xAnd => {
        am        => "source,binary",
        emit      => 'andp%FX %B',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1723,7 +1516,6 @@ xOr => {
        am        => "source,binary",
        emit      => 'orp%FX %B',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1737,7 +1529,6 @@ xXor => {
        am        => "source,binary",
        emit      => 'xorp%FX %B',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1751,7 +1542,6 @@ xAndNot => {
        am        => "source,binary",
        emit      => 'andnp%FX %B',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1765,7 +1555,6 @@ xSub => {
        am        => "source,binary",
        emit      => 'subs%FX %B',
        latency   => 4,
-       units     => [ "SSE" ],
        mode      => $mode_xmm
 },
 
@@ -1779,7 +1568,6 @@ xDiv => {
        am        => "source,binary",
        emit      => 'divs%FX %B',
        latency   => 16,
-       units     => [ "SSE" ],
 },
 
 Ucomi => {
@@ -1794,7 +1582,6 @@ Ucomi => {
        init_attr => "attr->data.ins_permuted = ins_permuted;",
        emit      => 'ucomis%FX %B',
        latency   => 3,
-       units     => [ "SSE" ],
        mode      => $mode_flags,
        modified_flags => 1,
 },
@@ -1810,7 +1597,6 @@ xLoad => {
        attr      => "ir_mode *load_mode",
        init_attr => "attr->ls_mode = load_mode;",
        latency   => 0,
-       units     => [ "SSE" ],
 },
 
 xStore => {
@@ -1822,7 +1608,6 @@ xStore => {
        outs      => [ "M", "X_regular", "X_except" ],
        emit     => 'movs%FX %S3, %AM',
        latency  => 0,
-       units    => [ "SSE" ],
 },
 
 xStoreSimple => {
@@ -1834,7 +1619,6 @@ xStoreSimple => {
        outs     => [ "M", "X_regular", "X_except" ],
        emit     => 'movs%FX %S3, %AM',
        latency  => 0,
-       units    => [ "SSE" ],
 },
 
 CvtSI2SS => {
@@ -1844,7 +1628,6 @@ CvtSI2SS => {
        am       => "source,unary",
        emit     => 'cvtsi2ss %AS3, %D0',
        latency  => 2,
-       units    => [ "SSE" ],
        mode     => $mode_xmm
 },
 
@@ -1855,7 +1638,6 @@ CvtSI2SD => {
        am       => "source,unary",
        emit     => 'cvtsi2sd %AS3, %D0',
        latency  => 2,
-       units    => [ "SSE" ],
        mode     => $mode_xmm
 },
 
@@ -1882,7 +1664,6 @@ CopyB => {
        outs      => [ "dest", "source", "count", "M", "X_regular", "X_except" ],
        attr_type => "ia32_copyb_attr_t",
        attr      => "unsigned size",
-       units     => [ "GP" ],
        latency   => 3,
 # we don't care about this flag, so no need to mark this node
 #      modified_flags => [ "DF" ]
@@ -1897,7 +1678,6 @@ CopyB_i => {
        outs      => [ "dest", "source", "M", "X_regular", "X_except" ],
        attr_type => "ia32_copyb_attr_t",
        attr      => "unsigned size",
-       units     => [ "GP" ],
        latency   => 3,
 # we don't care about this flag, so no need to mark this node
 #      modified_flags => [ "DF" ]
@@ -1909,7 +1689,6 @@ Cwtl => {
        ins       => [ "val" ],
        outs      => [ "res" ],
        emit      => 'cwtl',
-       units     => [ "GP" ],
        latency   => 1,
        mode      => $mode_gp,
 },
@@ -1917,29 +1696,20 @@ Cwtl => {
 Conv_I2I => {
        op_flags  => [ "uses_memory", "fragile" ],
        state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "gp" ],
-                      out => [ "gp", "none", "none", "none", "none" ] },
-       ins       => [ "base", "index", "mem", "val" ],
-       outs      => [ "res", "flags", "M", "X_regular", "X_except" ],
-       emit      => "mov%#Ml %#AS3, %D0",
-       am        => "source,unary",
-       units     => [ "GP" ],
-       latency   => 1,
-       attr      => "ir_mode *smaller_mode",
-       init_attr => "attr->ls_mode = smaller_mode;",
-       mode      => $mode_gp,
-},
-
-Conv_I2I8Bit => {
-       op_flags  => [ "uses_memory", "fragile" ],
-       state     => "exc_pinned",
-       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ],
-                      out => [ "gp", "none", "none", "none", "none" ] },
+       constructors => {
+               "" => {
+                       reg_req => { in => [ "gp", "gp", "none", "gp" ],
+                                   out => [ "gp", "none", "none", "none", "none" ] }
+               },
+               "8bit" => {
+                       reg_req   => { in => [ "gp", "gp", "none", "eax ebx ecx edx" ],
+                                     out => [ "gp", "none", "none", "none", "none" ] }
+               }
+       },
        ins       => [ "base", "index", "mem", "val" ],
        outs      => [ "res", "flags", "M", "X_regular", "X_except" ],
        emit      => "mov%#Ml %#AS3, %D0",
        am        => "source,unary",
-       units     => [ "GP" ],
        latency   => 1,
        attr      => "ir_mode *smaller_mode",
        init_attr => "attr->ls_mode = smaller_mode;",
@@ -1952,7 +1722,6 @@ Conv_I2FP => {
        ins       => [ "base", "index", "mem", "val" ],
        am        => "source,unary",
        latency   => 10,
-       units     => [ "SSE" ],
        mode      => $mode_xmm,
 },
 
@@ -1962,7 +1731,6 @@ Conv_FP2I => {
        ins       => [ "base", "index", "mem", "val" ],
        am        => "source,unary",
        latency   => 10,
-       units     => [ "SSE" ],
        mode      => $mode_gp,
 },
 
@@ -1972,7 +1740,6 @@ Conv_FP2FP => {
        ins       => [ "base", "index", "mem", "val" ],
        am        => "source,unary",
        latency   => 8,
-       units     => [ "SSE" ],
        mode      => $mode_xmm,
 },
 
@@ -1989,7 +1756,6 @@ fadd => {
        emit      => 'fadd%FP%FM %AF',
        am        => "source,binary",
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2004,7 +1770,6 @@ fmul => {
        emit      => 'fmul%FP%FM %AF',
        am        => "source,binary",
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2019,7 +1784,6 @@ fsub => {
        emit      => 'fsub%FR%FP%FM %AF',
        am        => "source,binary",
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2033,7 +1797,6 @@ fdiv => {
        emit      => 'fdiv%FR%FP%FM %AF',
        am        => "source,binary",
        latency   => 20,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
 },
 
@@ -2042,7 +1805,6 @@ fprem => {
        ins       => [ "left", "right", "fpcw" ],
        emit      => 'fprem1',
        latency   => 20,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2053,7 +1815,6 @@ fabs => {
        ins       => [ "value" ],
        emit      => 'fabs',
        latency   => 2,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2064,7 +1825,6 @@ fchs => {
        emit      => 'fchs',
        ins       => [ "value" ],
        latency   => 2,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2081,7 +1841,6 @@ fld => {
        attr      => "ir_mode *load_mode",
        init_attr => "attr->attr.ls_mode = load_mode;",
        latency   => 2,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
 },
 
@@ -2097,7 +1856,6 @@ fst => {
        attr      => "ir_mode *store_mode",
        init_attr => "attr->attr.ls_mode = store_mode;",
        latency   => 2,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
 },
 
@@ -2109,7 +1867,6 @@ fild => {
        ins       => [ "base", "index", "mem" ],
        emit      => 'fild%FM %AM',
        latency   => 4,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
 },
 
@@ -2122,7 +1879,6 @@ fist => {
        outs      => [ "dummy", "M", "X_regular", "X_except" ],
        emit      => 'fist%FP%FM %AM',
        latency   => 4,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
 },
 
@@ -2136,7 +1892,6 @@ fisttp => {
        outs      => [ "res", "M", "X_regular", "X_except" ],
        emit      => 'fisttp%FM %AM',
        latency   => 4,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
 },
 
@@ -2146,7 +1901,6 @@ fldz => {
        outs      => [ "res" ],
        emit      => 'fldz',
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2157,7 +1911,6 @@ fld1 => {
        outs      => [ "res" ],
        emit      => 'fld1',
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2168,7 +1921,6 @@ fldpi => {
        outs      => [ "res" ],
        emit      => 'fldpi',
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2179,7 +1931,6 @@ fldln2 => {
        outs      => [ "res" ],
        emit      => 'fldln2',
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2190,7 +1941,6 @@ fldlg2 => {
        emit      => 'fldlg2',
        outs      => [ "res" ],
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2201,7 +1951,6 @@ fldl2t => {
        emit      => 'fldll2t',
        outs      => [ "res" ],
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2212,7 +1961,6 @@ fldl2e => {
        emit      => 'fldl2e',
        outs      => [ "res" ],
        latency   => 4,
-       units     => [ "VFP" ],
        mode      => $mode_fp87,
        attr_type => "ia32_x87_attr_t",
 },
@@ -2229,7 +1977,6 @@ FucomFnstsw => {
        attr      => "bool ins_permuted",
        init_attr => "attr->attr.data.ins_permuted = ins_permuted;",
        latency   => 3,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
        mode      => $mode_gp
 },
@@ -2246,7 +1993,6 @@ FucomppFnstsw => {
        attr      => "bool ins_permuted",
        init_attr => "attr->attr.data.ins_permuted = ins_permuted;",
        latency   => 3,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
        mode      => $mode_gp
 },
@@ -2260,7 +2006,6 @@ Fucomi => {
        attr      => "bool ins_permuted",
        init_attr => "attr->attr.data.ins_permuted = ins_permuted;",
        latency   => 3,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
        mode      => $mode_gp
 },
@@ -2275,7 +2020,6 @@ FtstFnstsw => {
        attr      => "bool ins_permuted",
        init_attr => "attr->attr.data.ins_permuted = ins_permuted;",
        latency   => 3,
-       units     => [ "VFP" ],
        attr_type => "ia32_x87_attr_t",
        mode      => $mode_gp
 },
@@ -2287,7 +2031,6 @@ Sahf => {
        outs      => [ "flags" ],
        emit      => 'sahf',
        latency   => 1,
-       units     => [ "GP" ],
        mode      => $mode_flags,
 },
 
@@ -2373,7 +2116,6 @@ xxLoad => {
        emit      => 'movdqu %D0, %AM',
        ins       => [ "base", "index", "mem" ],
        outs      => [ "res", "M", "X_regular", "X_except" ],
-       units     => [ "SSE" ],
        latency   => 1,
 },
 
@@ -2385,7 +2127,6 @@ xxStore => {
        ins      => [ "base", "index", "mem", "val" ],
        outs     => [ "M", "X_regular", "X_except" ],
        emit     => 'movdqu %B',
-       units    => [ "SSE" ],
        latency  => 1,
 },