fix fucompp emitter when no register is needed

[libfirm] / ir / be / ia32 / ia32_finish.c

diff --git a/ir/be/ia32/ia32_finish.c b/ir/be/ia32/ia32_finish.c
index 0a39293..f5f40e1 100644 (file)
--- a/ir/be/ia32/ia32_finish.c
+++ b/ir/be/ia32/ia32_finish.c
@@ -221,6 +221,7 @@ static INLINE int need_constraint_copy(ir_node *irn) {
                ! is_ia32_Conv_I2I(irn)     && \
                ! is_ia32_Conv_I2I8Bit(irn) && \
                ! is_ia32_CmpCMov(irn)      && \
+               ! is_ia32_PsiCondCMov(irn)  && \
                ! is_ia32_CmpSet(irn);
 }
 
@@ -299,10 +300,36 @@ insert_copy:
                        }
                }
 
-               /* If we have a CondJmp/CmpSet/xCmpSet with immediate, we need to    */
-               /* check if it's the right operand, otherwise we have */
-               /* to change it, as CMP doesn't support immediate as  */
-               /* left operands.                                     */
+               /* check xCmp: try to avoid unordered cmp */
+               if ((is_ia32_xCmp(irn) || is_ia32_xCmpCMov(irn) || is_ia32_xCmpSet(irn)) &&
+                       op_tp == ia32_Normal    &&
+                       ! is_ia32_ImmConst(irn) && ! is_ia32_ImmSymConst(irn))
+               {
+                       long pnc = get_ia32_pncode(irn);
+
+                       if (pnc & pn_Cmp_Uo) {
+                               ir_node *tmp;
+                               int idx1 = 2, idx2 = 3;
+
+                               if (is_ia32_xCmpCMov(irn)) {
+                                       idx1 = 0;
+                                       idx2 = 1;
+                               }
+
+                               tmp = get_irn_n(irn, idx1);
+                               set_irn_n(irn, idx1, get_irn_n(irn, idx2));
+                               set_irn_n(irn, idx2, tmp);
+
+                               set_ia32_pncode(irn, get_negated_pnc(pnc, mode_D));
+                       }
+               }
+
+               /*
+                       If we have a CondJmp/CmpSet/xCmpSet with immediate,
+                       we need to check if it's the right operand, otherwise
+                       we have to change it, as CMP doesn't support immediate
+                       as left operands.
+               */
                if ((is_ia32_CondJmp(irn) || is_ia32_CmpSet(irn) || is_ia32_xCmpSet(irn)) &&
                        (is_ia32_ImmConst(irn) || is_ia32_ImmSymConst(irn))                   &&
                        op_tp == ia32_AddrModeS)
@@ -324,7 +351,7 @@ end: ;
  */
 static void fix_am_source(ir_node *irn, void *env) {
        ia32_code_gen_t *cg = env;
-       ir_node *base, *index;
+       ir_node *base, *index, *noreg;
        const arch_register_t *reg_base, *reg_index;
        const ia32_register_req_t **reqs;
        int n_res, i;
@@ -340,6 +367,8 @@ static void fix_am_source(ir_node *irn, void *env) {
        reg_index = arch_get_irn_register(cg->arch_env, index);
        reqs      = get_ia32_out_req_all(irn);
 
+       noreg = ia32_new_NoReg_gp(cg);
+
        n_res = get_ia32_n_res(irn);
 
        for (i = 0; i < n_res; i++) {
@@ -402,6 +431,8 @@ static void fix_am_source(ir_node *irn, void *env) {
                                set_irn_n(irn, 3, load);
 
                                /* this is a normal node now */
+                               set_irn_n(irn, 0, noreg);
+                               set_irn_n(irn, 1, noreg);
                                set_ia32_op_type(irn, ia32_Normal);
 
                                break;