rework fragile ops to have a throws_exception attribute
[libfirm] / ir / be / ia32 / ia32_optimize.c
index d66746b..a09ead1 100644 (file)
@@ -23,9 +23,7 @@
  * @author      Matthias Braun, Christian Wuerdig
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "irnode.h"
 #include "irprog_t.h"
 #include "tv.h"
 #include "irgmod.h"
 #include "irgwalk.h"
-#include "height.h"
+#include "heights.h"
 #include "irbitset.h"
 #include "irprintf.h"
+#include "irdump.h"
 #include "error.h"
 
 #include "../be_t.h"
 #include "../beabi.h"
-#include "../benode_t.h"
-#include "../besched_t.h"
+#include "../benode.h"
+#include "../besched.h"
 #include "../bepeephole.h"
 
 #include "ia32_new_nodes.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;
+static void copy_mark(const ir_node *old, ir_node *newn)
+{
+       if (is_ia32_is_reload(old))
+               set_ia32_is_reload(newn);
+       if (is_ia32_is_spill(old))
+               set_ia32_is_spill(newn);
+       if (is_ia32_is_remat(old))
+               set_ia32_is_remat(newn);
+}
 
-static void peephole_IncSP_IncSP(ir_node *node);
+typedef enum produces_flag_t {
+       produces_no_flag,
+       produces_flag_zero,
+       produces_flag_carry
+} produces_flag_t;
 
-#if 0
-static void peephole_ia32_Store_IncSP_to_push(ir_node *node)
+/**
+ * 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  *base  = get_irn_n(node, n_ia32_Store_base);
-       ir_node  *index = get_irn_n(node, n_ia32_Store_index);
-       ir_node  *mem   = get_irn_n(node, n_ia32_Store_mem);
-       ir_node  *incsp = base;
-       ir_node  *val;
-       ir_node  *noreg;
-       ir_graph *irg;
-       ir_node  *block;
-       dbg_info *dbgi;
-       ir_mode  *mode;
-       ir_node  *push;
-       ir_node  *proj;
-       int       offset;
-       int       node_offset;
+       ir_node                     *count;
+       const ia32_immediate_attr_t *imm_attr;
 
-       /* nomem inidicates the store doesn't alias with anything else */
-       if(!is_NoMem(mem))
-               return;
+       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;
 
-       /* find an IncSP in front of us, we might have to skip barriers for this */
-       while(is_Proj(incsp)) {
-               ir_node *proj_pred = get_Proj_pred(incsp);
-               if(!be_is_Barrier(proj_pred))
-                       return;
-               incsp = get_irn_n(proj_pred, get_Proj_proj(incsp));
+               case iro_ia32_ShlD:
+               case iro_ia32_ShrD:
+                       assert((int)n_ia32_ShlD_count == (int)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((int)n_ia32_Shl_count == (int)n_ia32_Shr_count
+                                       && (int)n_ia32_Shl_count == (int)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;
        }
-       if(!be_is_IncSP(incsp))
-               return;
 
-       peephole_IncSP_IncSP(incsp);
+       return pn == pn_ia32_res ?
+               produces_flag_zero : produces_no_flag;
+}
 
-       /* must be in the same block */
-       if(get_nodes_block(incsp) != get_nodes_block(node))
+/**
+ * Replace Cmp(x, 0) by a Test(x, x)
+ */
+static void peephole_ia32_Cmp(ir_node *const node)
+{
+       ir_node                     *right;
+       ir_graph                    *irg;
+       ia32_immediate_attr_t const *imm;
+       dbg_info                    *dbgi;
+       ir_node                     *block;
+       ir_node                     *noreg;
+       ir_node                     *nomem;
+       ir_node                     *op;
+       ia32_attr_t           const *attr;
+       int                          ins_permuted;
+       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;
 
-       if(!is_ia32_NoReg_GP(index) || get_ia32_am_sc(node) != NULL) {
-               panic("Invalid storeAM found (%+F)", node);
-       }
+       right = get_irn_n(node, n_ia32_Cmp_right);
+       if (!is_ia32_Immediate(right))
+               return;
 
-       /* we should be the store to the end of the stackspace */
-       offset      = be_get_IncSP_offset(incsp);
-       mode        = get_ia32_ls_mode(node);
-       node_offset = get_ia32_am_offs_int(node);
-       if(node_offset != offset - get_mode_size_bytes(mode))
+       imm = get_ia32_immediate_attr_const(right);
+       if (imm->symconst != NULL || imm->offset != 0)
                return;
 
-       /* we can use a push instead of the store */
-       irg   = current_ir_graph;
-       block = get_nodes_block(node);
-       dbgi  = get_irn_dbg_info(node);
-       noreg = ia32_new_NoReg_gp(cg);
-       base  = be_get_IncSP_pred(incsp);
-       val   = get_irn_n(node, n_ia32_Store_val);
-       push  = new_rd_ia32_Push(dbgi, irg, block, noreg, noreg, mem, base, val);
+       dbgi         = get_irn_dbg_info(node);
+       irg          = get_irn_irg(node);
+       block        = get_nodes_block(node);
+       noreg        = ia32_new_NoReg_gp(irg);
+       nomem        = get_irg_no_mem(current_ir_graph);
+       op           = get_irn_n(node, n_ia32_Cmp_left);
+       attr         = get_ia32_attr(node);
+       ins_permuted = attr->data.ins_permuted;
+
+       if (is_ia32_Cmp(node)) {
+               test = new_bd_ia32_Test(dbgi, block, noreg, noreg, nomem,
+                                       op, op, ins_permuted);
+       } else {
+               test = new_bd_ia32_Test8Bit(dbgi, block, noreg, noreg, nomem,
+                                           op, op, ins_permuted);
+       }
+       set_ia32_ls_mode(test, get_ia32_ls_mode(node));
 
-       proj  = new_r_Proj(irg, block, push, mode_M, pn_ia32_Push_M);
+       reg = arch_irn_get_register(node, pn_ia32_Cmp_eflags);
+       arch_irn_set_register(test, pn_ia32_Test_eflags, reg);
 
-       be_set_IncSP_offset(incsp, offset - get_mode_size_bytes(mode));
+       foreach_out_edge_safe(node, edge, tmp) {
+               ir_node *const user = get_edge_src_irn(edge);
 
-       sched_add_before(node, push);
-       sched_remove(node);
+               if (is_Proj(user))
+                       exchange(user, test);
+       }
 
-       be_peephole_before_exchange(node, proj);
-       exchange(node, proj);
-       be_peephole_after_exchange(proj);
+       sched_add_before(node, test);
+       copy_mark(node, test);
+       be_peephole_exchange(node, test);
 }
 
-static void peephole_ia32_Store(ir_node *node)
+/**
+ * Peephole optimization for Test instructions.
+ * - Remove the Test, if an appropriate flag was produced which is still live
+ * - Change a Test(x, c) to 8Bit, if 0 <= c < 256 (3 byte shorter opcode)
+ */
+static void peephole_ia32_Test(ir_node *node)
 {
-       peephole_ia32_Store_IncSP_to_push(node);
-}
-#endif
+       ir_node *left  = get_irn_n(node, n_ia32_Test_left);
+       ir_node *right = get_irn_n(node, n_ia32_Test_right);
 
-static int produces_zero_flag(ir_node *node, int pn)
-{
-       ir_node                     *count;
-       const ia32_immediate_attr_t *imm_attr;
+       assert((int)n_ia32_Test_left == (int)n_ia32_Test8Bit_left
+                       && (int)n_ia32_Test_right == (int)n_ia32_Test8Bit_right);
 
-       if(!is_ia32_irn(node))
-               return 0;
+       if (left == right) { /* we need a test for 0 */
+               ir_node         *block = get_nodes_block(node);
+               int              pn    = pn_ia32_res;
+               ir_node         *flags_proj;
+               ir_mode         *flags_mode;
+               ir_node         *schedpoint;
+               ir_node         *op = left;
+               const ir_edge_t *edge;
 
-       if(pn >= 0) {
-               if(pn != pn_ia32_res)
-                       return 0;
-       }
+               if (get_nodes_block(left) != block)
+                       return;
 
-       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:
-               return 1;
-
-       case iro_ia32_ShlD:
-       case iro_ia32_ShrD:
-       case iro_ia32_Shl:
-       case iro_ia32_Shr:
-       case iro_ia32_Sar:
-               assert(n_ia32_ShlD_count == n_ia32_ShrD_count);
-               assert(n_ia32_Shl_count == n_ia32_Shr_count
-                               && n_ia32_Shl_count == n_ia32_Sar_count);
-               if(is_ia32_ShlD(node) || is_ia32_ShrD(node)) {
-                       count = get_irn_n(node, n_ia32_ShlD_count);
-               } else {
-                       count = get_irn_n(node, n_ia32_Shl_count);
+               if (is_Proj(op)) {
+                       pn = get_Proj_proj(op);
+                       op = get_Proj_pred(op);
                }
-               /* 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 0;
-
-               imm_attr = get_ia32_immediate_attr_const(count);
-               if(imm_attr->symconst != NULL)
-                       return 0;
-               if((imm_attr->offset & 0x1f) == 0)
-                       return 0;
-               return 1;
-
-       default:
-               break;
-       }
-       return 0;
-}
 
-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);
+               /* 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 == op)
+                               break;
+                       if (arch_irn_is(schedpoint, modify_flags))
+                               return;
+                       if (schedpoint == block)
+                               panic("couldn't find left");
+               }
 
-       new_node = exact_copy(node);
-       set_irn_mode(new_node, mode_T);
+               /* make sure only Lg/Eq tests are used */
+               foreach_out_edge(node, edge) {
+                       ir_node              *user = get_edge_src_irn(edge);
+                       ia32_condition_code_t cc  = get_ia32_condcode(user);
 
-       block    = get_nodes_block(new_node);
-       res_proj = new_r_Proj(current_ir_graph, block, new_node, mode_Iu,
-                             pn_ia32_res);
+                       if (cc != ia32_cc_equal && cc != ia32_cc_not_equal) {
+                               return;
+                       }
+               }
 
-       reg = arch_get_irn_register(arch_env, node);
-       arch_set_irn_register(arch_env, res_proj, reg);
+               switch (produces_test_flag(op, pn)) {
+                       case produces_flag_zero:
+                               break;
+
+                       case produces_flag_carry:
+                               foreach_out_edge(node, edge) {
+                                       ir_node              *user = get_edge_src_irn(edge);
+                                       ia32_condition_code_t cc   = get_ia32_condcode(user);
+
+                                       switch (cc) {
+                                       case ia32_cc_equal:     cc = ia32_cc_above_equal; break; /* CF = 0 */
+                                       case ia32_cc_not_equal: cc = ia32_cc_below;       break; /* CF = 1 */
+                                       default: panic("unexpected pn");
+                                       }
+                                       set_ia32_condcode(user, cc);
+                               }
+                               break;
+
+                       default:
+                               return;
+               }
 
-       be_peephole_before_exchange(node, res_proj);
-       sched_add_before(node, new_node);
-       sched_remove(node);
-       exchange(node, res_proj);
-       be_peephole_after_exchange(res_proj);
+               if (get_irn_mode(op) != mode_T) {
+                       set_irn_mode(op, mode_T);
 
-       return new_node;
-}
+                       /* If there are other users, reroute them to result proj */
+                       if (get_irn_n_edges(op) != 2) {
+                               ir_node *res = new_r_Proj(op, mode_Iu, pn_ia32_res);
 
-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    = -1;
-       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;
+                               edges_reroute(op, res);
+                               /* Reattach the result proj to left */
+                               set_Proj_pred(res, op);
+                       }
+               } else {
+                       if (get_irn_n_edges(left) == 2)
+                               kill_node(left);
+               }
 
-       block = get_nodes_block(node);
-       if(get_nodes_block(left) != block)
-               return;
+               flags_mode = ia32_reg_classes[CLASS_ia32_flags].mode;
+               flags_proj = new_r_Proj(op, flags_mode, pn_ia32_flags);
+               arch_set_irn_register(flags_proj, &ia32_registers[REG_EFLAGS]);
 
-       if(is_Proj(left)) {
-               pn   = get_Proj_proj(left);
-               left = get_Proj_pred(left);
-       }
+               assert(get_irn_mode(node) != mode_T);
 
-       /* happens rarely, but if it does code will panic' */
-       if (is_ia32_Unknown_GP(left))
-               return;
+               be_peephole_exchange(node, flags_proj);
+       } else if (is_ia32_Immediate(right)) {
+               ia32_immediate_attr_t const *const imm = get_ia32_immediate_attr_const(right);
+               unsigned                           offset;
 
-       /* walk schedule up and abort when we find left or some other node destroys
-          the flags */
-       schedpoint = sched_prev(node);
-       while(schedpoint != left) {
-               schedpoint = sched_prev(schedpoint);
-               if(arch_irn_is(arch_env, schedpoint, modify_flags))
+               /* A test with a symconst is rather strange, but better safe than sorry */
+               if (imm->symconst != NULL)
                        return;
-               if(schedpoint == block)
-                       panic("couldn't find left");
-       }
 
-       /* 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);
+               offset = imm->offset;
+               if (get_ia32_op_type(node) == ia32_AddrModeS) {
+                       ia32_attr_t *const attr = get_ia32_attr(node);
+
+                       if ((offset & 0xFFFFFF00) == 0) {
+                               /* attr->am_offs += 0; */
+                       } else if ((offset & 0xFFFF00FF) == 0) {
+                               ir_node *imm = ia32_create_Immediate(NULL, 0, offset >>  8);
+                               set_irn_n(node, n_ia32_Test_right, imm);
+                               attr->am_offs += 1;
+                       } else if ((offset & 0xFF00FFFF) == 0) {
+                               ir_node *imm = ia32_create_Immediate(NULL, 0, offset >> 16);
+                               set_irn_n(node, n_ia32_Test_right, imm);
+                               attr->am_offs += 2;
+                       } else if ((offset & 0x00FFFFFF) == 0) {
+                               ir_node *imm = ia32_create_Immediate(NULL, 0, offset >> 24);
+                               set_irn_n(node, n_ia32_Test_right, imm);
+                               attr->am_offs += 3;
+                       } else {
+                               return;
+                       }
+               } else if (offset < 256) {
+                       arch_register_t const* const reg = arch_get_irn_register(left);
 
-               if(pnc != pn_Cmp_Eq && pnc != pn_Cmp_Lg) {
+                       if (reg != &ia32_registers[REG_EAX] &&
+                                       reg != &ia32_registers[REG_EBX] &&
+                                       reg != &ia32_registers[REG_ECX] &&
+                                       reg != &ia32_registers[REG_EDX]) {
+                               return;
+                       }
+               } else {
                        return;
                }
-       }
 
-       if(!produces_zero_flag(left, pn))
-               return;
+               /* Technically we should build a Test8Bit because of the register
+                * constraints, but nobody changes registers at this point anymore. */
+               set_ia32_ls_mode(node, mode_Bu);
+       }
+}
 
-       left = turn_into_mode_t(left);
+/**
+ * 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 *irn;
 
-       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]);
+       if (!ia32_cg_config.use_pad_return)
+               return;
 
-       assert(get_irn_mode(node) != mode_T);
+       /* 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_Start:
+                       /* 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;
+               }
+       }
 
-       be_peephole_before_exchange(node, flags_proj);
-       exchange(node, flags_proj);
-       sched_remove(node);
-       be_peephole_after_exchange(flags_proj);
+       /* 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
+/* 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    = get_irn_irg(irn);
+       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;
+               ir_node *noreg = ia32_new_NoReg_gp(irg);
+               const ir_edge_t *edge;
+               const ir_edge_t *next;
 
                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_bd_ia32_Push(get_irn_dbg_info(store), block, noreg, noreg,
+                                       mem, val, curr_sp);
+               copy_mark(store, push);
+
+               if (first_push == NULL)
+                       first_push = push;
+
+               sched_add_after(skip_Proj(curr_sp), push);
+
+               /* create stackpointer Proj */
+               curr_sp = new_r_Proj(push, spmode, pn_ia32_Push_stack);
+               arch_set_irn_register(curr_sp, spreg);
 
-               push = new_rd_ia32_Push(get_irn_dbg_info(store), irg, block, noreg, noreg, mem, curr_sp, val);
+               /* create memory Proj */
+               mem_proj = new_r_Proj(push, mode_M, pn_ia32_Push_M);
 
-               sched_add_before(irn, push);
+               /* rewire Store Projs */
+               foreach_out_edge_safe(store, edge, next) {
+                       ir_node *proj = get_edge_src_irn(edge);
+                       if (!is_Proj(proj))
+                               continue;
+                       switch (get_Proj_proj(proj)) {
+                       case pn_ia32_Store_M:
+                               exchange(proj, mem_proj);
+                               break;
+                       default:
+                               panic("unexpected Proj on Store->IncSp");
+                       }
+               }
 
-               // 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);
+               /* use the memproj now */
+               be_peephole_exchange(store, push);
 
-               // create memory proj
-               mem_proj = new_r_Proj(irg, block, push, mode_M, pn_ia32_Push_M);
+               inc_ofs -= 4;
+       }
 
-               // use the memproj now
-               exchange(store, mem_proj);
+       foreach_out_edge_safe(irn, edge, next) {
+               ir_node *const src = get_edge_src_irn(edge);
+               int      const pos = get_edge_src_pos(edge);
 
-               // we can remove the store now
-               sched_remove(store);
+               if (src == first_push)
+                       continue;
 
-               offset -= 4;
+               set_irn_n(src, pos, curr_sp);
        }
 
-       be_set_IncSP_offset(irn, offset);
-       be_set_IncSP_pred(irn, curr_sp);
+       be_set_IncSP_offset(irn, inc_ofs);
 }
 
+#if 0
 /**
- * Tries to optimize two following IncSP.
+ * Creates a Push instruction before the given schedule point.
+ *
+ * @param dbgi        debug info
+ * @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 void peephole_IncSP_IncSP(ir_node *node)
+static ir_node *create_push(dbg_info *dbgi, ir_node *block,
+                            ir_node *stack, ir_node *schedpoint)
 {
-       int      pred_offs;
-       int      curr_offs;
-       int      offs;
-       ir_node *pred = be_get_IncSP_pred(node);
-       ir_node *predpred;
+       const arch_register_t *esp = &ia32_registers[REG_ESP];
+
+       ir_node *val   = ia32_new_NoReg_gp(cg);
+       ir_node *noreg = ia32_new_NoReg_gp(cg);
+       ir_graph *irg  = get_irn_irg(block);
+       ir_node *nomem = get_irg_no_mem(irg);
+       ir_node *push  = new_bd_ia32_Push(dbgi, block, noreg, noreg, nomem, val, stack);
+       sched_add_before(schedpoint, push);
 
-       if(!be_is_IncSP(pred))
+       stack = new_r_Proj(push, mode_Iu, pn_ia32_Push_stack);
+       arch_set_irn_register(stack, esp);
+
+       return stack;
+}
+
+static void peephole_store_incsp(ir_node *store)
+{
+       dbg_info *dbgi;
+       ir_node  *node;
+       ir_node  *block;
+       ir_node  *noreg;
+       ir_node  *mem;
+       ir_node  *push;
+       ir_node  *val;
+       ir_node  *base;
+       ir_node  *index;
+       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;
+
+       /* we have to be at offset 0 */
+       int my_offset = get_ia32_am_offs_int(store);
+       if (my_offset != 0) {
+               /* TODO here: find out whether there is a store with offset 0 before
+                * us and whether 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;
 
-       if(pred_offs == BE_STACK_FRAME_SIZE_EXPAND) {
-               if(curr_offs != BE_STACK_FRAME_SIZE_SHRINK) {
+               /* 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_ls_mode);
+                               /* 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;
+                       }
+
+                       /* 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_irn_n(store, n_ia32_Store_val);
+
+       push  = new_bd_ia32_Push(dbgi, 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 == ia32_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_registers[REG_ESP];
+       int      i, maxslot, inc_ofs, ofs;
+       ir_node  *node, *pred_sp, *block;
+       ir_node  *loads[MAXPUSH_OPTIMIZE];
+       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_irn_get_register(node, pn_ia32_Load_res);
+               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);
+       if (inc_ofs > 0) {
+               pred_sp = be_new_IncSP(esp, 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_irn_get_register(load, pn_ia32_Load_res);
+
+               pop = new_bd_ia32_Pop(get_irn_dbg_info(load), block, mem, pred_sp);
+               arch_irn_set_register(pop, pn_ia32_Load_res, reg);
+
+               copy_mark(load, pop);
 
-       predpred = be_get_IncSP_pred(pred);
-       be_peephole_before_exchange(pred, predpred);
+               /* create stackpointer Proj */
+               pred_sp = new_r_Proj(pop, mode_Iu, pn_ia32_Pop_stack);
+               arch_set_irn_register(pred_sp, esp);
 
-       /* rewire dependency edges */
-       edges_reroute_kind(pred, predpred, EDGE_KIND_DEP, current_ir_graph);
-       be_set_IncSP_pred(node, predpred);
-       sched_remove(pred);
-       be_kill_node(pred);
+               sched_add_before(irn, pop);
 
-       be_peephole_after_exchange(predpred);
+               /* 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)
+static const arch_register_t *get_free_gp_reg(ir_graph *irg)
 {
+       be_irg_t *birg = be_birg_from_irg(irg);
        int i;
 
-       for(i = 0; i < N_ia32_gp_REGS; ++i) {
-               const arch_register_t *reg = &ia32_gp_regs[i];
-               if(arch_register_type_is(reg, ignore))
+       for (i = 0; i < N_ia32_gp_REGS; ++i) {
+               const arch_register_t *reg = &ia32_reg_classes[CLASS_ia32_gp].regs[i];
+               if (!rbitset_is_set(birg->allocatable_regs, reg->global_index))
                        continue;
 
-               if(be_peephole_get_value(CLASS_ia32_gp, i) == NULL)
-                       return &ia32_gp_regs[i];
+               if (be_peephole_get_value(CLASS_ia32_gp, i) == NULL)
+                       return reg;
        }
 
        return NULL;
 }
 
+/**
+ * Creates a Pop instruction before the given schedule point.
+ *
+ * @param dbgi        debug info
+ * @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_node *block,
+                           ir_node *stack, ir_node *schedpoint,
+                           const arch_register_t *reg)
+{
+       const arch_register_t *esp = &ia32_registers[REG_ESP];
+       ir_graph *irg = get_irn_irg(block);
+       ir_node *pop;
+       ir_node *keep;
+       ir_node *val;
+       ir_node *in[1];
+
+       pop   = new_bd_ia32_Pop(dbgi, block, get_irg_no_mem(irg), stack);
+
+       stack = new_r_Proj(pop, mode_Iu, pn_ia32_Pop_stack);
+       arch_set_irn_register(stack, esp);
+       val   = new_r_Proj(pop, mode_Iu, pn_ia32_Pop_res);
+       arch_set_irn_register(val, reg);
+
+       sched_add_before(schedpoint, pop);
+
+       in[0] = val;
+       keep  = be_new_Keep(block, 1, in);
+       sched_add_before(schedpoint, keep);
+
+       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 *esp = &ia32_registers[REG_ESP];
        const arch_register_t *reg;
-       ir_graph              *irg;
        dbg_info              *dbgi;
        ir_node               *block;
-       ir_node               *keep;
-       ir_node               *val;
-       ir_node               *pop, *pop2;
-       ir_node               *noreg;
        ir_node               *stack;
        int                    offset;
 
        /* first optimize incsp->incsp combinations */
-       peephole_IncSP_IncSP(node);
+       node = be_peephole_IncSP_IncSP(node);
 
        /* transform IncSP->Store combinations to Push where possible */
        peephole_IncSP_Store_to_push(node);
 
-       if (arch_get_irn_register(arch_env, node) != esp)
+       /* transform Load->IncSP combinations to Pop where possible */
+       peephole_Load_IncSP_to_pop(node);
+
+       if (arch_get_irn_register(node) != esp)
                return;
 
        /* replace IncSP -4 by Pop freereg when possible */
        offset = be_get_IncSP_offset(node);
-       if (!(offset == -4 && !ia32_cg_config.use_add_esp_4) &&
-           !(offset == -8 && !ia32_cg_config.use_add_esp_8) &&
-           !(offset == +4 && !ia32_cg_config.use_sub_esp_4) &&
-           !(offset == +8 && !ia32_cg_config.use_sub_esp_8))
+       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;
 
        if (offset < 0) {
                /* we need a free register for pop */
-               reg = get_free_gp_reg();
-               if(reg == NULL)
+               reg = get_free_gp_reg(get_irn_irg(node));
+               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);
 
-               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(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);
-               } else {
-                       be_Keep_add_node(keep, &ia32_reg_classes[CLASS_ia32_gp], val);
-               }
+               stack = create_pop(dbgi, block, stack, node, reg);
 
                if (offset == -8) {
-                       pop2  = new_rd_ia32_Pop(dbgi, irg, block, noreg, noreg, new_NoMem(), stack);
-
-                       stack = new_r_Proj(irg, block, pop2, mode_Iu, pn_ia32_Pop_stack);
-                       arch_set_irn_register(arch_env, stack, esp);
-                       val   = new_r_Proj(irg, block, pop2, mode_Iu, pn_ia32_Pop_res);
-                       arch_set_irn_register(arch_env, val, reg);
-
-                       sched_add_after(pop, pop2);
-                       be_Keep_add_node(keep, &ia32_reg_classes[CLASS_ia32_gp], val);
+                       stack = create_pop(dbgi, block, stack, node, reg);
                }
        } else {
-               /* NIY */
-               return;
+               dbgi  = get_irn_dbg_info(node);
+               block = get_nodes_block(node);
+               stack = be_get_IncSP_pred(node);
+               stack = new_bd_ia32_PushEax(dbgi, block, stack);
+               arch_set_irn_register(stack, esp);
+               sched_add_before(node, stack);
+
+               if (offset == +8) {
+                       stack = new_bd_ia32_PushEax(dbgi, block, stack);
+                       arch_set_irn_register(stack, esp);
+                       sched_add_before(node, stack);
+               }
        }
 
-       be_peephole_before_exchange(node, stack);
-       sched_remove(node);
-       exchange(node, stack);
-       be_peephole_after_exchange(stack);
+       be_peephole_exchange(node, stack);
 }
 
 /**
@@ -577,71 +959,63 @@ static void peephole_ia32_Const(ir_node *node)
 {
        const ia32_immediate_attr_t *attr = get_ia32_immediate_attr_const(node);
        const arch_register_t       *reg;
-       ir_graph                    *irg = current_ir_graph;
        ir_node                     *block;
        dbg_info                    *dbgi;
-       ir_node                     *produceval;
-       ir_node                     *xor;
-       ir_node                     *noreg;
+       ir_node                     *xorn;
 
        /* 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_FLAGS_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) */
-       block      = get_nodes_block(node);
-       dbgi       = get_irn_dbg_info(node);
-       produceval = new_rd_ia32_ProduceVal(dbgi, irg, block);
-       arch_set_irn_register(arch_env, produceval, reg);
-
-       noreg = ia32_new_NoReg_gp(cg);
-       xor   = new_rd_ia32_Xor(dbgi, irg, block, noreg, noreg, new_NoMem(),
-                               produceval, produceval);
-       arch_set_irn_register(arch_env, xor, reg);
+       block = get_nodes_block(node);
+       dbgi  = get_irn_dbg_info(node);
+       xorn  = new_bd_ia32_Xor0(dbgi, block);
+       arch_set_irn_register(xorn, reg);
 
-       sched_add_before(node, produceval);
-       sched_add_before(node, xor);
+       sched_add_before(node, xorn);
 
-       be_peephole_before_exchange(node, xor);
-       exchange(node, xor);
-       sched_remove(node);
-       be_peephole_after_exchange(xor);
+       copy_mark(node, xorn);
+       be_peephole_exchange(node, xorn);
 }
 
-static INLINE int is_noreg(ia32_code_gen_t *cg, const ir_node *node)
+static inline int is_noreg(const ir_node *node)
 {
-       return node == cg->noreg_gp;
+       return is_ia32_NoReg_GP(node);
 }
 
-static ir_node *create_immediate_from_int(ia32_code_gen_t *cg, int val)
+ir_node *ia32_immediate_from_long(long val)
 {
        ir_graph *irg         = current_ir_graph;
        ir_node  *start_block = get_irg_start_block(irg);
-       ir_node  *immediate   = new_rd_ia32_Immediate(NULL, irg, start_block, NULL,
-                                                     0, val);
-       arch_set_irn_register(cg->arch_env, immediate, &ia32_gp_regs[REG_GP_NOREG]);
+       ir_node  *immediate
+               = new_bd_ia32_Immediate(NULL, start_block, NULL, 0, 0, val);
+       arch_set_irn_register(immediate, &ia32_registers[REG_GP_NOREG]);
 
        return immediate;
 }
 
-static ir_node *create_immediate_from_am(ia32_code_gen_t *cg,
-                                         const ir_node *node)
+static ir_node *create_immediate_from_am(const ir_node *node)
 {
-       ir_graph  *irg     = get_irn_irg(node);
        ir_node   *block   = get_nodes_block(node);
        int        offset  = get_ia32_am_offs_int(node);
        int        sc_sign = is_ia32_am_sc_sign(node);
+       const ia32_attr_t *attr = get_ia32_attr_const(node);
+       int        sc_no_pic_adjust = attr->data.am_sc_no_pic_adjust;
        ir_entity *entity  = get_ia32_am_sc(node);
        ir_node   *res;
 
-       res = new_rd_ia32_Immediate(NULL, irg, block, entity, sc_sign, offset);
-       arch_set_irn_register(cg->arch_env, res, &ia32_gp_regs[REG_GP_NOREG]);
+       res = new_bd_ia32_Immediate(NULL, block, entity, sc_sign, sc_no_pic_adjust,
+                                   offset);
+       arch_set_irn_register(res, &ia32_registers[REG_GP_NOREG]);
        return res;
 }
 
@@ -666,8 +1040,7 @@ static int is_am_minus_one(const ir_node *node)
  */
 static void peephole_ia32_Lea(ir_node *node)
 {
-       const arch_env_t      *arch_env = cg->arch_env;
-       ir_graph              *irg      = current_ir_graph;
+       ir_graph              *irg;
        ir_node               *base;
        ir_node               *index;
        const arch_register_t *base_reg;
@@ -685,27 +1058,27 @@ static void peephole_ia32_Lea(ir_node *node)
 
        assert(is_ia32_Lea(node));
 
-       /* we can only do this if are allowed to globber the flags */
-       if(be_peephole_get_value(CLASS_ia32_flags, REG_EFLAGS) != NULL)
+       /* we can only do this if it is allowed to clobber the flags */
+       if (be_peephole_get_value(CLASS_ia32_flags, REG_FLAGS_EFLAGS) != NULL)
                return;
 
        base  = get_irn_n(node, n_ia32_Lea_base);
        index = get_irn_n(node, n_ia32_Lea_index);
 
-       if(is_noreg(cg, base)) {
+       if (is_noreg(base)) {
                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)) {
+       if (is_noreg(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) {
+       if (base == NULL && index == NULL) {
                /* we shouldn't construct these in the first place... */
 #ifdef DEBUG_libfirm
                ir_fprintf(stderr, "Optimisation warning: found immediate only lea\n");
@@ -713,12 +1086,12 @@ 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
         * expressed in the offsets) */
-       if(get_ia32_am_offs_int(node) != 0 || get_ia32_am_sc(node) != NULL) {
+       if (get_ia32_am_offs_int(node) != 0 || get_ia32_am_sc(node) != NULL) {
                has_immediates = 1;
        } else {
                has_immediates = 0;
@@ -726,10 +1099,10 @@ static void peephole_ia32_Lea(ir_node *node)
 
        /* we can transform leas where the out register is the same as either the
         * base or index register back to an Add or Shl */
-       if(out_reg == base_reg) {
-               if(index == NULL) {
+       if (out_reg == base_reg) {
+               if (index == NULL) {
 #ifdef DEBUG_libfirm
-                       if(!has_immediates) {
+                       if (!has_immediates) {
                                ir_fprintf(stderr, "Optimisation warning: found lea which is "
                                           "just a copy\n");
                        }
@@ -737,29 +1110,29 @@ static void peephole_ia32_Lea(ir_node *node)
                        op1 = base;
                        goto make_add_immediate;
                }
-               if(scale == 0 && !has_immediates) {
+               if (scale == 0 && !has_immediates) {
                        op1 = base;
                        op2 = index;
                        goto make_add;
                }
                /* can't create an add */
                return;
-       } else if(out_reg == index_reg) {
-               if(base == NULL) {
-                       if(has_immediates && scale == 0) {
+       } else if (out_reg == index_reg) {
+               if (base == NULL) {
+                       if (has_immediates && scale == 0) {
                                op1 = index;
                                goto make_add_immediate;
-                       } else if(!has_immediates && scale > 0) {
+                       } else if (!has_immediates && scale > 0) {
                                op1 = index;
-                               op2 = create_immediate_from_int(cg, scale);
+                               op2 = ia32_immediate_from_long(scale);
                                goto make_shl;
-                       } else if(!has_immediates) {
+                       } else if (!has_immediates) {
 #ifdef DEBUG_libfirm
                                ir_fprintf(stderr, "Optimisation warning: found lea which is "
                                           "just a copy\n");
 #endif
                        }
-               } else if(scale == 0 && !has_immediates) {
+               } else if (scale == 0 && !has_immediates) {
                        op1 = index;
                        op2 = base;
                        goto make_add;
@@ -772,91 +1145,154 @@ static void peephole_ia32_Lea(ir_node *node)
        }
 
 make_add_immediate:
-       if(ia32_cg_config.use_incdec) {
-               if(is_am_one(node)) {
+       if (ia32_cg_config.use_incdec) {
+               if (is_am_one(node)) {
                        dbgi  = get_irn_dbg_info(node);
                        block = get_nodes_block(node);
-                       res   = new_rd_ia32_Inc(dbgi, irg, block, op1);
-                       arch_set_irn_register(arch_env, res, out_reg);
+                       res   = new_bd_ia32_Inc(dbgi, block, op1);
+                       arch_set_irn_register(res, out_reg);
                        goto exchange;
                }
-               if(is_am_minus_one(node)) {
+               if (is_am_minus_one(node)) {
                        dbgi  = get_irn_dbg_info(node);
                        block = get_nodes_block(node);
-                       res   = new_rd_ia32_Dec(dbgi, irg, block, op1);
-                       arch_set_irn_register(arch_env, res, out_reg);
+                       res   = new_bd_ia32_Dec(dbgi, block, op1);
+                       arch_set_irn_register(res, out_reg);
                        goto exchange;
                }
        }
-       op2 = create_immediate_from_am(cg, node);
+       op2 = create_immediate_from_am(node);
 
 make_add:
        dbgi  = get_irn_dbg_info(node);
        block = get_nodes_block(node);
-       noreg = ia32_new_NoReg_gp(cg);
-       nomem = new_NoMem();
-       res   = new_rd_ia32_Add(dbgi, irg, block, noreg, noreg, nomem, op1, op2);
-       arch_set_irn_register(arch_env, res, out_reg);
+       irg   = get_irn_irg(node);
+       noreg = ia32_new_NoReg_gp(irg);
+       nomem = get_irg_no_mem(irg);
+       res   = new_bd_ia32_Add(dbgi, block, noreg, noreg, nomem, op1, op2);
+       arch_set_irn_register(res, out_reg);
        set_ia32_commutative(res);
        goto exchange;
 
 make_shl:
        dbgi  = get_irn_dbg_info(node);
        block = get_nodes_block(node);
-       noreg = ia32_new_NoReg_gp(cg);
-       nomem = new_NoMem();
-       res   = new_rd_ia32_Shl(dbgi, irg, block, op1, op2);
-       arch_set_irn_register(arch_env, res, out_reg);
+       irg   = get_irn_irg(node);
+       noreg = ia32_new_NoReg_gp(irg);
+       nomem = get_irg_no_mem(irg);
+       res   = new_bd_ia32_Shl(dbgi, block, op1, op2);
+       arch_set_irn_register(res, out_reg);
        goto exchange;
 
 exchange:
-       SET_IA32_ORIG_NODE(res, ia32_get_old_node_name(cg, node));
+       SET_IA32_ORIG_NODE(res, node);
 
        /* add new ADD/SHL to schedule */
        DBG_OPT_LEA2ADD(node, res);
 
        /* exchange the Add and the LEA */
-       be_peephole_before_exchange(node, res);
        sched_add_before(node, res);
-       sched_remove(node);
-       exchange(node, res);
-       be_peephole_after_exchange(res);
+       copy_mark(node, res);
+       be_peephole_exchange(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;
+
+       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(get_irn_irg(imul));
+       if (reg == NULL)
+               return;
+
+       /* fine, we can rebuild it */
+       res = ia32_turn_back_am(imul);
+       arch_set_irn_register(res, reg);
+}
+
+/**
+ * Replace xorps r,r and xorpd r,r by pxor r,r
+ */
+static void peephole_ia32_xZero(ir_node *xorn)
+{
+       set_irn_op(xorn, op_ia32_xPzero);
+}
+
+/**
+ * Replace 16bit sign extension from ax to eax by shorter cwtl
+ */
+static void peephole_ia32_Conv_I2I(ir_node *node)
+{
+       const arch_register_t *eax          = &ia32_registers[REG_EAX];
+       ir_mode               *smaller_mode = get_ia32_ls_mode(node);
+       ir_node               *val          = get_irn_n(node, n_ia32_Conv_I2I_val);
+       dbg_info              *dbgi;
+       ir_node               *block;
+       ir_node               *cwtl;
+
+       if (get_mode_size_bits(smaller_mode) != 16 ||
+                       !mode_is_signed(smaller_mode)          ||
+                       eax != arch_get_irn_register(val)      ||
+                       eax != arch_irn_get_register(node, pn_ia32_Conv_I2I_res))
+               return;
+
+       dbgi  = get_irn_dbg_info(node);
+       block = get_nodes_block(node);
+       cwtl  = new_bd_ia32_Cwtl(dbgi, block, val);
+       arch_set_irn_register(cwtl, eax);
+       sched_add_before(node, cwtl);
+       be_peephole_exchange(node, cwtl);
 }
 
 /**
  * Register a peephole optimisation function.
  */
-static void register_peephole_optimisation(ir_op *op, peephole_opt_func func) {
+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. */
-void ia32_peephole_optimization(ia32_code_gen_t *new_cg)
+void ia32_peephole_optimization(ir_graph *irg)
 {
-       cg       = new_cg;
-       arch_env = cg->arch_env;
-
        /* register peephole optimisations */
        clear_irp_opcodes_generic_func();
-       register_peephole_optimisation(op_ia32_Const, peephole_ia32_Const);
-       //register_peephole_optimisation(op_ia32_Store, peephole_ia32_Store);
-       register_peephole_optimisation(op_be_IncSP, peephole_be_IncSP);
-       register_peephole_optimisation(op_ia32_Lea, peephole_ia32_Lea);
-       register_peephole_optimisation(op_ia32_Test, peephole_ia32_Test);
+       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);
-
-       be_peephole_opt(cg->birg);
+       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);
+       if (ia32_cg_config.use_short_sex_eax)
+               register_peephole_optimisation(op_ia32_Conv_I2I, peephole_ia32_Conv_I2I);
+
+       be_peephole_opt(irg);
 }
 
 /**
  * Removes node from schedule if it is not used anymore. If irn is a mode_T node
- * all it's Projs are removed as well.
+ * all its Projs are removed as well.
  * @param irn  The irn to be removed from schedule
  */
-static INLINE void try_kill(ir_node *node)
+static inline void try_kill(ir_node *node)
 {
-       if(get_irn_mode(node) == mode_T) {
+       if (get_irn_mode(node) == mode_T) {
                const ir_edge_t *edge, *next;
                foreach_out_edge_safe(node, edge, next) {
                        ir_node *proj = get_edge_src_irn(edge);
@@ -864,14 +1300,14 @@ static INLINE void try_kill(ir_node *node)
                }
        }
 
-       if(get_irn_n_edges(node) != 0)
+       if (get_irn_n_edges(node) != 0)
                return;
 
        if (sched_is_scheduled(node)) {
                sched_remove(node);
        }
 
-       be_kill_node(node);
+       kill_node(node);
 }
 
 static void optimize_conv_store(ir_node *node)
@@ -881,33 +1317,33 @@ static void optimize_conv_store(ir_node *node)
        ir_mode *conv_mode;
        ir_mode *store_mode;
 
-       if(!is_ia32_Store(node) && !is_ia32_Store8Bit(node))
+       if (!is_ia32_Store(node) && !is_ia32_Store8Bit(node))
                return;
 
-       assert(n_ia32_Store_val == n_ia32_Store8Bit_val);
+       assert((int)n_ia32_Store_val == (int)n_ia32_Store8Bit_val);
        pred_proj = get_irn_n(node, n_ia32_Store_val);
-       if(is_Proj(pred_proj)) {
+       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))
+       if (!is_ia32_Conv_I2I(pred) && !is_ia32_Conv_I2I8Bit(pred))
                return;
-       if(get_ia32_op_type(pred) != ia32_Normal)
+       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 */
        conv_mode  = get_ia32_ls_mode(pred);
        store_mode = get_ia32_ls_mode(node);
-       if(get_mode_size_bits(conv_mode) < get_mode_size_bits(store_mode))
+       if (get_mode_size_bits(conv_mode) < get_mode_size_bits(store_mode))
                return;
 
        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) {
-               be_kill_node(pred_proj);
-               if(pred != pred_proj)
-                       be_kill_node(pred);
+       if (get_irn_n_edges(pred_proj) == 0) {
+               kill_node(pred_proj);
+               if (pred != pred_proj)
+                       kill_node(pred);
        }
 }
 
@@ -920,27 +1356,27 @@ static void optimize_load_conv(ir_node *node)
        if (!is_ia32_Conv_I2I(node) && !is_ia32_Conv_I2I8Bit(node))
                return;
 
-       assert(n_ia32_Conv_I2I_val == n_ia32_Conv_I2I8Bit_val);
+       assert((int)n_ia32_Conv_I2I_val == (int)n_ia32_Conv_I2I8Bit_val);
        pred = get_irn_n(node, n_ia32_Conv_I2I_val);
-       if(!is_Proj(pred))
+       if (!is_Proj(pred))
                return;
 
        predpred = get_Proj_pred(pred);
-       if(!is_ia32_Load(predpred))
+       if (!is_ia32_Load(predpred))
                return;
 
        /* the load is sign extending the upper bits, so we only need the conv
         * if it shrinks the mode */
        load_mode = get_ia32_ls_mode(predpred);
        conv_mode = get_ia32_ls_mode(node);
-       if(get_mode_size_bits(conv_mode) < get_mode_size_bits(load_mode))
+       if (get_mode_size_bits(conv_mode) < get_mode_size_bits(load_mode))
                return;
 
-       if(get_mode_sign(conv_mode) != get_mode_sign(load_mode)) {
+       if (get_mode_sign(conv_mode) != get_mode_sign(load_mode)) {
                /* change the load if it has only 1 user */
-               if(get_irn_n_edges(pred) == 1) {
+               if (get_irn_n_edges(pred) == 1) {
                        ir_mode *newmode;
-                       if(get_mode_sign(conv_mode)) {
+                       if (get_mode_sign(conv_mode)) {
                                newmode = find_signed_mode(load_mode);
                        } else {
                                newmode = find_unsigned_mode(load_mode);
@@ -967,14 +1403,14 @@ static void optimize_conv_conv(ir_node *node)
        if (!is_ia32_Conv_I2I(node) && !is_ia32_Conv_I2I8Bit(node))
                return;
 
-       assert(n_ia32_Conv_I2I_val == n_ia32_Conv_I2I8Bit_val);
+       assert((int)n_ia32_Conv_I2I_val == (int)n_ia32_Conv_I2I8Bit_val);
        pred_proj = get_irn_n(node, n_ia32_Conv_I2I_val);
-       if(is_Proj(pred_proj))
+       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))
+       if (!is_ia32_Conv_I2I(pred) && !is_ia32_Conv_I2I8Bit(pred))
                return;
 
        /* we know that after a conv, the upper bits are sign extended
@@ -984,24 +1420,25 @@ static void optimize_conv_conv(ir_node *node)
        pred_mode      = get_ia32_ls_mode(pred);
        pred_mode_bits = get_mode_size_bits(pred_mode);
 
-       if(conv_mode_bits == pred_mode_bits
+       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) {
+       } 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) {
+               if (get_irn_n_edges(pred_proj) == 1) {
                        result_conv = pred_proj;
                        set_ia32_ls_mode(pred, conv_mode);
 
                        /* Argh:We must change the opcode to 8bit AND copy the register constraints */
                        if (get_mode_size_bits(conv_mode) == 8) {
                                set_irn_op(pred, op_ia32_Conv_I2I8Bit);
-                               set_ia32_in_req_all(pred, get_ia32_in_req_all(node));
+                               arch_set_in_register_reqs(pred,
+                                                         arch_get_in_register_reqs(node));
                        }
                } else {
                        /* we don't want to end up with 2 loads, so we better do nothing */
-                       if(get_irn_mode(pred) == mode_T) {
+                       if (get_irn_mode(pred) == mode_T) {
                                return;
                        }
 
@@ -1011,16 +1448,17 @@ static void optimize_conv_conv(ir_node *node)
                        /* Argh:We must change the opcode to 8bit AND copy the register constraints */
                        if (get_mode_size_bits(conv_mode) == 8) {
                                set_irn_op(result_conv, op_ia32_Conv_I2I8Bit);
-                               set_ia32_in_req_all(result_conv, get_ia32_in_req_all(node));
+                               arch_set_in_register_reqs(result_conv,
+                                                         arch_get_in_register_reqs(node));
                        }
                }
        } else {
                /* if both convs have the same sign, then we can take the smaller one */
-               if(get_mode_sign(conv_mode) == get_mode_sign(pred_mode)) {
+               if (get_mode_sign(conv_mode) == get_mode_sign(pred_mode)) {
                        result_conv = pred_proj;
                } else {
                        /* no optimisation possible if smaller conv is sign-extend */
-                       if(mode_is_signed(pred_mode)) {
+                       if (mode_is_signed(pred_mode)) {
                                return;
                        }
                        /* we can take the smaller conv if it is unsigned */
@@ -1028,13 +1466,16 @@ static void optimize_conv_conv(ir_node *node)
                }
        }
 
+       /* Some user (like Phis) won't be happy if we change the mode. */
+       set_irn_mode(result_conv, get_irn_mode(node));
+
        /* kill the conv */
        exchange(node, result_conv);
 
-       if(get_irn_n_edges(pred_proj) == 0) {
-               be_kill_node(pred_proj);
-               if(pred != pred_proj)
-                       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);
 }
@@ -1051,12 +1492,9 @@ static void optimize_node(ir_node *node, void *env)
 /**
  * Performs conv and address mode optimization.
  */
-void ia32_optimize_graph(ia32_code_gen_t *cg)
+void ia32_optimize_graph(ir_graph *irg)
 {
-       irg_walk_blkwise_graph(cg->irg, NULL, optimize_node, cg);
-
-       if (cg->dump)
-               be_dump(cg->irg, "-opt", dump_ir_block_graph_sched);
+       irg_walk_blkwise_graph(irg, NULL, optimize_node, NULL);
 }
 
 void ia32_init_optimize(void)