added lowering for lowered intrinsic operations

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

diff --git a/ir/be/ia32/ia32_optimize.c b/ir/be/ia32/ia32_optimize.c
index d70f8b9..2198bc1 100644 (file)
--- a/ir/be/ia32/ia32_optimize.c
+++ b/ir/be/ia32/ia32_optimize.c
@@ -1,4 +1,4 @@
-/*
+/**
  * Project:     libFIRM
  * File name:   ir/be/ia32/ia32_optimize.c
  * Purpose:     Implements several optimizations for IA32
@@ -1179,7 +1179,7 @@ static ir_node *fold_addr(ia32_code_gen_t *cg, ir_node *irn, ir_node *noreg) {
 
                am_flav = ia32_am_N;
                /* determine new am flavour */
-               if (offs || offs_cnst || offs_lea) {
+               if (offs || offs_cnst || offs_lea || have_am_sc) {
                        am_flav |= ia32_O;
                }
                if (! be_is_NoReg(cg, base)) {
@@ -1522,6 +1522,8 @@ static void optimize_am(ir_node *irn, void *env) {
                                        DBG_OPT_AM_D(load, store, irn);
 
                                        DB((mod, LEVEL_1, "merged with %+F and %+F into dest AM\n", load, store));
+
+                                       need_exchange_on_fail = 0;
                                }
                        } /* if (store) */
                        else if (get_ia32_am_support(irn) & ia32_am_Source) {
@@ -1535,7 +1537,7 @@ static void optimize_am(ir_node *irn, void *env) {
                }
 
                /* was exchanged but optimize failed: exchange back */
-               if (check_am_src && need_exchange_on_fail) {
+               if (need_exchange_on_fail) {
                        exchange_left_right(irn, &left, &right, 3, 2);
                        cand = orig_cand;
                }