ia32: Clean up ia32_get_op_estimated_cost().
[libfirm] / ir / be / ia32 / ia32_optimize.c
index cfe379e..f19817e 100644 (file)
@@ -1,27 +1,12 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
- *
  * This file is part of libFirm.
- *
- * This file may be distributed and/or modified under the terms of the
- * GNU General Public License version 2 as published by the Free Software
- * Foundation and appearing in the file LICENSE.GPL included in the
- * packaging of this file.
- *
- * Licensees holding valid libFirm Professional Edition licenses may use
- * this file in accordance with the libFirm Commercial License.
- * Agreement provided with the Software.
- *
- * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
 
 /**
  * @file
  * @brief       Implements several optimizations for IA32.
  * @author      Matthias Braun, Christian Wuerdig
- * @version     $Id$
  */
 #include "config.h"
 
 #include "irgmod.h"
 #include "irgwalk.h"
 #include "heights.h"
-#include "irbitset.h"
 #include "irprintf.h"
 #include "irdump.h"
 #include "error.h"
+#include "firmstat_t.h"
 
-#include "../be_t.h"
-#include "../beabi.h"
-#include "../benode.h"
-#include "../besched.h"
-#include "../bepeephole.h"
+#include "be_t.h"
+#include "beabi.h"
+#include "benode.h"
+#include "besched.h"
+#include "bepeephole.h"
 
 #include "ia32_new_nodes.h"
 #include "ia32_optimize.h"
@@ -53,7 +38,6 @@
 #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;)
@@ -70,17 +54,19 @@ static void copy_mark(const ir_node *old, ir_node *newn)
 
 typedef enum produces_flag_t {
        produces_no_flag,
-       produces_flag_zero,
-       produces_flag_carry
+       produces_zero_sign,
+       produces_zero_in_carry
 } produces_flag_t;
 
 /**
- * Return which usable flag the given node produces
+ * Return which usable flag the given node produces about the result.
+ * That is zero (ZF) and sign(SF).
+ * We do not check for carry (CF) or overflow (OF).
  *
  * @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)
+static produces_flag_t check_produces_zero_sign(ir_node *node, int pn)
 {
        ir_node                     *count;
        const ia32_immediate_attr_t *imm_attr;
@@ -128,14 +114,13 @@ check_shift_amount:
 
                case iro_ia32_Mul:
                        return pn == pn_ia32_Mul_res_high ?
-                               produces_flag_carry : produces_no_flag;
+                               produces_zero_in_carry : produces_no_flag;
 
                default:
                        return produces_no_flag;
        }
 
-       return pn == pn_ia32_res ?
-               produces_flag_zero : produces_no_flag;
+       return pn == pn_ia32_res ? produces_zero_sign : produces_no_flag;
 }
 
 /**
@@ -143,54 +128,35 @@ check_shift_amount:
  */
 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;
 
-       right = get_irn_n(node, n_ia32_Cmp_right);
+       ir_node *const right = get_irn_n(node, n_ia32_Cmp_right);
        if (!is_ia32_Immediate(right))
                return;
 
-       imm = get_ia32_immediate_attr_const(right);
+       ia32_immediate_attr_t const *const imm = get_ia32_immediate_attr_const(right);
        if (imm->symconst != NULL || imm->offset != 0)
                return;
 
-       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));
+       dbg_info *const dbgi         = get_irn_dbg_info(node);
+       ir_node  *const block        = get_nodes_block(node);
+       ir_graph *const irg          = get_Block_irg(block);
+       ir_node  *const noreg        = ia32_new_NoReg_gp(irg);
+       ir_node  *const nomem        = get_irg_no_mem(irg);
+       ir_node  *const op           = get_irn_n(node, n_ia32_Cmp_left);
+       int       const ins_permuted = get_ia32_attr(node)->data.ins_permuted;
+
+       ir_mode *const ls_mode = get_ia32_ls_mode(node);
+       ir_node *const test    = get_mode_size_bits(ls_mode) == 8
+               ? new_bd_ia32_Test_8bit(dbgi, block, noreg, noreg, nomem, op, op, ins_permuted)
+               : new_bd_ia32_Test     (dbgi, block, noreg, noreg, nomem, op, op, ins_permuted);
+       set_ia32_ls_mode(test, ls_mode);
 
-       reg = arch_irn_get_register(node, pn_ia32_Cmp_eflags);
-       arch_irn_set_register(test, pn_ia32_Test_eflags, reg);
+       arch_register_t const *const reg = arch_get_irn_register_out(node, pn_ia32_Cmp_eflags);
+       arch_set_irn_register_out(test, pn_ia32_Test_eflags, reg);
 
-       foreach_out_edge_safe(node, edge, tmp) {
+       foreach_out_edge_safe(node, edge) {
                ir_node *const user = get_edge_src_irn(edge);
 
                if (is_Proj(user))
@@ -212,23 +178,22 @@ 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);
 
-       assert((int)n_ia32_Test_left == (int)n_ia32_Test8Bit_left
-                       && (int)n_ia32_Test_right == (int)n_ia32_Test8Bit_right);
-
        if (left == right) { /* we need a test for 0 */
                ir_node         *block = get_nodes_block(node);
                int              pn    = pn_ia32_res;
+               ir_node         *op    = left;
                ir_node         *flags_proj;
                ir_mode         *flags_mode;
+               ir_mode         *op_mode;
                ir_node         *schedpoint;
-               const ir_edge_t *edge;
+               produces_flag_t  produced;
 
                if (get_nodes_block(left) != block)
                        return;
 
-               if (is_Proj(left)) {
-                       pn   = get_Proj_proj(left);
-                       left = get_Proj_pred(left);
+               if (is_Proj(op)) {
+                       pn = get_Proj_proj(op);
+                       op = get_Proj_pred(op);
                }
 
                /* walk schedule up and abort when we find left or some other node
@@ -236,7 +201,7 @@ static void peephole_ia32_Test(ir_node *node)
                schedpoint = node;
                for (;;) {
                        schedpoint = sched_prev(schedpoint);
-                       if (schedpoint == left)
+                       if (schedpoint == op)
                                break;
                        if (arch_irn_is(schedpoint, modify_flags))
                                return;
@@ -244,53 +209,62 @@ static void peephole_ia32_Test(ir_node *node)
                                panic("couldn't find left");
                }
 
-               /* make sure only Lg/Eq tests are used */
+               produced = check_produces_zero_sign(op, pn);
+               if (produced == produces_no_flag)
+                       return;
+
+               /* make sure users only look at the sign/zero flag */
                foreach_out_edge(node, edge) {
                        ir_node              *user = get_edge_src_irn(edge);
                        ia32_condition_code_t cc  = get_ia32_condcode(user);
 
-                       if (cc != ia32_cc_equal && cc != ia32_cc_not_equal) {
-                               return;
+                       if (cc == ia32_cc_equal || cc == ia32_cc_not_equal)
+                               continue;
+                       if (produced == produces_zero_sign
+                               && (cc == ia32_cc_sign || cc == ia32_cc_not_sign)) {
+                               continue;
                        }
+                       return;
                }
 
-               switch (produces_test_flag(left, pn)) {
-                       case produces_flag_zero:
-                               break;
+               op_mode = get_ia32_ls_mode(op);
+               if (op_mode == NULL)
+                       op_mode = get_irn_mode(op);
 
-                       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;
+               /* Make sure we operate on the same bit size */
+               if (get_mode_size_bits(op_mode) != get_mode_size_bits(get_ia32_ls_mode(node)))
+                       return;
 
-                       default:
-                               return;
+               if (produced == produces_zero_in_carry) {
+                       /* patch users to look at the carry instead of the zero flag */
+                       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;
+                               case ia32_cc_not_equal: cc = ia32_cc_below;       break;
+                               default: panic("unexpected pn");
+                               }
+                               set_ia32_condcode(user, cc);
+                       }
                }
 
-               if (get_irn_mode(left) != mode_T) {
-                       set_irn_mode(left, mode_T);
+               if (get_irn_mode(op) != mode_T) {
+                       set_irn_mode(op, mode_T);
 
                        /* If there are other users, reroute them to result proj */
-                       if (get_irn_n_edges(left) != 2) {
-                               ir_node *res = new_r_Proj(left, mode_Iu, pn_ia32_res);
-
-                               edges_reroute(left, res);
-                               /* Reattach the result proj to left */
-                               set_Proj_pred(res, left);
+                       if (get_irn_n_edges(op) != 2) {
+                               ir_node *res = new_r_Proj(op, mode_Iu, pn_ia32_res);
+                               edges_reroute_except(op, res, res);
                        }
+               } else {
+                       if (get_irn_n_edges(left) == 2)
+                               kill_node(left);
                }
 
                flags_mode = ia32_reg_classes[CLASS_ia32_flags].mode;
-               flags_proj = new_r_Proj(left, flags_mode, pn_ia32_flags);
+               flags_proj = new_r_Proj(op, flags_mode, pn_ia32_flags);
                arch_set_irn_register(flags_proj, &ia32_registers[REG_EFLAGS]);
 
                assert(get_irn_mode(node) != mode_T);
@@ -307,20 +281,21 @@ static void peephole_ia32_Test(ir_node *node)
                offset = imm->offset;
                if (get_ia32_op_type(node) == ia32_AddrModeS) {
                        ia32_attr_t *const attr = get_ia32_attr(node);
+                       ir_graph    *const irg  = get_irn_irg(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);
+                               ir_node *imm_node = ia32_create_Immediate(irg, NULL, 0, offset >>  8);
+                               set_irn_n(node, n_ia32_Test_right, imm_node);
                                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);
+                               ir_node *imm_node = ia32_create_Immediate(irg, NULL, 0, offset >> 16);
+                               set_irn_n(node, n_ia32_Test_right, imm_node);
                                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);
+                               ir_node *imm_node = ia32_create_Immediate(irg, NULL, 0, offset >> 24);
+                               set_irn_n(node, n_ia32_Test_right, imm_node);
                                attr->am_offs += 3;
                        } else {
                                return;
@@ -351,20 +326,12 @@ static void peephole_ia32_Test(ir_node *node)
  */
 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) {
+       sched_foreach_reverse_before(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;
@@ -394,24 +361,18 @@ static void peephole_ia32_Return(ir_node *node)
  */
 static void peephole_IncSP_Store_to_push(ir_node *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;
+       int       i;
+       int       maxslot;
+       ir_node  *stores[MAXPUSH_OPTIMIZE];
+       ir_node  *block;
+       ir_graph *irg;
+       ir_node  *curr_sp;
+       ir_mode  *spmode;
+       ir_node  *first_push = NULL;
 
        memset(stores, 0, sizeof(stores));
 
-       assert(be_is_IncSP(irn));
-
-       inc_ofs = be_get_IncSP_offset(irn);
+       int inc_ofs = be_get_IncSP_offset(irn);
        if (inc_ofs < 4)
                return;
 
@@ -422,7 +383,7 @@ static void peephole_IncSP_Store_to_push(ir_node *irn)
         * attached to the node
         */
        maxslot = -1;
-       for (node = sched_next(irn); !sched_is_end(node); node = sched_next(node)) {
+       sched_foreach_after(irn, node) {
                ir_node *mem;
                int offset;
                int storeslot;
@@ -487,7 +448,8 @@ static void peephole_IncSP_Store_to_push(ir_node *irn)
                mem = get_irn_n(store, n_ia32_mem);
                spreg = arch_get_irn_register(curr_sp);
 
-               push = new_bd_ia32_Push(get_irn_dbg_info(store), block, noreg, noreg, mem, val, 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)
@@ -502,13 +464,27 @@ static void peephole_IncSP_Store_to_push(ir_node *irn)
                /* create memory Proj */
                mem_proj = new_r_Proj(push, mode_M, pn_ia32_Push_M);
 
+               /* rewire Store Projs */
+               foreach_out_edge_safe(store, edge) {
+                       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");
+                       }
+               }
+
                /* use the memproj now */
-               be_peephole_exchange(store, mem_proj);
+               be_peephole_exchange(store, push);
 
                inc_ofs -= 4;
        }
 
-       foreach_out_edge_safe(irn, edge, next) {
+       foreach_out_edge_safe(irn, edge) {
                ir_node *const src = get_edge_src_irn(edge);
                int      const pos = get_edge_src_pos(edge);
 
@@ -521,121 +497,6 @@ static void peephole_IncSP_Store_to_push(ir_node *irn)
        be_set_IncSP_offset(irn, inc_ofs);
 }
 
-#if 0
-/**
- * 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 ir_node *create_push(dbg_info *dbgi, ir_node *block,
-                            ir_node *stack, ir_node *schedpoint)
-{
-       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 = new_r_NoMem(irg);
-       ir_node *push  = new_bd_ia32_Push(dbgi, block, noreg, noreg, nomem, val, stack);
-       sched_add_before(schedpoint, push);
-
-       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 (my_offset + my_store_size > incsp_offset)
-               return;
-
-       /* 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_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;
-               }
-       }
-
-       /* 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
  */
@@ -656,17 +517,14 @@ static inline int mode_needs_gp_reg(ir_mode *mode)
 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;
+       int      i, maxslot, ofs;
        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);
+       int inc_ofs = -be_get_IncSP_offset(irn);
        if (inc_ofs < 4)
                return;
 
@@ -677,8 +535,8 @@ static void peephole_Load_IncSP_to_pop(ir_node *irn)
         * 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)) {
+       ir_node *pred_sp = be_get_IncSP_pred(irn);
+       sched_foreach_reverse_before(irn, node) {
                int offset;
                int loadslot;
                const arch_register_t *sreg, *dreg;
@@ -741,7 +599,7 @@ static void peephole_Load_IncSP_to_pop(ir_node *irn)
                if (loads[loadslot] != NULL)
                        break;
 
-               dreg = arch_irn_get_register(node, pn_ia32_Load_res);
+               dreg = arch_get_irn_register_out(node, pn_ia32_Load_res);
                if (regmask & (1 << dreg->index)) {
                        /* this register is already used */
                        break;
@@ -768,8 +626,7 @@ static void peephole_Load_IncSP_to_pop(ir_node *irn)
        inc_ofs = (i+1) * 4;
 
        /* create a new IncSP if needed */
-       block = get_nodes_block(irn);
-       irg   = get_irn_irg(irn);
+       ir_node *const 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);
@@ -779,14 +636,13 @@ static void peephole_Load_IncSP_to_pop(ir_node *irn)
        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);
+               reg = arch_get_irn_register_out(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);
+               arch_set_irn_register_out(pop, pn_ia32_Load_res, reg);
 
                copy_mark(load, pop);
 
@@ -797,7 +653,7 @@ static void peephole_Load_IncSP_to_pop(ir_node *irn)
                sched_add_before(irn, pop);
 
                /* rewire now */
-               foreach_out_edge_safe(load, edge, tmp) {
+               foreach_out_edge_safe(load, edge) {
                        ir_node *proj = get_edge_src_irn(edge);
 
                        set_Proj_pred(proj, pop);
@@ -826,7 +682,7 @@ static const arch_register_t *get_free_gp_reg(ir_graph *irg)
                if (!rbitset_is_set(birg->allocatable_regs, reg->global_index))
                        continue;
 
-               if (be_peephole_get_value(CLASS_ia32_gp, i) == NULL)
+               if (be_peephole_get_value(reg->global_index) == NULL)
                        return reg;
        }
 
@@ -855,7 +711,7 @@ static ir_node *create_pop(dbg_info *dbgi, ir_node *block,
        ir_node *val;
        ir_node *in[1];
 
-       pop   = new_bd_ia32_Pop(dbgi, block, new_r_NoMem(irg), stack);
+       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);
@@ -953,7 +809,7 @@ static void peephole_ia32_Const(ir_node *node)
        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_FLAGS_EFLAGS) != NULL)
+       if (be_peephole_get_value(REG_EFLAGS) != NULL)
                return;
 
        reg = arch_get_irn_register(node);
@@ -1024,7 +880,6 @@ static int is_am_minus_one(const ir_node *node)
  */
 static void peephole_ia32_Lea(ir_node *node)
 {
-       ir_graph              *irg;
        ir_node               *base;
        ir_node               *index;
        const arch_register_t *base_reg;
@@ -1037,13 +892,11 @@ static void peephole_ia32_Lea(ir_node *node)
        dbg_info              *dbgi;
        ir_node               *block;
        ir_node               *res;
-       ir_node               *noreg;
-       ir_node               *nomem;
 
        assert(is_ia32_Lea(node));
 
        /* 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)
+       if (be_peephole_get_value(REG_EFLAGS) != NULL)
                return;
 
        base  = get_irn_n(node, n_ia32_Lea_base);
@@ -1150,9 +1003,9 @@ make_add_immediate:
 make_add:
        dbgi  = get_irn_dbg_info(node);
        block = get_nodes_block(node);
-       irg   = get_irn_irg(node);
-       noreg = ia32_new_NoReg_gp(irg);
-       nomem = new_r_NoMem(irg);
+       ir_graph *irg   = get_irn_irg(node);
+       ir_node  *noreg = ia32_new_NoReg_gp(irg);
+       ir_node  *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);
@@ -1161,9 +1014,6 @@ make_add:
 make_shl:
        dbgi  = get_irn_dbg_info(node);
        block = get_nodes_block(node);
-       irg   = get_irn_irg(node);
-       noreg = ia32_new_NoReg_gp(irg);
-       nomem = new_r_NoMem(irg);
        res   = new_bd_ia32_Shl(dbgi, block, op1, op2);
        arch_set_irn_register(res, out_reg);
        goto exchange;
@@ -1226,7 +1076,7 @@ static void peephole_ia32_Conv_I2I(ir_node *node)
        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))
+                       eax != arch_get_irn_register_out(node, pn_ia32_Conv_I2I_res))
                return;
 
        dbgi  = get_irn_dbg_info(node);
@@ -1249,23 +1099,28 @@ static void register_peephole_optimisation(ir_op *op, peephole_opt_func func)
 /* Perform peephole-optimizations. */
 void ia32_peephole_optimization(ir_graph *irg)
 {
-       /* 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);
+       /* we currently do it in 2 passes because:
+        *    Lea -> Add could be usefull as flag producer for Test later
+        */
+
+       /* pass 1 */
+       ir_clear_opcodes_generic_func();
        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);
+       register_peephole_optimisation(op_ia32_Lea,      peephole_ia32_Lea);
        if (ia32_cg_config.use_short_sex_eax)
                register_peephole_optimisation(op_ia32_Conv_I2I, peephole_ia32_Conv_I2I);
+       if (ia32_cg_config.use_pxor)
+               register_peephole_optimisation(op_ia32_xZero, peephole_ia32_xZero);
+       if (! ia32_cg_config.use_imul_mem_imm32)
+               register_peephole_optimisation(op_ia32_IMul, peephole_ia32_Imul_split);
+       be_peephole_opt(irg);
 
+       /* pass 2 */
+       ir_clear_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_Test,  peephole_ia32_Test);
+       register_peephole_optimisation(op_be_Return,  peephole_ia32_Return);
        be_peephole_opt(irg);
 }
 
@@ -1277,8 +1132,7 @@ void ia32_peephole_optimization(ir_graph *irg)
 static inline void try_kill(ir_node *node)
 {
        if (get_irn_mode(node) == mode_T) {
-               const ir_edge_t *edge, *next;
-               foreach_out_edge_safe(node, edge, next) {
+               foreach_out_edge_safe(node, edge) {
                        ir_node *proj = get_edge_src_irn(edge);
                        try_kill(proj);
                }
@@ -1301,17 +1155,16 @@ 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))
                return;
 
-       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)) {
                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))
                return;
        if (get_ia32_op_type(pred) != ia32_Normal)
                return;
@@ -1323,6 +1176,7 @@ static void optimize_conv_store(ir_node *node)
        if (get_mode_size_bits(conv_mode) < get_mode_size_bits(store_mode))
                return;
 
+       ir_fprintf(stderr, "Optimisation warning: unoptimized ia32 Store(Conv) (%+F, %+F)\n", 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);
@@ -1337,10 +1191,9 @@ static void optimize_load_conv(ir_node *node)
        ir_mode *load_mode;
        ir_mode *conv_mode;
 
-       if (!is_ia32_Conv_I2I(node) && !is_ia32_Conv_I2I8Bit(node))
+       if (!is_ia32_Conv_I2I(node))
                return;
 
-       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))
                return;
@@ -1374,6 +1227,7 @@ static void optimize_load_conv(ir_node *node)
        }
 
        /* kill the conv */
+       ir_fprintf(stderr, "Optimisation warning: unoptimized ia32 Conv(Load) (%+F, %+F)\n", node, predpred);
        exchange(node, pred);
 }
 
@@ -1384,17 +1238,16 @@ static void optimize_conv_conv(ir_node *node)
        int      conv_mode_bits;
        int      pred_mode_bits;
 
-       if (!is_ia32_Conv_I2I(node) && !is_ia32_Conv_I2I8Bit(node))
+       if (!is_ia32_Conv_I2I(node))
                return;
 
-       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))
                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))
                return;
 
        /* we know that after a conv, the upper bits are sign extended
@@ -1416,9 +1269,9 @@ 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(pred, op_ia32_Conv_I2I8Bit);
-                               arch_set_in_register_reqs(pred,
-                                                         arch_get_in_register_reqs(node));
+                               const arch_register_req_t **reqs = arch_get_irn_register_reqs_in(node);
+                               set_irn_op(pred, op_ia32_Conv_I2I);
+                               arch_set_irn_register_reqs_in(pred, reqs);
                        }
                } else {
                        /* we don't want to end up with 2 loads, so we better do nothing */
@@ -1431,9 +1284,9 @@ 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);
-                               arch_set_in_register_reqs(result_conv,
-                                                         arch_get_in_register_reqs(node));
+                               const arch_register_req_t **reqs = arch_get_irn_register_reqs_in(node);
+                               set_irn_op(result_conv, op_ia32_Conv_I2I);
+                               arch_set_irn_register_reqs_in(result_conv, reqs);
                        }
                }
        } else {
@@ -1450,6 +1303,7 @@ static void optimize_conv_conv(ir_node *node)
                }
        }
 
+       ir_fprintf(stderr, "Optimisation warning: unoptimized ia32 Conv(Conv) (%+F, %+F)\n", node, pred);
        /* Some user (like Phis) won't be happy if we change the mode. */
        set_irn_mode(result_conv, get_irn_mode(node));