Remove the unused parameter const arch_env_t *env from arch_get_register_req().

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

diff --git a/ir/be/ia32/ia32_spec.pl b/ir/be/ia32/ia32_spec.pl
index cd3be7a..4bbb018 100644 (file)
--- a/ir/be/ia32/ia32_spec.pl
+++ b/ir/be/ia32/ia32_spec.pl
@@ -253,11 +253,9 @@ sub ia32_custom_init_attr {
        if(defined($node->{am})) {
                my $am = $node->{am};
                if($am eq "source,unary") {
-                       $res .= "\tset_ia32_am_support(res, ia32_am_Source, ia32_am_unary);";
+                       $res .= "\tset_ia32_am_support(res, ia32_am_unary);";
                } elsif($am eq "source,binary") {
-                       $res .= "\tset_ia32_am_support(res, ia32_am_Source, ia32_am_binary);";
-               } elsif($am eq "source,ternary") {
-                       $res .= "\tset_ia32_am_support(res, ia32_am_Source, ia32_am_ternary);";
+                       $res .= "\tset_ia32_am_support(res, ia32_am_binary);";
                } elsif($am eq "none") {
                        # nothing to do
                } else {
@@ -281,6 +279,9 @@ $custom_init_attr_func = \&ia32_custom_init_attr;
                "\tinit_ia32_asm_attributes(res);",
        ia32_attr_t     =>
                "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);",
+       ia32_call_attr_t =>
+               "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);\n".
+               "\tinit_ia32_call_attributes(res, pop, call_tp);",
        ia32_condcode_attr_t =>
                "\tinit_ia32_attributes(res, flags, in_reqs, out_reqs, exec_units, n_res);\n".
                "\tinit_ia32_condcode_attributes(res, pnc);",
@@ -298,6 +299,7 @@ $custom_init_attr_func = \&ia32_custom_init_attr;
 %compare_attr = (
        ia32_asm_attr_t       => "ia32_compare_asm_attr",
        ia32_attr_t           => "ia32_compare_nodes_attr",
+       ia32_call_attr_t      => "ia32_compare_call_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",
@@ -307,13 +309,14 @@ $custom_init_attr_func = \&ia32_custom_init_attr;
 %operands = (
 );
 
-$mode_xmm     = "mode_E";
-$mode_gp      = "mode_Iu";
-$mode_flags   = "mode_Iu";
-$mode_fpcw    = "mode_fpcw";
-$status_flags = [ "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" ];
+$mode_xmm           = "mode_E";
+$mode_gp            = "mode_Iu";
+$mode_flags         = "mode_Iu";
+$mode_fpcw          = "mode_fpcw";
+$status_flags       = [ "CF", "PF", "AF", "ZF", "SF", "OF" ];
+$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" ];
 
 %nodes = (
 
@@ -435,10 +438,10 @@ Mul => {
        # very strict constraints
        state     => "exc_pinned",
        reg_req   => { in => [ "gp", "gp", "none", "eax", "gp" ],
-                      out => [ "eax", "edx", "none" ] },
+                      out => [ "eax", "flags", "edx", "none" ] },
        ins       => [ "base", "index", "mem", "left", "right" ],
        emit      => '. mul%M %unop4',
-       outs      => [ "res_low", "res_high", "M" ],
+       outs      => [ "res_low", "flags", "res_high", "M" ],
        am        => "source,binary",
        latency   => 10,
        units     => [ "GP" ],
@@ -450,7 +453,7 @@ l_Mul => {
        # very strict constraints
        op_flags  => "C",
        cmp_attr  => "return 1;",
-       outs      => [ "EAX", "EDX", "M" ],
+       outs      => [ "EAX", "flags", "EDX", "M" ],
        arity     => 2
 },
 
@@ -681,7 +684,7 @@ IDiv => {
                       out => [ "eax", "flags", "none", "edx", "none" ] },
        ins       => [ "base", "index", "mem", "divisor", "dividend_low", "dividend_high" ],
        outs      => [ "div_res", "flags", "M", "mod_res", "X_exc" ],
-       am        => "source,ternary",
+       am        => "source,unary",
        emit      => ". idiv%M %unop3",
        latency   => 25,
        units     => [ "GP" ],
@@ -695,7 +698,7 @@ Div => {
                       out => [ "eax", "flags", "none", "edx", "none" ] },
        ins       => [ "base", "index", "mem", "divisor", "dividend_low", "dividend_high" ],
        outs      => [ "div_res", "flags", "M", "mod_res", "X_exc" ],
-       am        => "source,ternary",
+       am        => "source,unary",
        emit      => ". div%M %unop3",
        latency   => 25,
        units     => [ "GP" ],
@@ -930,7 +933,7 @@ Inc => {
        units     => [ "GP" ],
        mode      => $mode_gp,
        latency   => 1,
-       modified_flags => [ "OF", "SF", "ZF", "AF", "PF" ]
+       modified_flags => $status_flags_wo_cf
 },
 
 IncMem => {
@@ -942,7 +945,7 @@ IncMem => {
        units     => [ "GP" ],
        mode      => "mode_M",
        latency   => 1,
-       modified_flags => [ "OF", "SF", "ZF", "AF", "PF" ]
+       modified_flags => $status_flags_wo_cf
 },
 
 Dec => {
@@ -955,7 +958,7 @@ Dec => {
        units     => [ "GP" ],
        mode      => $mode_gp,
        latency   => 1,
-       modified_flags => [ "OF", "SF", "ZF", "AF", "PF" ]
+       modified_flags => $status_flags_wo_cf
 },
 
 DecMem => {
@@ -967,7 +970,7 @@ DecMem => {
        units     => [ "GP" ],
        mode      => "mode_M",
        latency   => 1,
-       modified_flags => [ "OF", "SF", "ZF", "AF", "PF" ]
+       modified_flags => $status_flags_wo_cf
 },
 
 Not => {
@@ -1400,7 +1403,7 @@ Enter => {
 },
 
 Leave => {
-       reg_req   => { in => [ "esp", "ebp" ], out => [ "ebp", "esp" ] },
+       reg_req   => { in => [ "ebp" ], out => [ "ebp", "esp" ] },
        emit      => '. leave',
        outs      => [ "frame:I", "stack:I|S" ],
        latency   => 3,
@@ -1461,6 +1464,21 @@ Bt => {
        modified_flags => $status_flags  # only CF is set, but the other flags are undefined
 },
 
+Call => {
+       state     => "exc_pinned",
+       reg_req   => {
+               in  => [ "gp", "gp", "none", "gp", "esp", "fpcw", "eax", "ecx", "edx" ],
+               out => [ "esp", "fpcw", "none", "eax", "ecx", "edx", "vf0", "vf1", "vf2", "vf3", "vf4", "vf5", "vf6", "vf7", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7" ]
+       },
+       ins       => [ "base", "index", "mem", "addr", "stack", "fpcw", "eax", "ecx", "edx" ],
+       outs      => [ "stack:I|S", "fpcw:I", "M", "eax", "ecx", "edx", "vf0", "vf1", "vf2", "vf3", "vf4", "vf5", "vf6", "vf7", "xmm0", "xmm1", "xmm2", "xmm3", "xmm4", "xmm5", "xmm6", "xmm7" ],
+       attr_type => "ia32_call_attr_t",
+       attr      => "unsigned pop, ir_type *call_tp",
+       am        => "source,unary",
+       units     => [ "BRANCH" ],
+       latency   => 4, # random number
+},
+
 #-----------------------------------------------------------------------------#
 #   _____ _____ ______    __ _             _                     _            #
 #  / ____/ ____|  ____|  / _| |           | |                   | |           #
@@ -2319,7 +2337,7 @@ fild => {
        state     => "exc_pinned",
        rd_constructor => "NONE",
        reg_req   => { },
-       emit      => '. fild%M %AM',
+       emit      => '. fild%XM %AM',
        attr_type => "ia32_x87_attr_t",
        latency   => 2,
 },
@@ -2328,7 +2346,7 @@ fist => {
        state     => "exc_pinned",
        rd_constructor => "NONE",
        reg_req   => { },
-       emit      => '. fist%M %AM',
+       emit      => '. fist%XM %AM',
        mode      => "mode_M",
        attr_type => "ia32_x87_attr_t",
        latency   => 2,
@@ -2338,7 +2356,7 @@ fistp => {
        state     => "exc_pinned",
        rd_constructor => "NONE",
        reg_req   => { },
-       emit      => '. fistp%M %AM',
+       emit      => '. fistp%XM %AM',
        mode      => "mode_M",
        attr_type => "ia32_x87_attr_t",
        latency   => 2,
@@ -2349,7 +2367,7 @@ fisttp => {
        state     => "exc_pinned",
        rd_constructor => "NONE",
        reg_req   => { },
-       emit      => '. fisttp%M %AM',
+       emit      => '. fisttp%XM %AM',
        mode      => "mode_M",
        attr_type => "ia32_x87_attr_t",
        latency   => 2,