register slots are now automatically allocated together with the $ARCH_attribute
[libfirm] / ir / be / ia32 / ia32_optimize.c
index 73ca2c1..769bebb 100644 (file)
 
 #include "../be_t.h"
 #include "../beabi.h"
+#include "../benode_t.h"
+#include "../besched_t.h"
 
 #include "ia32_new_nodes.h"
 #include "bearch_ia32_t.h"
 #include "gen_ia32_regalloc_if.h"     /* the generated interface (register type and class defenitions) */
+#include "ia32_transform.h"
+#include "ia32_dbg_stat.h"
 
 #undef is_NoMem
 #define is_NoMem(irn) (get_irn_op(irn) == op_NoMem)
 
-static int be_is_NoReg(be_abi_irg_t *babi, const ir_node *irn) {
-       if (be_abi_get_callee_save_irn(babi, &ia32_gp_regs[REG_XXX]) == irn ||
-               be_abi_get_callee_save_irn(babi, &ia32_fp_regs[REG_XXXX]) == irn)
-       {
-               return 1;
-       }
+typedef int is_op_func_t(const ir_node *n);
 
-       return 0;
+/**
+ * checks if a node represents the NOREG value
+ */
+static int be_is_NoReg(ia32_code_gen_t *cg, const ir_node *irn) {
+  be_abi_irg_t *babi = cg->birg->abi;
+       const arch_register_t *fp_noreg = USE_SSE2(cg) ?
+               &ia32_xmm_regs[REG_XMM_NOREG] : &ia32_vfp_regs[REG_VFP_NOREG];
+
+       return (be_abi_get_callee_save_irn(babi, &ia32_gp_regs[REG_GP_NOREG]) == irn) ||
+              (be_abi_get_callee_save_irn(babi, fp_noreg) == irn);
 }
 
+
+
+/*************************************************
+ *   _____                _              _
+ *  / ____|              | |            | |
+ * | |     ___  _ __  ___| |_ __ _ _ __ | |_ ___
+ * | |    / _ \| '_ \/ __| __/ _` | '_ \| __/ __|
+ * | |___| (_) | | | \__ \ || (_| | | | | |_\__ \
+ *  \_____\___/|_| |_|___/\__\__,_|_| |_|\__|___/
+ *
+ *************************************************/
+
 /**
  * creates a unique ident by adding a number to a tag
  *
@@ -63,8 +83,18 @@ static ir_node *gen_SymConst(ia32_transform_env_t *env) {
        ir_graph *irg   = env->irg;
        ir_node  *block = env->block;
 
-       cnst = new_rd_ia32_Const(dbg, irg, block, mode);
+       if (mode_is_float(mode)) {
+               FP_USED(env->cg);
+               if (USE_SSE2(env->cg))
+                       cnst = new_rd_ia32_xConst(dbg, irg, block, get_irg_no_mem(irg), mode);
+               else
+                       cnst = new_rd_ia32_vfConst(dbg, irg, block, get_irg_no_mem(irg), mode);
+       }
+       else
+               cnst = new_rd_ia32_Const(dbg, irg, block, get_irg_no_mem(irg), mode);
+
        set_ia32_Const_attr(cnst, env->irn);
+
        return cnst;
 }
 
@@ -93,7 +123,7 @@ static ir_type *get_prim_type(pmap *types, ir_mode *mode)
 static entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst)
 {
        tarval *tv    = get_Const_tarval(cnst);
-       pmap_entry *e = pmap_find(cg->tv_ent, tv);
+       pmap_entry *e = pmap_find(cg->isa->tv_ent, tv);
        entity *res;
        ir_graph *rem;
 
@@ -101,7 +131,7 @@ static entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst)
                ir_mode *mode = get_irn_mode(cnst);
                ir_type *tp = get_Const_type(cnst);
                if (tp == firm_unknown_type)
-                       tp = get_prim_type(cg->types, mode);
+                       tp = get_prim_type(cg->isa->types, mode);
 
                res = new_entity(get_glob_type(), unique_id("ia32FloatCnst_%u"), tp);
 
@@ -116,6 +146,8 @@ static entity *get_entity_for_tv(ia32_code_gen_t *cg, ir_node *cnst)
                current_ir_graph = get_const_code_irg();
                set_atomic_ent_value(res, new_Const_type(tv, tp));
                current_ir_graph = rem;
+
+               pmap_insert(cg->isa->tv_ent, tv, res);
        }
        else
                res = e->value;
@@ -141,6 +173,15 @@ static ir_node *gen_Const(ia32_transform_env_t *env) {
        ir_mode  *mode  = env->mode;
 
        if (mode_is_float(mode)) {
+               FP_USED(env->cg);
+               if (! USE_SSE2(env->cg)) {
+                       cnst_classify_t clss = classify_Const(node);
+
+                       if (clss == CNST_NULL)
+                               return new_rd_ia32_vfldz(dbg, irg, block, mode);
+                       else if (clss == CNST_ONE)
+                               return new_rd_ia32_vfld1(dbg, irg, block, mode);
+               }
                sym.entity_p = get_entity_for_tv(env->cg, node);
 
                cnst = new_rd_SymConst(dbg, irg, block, sym, symconst_addr_ent);
@@ -148,7 +189,7 @@ static ir_node *gen_Const(ia32_transform_env_t *env) {
                cnst = gen_SymConst(env);
        }
        else {
-               cnst = new_rd_ia32_Const(dbg, irg, block, get_irn_mode(node));
+               cnst = new_rd_ia32_Const(dbg, irg, block, get_irg_no_mem(irg), get_irn_mode(node));
                set_ia32_Const_attr(cnst, node);
        }
        return cnst;
@@ -159,7 +200,7 @@ static ir_node *gen_Const(ia32_transform_env_t *env) {
 /**
  * Transforms (all) Const's into ia32_Const and places them in the
  * block where they are used (or in the cfg-pred Block in case of Phi's).
- * Additionally all mode_P nodes are changed into mode_Is nodes.
+ * Additionally all reference nodes are changed into mode_Is nodes.
  */
 void ia32_place_consts_set_modes(ir_node *irn, void *env) {
        ia32_code_gen_t      *cg = env;
@@ -174,16 +215,16 @@ void ia32_place_consts_set_modes(ir_node *irn, void *env) {
 
        mode = get_irn_mode(irn);
 
-       /* transform all mode_P nodes into mode_Is nodes */
-       if (mode == mode_P) {
-               set_irn_mode(irn, mode_Is);
+       /* transform all reference nodes into mode_Is nodes */
+       if (mode_is_reference(mode)) {
                mode = mode_Is;
+               set_irn_mode(irn, mode);
        }
 
        tenv.block    = get_nodes_block(irn);
        tenv.cg       = cg;
        tenv.irg      = cg->irg;
-       tenv.mod      = cg->mod;
+       DEBUG_ONLY(tenv.mod      = cg->mod;)
 
        /* Loop over all predecessors and check for Sym/Const nodes */
        for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
@@ -201,7 +242,7 @@ void ia32_place_consts_set_modes(ir_node *irn, void *env) {
                }
 
                /* put the const into the block where the original const was */
-               if (! cg->opt.placecnst) {
+               if (! (cg->opt & IA32_OPT_PLACECNST)) {
                        tenv.block = get_nodes_block(pred);
                }
 
@@ -224,6 +265,308 @@ void ia32_place_consts_set_modes(ir_node *irn, void *env) {
 }
 
 
+
+/********************************************************************************************************
+ *  _____                _           _         ____        _   _           _          _   _
+ * |  __ \              | |         | |       / __ \      | | (_)         (_)        | | (_)
+ * | |__) |__  ___ _ __ | |__   ___ | | ___  | |  | |_ __ | |_ _ _ __ ___  _ ______ _| |_ _  ___  _ __
+ * |  ___/ _ \/ _ \ '_ \| '_ \ / _ \| |/ _ \ | |  | | '_ \| __| | '_ ` _ \| |_  / _` | __| |/ _ \| '_ \
+ * | |  |  __/  __/ |_) | | | | (_) | |  __/ | |__| | |_) | |_| | | | | | | |/ / (_| | |_| | (_) | | | |
+ * |_|   \___|\___| .__/|_| |_|\___/|_|\___|  \____/| .__/ \__|_|_| |_| |_|_/___\__,_|\__|_|\___/|_| |_|
+ *                | |                               | |
+ *                |_|                               |_|
+ ********************************************************************************************************/
+
+/**
+ * NOTE: THESE PEEPHOLE OPTIMIZATIONS MUST BE CALLED AFTER SCHEDULING AND REGISTER ALLOCATION.
+ */
+
+static int ia32_cnst_compare(ir_node *n1, ir_node *n2) {
+       return get_ia32_id_cnst(n1) == get_ia32_id_cnst(n2);
+}
+
+/**
+ * Checks for potential CJmp/CJmpAM optimization candidates.
+ */
+static ir_node *ia32_determine_cjmp_cand(ir_node *irn, is_op_func_t *is_op_func) {
+       ir_node *cand = NULL;
+       ir_node *prev = sched_prev(irn);
+
+       if (is_Block(prev)) {
+               if (get_Block_n_cfgpreds(prev) == 1)
+                       prev = get_Block_cfgpred(prev, 0);
+               else
+                       prev = NULL;
+       }
+
+       /* The predecessor must be a ProjX. */
+       if (prev && is_Proj(prev) && get_irn_mode(prev) == mode_X) {
+               prev = get_Proj_pred(prev);
+
+               if (is_op_func(prev))
+                       cand = prev;
+       }
+
+       return cand;
+}
+
+static int is_TestJmp_cand(const ir_node *irn) {
+       return is_ia32_TestJmp(irn) || is_ia32_And(irn);
+}
+
+/**
+ * Checks if two consecutive arguments of cand matches
+ * the two arguments of irn (TestJmp).
+ */
+static int is_TestJmp_replacement(ir_node *cand, ir_node *irn) {
+       ir_node *in1       = get_irn_n(irn, 0);
+       ir_node *in2       = get_irn_n(irn, 1);
+       int      i, n      = get_irn_arity(cand);
+       int      same_args = 0;
+
+       for (i = 0; i < n - 1; i++) {
+               if (get_irn_n(cand, i)     == in1 &&
+                       get_irn_n(cand, i + 1) == in2)
+               {
+                       same_args = 1;
+                       break;
+               }
+       }
+
+       if (same_args)
+               return ia32_cnst_compare(cand, irn);
+
+       return 0;
+}
+
+/**
+ * Tries to replace a TestJmp by a CJmp or CJmpAM (in case of And)
+ */
+static void ia32_optimize_TestJmp(ir_node *irn, ia32_code_gen_t *cg) {
+       ir_node *cand    = ia32_determine_cjmp_cand(irn, is_TestJmp_cand);
+       int      replace = 0;
+
+       /* we found a possible candidate */
+       replace = cand ? is_TestJmp_replacement(cand, irn) : 0;
+
+       if (replace) {
+               DBG((cg->mod, LEVEL_1, "replacing %+F by ", irn));
+
+               if (is_ia32_And(cand))
+                       set_irn_op(irn, op_ia32_CJmpAM);
+               else
+                       set_irn_op(irn, op_ia32_CJmp);
+
+               DB((cg->mod, LEVEL_1, "%+F\n", irn));
+       }
+}
+
+static int is_CondJmp_cand(const ir_node *irn) {
+       return is_ia32_CondJmp(irn) || is_ia32_Sub(irn);
+}
+
+/**
+ * Checks if the arguments of cand are the same of irn.
+ */
+static int is_CondJmp_replacement(ir_node *cand, ir_node *irn) {
+       int i, n      = get_irn_arity(cand);
+       int same_args = 1;
+
+       for (i = 0; i < n; i++) {
+               if (get_irn_n(cand, i) != get_irn_n(irn, i)) {
+                       same_args = 0;
+                       break;
+               }
+       }
+
+       if (same_args)
+               return ia32_cnst_compare(cand, irn);
+
+       return 0;
+}
+
+/**
+ * Tries to replace a CondJmp by a CJmpAM
+ */
+static void ia32_optimize_CondJmp(ir_node *irn, ia32_code_gen_t *cg) {
+       ir_node *cand    = ia32_determine_cjmp_cand(irn, is_CondJmp_cand);
+       int      replace = 0;
+
+       /* we found a possible candidate */
+       replace = cand ? is_CondJmp_replacement(cand, irn) : 0;
+
+       if (replace) {
+               DBG((cg->mod, LEVEL_1, "replacing %+F by ", irn));
+               DBG_OPT_CJMP(irn);
+
+               set_irn_op(irn, op_ia32_CJmpAM);
+
+               DB((cg->mod, LEVEL_1, "%+F\n", irn));
+       }
+}
+
+/**
+ * Creates a Push from Store(IncSP(gp_reg_size))
+ */
+static void ia32_create_Push(ir_node *irn, ia32_code_gen_t *cg) {
+       ir_node *sp  = get_irn_n(irn, 0);
+       ir_node *val, *next, *push, *bl, *proj_M, *proj_res, *old_proj_M;
+       const ir_edge_t *edge;
+
+       if (get_ia32_am_offs(irn) || !be_is_IncSP(sp))
+               return;
+
+       if (arch_get_irn_register(cg->arch_env, get_irn_n(irn, 1)) !=
+               &ia32_gp_regs[REG_GP_NOREG])
+               return;
+
+       val = get_irn_n(irn, 2);
+       if (mode_is_float(get_irn_mode(val)))
+               return;
+
+       if (be_get_IncSP_direction(sp) != be_stack_dir_expand ||
+               be_get_IncSP_offset(sp) != get_mode_size_bytes(ia32_reg_classes[CLASS_ia32_gp].mode))
+               return;
+
+       /* ok, translate into Push */
+       edge = get_irn_out_edge_first(irn);
+       old_proj_M = get_edge_src_irn(edge);
+
+       next = sched_next(irn);
+       sched_remove(irn);
+       sched_remove(sp);
+
+       bl   = get_nodes_block(irn);
+       push = new_rd_ia32_Push(NULL, current_ir_graph, bl,
+               be_get_IncSP_pred(sp), val, be_get_IncSP_mem(sp));
+       proj_res = new_r_Proj(current_ir_graph, bl, push, get_irn_mode(sp), pn_ia32_Push_stack);
+       proj_M   = new_r_Proj(current_ir_graph, bl, push, mode_M, pn_ia32_Push_M);
+
+       /* copy a possible constant from the store */
+       set_ia32_id_cnst(push, get_ia32_id_cnst(irn));
+       set_ia32_immop_type(push, get_ia32_immop_type(irn));
+
+       /* the push must have SP out register */
+       arch_set_irn_register(cg->arch_env, push, arch_get_irn_register(cg->arch_env, sp));
+
+       exchange(old_proj_M, proj_M);
+       exchange(sp, proj_res);
+       sched_add_before(next, push);
+       sched_add_after(push, proj_res);
+}
+
+/**
+ * Creates a Pop from IncSP(Load(sp))
+ */
+static void ia32_create_Pop(ir_node *irn, ia32_code_gen_t *cg) {
+       ir_node *old_proj_M = be_get_IncSP_mem(irn);
+       ir_node *load = skip_Proj(old_proj_M);
+       ir_node *old_proj_res = NULL;
+       ir_node *bl, *pop, *next, *proj_res, *proj_sp, *proj_M;
+       const ir_edge_t *edge;
+       const arch_register_t *reg, *sp;
+
+       if (! is_ia32_Load(load) || get_ia32_am_offs(load))
+               return;
+
+       if (arch_get_irn_register(cg->arch_env, get_irn_n(load, 1)) !=
+               &ia32_gp_regs[REG_GP_NOREG])
+               return;
+       if (arch_get_irn_register(cg->arch_env, get_irn_n(load, 0)) != cg->isa->arch_isa.sp)
+               return;
+
+       /* ok, translate into pop */
+       foreach_out_edge(load, edge) {
+               ir_node *succ = get_edge_src_irn(edge);
+               if (succ != old_proj_M) {
+                       old_proj_res = succ;
+                       break;
+               }
+       }
+       if (! old_proj_res) {
+               assert(0);
+               return; /* should not happen */
+       }
+
+       bl = get_nodes_block(load);
+
+       /* IncSP is typically scheduled after the load, so remove it first */
+       sched_remove(irn);
+       next = sched_next(old_proj_res);
+       sched_remove(old_proj_res);
+       sched_remove(load);
+
+       reg = arch_get_irn_register(cg->arch_env, load);
+       sp  = arch_get_irn_register(cg->arch_env, irn);
+
+       pop      = new_rd_ia32_Pop(NULL, current_ir_graph, bl, get_irn_n(irn, 0), get_irn_n(load, 2));
+       proj_res = new_r_Proj(current_ir_graph, bl, pop, get_irn_mode(old_proj_res), pn_ia32_Pop_res);
+       proj_sp  = new_r_Proj(current_ir_graph, bl, pop, get_irn_mode(irn), pn_ia32_Pop_stack);
+       proj_M   = new_r_Proj(current_ir_graph, bl, pop, mode_M, pn_ia32_Pop_M);
+
+       exchange(old_proj_M, proj_M);
+       exchange(old_proj_res, proj_res);
+       exchange(irn, proj_sp);
+
+       arch_set_irn_register(cg->arch_env, proj_res, reg);
+       arch_set_irn_register(cg->arch_env, proj_sp, sp);
+
+       sched_add_before(next, proj_sp);
+       sched_add_before(proj_sp, proj_res);
+       sched_add_before(proj_res,pop);
+}
+
+/**
+ * Tries to optimize two following IncSP.
+ */
+static void ia32_optimize_IncSP(ir_node *irn, ia32_code_gen_t *cg) {
+       ir_node *prev = be_get_IncSP_pred(irn);
+       int real_uses = get_irn_n_edges(prev);
+
+       if (be_is_IncSP(prev) && real_uses == 1) {
+               /* first IncSP has only one IncSP user, kill the first one */
+               unsigned       prev_offs = be_get_IncSP_offset(prev);
+               be_stack_dir_t prev_dir  = be_get_IncSP_direction(prev);
+               unsigned       curr_offs = be_get_IncSP_offset(irn);
+               be_stack_dir_t curr_dir  = be_get_IncSP_direction(irn);
+
+               int new_ofs = prev_offs * (prev_dir == be_stack_dir_expand ? -1 : +1) +
+                                   curr_offs * (curr_dir == be_stack_dir_expand ? -1 : +1);
+
+               if (new_ofs < 0) {
+                       new_ofs  = -new_ofs;
+                       curr_dir = be_stack_dir_expand;
+               }
+               else
+                       curr_dir = be_stack_dir_shrink;
+               be_set_IncSP_offset(prev, 0);
+               be_set_IncSP_offset(irn, (unsigned)new_ofs);
+               be_set_IncSP_direction(irn, curr_dir);
+
+               /* Omit the optimized IncSP */
+               be_set_IncSP_pred(irn, be_get_IncSP_pred(prev));
+       }
+}
+
+/**
+ * Performs Peephole Optimizations.
+ */
+void ia32_peephole_optimization(ir_node *irn, void *env) {
+       ia32_code_gen_t *cg = env;
+
+       if (is_ia32_TestJmp(irn))
+               ia32_optimize_TestJmp(irn, cg);
+       else if (is_ia32_CondJmp(irn))
+               ia32_optimize_CondJmp(irn, cg);
+       /* seems to be buggy when using Pushes */
+//     else if (be_is_IncSP(irn))
+//             ia32_optimize_IncSP(irn, cg);
+       else if (is_ia32_Store(irn))
+               ia32_create_Push(irn, cg);
+}
+
+
+
 /******************************************************************
  *              _     _                   __  __           _
  *     /\      | |   | |                 |  \/  |         | |
@@ -234,7 +577,7 @@ void ia32_place_consts_set_modes(ir_node *irn, void *env) {
  *
  ******************************************************************/
 
-static int node_is_comm(const ir_node *irn) {
+static int node_is_ia32_comm(const ir_node *irn) {
        return is_ia32_irn(irn) ? is_ia32_commutative(irn) : 0;
 }
 
@@ -271,7 +614,7 @@ static ir_node *get_mem_proj(const ir_node *irn) {
 }
 
 /**
- * Returns the Proj with number 0 connected to irn.
+ * Returns the first Proj with mode != mode_M connected to irn.
  */
 static ir_node *get_res_proj(const ir_node *irn) {
        const ir_edge_t *edge;
@@ -284,7 +627,7 @@ static ir_node *get_res_proj(const ir_node *irn) {
 
                assert(is_Proj(src) && "Proj expected");
 
-               if (get_Proj_proj(src) == 0)
+               if (get_irn_mode(src) != mode_M)
                        return src;
        }
 
@@ -298,7 +641,7 @@ static ir_node *get_res_proj(const ir_node *irn) {
  * @param is_op_func The check-function
  * @return 1 if conditions are fulfilled, 0 otherwise
  */
-static int pred_is_specific_node(const ir_node *pred, int (*is_op_func)(const ir_node *n)) {
+static int pred_is_specific_node(const ir_node *pred, is_op_func_t *is_op_func) {
        if (is_Proj(pred) && is_op_func(get_Proj_pred(pred))) {
                return 1;
        }
@@ -328,9 +671,7 @@ static int pred_is_specific_nodeblock(const ir_node *bl, const ir_node *pred,
        return 0;
 }
 
-static int is_addr_candidate(const ir_node *block, const ir_node *irn) {
 
-}
 
 /**
  * Checks if irn is a candidate for address calculation or address mode.
@@ -351,22 +692,24 @@ static int is_addr_candidate(const ir_node *block, const ir_node *irn) {
  * return 1 if irn is a candidate for AC or AM, 0 otherwise
  */
 static int is_candidate(const ir_node *block, const ir_node *irn, int check_addr) {
-       ir_node *load_proj;
+       ir_node *in;
        int      n, is_cand = check_addr;
 
-       if (pred_is_specific_nodeblock(block, get_irn_n(irn, 2), is_ia32_Load)) {
-               load_proj = get_irn_n(irn, 2);
-               n         = ia32_get_irn_n_edges(load_proj);
+       in = get_irn_n(irn, 2);
+
+       if (pred_is_specific_nodeblock(block, in, is_ia32_Ld)) {
+               n         = ia32_get_irn_n_edges(in);
                is_cand   = check_addr ? (n == 1 ? 0 : is_cand) : (n == 1 ? 1 : is_cand);
        }
 
-       if (pred_is_specific_nodeblock(block, get_irn_n(irn, 3), is_ia32_Load)) {
-               load_proj = get_irn_n(irn, 3);
-               n         = ia32_get_irn_n_edges(load_proj);
+       in = get_irn_n(irn, 3);
+
+       if (pred_is_specific_nodeblock(block, in, is_ia32_Ld)) {
+               n         = ia32_get_irn_n_edges(in);
                is_cand   = check_addr ? (n == 1 ? 0 : is_cand) : (n == 1 ? 1 : is_cand);
        }
 
-       is_cand = get_ia32_frame_ent(irn) ? (check_addr ? 1 : 0) : (check_addr ? 0 : 1);
+       is_cand = get_ia32_frame_ent(irn) ? (check_addr ? 1 : 0) : is_cand;
 
        return is_cand;
 }
@@ -381,30 +724,162 @@ static int load_store_addr_is_equal(const ir_node *load, const ir_node *store,
        int     is_equal = (addr_b == get_irn_n(load, 0)) && (addr_i == get_irn_n(load, 1));
        entity *lent     = get_ia32_frame_ent(load);
        entity *sent     = get_ia32_frame_ent(store);
+       ident  *lid      = get_ia32_am_sc(load);
+       ident  *sid      = get_ia32_am_sc(store);
+       char   *loffs    = get_ia32_am_offs(load);
+       char   *soffs    = get_ia32_am_offs(store);
 
        /* are both entities set and equal? */
-       is_equal = (lent && sent && (lent == sent)) ? 1 : is_equal;
+       if (is_equal && (lent || sent))
+               is_equal = lent && sent && (lent == sent);
+
+       /* are address mode idents set and equal? */
+       if (is_equal && (lid || sid))
+               is_equal = lid && sid && (lid == sid);
+
+       /* are offsets set and equal */
+       if (is_equal && (loffs || soffs))
+               is_equal = loffs && soffs && strcmp(loffs, soffs) == 0;
+
+       /* are the load and the store of the same mode? */
+       is_equal = is_equal ? get_ia32_ls_mode(load) == get_ia32_ls_mode(store) : 0;
 
        return is_equal;
 }
 
+typedef enum _ia32_take_lea_attr {
+       IA32_LEA_ATTR_NONE  = 0,
+       IA32_LEA_ATTR_BASE  = (1 << 0),
+       IA32_LEA_ATTR_INDEX = (1 << 1),
+       IA32_LEA_ATTR_OFFS  = (1 << 2),
+       IA32_LEA_ATTR_SCALE = (1 << 3),
+       IA32_LEA_ATTR_AMSC  = (1 << 4),
+       IA32_LEA_ATTR_FENT  = (1 << 5)
+} ia32_take_lea_attr;
+
+/**
+ * Decides if we have to keep the LEA operand or if we can assimilate it.
+ */
+static int do_new_lea(ir_node *irn, ir_node *base, ir_node *index, ir_node *lea,
+               int have_am_sc, ia32_code_gen_t *cg)
+{
+       ir_node *lea_base = get_irn_n(lea, 0);
+       ir_node *lea_idx  = get_irn_n(lea, 1);
+       entity  *irn_ent  = get_ia32_frame_ent(irn);
+       entity  *lea_ent  = get_ia32_frame_ent(lea);
+       int      ret_val  = 0;
+       int      is_noreg_base  = be_is_NoReg(cg, base);
+       int      is_noreg_index = be_is_NoReg(cg, index);
+       ia32_am_flavour_t am_flav = get_ia32_am_flavour(lea);
+
+       /* If the Add and the LEA both have a different frame entity set: keep */
+       if (irn_ent && lea_ent && (irn_ent != lea_ent))
+               return IA32_LEA_ATTR_NONE;
+       else if (! irn_ent && lea_ent)
+               ret_val |= IA32_LEA_ATTR_FENT;
+
+       /* If the Add and the LEA both have already an address mode symconst: keep */
+       if (have_am_sc && get_ia32_am_sc(lea))
+               return IA32_LEA_ATTR_NONE;
+       else if (get_ia32_am_sc(lea))
+               ret_val |= IA32_LEA_ATTR_AMSC;
+
+       /* Check the different base-index combinations */
+
+       if (! is_noreg_base && ! is_noreg_index) {
+               /* Assimilate if base is the lea and the LEA is just a Base + Offset calculation */
+               if ((base == lea) && ! (am_flav & ia32_I ? 1 : 0)) {
+                       if (am_flav & ia32_O)
+                               ret_val |= IA32_LEA_ATTR_OFFS;
+
+                       ret_val |= IA32_LEA_ATTR_BASE;
+               }
+               else
+                       return IA32_LEA_ATTR_NONE;
+       }
+       else if (! is_noreg_base && is_noreg_index) {
+               /* Base is set but index not */
+               if (base == lea) {
+                       /* Base points to LEA: assimilate everything */
+                       if (am_flav & ia32_O)
+                               ret_val |= IA32_LEA_ATTR_OFFS;
+                       if (am_flav & ia32_S)
+                               ret_val |= IA32_LEA_ATTR_SCALE;
+                       if (am_flav & ia32_I)
+                               ret_val |= IA32_LEA_ATTR_INDEX;
+
+                       ret_val |= IA32_LEA_ATTR_BASE;
+               }
+               else if (am_flav & ia32_B ? 0 : 1) {
+                       /* Base is not the LEA but the LEA is an index only calculation: assimilate */
+                       if (am_flav & ia32_O)
+                               ret_val |= IA32_LEA_ATTR_OFFS;
+                       if (am_flav & ia32_S)
+                               ret_val |= IA32_LEA_ATTR_SCALE;
+
+                       ret_val |= IA32_LEA_ATTR_INDEX;
+               }
+               else
+                       return IA32_LEA_ATTR_NONE;
+       }
+       else if (is_noreg_base && ! is_noreg_index) {
+               /* Index is set but not base */
+               if (index == lea) {
+                       /* Index points to LEA: assimilate everything */
+                       if (am_flav & ia32_O)
+                               ret_val |= IA32_LEA_ATTR_OFFS;
+                       if (am_flav & ia32_S)
+                               ret_val |= IA32_LEA_ATTR_SCALE;
+                       if (am_flav & ia32_B)
+                               ret_val |= IA32_LEA_ATTR_BASE;
+
+                       ret_val |= IA32_LEA_ATTR_INDEX;
+               }
+               else if (am_flav & ia32_I ? 0 : 1) {
+                       /* Index is not the LEA but the LEA is a base only calculation: assimilate */
+                       if (am_flav & ia32_O)
+                               ret_val |= IA32_LEA_ATTR_OFFS;
+                       if (am_flav & ia32_S)
+                               ret_val |= IA32_LEA_ATTR_SCALE;
+
+                       ret_val |= IA32_LEA_ATTR_BASE;
+               }
+               else
+                       return IA32_LEA_ATTR_NONE;
+       }
+       else {
+               assert(0 && "There must have been set base or index");
+       }
+
+       return ret_val;
+}
+
+
 /**
  * Folds Add or Sub to LEA if possible
  */
-static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *mod, ir_node *noreg) {
-       ir_graph *irg       = get_irn_irg(irn);
-       dbg_info *dbg       = get_irn_dbg_info(irn);
-       ir_node  *block     = get_nodes_block(irn);
-       ir_node  *res       = irn;
-       char     *offs      = NULL;
-       char     *offs_cnst = NULL;
-       char     *offs_lea  = NULL;
-       int       scale     = 0;
-       int       isadd     = 0;
-       int       dolea     = 0;
-       ir_node  *left, *right, *temp;
-       ir_node  *base, *index;
+static ir_node *fold_addr(ia32_code_gen_t *cg, ir_node *irn, ir_node *noreg) {
+       ir_graph   *irg        = get_irn_irg(irn);
+       dbg_info   *dbg        = get_irn_dbg_info(irn);
+       ir_node    *block      = get_nodes_block(irn);
+       ir_node    *res        = irn;
+       ir_node    *shift      = NULL;
+       ir_node    *lea_o      = NULL;
+       ir_node    *lea        = NULL;
+       char       *offs       = NULL;
+       const char *offs_cnst  = NULL;
+       char       *offs_lea   = NULL;
+       int         scale      = 0;
+       int         isadd      = 0;
+       int         dolea      = 0;
+       int         have_am_sc = 0;
+       int         am_sc_sign = 0;
+       ident      *am_sc      = NULL;
+       entity     *lea_ent    = NULL;
+       ir_node    *left, *right, *temp;
+       ir_node    *base, *index;
        ia32_am_flavour_t am_flav;
+       DEBUG_ONLY(firm_dbg_module_t *mod = cg->mod;)
 
        if (is_ia32_Add(irn))
                isadd = 1;
@@ -412,14 +887,8 @@ static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *m
        left  = get_irn_n(irn, 2);
        right = get_irn_n(irn, 3);
 
-       base    = left;
-       index   = noreg;
-       offs    = NULL;
-       scale   = 0;
-       am_flav = 0;
-
        /* "normalize" arguments in case of add with two operands */
-       if  (isadd && ! be_is_NoReg(babi, right)) {
+       if  (isadd && ! be_is_NoReg(cg, right)) {
                /* put LEA == ia32_am_O as right operand */
                if (is_ia32_Lea(left) && get_ia32_am_flavour(left) == ia32_am_O) {
                        set_irn_n(irn, 2, right);
@@ -448,28 +917,48 @@ static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *m
                }
        }
 
-       /* check if operand is either const */
-       if (get_ia32_cnst(irn)) {
-               DBG((mod, LEVEL_1, "\tfound op with imm"));
+       base    = left;
+       index   = noreg;
+       offs    = NULL;
+       scale   = 0;
+       am_flav = 0;
+
+       /* check for operation with immediate */
+       if (is_ia32_ImmConst(irn)) {
+               DBG((mod, LEVEL_1, "\tfound op with imm const"));
 
                offs_cnst = get_ia32_cnst(irn);
                dolea     = 1;
        }
+       else if (is_ia32_ImmSymConst(irn)) {
+               DBG((mod, LEVEL_1, "\tfound op with imm symconst"));
+
+               have_am_sc = 1;
+               dolea      = 1;
+               am_sc      = get_ia32_id_cnst(irn);
+               am_sc_sign = is_ia32_am_sc_sign(irn);
+       }
 
        /* determine the operand which needs to be checked */
-       if (be_is_NoReg(babi, right)) {
+       if (be_is_NoReg(cg, right)) {
                temp = left;
        }
        else {
                temp = right;
        }
 
-       /* check if right operand is AMConst (LEA with ia32_am_O) */
-       if (is_ia32_Lea(temp) && get_ia32_am_flavour(temp) == ia32_am_O) {
+       /* check if right operand is AMConst (LEA with ia32_am_O)  */
+       /* but we can only eat it up if there is no other symconst */
+       /* because the linker won't accept two symconsts           */
+       if (! have_am_sc && is_ia32_Lea(temp) && get_ia32_am_flavour(temp) == ia32_am_O) {
                DBG((mod, LEVEL_1, "\tgot op with LEA am_O"));
 
-               offs_lea = get_ia32_am_offs(temp);
-               dolea    = 1;
+               offs_lea   = get_ia32_am_offs(temp);
+               am_sc      = get_ia32_am_sc(temp);
+               am_sc_sign = is_ia32_am_sc_sign(temp);
+               have_am_sc = 1;
+               dolea      = 1;
+               lea_o      = temp;
        }
 
        if (isadd) {
@@ -487,7 +976,8 @@ static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *m
 
                /* check for SHL 1,2,3 */
                if (pred_is_specific_node(temp, is_ia32_Shl)) {
-                       temp = get_Proj_pred(temp);
+                       temp  = get_Proj_pred(temp);
+                       shift = temp;
 
                        if (get_ia32_Immop_tarval(temp)) {
                                scale = get_tarval_long(get_ia32_Immop_tarval(temp));
@@ -497,11 +987,15 @@ static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *m
 
                                        DBG((mod, LEVEL_1, "\tgot scaled index %+F\n", index));
                                }
+                               else {
+                                       scale = 0;
+                                       shift = NULL;
+                               }
                        }
                }
 
                /* fix base */
-               if (! be_is_NoReg(babi, index)) {
+               if (! be_is_NoReg(cg, index)) {
                        /* if we have index, but left == right -> no base */
                        if (left == right) {
                                base = noreg;
@@ -517,22 +1011,36 @@ static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *m
 
        /* Try to assimilate a LEA as left operand */
        if (is_ia32_Lea(left) && (get_ia32_am_flavour(left) != ia32_am_O)) {
-               am_flav = get_ia32_am_flavour(left);
-
-               /* If we have an Add with a real right operand (not NoReg) and  */
-               /* the LEA contains already an index calculation then we create */
-               /* a new LEA.                                                   */
-               /* If the LEA contains already a frame_entity then we also      */
-               /* create a new one  otherwise we would loose it.               */
-               if (isadd && ((!be_is_NoReg(babi, index) && (am_flav & ia32_am_I)) || get_ia32_frame_ent(left))) {
+               /* check if we can assimilate the LEA */
+               int take_attr = do_new_lea(irn, base, index, left, have_am_sc, cg);
+
+               if (take_attr == IA32_LEA_ATTR_NONE) {
                        DBG((mod, LEVEL_1, "\tleave old LEA, creating new one\n"));
                }
                else {
                        DBG((mod, LEVEL_1, "\tgot LEA as left operand ... assimilating\n"));
-                       offs  = get_ia32_am_offs(left);
-                       base  = get_irn_n(left, 0);
-                       index = get_irn_n(left, 1);
-                       scale = get_ia32_am_scale(left);
+                       lea = left; /* for statistics */
+
+                       if (take_attr & IA32_LEA_ATTR_OFFS)
+                               offs = get_ia32_am_offs(left);
+
+                       if (take_attr & IA32_LEA_ATTR_AMSC) {
+                               am_sc      = get_ia32_am_sc(left);
+                               have_am_sc = 1;
+                               am_sc_sign = is_ia32_am_sc_sign(left);
+                       }
+
+                       if (take_attr & IA32_LEA_ATTR_SCALE)
+                               scale = get_ia32_am_scale(left);
+
+                       if (take_attr & IA32_LEA_ATTR_BASE)
+                               base = get_irn_n(left, 0);
+
+                       if (take_attr & IA32_LEA_ATTR_INDEX)
+                               index = get_irn_n(left, 1);
+
+                       if (take_attr & IA32_LEA_ATTR_FENT)
+                               lea_ent = get_ia32_frame_ent(left);
                }
        }
 
@@ -568,11 +1076,21 @@ static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *m
                        }
                }
 
+               /* set the address mode symconst */
+               if (have_am_sc) {
+                       set_ia32_am_sc(res, am_sc);
+                       if (am_sc_sign)
+                               set_ia32_am_sc_sign(res);
+               }
+
                /* copy the frame entity (could be set in case of Add */
                /* which was a FrameAddr) */
-               set_ia32_frame_ent(res, get_ia32_frame_ent(irn));
+               if (lea_ent)
+                       set_ia32_frame_ent(res, lea_ent);
+               else
+                       set_ia32_frame_ent(res, get_ia32_frame_ent(irn));
 
-               if (is_ia32_use_frame(irn))
+               if (get_ia32_frame_ent(res))
                        set_ia32_use_frame(res);
 
                /* set scale */
@@ -583,10 +1101,10 @@ static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *m
                if (offs || offs_cnst || offs_lea) {
                        am_flav |= ia32_O;
                }
-               if (! be_is_NoReg(babi, base)) {
+               if (! be_is_NoReg(cg, base)) {
                        am_flav |= ia32_B;
                }
-               if (! be_is_NoReg(babi, index)) {
+               if (! be_is_NoReg(cg, index)) {
                        am_flav |= ia32_I;
                }
                if (scale > 0) {
@@ -596,8 +1114,28 @@ static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *m
 
                set_ia32_op_type(res, ia32_AddrModeS);
 
+               SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(cg, irn));
+
                DBG((mod, LEVEL_1, "\tLEA [%+F + %+F * %d + %s]\n", base, index, scale, get_ia32_am_offs(res)));
 
+               /* we will exchange it, report here before the Proj is created */
+               if (shift && lea && lea_o)
+                       DBG_OPT_LEA4(irn, lea_o, lea, shift, res);
+               else if (shift && lea)
+                       DBG_OPT_LEA3(irn, lea, shift, res);
+               else if (shift && lea_o)
+                       DBG_OPT_LEA3(irn, lea_o, shift, res);
+               else if (lea && lea_o)
+                       DBG_OPT_LEA3(irn, lea_o, lea, res);
+               else if (shift)
+                       DBG_OPT_LEA2(irn, shift, res);
+               else if (lea)
+                       DBG_OPT_LEA2(irn, lea, res);
+               else if (lea_o)
+                       DBG_OPT_LEA2(irn, lea_o, res);
+               else
+                       DBG_OPT_LEA1(irn, res);
+
                /* get the result Proj of the Add/Sub */
                irn = get_res_proj(irn);
 
@@ -610,21 +1148,83 @@ static ir_node *fold_addr(be_abi_irg_t *babi, ir_node *irn, firm_dbg_module_t *m
        return res;
 }
 
+
+/**
+ * Merges a Load/Store node with a LEA.
+ * @param irn The Load/Store node
+ * @param lea The LEA
+ */
+static void merge_loadstore_lea(ir_node *irn, ir_node *lea) {
+       entity *irn_ent = get_ia32_frame_ent(irn);
+       entity *lea_ent = get_ia32_frame_ent(lea);
+
+       /* If the irn and the LEA both have a different frame entity set: do not merge */
+       if (irn_ent && lea_ent && (irn_ent != lea_ent))
+               return;
+       else if (! irn_ent && lea_ent) {
+               set_ia32_frame_ent(irn, lea_ent);
+               set_ia32_use_frame(irn);
+       }
+
+       /* get the AM attributes from the LEA */
+       add_ia32_am_offs(irn, get_ia32_am_offs(lea));
+       set_ia32_am_scale(irn, get_ia32_am_scale(lea));
+       set_ia32_am_flavour(irn, get_ia32_am_flavour(lea));
+
+       set_ia32_am_sc(irn, get_ia32_am_sc(lea));
+       if (is_ia32_am_sc_sign(lea))
+               set_ia32_am_sc_sign(irn);
+
+       set_ia32_op_type(irn, is_ia32_Ld(irn) ? ia32_AddrModeS : ia32_AddrModeD);
+
+       /* set base and index */
+       set_irn_n(irn, 0, get_irn_n(lea, 0));
+       set_irn_n(irn, 1, get_irn_n(lea, 1));
+
+       /* clear remat flag */
+       set_ia32_flags(irn, get_ia32_flags(irn) & ~arch_irn_flags_rematerializable);
+
+       if (is_ia32_Ld(irn))
+               DBG_OPT_LOAD_LEA(lea, irn);
+       else
+               DBG_OPT_STORE_LEA(lea, irn);
+
+}
+
+/**
+ * Sets new_right index of irn to right and new_left index to left.
+ * Also exchange left and right
+ */
+static void exchange_left_right(ir_node *irn, ir_node **left, ir_node **right, int new_left, int new_right) {
+       ir_node *temp;
+
+       set_irn_n(irn, new_right, *right);
+       set_irn_n(irn, new_left, *left);
+
+       temp   = *left;
+       *left  = *right;
+       *right = temp;
+
+       /* this is only needed for Compares, but currently ALL nodes
+        * have this attribute :-) */
+       set_ia32_pncode(irn, get_inversed_pnc(get_ia32_pncode(irn)));
+}
+
 /**
  * Optimizes a pattern around irn to address mode if possible.
  */
 void ia32_optimize_am(ir_node *irn, void *env) {
        ia32_code_gen_t   *cg   = env;
-       firm_dbg_module_t *mod  = cg->mod;
        ir_node           *res  = irn;
-       be_abi_irg_t      *babi = cg->birg->abi;
        dbg_info          *dbg;
        ir_mode           *mode;
        ir_node           *block, *noreg_gp, *noreg_fp;
        ir_node           *left, *right, *temp;
        ir_node           *store, *load, *mem_proj;
        ir_node           *succ, *addr_b, *addr_i;
-       int                check_am_src = 0;
+       int               check_am_src = 0;
+       int               need_exchange_on_fail = 0;
+       DEBUG_ONLY(firm_dbg_module_t *mod = cg->mod;)
 
        if (! is_ia32_irn(irn))
                return;
@@ -656,7 +1256,7 @@ void ia32_optimize_am(ir_node *irn, void *env) {
                /* check is irn is a candidate for address calculation */
                if (is_candidate(block, irn, 1)) {
                        DBG((mod, LEVEL_1, "\tfound address calculation candidate %+F ... ", irn));
-                       res = fold_addr(babi, irn, mod, noreg_gp);
+                       res = fold_addr(cg, irn, noreg_gp);
 
                        if (res == irn)
                                DB((mod, LEVEL_1, "transformed into %+F\n", res));
@@ -683,22 +1283,22 @@ void ia32_optimize_am(ir_node *irn, void *env) {
 
        if ((res == irn) && (get_ia32_am_support(irn) != ia32_am_None) && !is_ia32_Lea(irn)) {
                /* 1st: check for Load/Store -> LEA   */
-               if (is_ia32_Ld(irn) || is_ia32_St(irn)) {
+               if (is_ia32_Ld(irn) || is_ia32_St(irn) || is_ia32_Store8Bit(irn)) {
                        left = get_irn_n(irn, 0);
 
                        if (is_ia32_Lea(left)) {
-                               DBG((mod, LEVEL_1, "\nmerging %+F into %+F\n", left, irn));
-
-                               /* get the AM attributes from the LEA */
-                               add_ia32_am_offs(irn, get_ia32_am_offs(left));
-                               set_ia32_am_scale(irn, get_ia32_am_scale(left));
-                               set_ia32_am_flavour(irn, get_ia32_am_flavour(left));
+                               const ir_edge_t *edge, *ne;
+                               ir_node *src;
 
-                               set_ia32_op_type(irn, is_ia32_St(irn) ? ia32_AddrModeD : ia32_AddrModeS);
+                               /* merge all Loads/Stores connected to this LEA with the LEA */
+                               foreach_out_edge_safe(left, edge, ne) {
+                                       src = get_edge_src_irn(edge);
 
-                               /* set base and index */
-                               set_irn_n(irn, 0, get_irn_n(left, 0));
-                               set_irn_n(irn, 1, get_irn_n(left, 1));
+                                       if (src && (is_ia32_Ld(src) || is_ia32_St(src) || is_ia32_Store8Bit(src))) {
+                                               DBG((mod, LEVEL_1, "\nmerging %+F into %+F\n", left, irn));
+                                               merge_loadstore_lea(src, left);
+                                       }
+                               }
                        }
                }
                /* check if the node is an address mode candidate */
@@ -715,18 +1315,14 @@ void ia32_optimize_am(ir_node *irn, void *env) {
                        }
 
                        /* normalize commutative ops */
-                       if (node_is_comm(irn)) {
+                       if (node_is_ia32_comm(irn)) {
                                /* Assure that right operand is always a Load if there is one    */
                                /* because non-commutative ops can only use Dest AM if the right */
                                /* operand is a load, so we only need to check right operand.    */
                                if (pred_is_specific_nodeblock(block, left, is_ia32_Ld))
                                {
-                                       set_irn_n(irn, 2, right);
-                                       set_irn_n(irn, 3, left);
-
-                                       temp  = left;
-                                       left  = right;
-                                       right = temp;
+                                       exchange_left_right(irn, &left, &right, 3, 2);
+                                       need_exchange_on_fail = 1;
                                }
                        }
 
@@ -754,20 +1350,10 @@ void ia32_optimize_am(ir_node *irn, void *env) {
                                if (ia32_get_irn_n_edges(succ) == 1) {
                                        succ = get_edge_src_irn(get_irn_out_edge_first(succ));
 
-                                       if (is_ia32_fStore(succ) || is_ia32_Store(succ)) {
+                                       if (is_ia32_xStore(succ) || is_ia32_Store(succ)) {
                                                store  = succ;
                                                addr_b = get_irn_n(store, 0);
-
-                                               /* Could be that the Store is connected to the address    */
-                                               /* calculating LEA while the Load is already transformed. */
-                                               if (is_ia32_Lea(addr_b)) {
-                                                       succ   = addr_b;
-                                                       addr_b = get_irn_n(succ, 0);
-                                                       addr_i = get_irn_n(succ, 1);
-                                               }
-                                               else {
-                                                       addr_i = noreg_gp;
-                                               }
+                                               addr_i = get_irn_n(store, 1);
                                        }
                                }
 
@@ -776,7 +1362,7 @@ void ia32_optimize_am(ir_node *irn, void *env) {
 
                                        /* Extra check for commutative ops with two Loads */
                                        /* -> put the interesting Load right              */
-                                       if (node_is_comm(irn) &&
+                                       if (node_is_ia32_comm(irn) &&
                                                pred_is_specific_nodeblock(block, left, is_ia32_Ld))
                                        {
                                                if ((addr_b == get_irn_n(get_Proj_pred(left), 0)) &&
@@ -790,6 +1376,10 @@ void ia32_optimize_am(ir_node *irn, void *env) {
                                                        temp  = left;
                                                        left  = right;
                                                        right = temp;
+
+                                                       /* this is only needed for Compares, but currently ALL nodes
+                                                        * have this attribute :-) */
+                                                       set_ia32_pncode(irn, get_inversed_pnc(get_ia32_pncode(irn)));
                                                }
                                        }
 
@@ -811,6 +1401,10 @@ void ia32_optimize_am(ir_node *irn, void *env) {
                                                set_ia32_frame_ent(irn, get_ia32_frame_ent(load));
                                                set_ia32_ls_mode(irn, get_ia32_ls_mode(load));
 
+                                               set_ia32_am_sc(irn, get_ia32_am_sc(load));
+                                               if (is_ia32_am_sc_sign(load))
+                                                       set_ia32_am_sc_sign(irn);
+
                                                if (is_ia32_use_frame(load))
                                                        set_ia32_use_frame(irn);
 
@@ -831,6 +1425,11 @@ void ia32_optimize_am(ir_node *irn, void *env) {
                                                set_Proj_pred(mem_proj, irn);
                                                set_Proj_proj(mem_proj, 1);
 
+                                               /* clear remat flag */
+                                               set_ia32_flags(irn, get_ia32_flags(irn) & ~arch_irn_flags_rematerializable);
+
+                                               DBG_OPT_AM_D(load, store, irn);
+
                                                DB((mod, LEVEL_1, "merged with %+F and %+F into dest AM\n", load, store));
                                        }
                                } /* if (store) */
@@ -844,19 +1443,21 @@ void ia32_optimize_am(ir_node *irn, void *env) {
                                check_am_src = 1;
                        }
 
+                       /* was exchanged but optimize failed: exchange back */
+                       if (check_am_src && need_exchange_on_fail)
+                               exchange_left_right(irn, &left, &right, 3, 2);
+
+                       need_exchange_on_fail = 0;
+
                        /* normalize commutative ops */
-                       if (node_is_comm(irn)) {
+                       if (check_am_src && node_is_ia32_comm(irn)) {
                                /* Assure that left operand is always a Load if there is one */
                                /* because non-commutative ops can only use Source AM if the */
                                /* left operand is a Load, so we only need to check the left */
                                /* operand afterwards.                                       */
                                if (pred_is_specific_nodeblock(block, right, is_ia32_Ld))       {
-                                       set_irn_n(irn, 2, right);
-                                       set_irn_n(irn, 3, left);
-
-                                       temp  = left;
-                                       left  = right;
-                                       right = temp;
+                                       exchange_left_right(irn, &left, &right, 3, 2);
+                                       need_exchange_on_fail = 1;
                                }
                        }
 
@@ -881,6 +1482,13 @@ void ia32_optimize_am(ir_node *irn, void *env) {
                                set_ia32_frame_ent(irn, get_ia32_frame_ent(left));
                                set_ia32_ls_mode(irn, get_ia32_ls_mode(left));
 
+                               set_ia32_am_sc(irn, get_ia32_am_sc(left));
+                               if (is_ia32_am_sc_sign(left))
+                                       set_ia32_am_sc_sign(irn);
+
+                               /* clear remat flag */
+                               set_ia32_flags(irn, get_ia32_flags(irn) & ~arch_irn_flags_rematerializable);
+
                                if (is_ia32_use_frame(left))
                                        set_ia32_use_frame(irn);
 
@@ -888,14 +1496,25 @@ void ia32_optimize_am(ir_node *irn, void *env) {
                                if (get_irn_arity(irn) == 5) {
                                        /* binary AMop */
                                        set_irn_n(irn, 4, get_irn_n(left, 2));
+
+                                       /* this is only needed for Compares, but currently ALL nodes
+                                        * have this attribute :-) */
+                                       set_ia32_pncode(irn, get_inversed_pnc(get_ia32_pncode(irn)));
+
+                                       /* disconnect from Load */
+                                       /* (make second op -> first, set second in to noreg) */
+                                       set_irn_n(irn, 2, get_irn_n(irn, 3));
+                                       set_irn_n(irn, 3, noreg_gp);
                                }
                                else {
                                        /* unary AMop */
                                        set_irn_n(irn, 3, get_irn_n(left, 2));
+
+                                       /* disconnect from Load */
+                                       set_irn_n(irn, 2, noreg_gp);
                                }
 
-                               /* disconnect from Load */
-                               set_irn_n(irn, 2, noreg_gp);
+                               DBG_OPT_AM_S(left, irn);
 
                                /* If Load has a memory Proj, connect it to the op */
                                mem_proj = get_mem_proj(left);
@@ -906,6 +1525,11 @@ void ia32_optimize_am(ir_node *irn, void *env) {
 
                                DB((mod, LEVEL_1, "merged with %+F into source AM\n", left));
                        }
+                       else {
+                               /* was exchanged but optimize failed: exchange back */
+                               if (need_exchange_on_fail)
+                                       exchange_left_right(irn, &left, &right, 3, 2);
+                       }
                }
        }
 }