Remove the unused parameter const arch_env_t *env from arch_get_irn_register().
[libfirm] / ir / be / ia32 / ia32_optimize.c
index daecdbd..5b8a35c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -39,6 +39,7 @@
 #include "height.h"
 #include "irbitset.h"
 #include "irprintf.h"
+#include "error.h"
 
 #include "../be_t.h"
 #include "../beabi.h"
 #include "ia32_optimize.h"
 #include "bearch_ia32_t.h"
 #include "gen_ia32_regalloc_if.h"
+#include "ia32_common_transform.h"
 #include "ia32_transform.h"
 #include "ia32_dbg_stat.h"
 #include "ia32_util.h"
+#include "ia32_architecture.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 static const arch_env_t *arch_env;
 static ia32_code_gen_t  *cg;
 
-typedef int is_op_func_t(const ir_node *n);
-typedef ir_node *load_func_t(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *base, ir_node *index, ir_node *mem);
+static void copy_mark(const ir_node *old, ir_node *new)
+{
+       if (is_ia32_is_reload(old))
+               set_ia32_is_reload(new);
+       if (is_ia32_is_spill(old))
+               set_ia32_is_spill(new);
+       if (is_ia32_is_remat(old))
+               set_ia32_is_remat(new);
+}
+
+typedef enum produces_flag_t {
+       produces_no_flag,
+       produces_flag_zero,
+       produces_flag_carry
+} produces_flag_t;
 
 /**
- * checks if a node represents the NOREG value
+ * Return which usable flag the given node produces
+ *
+ * @param node  the node to check
+ * @param pn    the projection number of the used result
+ */
+static produces_flag_t produces_test_flag(ir_node *node, int pn)
+{
+       ir_node                     *count;
+       const ia32_immediate_attr_t *imm_attr;
+
+       if (!is_ia32_irn(node))
+               return produces_no_flag;
+
+       switch (get_ia32_irn_opcode(node)) {
+               case iro_ia32_Add:
+               case iro_ia32_Adc:
+               case iro_ia32_And:
+               case iro_ia32_Or:
+               case iro_ia32_Xor:
+               case iro_ia32_Sub:
+               case iro_ia32_Sbb:
+               case iro_ia32_Neg:
+               case iro_ia32_Inc:
+               case iro_ia32_Dec:
+                       break;
+
+               case iro_ia32_ShlD:
+               case iro_ia32_ShrD:
+                       assert(n_ia32_ShlD_count == n_ia32_ShrD_count);
+                       count = get_irn_n(node, n_ia32_ShlD_count);
+                       goto check_shift_amount;
+
+               case iro_ia32_Shl:
+               case iro_ia32_Shr:
+               case iro_ia32_Sar:
+                       assert(n_ia32_Shl_count == n_ia32_Shr_count
+                                       && n_ia32_Shl_count == n_ia32_Sar_count);
+                       count = get_irn_n(node, n_ia32_Shl_count);
+check_shift_amount:
+                       /* when shift count is zero the flags are not affected, so we can only
+                        * do this for constants != 0 */
+                       if (!is_ia32_Immediate(count))
+                               return produces_no_flag;
+
+                       imm_attr = get_ia32_immediate_attr_const(count);
+                       if (imm_attr->symconst != NULL)
+                               return produces_no_flag;
+                       if ((imm_attr->offset & 0x1f) == 0)
+                               return produces_no_flag;
+                       break;
+
+               case iro_ia32_Mul:
+                       return pn == pn_ia32_Mul_res_high ?
+                               produces_flag_carry : produces_no_flag;
+
+               default:
+                       return produces_no_flag;
+       }
+
+       return pn == pn_ia32_res ?
+               produces_flag_zero : produces_no_flag;
+}
+
+/**
+ * If the given node has not mode_T, creates a mode_T version (with a result Proj).
+ *
+ * @param node  the node to change
+ *
+ * @return the new mode_T node (if the mode was changed) or node itself
  */
-static INLINE int be_is_NoReg(ia32_code_gen_t *cg, const ir_node *irn) {
-       return irn == cg->noreg_gp || irn == cg->noreg_xmm || irn == cg->noreg_vfp;
+static ir_node *turn_into_mode_t(ir_node *node)
+{
+       ir_node               *block;
+       ir_node               *res_proj;
+       ir_node               *new_node;
+       const arch_register_t *reg;
+
+       if(get_irn_mode(node) == mode_T)
+               return node;
+
+       assert(get_irn_mode(node) == mode_Iu);
+
+       new_node = exact_copy(node);
+       set_irn_mode(new_node, mode_T);
+
+       block    = get_nodes_block(new_node);
+       res_proj = new_r_Proj(current_ir_graph, block, new_node, mode_Iu,
+                             pn_ia32_res);
+
+       reg = arch_get_irn_register(node);
+       arch_set_irn_register(arch_env, res_proj, reg);
+
+       sched_add_before(node, new_node);
+       be_peephole_exchange(node, res_proj);
+       return new_node;
 }
 
-/********************************************************************************************************
- *  _____                _           _         ____        _   _           _          _   _
- * |  __ \              | |         | |       / __ \      | | (_)         (_)        | | (_)
- * | |__) |__  ___ _ __ | |__   ___ | | ___  | |  | |_ __ | |_ _ _ __ ___  _ ______ _| |_ _  ___  _ __
- * |  ___/ _ \/ _ \ '_ \| '_ \ / _ \| |/ _ \ | |  | | '_ \| __| | '_ ` _ \| |_  / _` | __| |/ _ \| '_ \
- * | |  |  __/  __/ |_) | | | | (_) | |  __/ | |__| | |_) | |_| | | | | | | |/ / (_| | |_| | (_) | | | |
- * |_|   \___|\___| .__/|_| |_|\___/|_|\___|  \____/| .__/ \__|_|_| |_| |_|_/___\__,_|\__|_|\___/|_| |_|
- *                | |                               | |
- *                |_|                               |_|
- ********************************************************************************************************/
+/**
+ * Replace Cmp(x, 0) by a Test(x, x)
+ */
+static void peephole_ia32_Cmp(ir_node *const node)
+{
+       ir_node                     *right;
+       ia32_immediate_attr_t const *imm;
+       dbg_info                    *dbgi;
+       ir_graph                    *irg;
+       ir_node                     *block;
+       ir_node                     *noreg;
+       ir_node                     *nomem;
+       ir_node                     *op;
+       ia32_attr_t           const *attr;
+       int                          ins_permuted;
+       int                          cmp_unsigned;
+       ir_node                     *test;
+       arch_register_t       const *reg;
+       ir_edge_t             const *edge;
+       ir_edge_t             const *tmp;
+
+       if (get_ia32_op_type(node) != ia32_Normal)
+               return;
+
+       right = get_irn_n(node, n_ia32_Cmp_right);
+       if (!is_ia32_Immediate(right))
+               return;
+
+       imm = get_ia32_immediate_attr_const(right);
+       if (imm->symconst != NULL || imm->offset != 0)
+               return;
+
+       dbgi         = get_irn_dbg_info(node);
+       irg          = current_ir_graph;
+       block        = get_nodes_block(node);
+       noreg        = ia32_new_NoReg_gp(cg);
+       nomem        = get_irg_no_mem(irg);
+       op           = get_irn_n(node, n_ia32_Cmp_left);
+       attr         = get_irn_generic_attr(node);
+       ins_permuted = attr->data.ins_permuted;
+       cmp_unsigned = attr->data.cmp_unsigned;
+
+       if (is_ia32_Cmp(node)) {
+               test = new_rd_ia32_Test(dbgi, irg, block, noreg, noreg, nomem,
+                                       op, op, ins_permuted, cmp_unsigned);
+       } else {
+               test = new_rd_ia32_Test8Bit(dbgi, irg, block, noreg, noreg, nomem,
+                                           op, op, ins_permuted, cmp_unsigned);
+       }
+       set_ia32_ls_mode(test, get_ia32_ls_mode(node));
+
+       reg = arch_get_irn_register(node);
+       arch_set_irn_register(arch_env, test, reg);
+
+       foreach_out_edge_safe(node, edge, tmp) {
+               ir_node *const user = get_edge_src_irn(edge);
+
+               if (is_Proj(user))
+                       exchange(user, test);
+       }
+
+       sched_add_before(node, test);
+       copy_mark(node, test);
+       be_peephole_exchange(node, test);
+}
 
 /**
- * NOTE: THESE PEEPHOLE OPTIMIZATIONS MUST BE CALLED AFTER SCHEDULING AND REGISTER ALLOCATION.
+ * Peephole optimization for Test instructions.
+ * We can remove the Test, if a zero flags was produced which is still
+ * live.
  */
+static void peephole_ia32_Test(ir_node *node)
+{
+       ir_node         *left  = get_irn_n(node, n_ia32_Test_left);
+       ir_node         *right = get_irn_n(node, n_ia32_Test_right);
+       ir_node         *flags_proj;
+       ir_node         *block;
+       ir_mode         *flags_mode;
+       int              pn    = pn_ia32_res;
+       ir_node         *schedpoint;
+       const ir_edge_t *edge;
+
+       assert(n_ia32_Test_left == n_ia32_Test8Bit_left
+                       && n_ia32_Test_right == n_ia32_Test8Bit_right);
+
+       /* we need a test for 0 */
+       if(left != right)
+               return;
+
+       block = get_nodes_block(node);
+       if(get_nodes_block(left) != block)
+               return;
+
+       if(is_Proj(left)) {
+               pn   = get_Proj_proj(left);
+               left = get_Proj_pred(left);
+       }
+
+       /* happens rarely, but if it does code will panic' */
+       if (is_ia32_Unknown_GP(left))
+               return;
+
+       /* walk schedule up and abort when we find left or some other node destroys
+          the flags */
+       schedpoint = node;
+       for (;;) {
+               schedpoint = sched_prev(schedpoint);
+               if (schedpoint == left)
+                       break;
+               if (arch_irn_is(arch_env, schedpoint, modify_flags))
+                       return;
+               if (schedpoint == block)
+                       panic("couldn't find left");
+       }
 
-// only optimize up to 48 stores behind IncSPs
+       /* make sure only Lg/Eq tests are used */
+       foreach_out_edge(node, edge) {
+               ir_node *user = get_edge_src_irn(edge);
+               int      pnc  = get_ia32_condcode(user);
+
+               if(pnc != pn_Cmp_Eq && pnc != pn_Cmp_Lg) {
+                       return;
+               }
+       }
+
+       switch (produces_test_flag(left, pn)) {
+               case produces_flag_zero:
+                       break;
+
+               case produces_flag_carry:
+                       foreach_out_edge(node, edge) {
+                               ir_node *user = get_edge_src_irn(edge);
+                               int      pnc  = get_ia32_condcode(user);
+
+                               switch (pnc) {
+                                       case pn_Cmp_Eq: pnc = pn_Cmp_Ge | ia32_pn_Cmp_unsigned; break;
+                                       case pn_Cmp_Lg: pnc = pn_Cmp_Lt | ia32_pn_Cmp_unsigned; break;
+                                       default: panic("unexpected pn");
+                               }
+                               set_ia32_condcode(user, pnc);
+                       }
+                       break;
+
+               default:
+                       return;
+       }
+
+       left = turn_into_mode_t(left);
+
+       flags_mode = ia32_reg_classes[CLASS_ia32_flags].mode;
+       flags_proj = new_r_Proj(current_ir_graph, block, left, flags_mode,
+                               pn_ia32_flags);
+       arch_set_irn_register(arch_env, flags_proj, &ia32_flags_regs[REG_EFLAGS]);
+
+       assert(get_irn_mode(node) != mode_T);
+
+       be_peephole_exchange(node, flags_proj);
+}
+
+/**
+ * AMD Athlon works faster when RET is not destination of
+ * conditional jump or directly preceded by other jump instruction.
+ * Can be avoided by placing a Rep prefix before the return.
+ */
+static void peephole_ia32_Return(ir_node *node) {
+       ir_node *block, *irn;
+
+       if (!ia32_cg_config.use_pad_return)
+               return;
+
+       block = get_nodes_block(node);
+
+       /* check if this return is the first on the block */
+       sched_foreach_reverse_from(node, irn) {
+               switch (get_irn_opcode(irn)) {
+               case beo_Return:
+                       /* the return node itself, ignore */
+                       continue;
+               case iro_Start:
+               case beo_RegParams:
+               case beo_Barrier:
+                       /* ignore no code generated */
+                       continue;
+               case beo_IncSP:
+                       /* arg, IncSP 0 nodes might occur, ignore these */
+                       if (be_get_IncSP_offset(irn) == 0)
+                               continue;
+                       return;
+               case iro_Phi:
+                       continue;
+               default:
+                       return;
+               }
+       }
+
+       /* ensure, that the 3 byte return is generated */
+       be_Return_set_emit_pop(node, 1);
+}
+
+/* only optimize up to 48 stores behind IncSPs */
 #define MAXPUSH_OPTIMIZE       48
 
 /**
- * Tries to create pushs from IncSP,Store combinations
+ * Tries to create Push's from IncSP, Store combinations.
+ * The Stores are replaced by Push's, the IncSP is modified
+ * (possibly into IncSP 0, but not removed).
  */
 static void peephole_IncSP_Store_to_push(ir_node *irn)
 {
-       int i;
-       int offset;
-       ir_node *node;
-       ir_node *stores[MAXPUSH_OPTIMIZE];
-       ir_node *block = get_nodes_block(irn);
-       ir_graph *irg = cg->irg;
-       ir_node *curr_sp;
-       ir_mode *spmode = get_irn_mode(irn);
+       int              i;
+       int              maxslot;
+       int              inc_ofs;
+       ir_node         *node;
+       ir_node         *stores[MAXPUSH_OPTIMIZE];
+       ir_node         *block;
+       ir_graph        *irg;
+       ir_node         *curr_sp;
+       ir_mode         *spmode;
+       ir_node         *first_push = NULL;
+       ir_edge_t const *edge;
+       ir_edge_t const *next;
 
        memset(stores, 0, sizeof(stores));
 
        assert(be_is_IncSP(irn));
 
-       offset = be_get_IncSP_offset(irn);
-       if(offset < 4)
+       inc_ofs = be_get_IncSP_offset(irn);
+       if (inc_ofs < 4)
                return;
 
        /*
         * We first walk the schedule after the IncSP node as long as we find
-        * suitable stores that could be transformed to a push.
+        * suitable Stores that could be transformed to a Push.
         * We save them into the stores array which is sorted by the frame offset/4
         * attached to the node
         */
-       for(node = sched_next(irn); !sched_is_end(node); node = sched_next(node)) {
+       maxslot = -1;
+       for (node = sched_next(irn); !sched_is_end(node); node = sched_next(node)) {
                ir_node *mem;
                int offset;
                int storeslot;
 
-               // it has to be a store
-               if(!is_ia32_Store(node))
+               /* it has to be a Store */
+               if (!is_ia32_Store(node))
                        break;
 
-               // it has to use our sp value
-               if(get_irn_n(node, n_ia32_base) != irn)
+               /* it has to use our sp value */
+               if (get_irn_n(node, n_ia32_base) != irn)
                        continue;
-               // store has to be attached to NoMem
+               /* Store has to be attached to NoMem */
                mem = get_irn_n(node, n_ia32_mem);
-               if(!is_NoMem(mem)) {
+               if (!is_NoMem(mem))
                        continue;
-               }
 
                /* unfortunately we can't support the full AMs possible for push at the
                 * moment. TODO: fix this */
-               if(get_ia32_am_scale(node) > 0 || !is_ia32_NoReg_GP(get_irn_n(node, n_ia32_index)))
+               if (!is_ia32_NoReg_GP(get_irn_n(node, n_ia32_index)))
                        break;
 
                offset = get_ia32_am_offs_int(node);
+               /* we should NEVER access uninitialized stack BELOW the current SP */
+               assert(offset >= 0);
 
-               storeslot = offset / 4;
-               if(storeslot >= MAXPUSH_OPTIMIZE)
-                       continue;
-
-               // storing into the same slot twice is bad (and shouldn't happen...)
-               if(stores[storeslot] != NULL)
+               /* storing at half-slots is bad */
+               if ((offset & 3) != 0)
                        break;
 
-               // storing at half-slots is bad
-               if(offset % 4 != 0)
+               if (inc_ofs - 4 < offset || offset >= MAXPUSH_OPTIMIZE * 4)
+                       continue;
+               storeslot = offset >> 2;
+
+               /* storing into the same slot twice is bad (and shouldn't happen...) */
+               if (stores[storeslot] != NULL)
                        break;
 
                stores[storeslot] = node;
+               if (storeslot > maxslot)
+                       maxslot = storeslot;
        }
 
-       curr_sp = be_get_IncSP_pred(irn);
+       curr_sp = irn;
 
-       // walk the stores in inverse order and create pushs for them
-       i = (offset / 4) - 1;
-       if(i >= MAXPUSH_OPTIMIZE) {
-               i = MAXPUSH_OPTIMIZE - 1;
+       for (i = -1; i < maxslot; ++i) {
+               if (stores[i + 1] == NULL)
+                       break;
        }
 
-       for( ; i >= 0; --i) {
+       /* walk through the Stores and create Pushs for them */
+       block  = get_nodes_block(irn);
+       spmode = get_irn_mode(irn);
+       irg    = cg->irg;
+       for (; i >= 0; --i) {
                const arch_register_t *spreg;
                ir_node *push;
                ir_node *val, *mem, *mem_proj;
                ir_node *store = stores[i];
                ir_node *noreg = ia32_new_NoReg_gp(cg);
 
-               if(store == NULL || is_Bad(store))
-                       break;
-
                val = get_irn_n(store, n_ia32_unary_op);
                mem = get_irn_n(store, n_ia32_mem);
-               spreg = arch_get_irn_register(cg->arch_env, curr_sp);
+               spreg = arch_get_irn_register(curr_sp);
 
-               push = new_rd_ia32_Push(get_irn_dbg_info(store), irg, block, noreg, noreg, mem, curr_sp, val);
+               push = new_rd_ia32_Push(get_irn_dbg_info(store), irg, block, noreg, noreg, mem, val, curr_sp);
+               copy_mark(store, push);
 
-               set_ia32_am_support(push, ia32_am_Source, ia32_am_unary);
+               if (first_push == NULL)
+                       first_push = push;
 
-               sched_add_before(irn, push);
+               sched_add_after(curr_sp, push);
 
-               // create stackpointer proj
+               /* create stackpointer Proj */
                curr_sp = new_r_Proj(irg, block, push, spmode, pn_ia32_Push_stack);
                arch_set_irn_register(cg->arch_env, curr_sp, spreg);
 
-               // create memory proj
+               /* create memory Proj */
                mem_proj = new_r_Proj(irg, block, push, mode_M, pn_ia32_Push_M);
 
-               // use the memproj now
-               exchange(store, mem_proj);
+               /* use the memproj now */
+               be_peephole_exchange(store, mem_proj);
 
-               // we can remove the store now
-               sched_remove(store);
+               inc_ofs -= 4;
+       }
 
-               offset -= 4;
+       foreach_out_edge_safe(irn, edge, next) {
+               ir_node *const src = get_edge_src_irn(edge);
+               int      const pos = get_edge_src_pos(edge);
+
+               if (src == first_push)
+                       continue;
+
+               set_irn_n(src, pos, curr_sp);
        }
 
-       be_set_IncSP_offset(irn, offset);
-       be_set_IncSP_pred(irn, curr_sp);
-       be_peephole_node_replaced(irn, irn);
+       be_set_IncSP_offset(irn, inc_ofs);
 }
 
-/**
- * Tries to optimize two following IncSP.
- */
-static void peephole_IncSP_IncSP(ir_node *node)
+#if 0
+static void peephole_store_incsp(ir_node *store)
 {
-       int      pred_offs;
-       int      curr_offs;
-       int      offs;
-       ir_node *pred = be_get_IncSP_pred(node);
-       ir_node *predpred;
+       dbg_info *dbgi;
+       ir_node  *node;
+       ir_node  *block;
+       ir_node  *noref;
+       ir_node  *mem;
+       ir_node  *push;
+       ir_node  *val;
+       ir_node  *am_base = get_irn_n(store, n_ia32_Store_base);
+       if (!be_is_IncSP(am_base)
+                       || get_nodes_block(am_base) != get_nodes_block(store))
+               return;
+       mem = get_irn_n(store, n_ia32_Store_mem);
+       if (!is_ia32_NoReg_GP(get_irn_n(store, n_ia32_Store_index))
+                       || !is_NoMem(mem))
+               return;
+
+       int incsp_offset = be_get_IncSP_offset(am_base);
+       if (incsp_offset <= 0)
+               return;
 
-       if(!be_is_IncSP(pred))
+       /* we have to be at offset 0 */
+       int my_offset = get_ia32_am_offs_int(store);
+       if (my_offset != 0) {
+               /* TODO here: find out wether there is a store with offset 0 before
+                * us and wether we can move it down to our place */
                return;
+       }
+       ir_mode *ls_mode = get_ia32_ls_mode(store);
+       int my_store_size = get_mode_size_bytes(ls_mode);
 
-       if(get_irn_n_edges(pred) > 1)
+       if (my_offset + my_store_size > incsp_offset)
                return;
 
-       pred_offs = be_get_IncSP_offset(pred);
-       curr_offs = be_get_IncSP_offset(node);
+       /* correctness checking:
+               - noone else must write to that stackslot
+                   (because after translation incsp won't allocate it anymore)
+       */
+       sched_foreach_reverse_from(store, node) {
+               int i, arity;
+
+               if (node == am_base)
+                       break;
+
+               /* make sure noone else can use the space on the stack */
+               arity = get_irn_arity(node);
+               for (i = 0; i < arity; ++i) {
+                       ir_node *pred = get_irn_n(node, i);
+                       if (pred != am_base)
+                               continue;
+
+                       if (i == n_ia32_base &&
+                                       (get_ia32_op_type(node) == ia32_AddrModeS
+                                        || get_ia32_op_type(node) == ia32_AddrModeD)) {
+                               int      node_offset  = get_ia32_am_offs_int(node);
+                               ir_mode *node_ls_mode = get_ia32_ls_mode(node);
+                               int      node_size    = get_mode_size_bytes(node);
+                               /* overlapping with our position? abort */
+                               if (node_offset < my_offset + my_store_size
+                                               && node_offset + node_size >= my_offset)
+                                       return;
+                               /* otherwise it's fine */
+                               continue;
+                       }
 
-       if(pred_offs == BE_STACK_FRAME_SIZE_EXPAND) {
-               if(curr_offs != BE_STACK_FRAME_SIZE_SHRINK) {
+                       /* strange use of esp: abort */
                        return;
                }
-               offs = 0;
-       } else if(pred_offs == BE_STACK_FRAME_SIZE_SHRINK) {
-               if(curr_offs != BE_STACK_FRAME_SIZE_EXPAND) {
-                       return;
+       }
+
+       /* all ok, change to push */
+       dbgi  = get_irn_dbg_info(store);
+       block = get_nodes_block(store);
+       noreg = ia32_new_NoReg_gp(cg);
+       val   = get_ia32_
+
+       push  = new_rd_ia32_Push(dbgi, irg, block, noreg, noreg, mem,
+
+       create_push(dbgi, current_ir_graph, block, am_base, store);
+}
+#endif
+
+/**
+ * Return true if a mode can be stored in the GP register set
+ */
+static INLINE int mode_needs_gp_reg(ir_mode *mode) {
+        if (mode == mode_fpcw)
+                return 0;
+        if (get_mode_size_bits(mode) > 32)
+                return 0;
+        return mode_is_int(mode) || mode_is_reference(mode) || mode == mode_b;
+}
+
+/**
+ * Tries to create Pops from Load, IncSP combinations.
+ * The Loads are replaced by Pops, the IncSP is modified
+ * (possibly into IncSP 0, but not removed).
+ */
+static void peephole_Load_IncSP_to_pop(ir_node *irn)
+{
+       const arch_register_t *esp = &ia32_gp_regs[REG_ESP];
+       int      i, maxslot, inc_ofs, ofs;
+       ir_node  *node, *pred_sp, *block;
+       ir_node  *loads[MAXPUSH_OPTIMIZE];
+       ir_graph *irg;
+       unsigned regmask = 0;
+       unsigned copymask = ~0;
+
+       memset(loads, 0, sizeof(loads));
+       assert(be_is_IncSP(irn));
+
+       inc_ofs = -be_get_IncSP_offset(irn);
+       if (inc_ofs < 4)
+               return;
+
+       /*
+        * We first walk the schedule before the IncSP node as long as we find
+        * suitable Loads that could be transformed to a Pop.
+        * We save them into the stores array which is sorted by the frame offset/4
+        * attached to the node
+        */
+       maxslot = -1;
+       pred_sp = be_get_IncSP_pred(irn);
+       for (node = sched_prev(irn); !sched_is_end(node); node = sched_prev(node)) {
+               int offset;
+               int loadslot;
+               const arch_register_t *sreg, *dreg;
+
+               /* it has to be a Load */
+               if (!is_ia32_Load(node)) {
+                       if (be_is_Copy(node)) {
+                               if (!mode_needs_gp_reg(get_irn_mode(node))) {
+                                       /* not a GP copy, ignore */
+                                       continue;
+                               }
+                               dreg = arch_get_irn_register(node);
+                               sreg = arch_get_irn_register(be_get_Copy_op(node));
+                               if (regmask & copymask & (1 << sreg->index)) {
+                                       break;
+                               }
+                               if (regmask & copymask & (1 << dreg->index)) {
+                                       break;
+                               }
+                               /* we CAN skip Copies if neither the destination nor the source
+                                * is not in our regmask, ie none of our future Pop will overwrite it */
+                               regmask |= (1 << dreg->index) | (1 << sreg->index);
+                               copymask &= ~((1 << dreg->index) | (1 << sreg->index));
+                               continue;
+                       }
+                       break;
+               }
+
+               /* we can handle only GP loads */
+               if (!mode_needs_gp_reg(get_ia32_ls_mode(node)))
+                       continue;
+
+               /* it has to use our predecessor sp value */
+               if (get_irn_n(node, n_ia32_base) != pred_sp) {
+                       /* it would be ok if this load does not use a Pop result,
+                        * but we do not check this */
+                       break;
                }
-               offs = 0;
-       } else if(curr_offs == BE_STACK_FRAME_SIZE_EXPAND
-                       || curr_offs == BE_STACK_FRAME_SIZE_SHRINK) {
+
+               /* should have NO index */
+               if (!is_ia32_NoReg_GP(get_irn_n(node, n_ia32_index)))
+                       break;
+
+               offset = get_ia32_am_offs_int(node);
+               /* we should NEVER access uninitialized stack BELOW the current SP */
+               assert(offset >= 0);
+
+               /* storing at half-slots is bad */
+               if ((offset & 3) != 0)
+                       break;
+
+               if (offset < 0 || offset >= MAXPUSH_OPTIMIZE * 4)
+                       continue;
+               /* ignore those outside the possible windows */
+               if (offset > inc_ofs - 4)
+                       continue;
+               loadslot = offset >> 2;
+
+               /* loading from the same slot twice is bad (and shouldn't happen...) */
+               if (loads[loadslot] != NULL)
+                       break;
+
+               dreg = arch_get_irn_register(node);
+               if (regmask & (1 << dreg->index)) {
+                       /* this register is already used */
+                       break;
+               }
+               regmask |= 1 << dreg->index;
+
+               loads[loadslot] = node;
+               if (loadslot > maxslot)
+                       maxslot = loadslot;
+       }
+
+       if (maxslot < 0)
                return;
-       } else {
-               offs = curr_offs + pred_offs;
+
+       /* find the first slot */
+       for (i = maxslot; i >= 0; --i) {
+               ir_node *load = loads[i];
+
+               if (load == NULL)
+                       break;
        }
 
-       /* add pred offset to ours and remove pred IncSP */
-       be_set_IncSP_offset(node, offs);
+       ofs = inc_ofs - (maxslot + 1) * 4;
+       inc_ofs = (i+1) * 4;
+
+       /* create a new IncSP if needed */
+       block = get_nodes_block(irn);
+       irg   = cg->irg;
+       if (inc_ofs > 0) {
+               pred_sp = be_new_IncSP(esp, irg, block, pred_sp, -inc_ofs, be_get_IncSP_align(irn));
+               sched_add_before(irn, pred_sp);
+       }
+
+       /* walk through the Loads and create Pops for them */
+       for (++i; i <= maxslot; ++i) {
+               ir_node *load = loads[i];
+               ir_node *mem, *pop;
+               const ir_edge_t *edge, *tmp;
+               const arch_register_t *reg;
+
+               mem = get_irn_n(load, n_ia32_mem);
+               reg = arch_get_irn_register(load);
+
+               pop = new_rd_ia32_Pop(get_irn_dbg_info(load), irg, block, mem, pred_sp);
+               arch_set_irn_register(arch_env, pop, reg);
 
-       predpred = be_get_IncSP_pred(pred);
-       be_peephole_node_replaced(pred, predpred);
+               copy_mark(load, pop);
 
-       /* rewire dependency edges */
-       edges_reroute_kind(pred, predpred, EDGE_KIND_DEP, current_ir_graph);
-       be_set_IncSP_pred(node, predpred);
-       sched_remove(pred);
+               /* create stackpointer Proj */
+               pred_sp = new_r_Proj(irg, block, pop, mode_Iu, pn_ia32_Pop_stack);
+               arch_set_irn_register(arch_env, pred_sp, esp);
 
-       be_kill_node(pred);
+               sched_add_before(irn, pop);
+
+               /* rewire now */
+               foreach_out_edge_safe(load, edge, tmp) {
+                       ir_node *proj = get_edge_src_irn(edge);
+
+                       set_Proj_pred(proj, pop);
+               }
+
+               /* we can remove the Load now */
+               sched_remove(load);
+               kill_node(load);
+       }
+
+       be_set_IncSP_offset(irn, -ofs);
+       be_set_IncSP_pred(irn, pred_sp);
 }
 
+
+/**
+ * Find a free GP register if possible, else return NULL.
+ */
 static const arch_register_t *get_free_gp_reg(void)
 {
        int i;
@@ -271,66 +791,133 @@ static const arch_register_t *get_free_gp_reg(void)
        return NULL;
 }
 
+/**
+ * Creates a Pop instruction before the given schedule point.
+ *
+ * @param dbgi        debug info
+ * @param irg         the graph
+ * @param block       the block
+ * @param stack       the previous stack value
+ * @param schedpoint  the new node is added before this node
+ * @param reg         the register to pop
+ *
+ * @return the new stack value
+ */
+static ir_node *create_pop(dbg_info *dbgi, ir_graph *irg, ir_node *block,
+                           ir_node *stack, ir_node *schedpoint,
+                           const arch_register_t *reg)
+{
+       const arch_register_t *esp = &ia32_gp_regs[REG_ESP];
+       ir_node *pop;
+       ir_node *keep;
+       ir_node *val;
+       ir_node *in[1];
+
+       pop   = new_rd_ia32_Pop(dbgi, irg, block, new_NoMem(), stack);
+
+       stack = new_r_Proj(irg, block, pop, mode_Iu, pn_ia32_Pop_stack);
+       arch_set_irn_register(arch_env, stack, esp);
+       val   = new_r_Proj(irg, block, pop, mode_Iu, pn_ia32_Pop_res);
+       arch_set_irn_register(arch_env, val, reg);
+
+       sched_add_before(schedpoint, pop);
+
+       in[0] = val;
+       keep = be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in);
+       sched_add_before(schedpoint, keep);
+
+       return stack;
+}
+
+/**
+ * Creates a Push instruction before the given schedule point.
+ *
+ * @param dbgi        debug info
+ * @param irg         the graph
+ * @param block       the block
+ * @param stack       the previous stack value
+ * @param schedpoint  the new node is added before this node
+ * @param reg         the register to pop
+ *
+ * @return the new stack value
+ */
+static ir_node *create_push(dbg_info *dbgi, ir_graph *irg, ir_node *block,
+                            ir_node *stack, ir_node *schedpoint)
+{
+       const arch_register_t *esp = &ia32_gp_regs[REG_ESP];
+
+       ir_node *val   = ia32_new_Unknown_gp(cg);
+       ir_node *noreg = ia32_new_NoReg_gp(cg);
+       ir_node *nomem = get_irg_no_mem(irg);
+       ir_node *push  = new_rd_ia32_Push(dbgi, irg, block, noreg, noreg, nomem, val, stack);
+       sched_add_before(schedpoint, push);
+
+       stack = new_r_Proj(irg, block, push, mode_Iu, pn_ia32_Push_stack);
+       arch_set_irn_register(arch_env, stack, esp);
+
+       return stack;
+}
+
+/**
+ * Optimize an IncSp by replacing it with Push/Pop.
+ */
 static void peephole_be_IncSP(ir_node *node)
 {
        const arch_register_t *esp = &ia32_gp_regs[REG_ESP];
        const arch_register_t *reg;
-       ir_graph              *irg;
+       ir_graph              *irg = current_ir_graph;
        dbg_info              *dbgi;
        ir_node               *block;
-       ir_node               *keep;
-       ir_node               *val;
-       ir_node               *pop;
-       ir_node               *noreg;
        ir_node               *stack;
        int                    offset;
 
+       /* first optimize incsp->incsp combinations */
+       node = be_peephole_IncSP_IncSP(node);
+
        /* transform IncSP->Store combinations to Push where possible */
        peephole_IncSP_Store_to_push(node);
 
-       /* first optimize incsp->incsp combinations */
-       peephole_IncSP_IncSP(node);
+       /* transform Load->IncSP combinations to Pop where possible */
+       peephole_Load_IncSP_to_pop(node);
 
-       /* replace IncSP -4 by Pop freereg when possible */
-       offset = be_get_IncSP_offset(node);
-       if(offset != -4)
+       if (arch_get_irn_register(node) != esp)
                return;
 
-       if(arch_get_irn_register(arch_env, node) != esp)
+       /* replace IncSP -4 by Pop freereg when possible */
+       offset = be_get_IncSP_offset(node);
+       if ((offset != -8 || ia32_cg_config.use_add_esp_8) &&
+           (offset != -4 || ia32_cg_config.use_add_esp_4) &&
+           (offset != +4 || ia32_cg_config.use_sub_esp_4) &&
+           (offset != +8 || ia32_cg_config.use_sub_esp_8))
                return;
 
-       reg = get_free_gp_reg();
-       if(reg == NULL)
-               return;
+       if (offset < 0) {
+               /* we need a free register for pop */
+               reg = get_free_gp_reg();
+               if (reg == NULL)
+                       return;
 
-       irg   = current_ir_graph;
-       dbgi  = get_irn_dbg_info(node);
-       block = get_nodes_block(node);
-       noreg = ia32_new_NoReg_gp(cg);
-       stack = be_get_IncSP_pred(node);
-       pop   = new_rd_ia32_Pop(dbgi, irg, block, noreg, noreg, new_NoMem(), stack);
+               dbgi  = get_irn_dbg_info(node);
+               block = get_nodes_block(node);
+               stack = be_get_IncSP_pred(node);
 
-       stack = new_r_Proj(irg, block, pop, mode_Iu, pn_ia32_Pop_stack);
-       arch_set_irn_register(arch_env, stack, esp);
-       val   = new_r_Proj(irg, block, pop, mode_Iu, pn_ia32_Pop_res);
-       arch_set_irn_register(arch_env, val, reg);
+               stack = create_pop(dbgi, irg, block, stack, node, reg);
 
-       sched_add_before(node, pop);
-
-       keep  = sched_next(node);
-       if(!be_is_Keep(keep)) {
-               ir_node *in[1];
-               in[0] = val;
-               keep = be_new_Keep(&ia32_reg_classes[CLASS_ia32_gp], irg, block, 1, in);
-               sched_add_before(node, keep);
+               if (offset == -8) {
+                       stack = create_pop(dbgi, irg, block, stack, node, reg);
+               }
        } else {
-               be_Keep_add_node(keep, &ia32_reg_classes[CLASS_ia32_gp], val);
-       }
+               dbgi  = get_irn_dbg_info(node);
+               block = get_nodes_block(node);
+               stack = be_get_IncSP_pred(node);
+               stack = create_push(dbgi, irg, block, stack, node);
 
-       be_peephole_node_replaced(node, stack);
+               if (offset == +8) {
+                       stack = create_push(dbgi, irg, block, stack, node);
+               }
+       }
 
-       exchange(node, stack);
-       sched_remove(node);
+       be_peephole_exchange(node, stack);
 }
 
 /**
@@ -348,13 +935,15 @@ static void peephole_ia32_Const(ir_node *node)
        ir_node                     *noreg;
 
        /* try to transform a mov 0, reg to xor reg reg */
-       if(attr->offset != 0 || attr->symconst != NULL)
+       if (attr->offset != 0 || attr->symconst != NULL)
+               return;
+       if (ia32_cg_config.use_mov_0)
                return;
        /* xor destroys the flags, so no-one must be using them */
-       if(be_peephole_get_value(CLASS_ia32_flags, REG_EFLAGS) != NULL)
+       if (be_peephole_get_value(CLASS_ia32_flags, REG_EFLAGS) != NULL)
                return;
 
-       reg = arch_get_irn_register(arch_env, node);
+       reg = arch_get_irn_register(node);
        assert(be_peephole_get_reg_value(reg) == NULL);
 
        /* create xor(produceval, produceval) */
@@ -371,9 +960,8 @@ static void peephole_ia32_Const(ir_node *node)
        sched_add_before(node, produceval);
        sched_add_before(node, xor);
 
-       be_peephole_node_replaced(node, xor);
-       exchange(node, xor);
-       sched_remove(node);
+       copy_mark(node, xor);
+       be_peephole_exchange(node, xor);
 }
 
 static INLINE int is_noreg(ia32_code_gen_t *cg, const ir_node *node)
@@ -458,13 +1046,13 @@ static void peephole_ia32_Lea(ir_node *node)
                base     = NULL;
                base_reg = NULL;
        } else {
-               base_reg = arch_get_irn_register(arch_env, base);
+               base_reg = arch_get_irn_register(base);
        }
        if(is_noreg(cg, index)) {
                index     = NULL;
                index_reg = NULL;
        } else {
-               index_reg = arch_get_irn_register(arch_env, index);
+               index_reg = arch_get_irn_register(index);
        }
 
        if(base == NULL && index == NULL) {
@@ -475,7 +1063,7 @@ static void peephole_ia32_Lea(ir_node *node)
                return;
        }
 
-       out_reg = arch_get_irn_register(arch_env, node);
+       out_reg = arch_get_irn_register(node);
        scale   = get_ia32_am_scale(node);
        assert(!is_ia32_need_stackent(node) || get_ia32_frame_ent(node) != NULL);
        /* check if we have immediates values (frame entities should already be
@@ -534,7 +1122,7 @@ static void peephole_ia32_Lea(ir_node *node)
        }
 
 make_add_immediate:
-       if(cg->isa->opt & IA32_OPT_INCDEC) {
+       if(ia32_cg_config.use_incdec) {
                if(is_am_one(node)) {
                        dbgi  = get_irn_dbg_info(node);
                        block = get_nodes_block(node);
@@ -575,16 +1163,42 @@ exchange:
        SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(cg, node));
 
        /* add new ADD/SHL to schedule */
+       DBG_OPT_LEA2ADD(node, res);
+
+       /* exchange the Add and the LEA */
        sched_add_before(node, res);
+       copy_mark(node, res);
+       be_peephole_exchange(node, res);
+}
 
-       DBG_OPT_LEA2ADD(node, res);
+/**
+ * Split a Imul mem, imm into a Load mem and Imul reg, imm if possible.
+ */
+static void peephole_ia32_Imul_split(ir_node *imul)
+{
+       const ir_node         *right = get_irn_n(imul, n_ia32_IMul_right);
+       const arch_register_t *reg;
+       ir_node               *res;
 
-       /* remove the old LEA */
-       sched_remove(node);
+       if (!is_ia32_Immediate(right) || get_ia32_op_type(imul) != ia32_AddrModeS) {
+               /* no memory, imm form ignore */
+               return;
+       }
+       /* we need a free register */
+       reg = get_free_gp_reg();
+       if (reg == NULL)
+               return;
 
-       /* exchange the Add and the LEA */
-       be_peephole_node_replaced(node, res);
-       exchange(node, res);
+       /* fine, we can rebuild it */
+       res = turn_back_am(imul);
+       arch_set_irn_register(arch_env, res, reg);
+}
+
+/**
+ * Replace xorps r,r and xorpd r,r by pxor r,r
+ */
+static void peephole_ia32_xZero(ir_node *xor) {
+       set_irn_op(xor, op_ia32_xPzero);
 }
 
 /**
@@ -592,7 +1206,7 @@ exchange:
  */
 static void register_peephole_optimisation(ir_op *op, peephole_opt_func func) {
        assert(op->ops.generic == NULL);
-       op->ops.generic = (void*) func;
+       op->ops.generic = (op_func)func;
 }
 
 /* Perform peephole-optimizations. */
@@ -603,9 +1217,18 @@ void ia32_peephole_optimization(ia32_code_gen_t *new_cg)
 
        /* register peephole optimisations */
        clear_irp_opcodes_generic_func();
-       register_peephole_optimisation(op_ia32_Const, peephole_ia32_Const);
-       register_peephole_optimisation(op_be_IncSP, peephole_be_IncSP);
-       register_peephole_optimisation(op_ia32_Lea, peephole_ia32_Lea);
+       register_peephole_optimisation(op_ia32_Const,    peephole_ia32_Const);
+       register_peephole_optimisation(op_be_IncSP,      peephole_be_IncSP);
+       register_peephole_optimisation(op_ia32_Lea,      peephole_ia32_Lea);
+       register_peephole_optimisation(op_ia32_Cmp,      peephole_ia32_Cmp);
+       register_peephole_optimisation(op_ia32_Cmp8Bit,  peephole_ia32_Cmp);
+       register_peephole_optimisation(op_ia32_Test,     peephole_ia32_Test);
+       register_peephole_optimisation(op_ia32_Test8Bit, peephole_ia32_Test);
+       register_peephole_optimisation(op_be_Return,     peephole_ia32_Return);
+       if (! ia32_cg_config.use_imul_mem_imm32)
+               register_peephole_optimisation(op_ia32_IMul, peephole_ia32_Imul_split);
+       if (ia32_cg_config.use_pxor)
+               register_peephole_optimisation(op_ia32_xZero, peephole_ia32_xZero);
 
        be_peephole_opt(cg->birg);
 }
@@ -632,21 +1255,30 @@ static INLINE void try_kill(ir_node *node)
                sched_remove(node);
        }
 
-       be_kill_node(node);
+       kill_node(node);
 }
 
 static void optimize_conv_store(ir_node *node)
 {
        ir_node *pred;
+       ir_node *pred_proj;
        ir_mode *conv_mode;
        ir_mode *store_mode;
 
        if(!is_ia32_Store(node) && !is_ia32_Store8Bit(node))
                return;
 
-       pred = get_irn_n(node, 2);
+       assert(n_ia32_Store_val == n_ia32_Store8Bit_val);
+       pred_proj = get_irn_n(node, n_ia32_Store_val);
+       if(is_Proj(pred_proj)) {
+               pred = get_Proj_pred(pred_proj);
+       } else {
+               pred = pred_proj;
+       }
        if(!is_ia32_Conv_I2I(pred) && !is_ia32_Conv_I2I8Bit(pred))
                return;
+       if(get_ia32_op_type(pred) != ia32_Normal)
+               return;
 
        /* the store only stores the lower bits, so we only need the conv
         * it it shrinks the mode */
@@ -655,9 +1287,11 @@ static void optimize_conv_store(ir_node *node)
        if(get_mode_size_bits(conv_mode) < get_mode_size_bits(store_mode))
                return;
 
-       set_irn_n(node, 2, get_irn_n(pred, 2));
-       if(get_irn_n_edges(pred) == 0) {
-               be_kill_node(pred);
+       set_irn_n(node, n_ia32_Store_val, get_irn_n(pred, n_ia32_Conv_I2I_val));
+       if(get_irn_n_edges(pred_proj) == 0) {
+               kill_node(pred_proj);
+               if(pred != pred_proj)
+                       kill_node(pred);
        }
 }
 
@@ -670,7 +1304,8 @@ static void optimize_load_conv(ir_node *node)
        if (!is_ia32_Conv_I2I(node) && !is_ia32_Conv_I2I8Bit(node))
                return;
 
-       pred = get_irn_n(node, 2);
+       assert(n_ia32_Conv_I2I_val == n_ia32_Conv_I2I8Bit_val);
+       pred = get_irn_n(node, n_ia32_Conv_I2I_val);
        if(!is_Proj(pred))
                return;
 
@@ -710,6 +1345,8 @@ static void optimize_conv_conv(ir_node *node)
 {
        ir_node *pred_proj, *pred, *result_conv;
        ir_mode *pred_mode, *conv_mode;
+       int      conv_mode_bits;
+       int      pred_mode_bits;
 
        if (!is_ia32_Conv_I2I(node) && !is_ia32_Conv_I2I8Bit(node))
                return;
@@ -726,11 +1363,17 @@ static void optimize_conv_conv(ir_node *node)
 
        /* we know that after a conv, the upper bits are sign extended
         * so we only need the 2nd conv if it shrinks the mode */
-       conv_mode = get_ia32_ls_mode(node);
-       pred_mode = get_ia32_ls_mode(pred);
-       /* if 2nd conv is smaller then first conv, then we can always take the 2nd
-        * conv */
-       if(get_mode_size_bits(conv_mode) <= get_mode_size_bits(pred_mode)) {
+       conv_mode      = get_ia32_ls_mode(node);
+       conv_mode_bits = get_mode_size_bits(conv_mode);
+       pred_mode      = get_ia32_ls_mode(pred);
+       pred_mode_bits = get_mode_size_bits(pred_mode);
+
+       if(conv_mode_bits == pred_mode_bits
+                       && get_mode_sign(conv_mode) == get_mode_sign(pred_mode)) {
+               result_conv = pred_proj;
+       } else if(conv_mode_bits <= pred_mode_bits) {
+               /* if 2nd conv is smaller then first conv, then we can always take the
+                * 2nd conv */
                if(get_irn_n_edges(pred_proj) == 1) {
                        result_conv = pred_proj;
                        set_ia32_ls_mode(pred, conv_mode);
@@ -772,8 +1415,10 @@ static void optimize_conv_conv(ir_node *node)
        /* kill the conv */
        exchange(node, result_conv);
 
-       if(get_irn_n_edges(pred) == 0) {
-               be_kill_node(pred);
+       if(get_irn_n_edges(pred_proj) == 0) {
+               kill_node(pred_proj);
+               if(pred != pred_proj)
+                       kill_node(pred);
        }
        optimize_conv_conv(result_conv);
 }