Indentation.

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

diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index 64673b0..121aa27 100644 (file)
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -219,8 +219,8 @@ $arch = "ia32";
        XXM => "${arch}_emit_xmm_mode_suffix(node);",
        XSD => "${arch}_emit_xmm_mode_suffix_s(node);",
        AM => "${arch}_emit_am(node);",
-       unop3 => "${arch}_emit_unop(node, 3);",
-       unop4 => "${arch}_emit_unop(node, 4);",
+       unop3 => "${arch}_emit_unop(node, n_ia32_unary_op);",
+       unop4 => "${arch}_emit_unop(node, n_ia32_binary_right);",
        binop => "${arch}_emit_binop(node);",
        x87_binop => "${arch}_emit_x87_binop(node);",
        CMP0  => "${arch}_emit_cmp_suffix_node(node, 0);",
@@ -275,32 +275,33 @@ sub ia32_custom_init_attr {
 $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);",
-       ia32_x87_attr_t =>
-               "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);\n".
-               "\tinit_ia32_x87_attributes(res);",
        ia32_asm_attr_t =>
                "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);\n".
                "\tinit_ia32_x87_attributes(res);".
                "\tinit_ia32_asm_attributes(res);",
-       ia32_immediate_attr_t =>
+       ia32_attr_t     =>
+               "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);",
+       ia32_condcode_attr_t =>
                "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);\n".
-               "\tinit_ia32_immediate_attributes(res, symconst, symconst_sign, offset);",
+               "\tinit_ia32_condcode_attributes(res, pnc);",
        ia32_copyb_attr_t =>
                "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);\n".
                "\tinit_ia32_copyb_attributes(res, size);",
-       ia32_condcode_attr_t =>
+       ia32_immediate_attr_t =>
                "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);\n".
-               "\tinit_ia32_condcode_attributes(res, pnc);",
+               "\tinit_ia32_immediate_attributes(res, symconst, symconst_sign, offset);",
+       ia32_x87_attr_t =>
+               "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);\n".
+               "\tinit_ia32_x87_attributes(res);",
 );
 
 %compare_attr = (
-       ia32_attr_t           => "ia32_compare_nodes_attr",
-       ia32_x87_attr_t       => "ia32_compare_x87_attr",
        ia32_asm_attr_t       => "ia32_compare_asm_attr",
-       ia32_immediate_attr_t => "ia32_compare_immediate_attr",
-       ia32_copyb_attr_t     => "ia32_compare_copyb_attr",
+       ia32_attr_t           => "ia32_compare_nodes_attr",
        ia32_condcode_attr_t  => "ia32_compare_condcode_attr",
+       ia32_copyb_attr_t     => "ia32_compare_copyb_attr",
+       ia32_immediate_attr_t => "ia32_compare_immediate_attr",
+       ia32_x87_attr_t       => "ia32_compare_x87_attr",
 );
 
 %operands = (
@@ -431,11 +432,11 @@ l_Adc => {
 
 Mul => {
        # we should not rematrialize this node. It produces 2 results and has
-       # very strict constrains
+       # very strict constraints
        state     => "exc_pinned",
        reg_req   => { in => [ "gp", "gp", "none", "eax", "gp" ],
                       out => [ "eax", "edx", "none" ] },
-       ins       => [ "base", "index", "mem", "val_high", "val_low" ],
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. mul%M %unop4',
        outs      => [ "res_low", "res_high", "M" ],
        am        => "source,binary",
@@ -446,7 +447,7 @@ Mul => {
 
 l_Mul => {
        # we should not rematrialize this node. It produces 2 results and has
-       # very strict constrains
+       # very strict constraints
        op_flags  => "C",
        cmp_attr  => "return 1;",
        outs      => [ "EAX", "EDX", "M" ],
@@ -474,7 +475,7 @@ IMul1OP => {
        state     => "exc_pinned",
        reg_req   => { in => [ "gp", "gp", "none", "eax", "gp" ],
                       out => [ "eax", "edx", "none" ] },
-       ins       => [ "base", "index", "mem", "val_high", "val_low" ],
+       ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. imul%M %unop4',
        outs      => [ "res_low", "res_high", "M" ],
        am        => "source,binary",
@@ -1322,21 +1323,6 @@ Load => {
        units     => [ "GP" ],
 },
 
-l_Load => {
-       op_flags  => "L|F",
-       cmp_attr  => "return 1;",
-       outs      => [ "res", "M" ],
-       arity     => 2,
-},
-
-l_Store => {
-       op_flags  => "L|F",
-       cmp_attr  => "return 1;",
-       state     => "exc_pinned",
-       arity     => 3,
-       mode      => "mode_M",
-},
-
 Store => {
        op_flags  => "L|F",
        state     => "exc_pinned",
@@ -1380,7 +1366,7 @@ Push => {
        ins       => [ "base", "index", "mem", "val", "stack" ],
        emit      => '. push%M %unop3',
        outs      => [ "stack:I|S", "M" ],
-       am        => "source,binary",
+       am        => "source,unary",
        latency   => 2,
        units     => [ "GP" ],
 },
@@ -1991,12 +1977,6 @@ vfild => {
        attr_type => "ia32_x87_attr_t",
 },
 
-l_vfild => {
-       cmp_attr  => "return 1;",
-       outs      => [ "res", "M" ],
-       arity     => 2,
-},
-
 vfist => {
        state     => "exc_pinned",
        reg_req   => { in => [ "gp", "gp", "none", "vfp", "fpcw" ] },
@@ -2018,13 +1998,6 @@ vfisttp => {
        attr_type => "ia32_x87_attr_t",
 },
 
-l_vfist => {
-       cmp_attr  => "return 1;",
-       state     => "exc_pinned",
-       arity     => 3,
-       mode      => "mode_M",
-},
-
 
 # constants