missing goto added
[libfirm] / ir / be / ia32 / ia32_transform.c
index 05b9e2d..7817ef1 100644 (file)
@@ -281,7 +281,6 @@ static int is_Const_Minus_1(ir_node *node) {
 static int is_simple_x87_Const(ir_node *node)
 {
        tarval *tv = get_Const_tarval(node);
-
        if (tarval_is_null(tv) || tarval_is_one(tv))
                return 1;
 
@@ -294,7 +293,7 @@ static int is_simple_x87_Const(ir_node *node)
  */
 static int is_simple_sse_Const(ir_node *node)
 {
-       tarval *tv = get_Const_tarval(node);
+       tarval  *tv   = get_Const_tarval(node);
        ir_mode *mode = get_tarval_mode(tv);
 
        if (mode == mode_F)
@@ -582,49 +581,51 @@ const char *ia32_get_old_node_name(ia32_code_gen_t *cg, ir_node *irn) {
  * input here, for unary operations use NULL).
  */
 static int ia32_use_source_address_mode(ir_node *block, ir_node *node,
-                                        ir_node *other, ir_node *other2)
+                                        ir_node *other, ir_node *other2, match_flags_t flags)
 {
-       ir_mode *mode = get_irn_mode(node);
        ir_node *load;
        long     pn;
 
        /* float constants are always available */
-       if (is_Const(node) && mode_is_float(mode)) {
-               if (ia32_cg_config.use_sse2) {
-                       if (is_simple_sse_Const(node))
-                               return 0;
-               } else {
-                       if (is_simple_x87_Const(node))
+       if (is_Const(node)) {
+               ir_mode *mode = get_irn_mode(node);
+               if (mode_is_float(mode)) {
+                       if (ia32_cg_config.use_sse2) {
+                               if (is_simple_sse_Const(node))
+                                       return 0;
+                       } else {
+                               if (is_simple_x87_Const(node))
+                                       return 0;
+                       }
+                       if (get_irn_n_edges(node) > 1)
                                return 0;
+                       return 1;
                }
-               if (get_irn_n_edges(node) > 1)
-                       return 0;
-               return 1;
        }
 
-       if(!is_Proj(node))
+       if (!is_Proj(node))
                return 0;
        load = get_Proj_pred(node);
        pn   = get_Proj_proj(node);
-       if(!is_Load(load) || pn != pn_Load_res)
+       if (!is_Load(load) || pn != pn_Load_res)
                return 0;
-       if(get_nodes_block(load) != block)
+       if (get_nodes_block(load) != block)
                return 0;
        /* we only use address mode if we're the only user of the load */
-       if(get_irn_n_edges(node) > 1)
+       if (get_irn_n_edges(node) != (flags & match_two_users ? 2 : 1))
                return 0;
        /* in some edge cases with address mode we might reach the load normally
         * and through some AM sequence, if it is already materialized then we
         * can't create an AM node from it */
-       if(be_is_transformed(node))
+       if (be_is_transformed(node))
                return 0;
 
        /* don't do AM if other node inputs depend on the load (via mem-proj) */
-       if(other != NULL && get_nodes_block(other) == block
-                       && heights_reachable_in_block(heights, other, load))
+       if (other != NULL && get_nodes_block(other) == block &&
+           heights_reachable_in_block(heights, other, load))
                return 0;
-       if(other2 != NULL && get_nodes_block(other2) == block
-                       && heights_reachable_in_block(heights, other2, load))
+       if (other2 != NULL && get_nodes_block(other2) == block &&
+           heights_reachable_in_block(heights, other2, load))
                return 0;
 
        return 1;
@@ -645,12 +646,13 @@ struct ia32_address_mode_t {
 
 static void build_address_ptr(ia32_address_t *addr, ir_node *ptr, ir_node *mem)
 {
-       ir_node *noreg_gp = ia32_new_NoReg_gp(env_cg);
+       ir_node *noreg_gp;
 
        /* construct load address */
        memset(addr, 0, sizeof(addr[0]));
        ia32_create_address_mode(addr, ptr, /*force=*/0);
 
+       noreg_gp    = ia32_new_NoReg_gp(env_cg);
        addr->base  = addr->base  ? be_transform_node(addr->base)  : noreg_gp;
        addr->index = addr->index ? be_transform_node(addr->index) : noreg_gp;
        addr->mem   = be_transform_node(mem);
@@ -705,16 +707,19 @@ static void set_address(ir_node *node, const ia32_address_t *addr)
        set_ia32_frame_ent(node, addr->frame_entity);
 }
 
+/**
+ * Apply attributes of a given address mode to a node.
+ */
 static void set_am_attributes(ir_node *node, const ia32_address_mode_t *am)
 {
        set_address(node, &am->addr);
 
        set_ia32_op_type(node, am->op_type);
        set_ia32_ls_mode(node, am->ls_mode);
-       if(am->pinned == op_pin_state_pinned && get_irn_pinned(node) != op_pin_state_pinned) {
+       if (am->pinned == op_pin_state_pinned) {
                set_irn_pinned(node, am->pinned);
        }
-       if(am->commutative)
+       if (am->commutative)
                set_ia32_commutative(node);
 }
 
@@ -790,16 +795,14 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
                             ir_node *op1, ir_node *op2, ir_node *other_op,
                             match_flags_t flags)
 {
-       ia32_address_t *addr     = &am->addr;
-       ir_node        *noreg_gp = ia32_new_NoReg_gp(env_cg);
-       ir_node        *new_op1;
-       ir_node        *new_op2;
-       ir_mode        *mode = get_irn_mode(op2);
+       ia32_address_t *addr      = &am->addr;
+       ir_mode        *mode      = get_irn_mode(op2);
+       int             mode_bits = get_mode_size_bits(mode);
+       ir_node        *noreg_gp, *new_op1, *new_op2;
        int             use_am;
        unsigned        commutative;
        int             use_am_and_immediates;
        int             use_immediate;
-       int             mode_bits = get_mode_size_bits(mode);
 
        memset(am, 0, sizeof(am[0]));
 
@@ -842,11 +845,12 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
                new_op2 = try_create_Immediate(op2, 0);
        }
 
+       noreg_gp = ia32_new_NoReg_gp(env_cg);
        if (new_op2 == NULL &&
-           use_am && ia32_use_source_address_mode(block, op2, op1, other_op)) {
+           use_am && ia32_use_source_address_mode(block, op2, op1, other_op, flags)) {
                build_address(am, op2);
                new_op1     = (op1 == NULL ? NULL : be_transform_node(op1));
-               if(mode_is_float(mode)) {
+               if (mode_is_float(mode)) {
                        new_op2 = ia32_new_NoReg_vfp(env_cg);
                } else {
                        new_op2 = noreg_gp;
@@ -854,7 +858,7 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
                am->op_type = ia32_AddrModeS;
        } else if (commutative && (new_op2 == NULL || use_am_and_immediates) &&
                       use_am &&
-                      ia32_use_source_address_mode(block, op1, op2, other_op)) {
+                      ia32_use_source_address_mode(block, op1, op2, other_op, flags)) {
                ir_node *noreg;
                build_address(am, op1);
 
@@ -864,7 +868,7 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
                        noreg = noreg_gp;
                }
 
-               if(new_op2 != NULL) {
+               if (new_op2 != NULL) {
                        new_op1 = noreg;
                } else {
                        new_op1 = be_transform_node(op2);
@@ -873,7 +877,7 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
                }
                am->op_type = ia32_AddrModeS;
        } else {
-               if(flags & match_try_am) {
+               if (flags & match_try_am) {
                        am->new_op1 = NULL;
                        am->new_op2 = NULL;
                        am->op_type = ia32_Normal;
@@ -881,18 +885,18 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
                }
 
                new_op1 = (op1 == NULL ? NULL : be_transform_node(op1));
-               if(new_op2 == NULL)
+               if (new_op2 == NULL)
                        new_op2 = be_transform_node(op2);
                am->op_type = ia32_Normal;
                am->ls_mode = get_irn_mode(op2);
-               if(flags & match_mode_neutral)
+               if (flags & match_mode_neutral)
                        am->ls_mode = mode_Iu;
        }
-       if(addr->base == NULL)
+       if (addr->base == NULL)
                addr->base = noreg_gp;
-       if(addr->index == NULL)
+       if (addr->index == NULL)
                addr->index = noreg_gp;
-       if(addr->mem == NULL)
+       if (addr->mem == NULL)
                addr->mem = new_NoMem();
 
        am->new_op1     = new_op1;
@@ -902,11 +906,10 @@ static void match_arguments(ia32_address_mode_t *am, ir_node *block,
 
 static ir_node *fix_mem_proj(ir_node *node, ia32_address_mode_t *am)
 {
-       ir_graph *irg = current_ir_graph;
        ir_mode  *mode;
        ir_node  *load;
 
-       if(am->mem_proj == NULL)
+       if (am->mem_proj == NULL)
                return node;
 
        /* we have to create a mode_T so the old MemProj can attach to us */
@@ -916,9 +919,9 @@ static ir_node *fix_mem_proj(ir_node *node, ia32_address_mode_t *am)
        mark_irn_visited(load);
        be_set_transformed_node(load, node);
 
-       if(mode != mode_T) {
+       if (mode != mode_T) {
                set_irn_mode(node, mode_T);
-               return new_rd_Proj(NULL, irg, get_nodes_block(node), node, mode, pn_ia32_res);
+               return new_rd_Proj(NULL, current_ir_graph, get_nodes_block(node), node, mode, pn_ia32_res);
        } else {
                return node;
        }
@@ -927,6 +930,7 @@ static ir_node *fix_mem_proj(ir_node *node, ia32_address_mode_t *am)
 /**
  * Construct a standard binary operation, set AM and immediate if required.
  *
+ * @param node  The original node for which the binop is created
  * @param op1   The first operand
  * @param op2   The second operand
  * @param func  The node constructor function
@@ -935,21 +939,22 @@ static ir_node *fix_mem_proj(ir_node *node, ia32_address_mode_t *am)
 static ir_node *gen_binop(ir_node *node, ir_node *op1, ir_node *op2,
                           construct_binop_func *func, match_flags_t flags)
 {
-       ir_node  *block     = get_nodes_block(node);
-       ir_node  *new_block = be_transform_node(block);
-       ir_graph *irg       = current_ir_graph;
-       dbg_info *dbgi      = get_irn_dbg_info(node);
-       ir_node  *new_node;
+       dbg_info            *dbgi;
+       ir_node             *block, *new_block, *new_node;
        ia32_address_mode_t  am;
        ia32_address_t      *addr = &am.addr;
 
+       block = get_nodes_block(node);
        match_arguments(&am, block, op1, op2, NULL, flags);
 
-       new_node = func(dbgi, irg, new_block, addr->base, addr->index, addr->mem,
-                       am.new_op1, am.new_op2);
+       dbgi      = get_irn_dbg_info(node);
+       new_block = be_transform_node(block);
+       new_node  = func(dbgi, current_ir_graph, new_block,
+                        addr->base, addr->index, addr->mem,
+                        am.new_op1, am.new_op2);
        set_am_attributes(new_node, &am);
        /* we can't use source address mode anymore when using immediates */
-       if(is_ia32_Immediate(am.new_op1) || is_ia32_Immediate(am.new_op2))
+       if (is_ia32_Immediate(am.new_op1) || is_ia32_Immediate(am.new_op2))
                set_ia32_am_support(new_node, ia32_am_None, ia32_am_arity_none);
        SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
 
@@ -982,21 +987,21 @@ static ir_node *gen_binop_flags(ir_node *node, construct_binop_flags_func *func,
                                 match_flags_t flags)
 {
        ir_node             *src_block  = get_nodes_block(node);
-       ir_node             *block      = be_transform_node(src_block);
        ir_node             *op1        = get_irn_n(node, n_ia32_l_binop_left);
        ir_node             *op2        = get_irn_n(node, n_ia32_l_binop_right);
-       ir_node             *eflags     = get_irn_n(node, n_ia32_l_binop_eflags);
-       ir_node             *new_eflags = be_transform_node(eflags);
-       ir_graph            *irg        = current_ir_graph;
-       dbg_info            *dbgi       = get_irn_dbg_info(node);
-       ir_node             *new_node;
+       dbg_info            *dbgi;
+       ir_node             *block, *new_node, *eflags, *new_eflags;
        ia32_address_mode_t  am;
        ia32_address_t      *addr       = &am.addr;
 
        match_arguments(&am, src_block, op1, op2, NULL, flags);
 
-       new_node = func(dbgi, irg, block, addr->base, addr->index,
-                                  addr->mem, am.new_op1, am.new_op2, new_eflags);
+       dbgi       = get_irn_dbg_info(node);
+       block      = be_transform_node(src_block);
+       eflags     = get_irn_n(node, n_ia32_l_binop_eflags);
+       new_eflags = be_transform_node(eflags);
+       new_node   = func(dbgi, current_ir_graph, block, addr->base, addr->index,
+                       addr->mem, am.new_op1, am.new_op2, new_eflags);
        set_am_attributes(new_node, &am);
        /* we can't use source address mode anymore when using immediates */
        if(is_ia32_Immediate(am.new_op1) || is_ia32_Immediate(am.new_op2))
@@ -1011,7 +1016,7 @@ static ir_node *gen_binop_flags(ir_node *node, construct_binop_flags_func *func,
 static ir_node *get_fpcw(void)
 {
        ir_node *fpcw;
-       if(initial_fpcw != NULL)
+       if (initial_fpcw != NULL)
                return initial_fpcw;
 
        fpcw         = be_abi_get_ignore_irn(env_cg->birg->abi,
@@ -1033,23 +1038,24 @@ static ir_node *gen_binop_x87_float(ir_node *node, ir_node *op1, ir_node *op2,
                                     construct_binop_float_func *func,
                                     match_flags_t flags)
 {
-       ir_graph *irg       = current_ir_graph;
-       dbg_info *dbgi      = get_irn_dbg_info(node);
-       ir_node  *block     = get_nodes_block(node);
-       ir_node  *new_block = be_transform_node(block);
-       ir_mode  *mode      = get_irn_mode(node);
-       ir_node  *new_node;
+       ir_mode             *mode  = get_irn_mode(node);
+       dbg_info            *dbgi;
+       ir_node             *block, *new_block, *new_node;
        ia32_address_mode_t  am;
        ia32_address_t      *addr = &am.addr;
 
-       /* cannot use addresmode with long double on x87 */
+       /* cannot use addresmode with long double on x87 */
        if (get_mode_size_bits(mode) > 64)
                flags &= ~match_am;
 
+       block = get_nodes_block(node);
        match_arguments(&am, block, op1, op2, NULL, flags);
 
-       new_node = func(dbgi, irg, new_block, addr->base, addr->index, addr->mem,
-                       am.new_op1, am.new_op2, get_fpcw());
+       dbgi      = get_irn_dbg_info(node);
+       new_block = be_transform_node(block);
+       new_node  = func(dbgi, current_ir_graph, new_block,
+                        addr->base, addr->index, addr->mem,
+                        am.new_op1, am.new_op2, get_fpcw());
        set_am_attributes(new_node, &am);
 
        SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
@@ -1071,19 +1077,14 @@ static ir_node *gen_shift_binop(ir_node *node, ir_node *op1, ir_node *op2,
                                 construct_shift_func *func,
                                 match_flags_t flags)
 {
-       dbg_info *dbgi      = get_irn_dbg_info(node);
-       ir_graph *irg       = current_ir_graph;
-       ir_node  *block     = get_nodes_block(node);
-       ir_node  *new_block = be_transform_node(block);
-       ir_node  *new_op1;
-       ir_node  *new_op2;
-       ir_node  *new_node;
+       dbg_info *dbgi;
+       ir_node  *block, *new_block, *new_op1, *new_op2, *new_node;
 
        assert(! mode_is_float(get_irn_mode(node)));
        assert(flags & match_immediate);
        assert((flags & ~(match_mode_neutral | match_immediate)) == 0);
 
-       if(flags & match_mode_neutral) {
+       if (flags & match_mode_neutral) {
                op1 = ia32_skip_downconv(op1);
        } else if (get_mode_size_bits(get_irn_mode(node)) != 32) {
                panic("right shifting of non-32bit values not supported, yet");
@@ -1098,7 +1099,10 @@ static ir_node *gen_shift_binop(ir_node *node, ir_node *op1, ir_node *op2,
        }
        new_op2 = create_immediate_or_transform(op2, 0);
 
-       new_node = func(dbgi, irg, new_block, new_op1, new_op2);
+       dbgi      = get_irn_dbg_info(node);
+       block     = get_nodes_block(node);
+       new_block = be_transform_node(block);
+       new_node  = func(dbgi, current_ir_graph, new_block, new_op1, new_op2);
        SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
 
        /* lowered shift instruction may have a dependency operand, handle it here */
@@ -1122,20 +1126,19 @@ static ir_node *gen_shift_binop(ir_node *node, ir_node *op1, ir_node *op2,
 static ir_node *gen_unop(ir_node *node, ir_node *op, construct_unop_func *func,
                          match_flags_t flags)
 {
-       ir_graph *irg       = current_ir_graph;
-       dbg_info *dbgi      = get_irn_dbg_info(node);
-       ir_node  *block     = get_nodes_block(node);
-       ir_node  *new_block = be_transform_node(block);
-       ir_node  *new_op;
-       ir_node  *new_node;
+       dbg_info *dbgi;
+       ir_node  *block, *new_block, *new_op, *new_node;
 
        assert(flags == 0 || flags == match_mode_neutral);
-       if(flags & match_mode_neutral) {
+       if (flags & match_mode_neutral) {
                op = ia32_skip_downconv(op);
        }
 
-       new_op   = be_transform_node(op);
-       new_node = func(dbgi, irg, new_block, new_op);
+       new_op    = be_transform_node(op);
+       dbgi      = get_irn_dbg_info(node);
+       block     = get_nodes_block(node);
+       new_block = be_transform_node(block);
+       new_node  = func(dbgi, current_ir_graph, new_block, new_op);
 
        SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
 
@@ -1145,29 +1148,32 @@ static ir_node *gen_unop(ir_node *node, ir_node *op, construct_unop_func *func,
 static ir_node *create_lea_from_address(dbg_info *dbgi,        ir_node *block,
                                         ia32_address_t *addr)
 {
-       ir_graph *irg   = current_ir_graph;
-       ir_node  *base  = addr->base;
-       ir_node  *index = addr->index;
-       ir_node  *res;
+       ir_node *base, *index, *res;
 
-       if(base == NULL) {
+       base = addr->base;
+       if (base == NULL) {
                base = ia32_new_NoReg_gp(env_cg);
        } else {
                base = be_transform_node(base);
        }
 
-       if(index == NULL) {
+       index = addr->index;
+       if (index == NULL) {
                index = ia32_new_NoReg_gp(env_cg);
        } else {
                index = be_transform_node(index);
        }
 
-       res = new_rd_ia32_Lea(dbgi, irg, block, base, index);
+       res = new_rd_ia32_Lea(dbgi, current_ir_graph, block, base, index);
        set_address(res, addr);
 
        return res;
 }
 
+/**
+ * Returns non-zero if a given address mode has a symbolic or
+ * numerical offset != 0.
+ */
 static int am_has_immediates(const ia32_address_t *addr)
 {
        return addr->offset != 0 || addr->symconst_ent != NULL
@@ -1180,15 +1186,11 @@ static int am_has_immediates(const ia32_address_t *addr)
  * @return the created ia32 Add node
  */
 static ir_node *gen_Add(ir_node *node) {
-       ir_graph *irg       = current_ir_graph;
-       dbg_info *dbgi      = get_irn_dbg_info(node);
-       ir_node  *block     = get_nodes_block(node);
-       ir_node  *new_block = be_transform_node(block);
-       ir_node  *op1       = get_Add_left(node);
-       ir_node  *op2       = get_Add_right(node);
-       ir_mode  *mode      = get_irn_mode(node);
-       ir_node  *new_node;
-       ir_node  *add_immediate_op;
+       ir_mode  *mode = get_irn_mode(node);
+       ir_node  *op1  = get_Add_left(node);
+       ir_node  *op2  = get_Add_right(node);
+       dbg_info *dbgi;
+       ir_node  *block, *new_block, *new_node, *add_immediate_op;
        ia32_address_t       addr;
        ia32_address_mode_t  am;
 
@@ -1216,8 +1218,14 @@ static ir_node *gen_Add(ir_node *node) {
        memset(&addr, 0, sizeof(addr));
        ia32_create_address_mode(&addr, node, /*force=*/1);
        add_immediate_op = NULL;
+
+       dbgi      = get_irn_dbg_info(node);
+       block     = get_nodes_block(node);
+       new_block = be_transform_node(block);
+
        /* a constant? */
        if(addr.base == NULL && addr.index == NULL) {
+               ir_graph *irg = current_ir_graph;
                new_node = new_rd_ia32_Const(dbgi, irg, new_block, addr.symconst_ent,
                                             addr.symconst_sign, addr.offset);
                add_irn_dep(new_node, get_irg_frame(irg));
@@ -1251,6 +1259,7 @@ static ir_node *gen_Add(ir_node *node) {
 
        /* construct an Add with source address mode */
        if (am.op_type == ia32_AddrModeS) {
+               ir_graph *irg = current_ir_graph;
                ia32_address_t *am_addr = &am.addr;
                new_node = new_rd_ia32_Add(dbgi, irg, new_block, am_addr->base,
                                         am_addr->index, am_addr->mem, am.new_op1,
@@ -1379,7 +1388,6 @@ static ir_node *gen_And(ir_node *node) {
                        return res;
                }
        }
-
        return gen_binop(node, op1, op2, new_rd_ia32_And,
                         match_commutative | match_mode_neutral | match_am
                                         | match_immediate);
@@ -1436,7 +1444,7 @@ static ir_node *gen_Sub(ir_node *node) {
                                                   match_am);
        }
 
-       if(is_Const(op2)) {
+       if (is_Const(op2)) {
                ir_fprintf(stderr, "Optimisation warning: found sub with const (%+F)\n",
                           node);
        }
@@ -1556,8 +1564,8 @@ static ir_node *gen_DivMod(ir_node *node) {
  */
 static ir_node *gen_Quot(ir_node *node)
 {
-       ir_node  *op1     = get_Quot_left(node);
-       ir_node  *op2     = get_Quot_right(node);
+       ir_node *op1 = get_Quot_left(node);
+       ir_node *op2 = get_Quot_right(node);
 
        if (ia32_cg_config.use_sse2) {
                return gen_binop(node, op1, op2, new_rd_ia32_xDiv, match_am);
@@ -1859,9 +1867,27 @@ static ir_node *gen_Abs(ir_node *node)
        return new_node;
 }
 
+/**
+ * Create a bt instruction for x & (1 << n) and place it into the block of cmp.
+ */
+static ir_node *gen_bt(ir_node *cmp, ir_node *x, ir_node *n) {
+       dbg_info *dbgi      = get_irn_dbg_info(cmp);
+       ir_node  *block     = get_nodes_block(cmp);
+       ir_node  *new_block = be_transform_node(block);
+       ir_node  *op1       = be_transform_node(x);
+       ir_node  *op2       = be_transform_node(n);
+
+       return new_rd_ia32_Bt(dbgi, current_ir_graph, new_block, op1, op2);
+}
+
+/**
+ * Transform a node returning a "flag" result.
+ *
+ * @param node     the node to transform
+ * @param pnc_out  the compare mode to use
+ */
 static ir_node *get_flags_node(ir_node *node, pn_Cmp *pnc_out)
 {
-       ir_graph *irg = current_ir_graph;
        ir_node  *flags;
        ir_node  *new_op;
        ir_node  *noreg;
@@ -1870,11 +1896,48 @@ static ir_node *get_flags_node(ir_node *node, pn_Cmp *pnc_out)
        dbg_info *dbgi;
 
        /* we have a Cmp as input */
-       if(is_Proj(node)) {
+       if (is_Proj(node)) {
                ir_node *pred = get_Proj_pred(node);
-               if(is_Cmp(pred)) {
+               if (is_Cmp(pred)) {
+                       pn_Cmp pnc = get_Proj_proj(node);
+                       if (ia32_cg_config.use_bt && (pnc == pn_Cmp_Lg || pnc == pn_Cmp_Eq)) {
+                               ir_node *l = get_Cmp_left(pred);
+                               ir_node *r = get_Cmp_right(pred);
+                               if (is_And(l)) {
+                                       ir_node *la = get_And_left(l);
+                                       ir_node *ra = get_And_right(l);
+                                       if (is_Shl(la)) {
+                                               ir_node *c = get_Shl_left(la);
+                                               if (is_Const_1(c) && (is_Const_0(r) || r == la)) {
+                                                       /* (1 << n) & ra) */
+                                                       ir_node *n = get_Shl_right(la);
+                                                       flags    = gen_bt(pred, ra, n);
+                                                       /* we must generate a Jc/Jnc jump */
+                                                       pnc = pnc == pn_Cmp_Lg ? pn_Cmp_Lt : pn_Cmp_Ge;
+                                                       if (r == la)
+                                                               pnc ^= pn_Cmp_Leg;
+                                                       *pnc_out = ia32_pn_Cmp_unsigned | pnc;
+                                                       return flags;
+                                               }
+                                       }
+                                       if (is_Shl(ra)) {
+                                               ir_node *c = get_Shl_left(ra);
+                                               if (is_Const_1(c) && (is_Const_0(r) || r == ra)) {
+                                                       /* la & (1 << n)) */
+                                                       ir_node *n = get_Shl_right(ra);
+                                                       flags    = gen_bt(pred, la, n);
+                                                       /* we must generate a Jc/Jnc jump */
+                                                       pnc = pnc == pn_Cmp_Lg ? pn_Cmp_Lt : pn_Cmp_Ge;
+                                                       if (r == ra)
+                                                               pnc ^= pn_Cmp_Leg;
+                                                       *pnc_out = ia32_pn_Cmp_unsigned | pnc;
+                                                       return flags;
+                                               }
+                                       }
+                               }
+                       }
                        flags    = be_transform_node(pred);
-                       *pnc_out = get_Proj_proj(node);
+                       *pnc_out = pnc;
                        return flags;
                }
        }
@@ -1885,8 +1948,8 @@ static ir_node *get_flags_node(ir_node *node, pn_Cmp *pnc_out)
        new_op    = be_transform_node(node);
        noreg     = ia32_new_NoReg_gp(env_cg);
        nomem     = new_NoMem();
-       flags     = new_rd_ia32_Test(dbgi, irg, new_block, noreg, noreg, nomem,
-                                    new_op, new_op, 0, 0);
+       flags     = new_rd_ia32_Test(dbgi, current_ir_graph, new_block, noreg, noreg, nomem,
+                                    new_op, new_op, /*is_permuted=*/0, /*cmp_unsigned=*/0);
        *pnc_out  = pn_Cmp_Lg;
        return flags;
 }
@@ -2350,7 +2413,7 @@ static ir_node *gen_float_const_Store(ir_node *node, ir_node *cns) {
 
        set_irn_pinned(new_node, get_irn_pinned(node));
        set_ia32_op_type(new_node, ia32_AddrModeD);
-       set_ia32_ls_mode(new_node, mode);
+       set_ia32_ls_mode(new_node, mode_Iu);
 
        set_address(new_node, &addr);
 
@@ -2370,7 +2433,7 @@ static ir_node *gen_float_const_Store(ir_node *node, ir_node *cns) {
 
                set_irn_pinned(new_node, get_irn_pinned(node));
                set_ia32_op_type(new_node, ia32_AddrModeD);
-               set_ia32_ls_mode(new_node, mode);
+               set_ia32_ls_mode(new_node, mode_Iu);
 
                set_address(new_node, &addr);
                size -= 32;
@@ -2381,6 +2444,33 @@ static ir_node *gen_float_const_Store(ir_node *node, ir_node *cns) {
        return new_node;
 }
 
+/**
+ * Generate a vfist or vfisttp instruction.
+ */
+static ir_node *gen_vfist(dbg_info *dbgi, ir_graph *irg, ir_node *block, ir_node *base, ir_node *index,
+                          ir_node *mem,  ir_node *val, ir_node **fist)
+{
+       ir_node *new_node;
+
+       if (ia32_cg_config.use_fisttp) {
+               /* Note: fisttp ALWAYS pop the tos. We have to ensure here that the value is copied
+               if other users exists */
+               const arch_register_class_t *reg_class = &ia32_reg_classes[CLASS_ia32_vfp];
+               ir_node *vfisttp = new_rd_ia32_vfisttp(dbgi, irg, block, base, index, mem, val);
+               ir_node *value   = new_r_Proj(irg, block, vfisttp, mode_E, pn_ia32_vfisttp_res);
+               be_new_Keep(reg_class, irg, block, 1, &value);
+
+               new_node = new_r_Proj(irg, block, vfisttp, mode_M, pn_ia32_vfisttp_M);
+               *fist    = vfisttp;
+       } else {
+               ir_node *trunc_mode = ia32_new_Fpu_truncate(env_cg);
+
+               /* do a fist */
+               new_node = new_rd_ia32_vfist(dbgi, irg, block, base, index, mem, val, trunc_mode);
+               *fist    = new_node;
+       }
+       return new_node;
+}
 /**
  * Transforms a normal Store.
  *
@@ -2397,8 +2487,7 @@ static ir_node *gen_normal_Store(ir_node *node)
        ir_graph *irg       = current_ir_graph;
        dbg_info *dbgi      = get_irn_dbg_info(node);
        ir_node  *noreg     = ia32_new_NoReg_gp(env_cg);
-       ir_node  *new_val;
-       ir_node  *new_node;
+       ir_node  *new_val, *new_node, *store;
        ia32_address_t addr;
 
        /* check for destination address mode */
@@ -2437,8 +2526,8 @@ static ir_node *gen_normal_Store(ir_node *node)
                        new_node = new_rd_ia32_vfst(dbgi, irg, new_block, addr.base,
                                                    addr.index, addr.mem, new_val, mode);
                }
+               store = new_node;
        } else if (is_float_to_int32_conv(val)) {
-               ir_node *trunc_mode = ia32_new_Fpu_truncate(env_cg);
                val = get_Conv_op(val);
 
                /* convs (and strict-convs) before stores are unnecessary if the mode
@@ -2446,10 +2535,8 @@ static ir_node *gen_normal_Store(ir_node *node)
                while(is_Conv(val) && mode == get_irn_mode(get_Conv_op(val))) {
                        val = get_Conv_op(val);
                }
-               new_val = be_transform_node(val);
-
-               new_node = new_rd_ia32_vfist(dbgi, irg, new_block, addr.base,
-                                            addr.index, addr.mem, new_val, trunc_mode);
+               new_val  = be_transform_node(val);
+               new_node = gen_vfist(dbgi, irg, new_block, addr.base, addr.index, addr.mem, new_val, &store);
        } else {
                new_val = create_immediate_or_transform(val, 0);
                assert(mode != mode_b);
@@ -2461,14 +2548,15 @@ static ir_node *gen_normal_Store(ir_node *node)
                        new_node = new_rd_ia32_Store(dbgi, irg, new_block, addr.base,
                                                     addr.index, addr.mem, new_val);
                }
+               store = new_node;
        }
 
-       set_irn_pinned(new_node, get_irn_pinned(node));
-       set_ia32_op_type(new_node, ia32_AddrModeD);
-       set_ia32_ls_mode(new_node, mode);
+       set_irn_pinned(store, get_irn_pinned(node));
+       set_ia32_op_type(store, ia32_AddrModeD);
+       set_ia32_ls_mode(store, mode);
 
-       set_address(new_node, &addr);
-       SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, node));
+       set_address(store, &addr);
+       SET_IA32_ORIG_NODE(store, ia32_get_old_node_name(env_cg, node));
 
        return new_node;
 }
@@ -2570,7 +2658,7 @@ static ir_node *gen_Cond(ir_node *node) {
                return create_Switch(node);
        }
 
-       /* we get flags from a cmp */
+       /* we get flags from a Cmp */
        flags = get_flags_node(sel, &pnc);
 
        new_node = new_rd_ia32_Jcc(dbgi, irg, new_block, flags, pnc);
@@ -2718,6 +2806,9 @@ static int can_fold_test_and(ir_node *node)
        return 1;
 }
 
+/**
+ * Generate code for a Cmp.
+ */
 static ir_node *gen_Cmp(ir_node *node)
 {
        ir_graph *irg       = current_ir_graph;
@@ -2865,8 +2956,9 @@ static ir_node *create_CMov(ir_node *node, ir_node *flags, ir_node *new_flags,
        return new_node;
 }
 
-
-
+/**
+ * Creates a ia32 Setcc instruction.
+ */
 static ir_node *create_set_32bit(dbg_info *dbgi, ir_node *new_block,
                                  ir_node *flags, pn_Cmp pnc, ir_node *orig_node,
                                  int ins_permuted)
@@ -2881,7 +2973,7 @@ static ir_node *create_set_32bit(dbg_info *dbgi, ir_node *new_block,
        SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, orig_node));
 
        /* we might need to conv the result up */
-       if(get_mode_size_bits(mode) > 8) {
+       if (get_mode_size_bits(mode) > 8) {
                new_node = new_rd_ia32_Conv_I2I8Bit(dbgi, irg, new_block, noreg, noreg,
                                                    nomem, new_node, mode_Bu);
                SET_IA32_ORIG_NODE(new_node, ia32_get_old_node_name(env_cg, orig_node));
@@ -2890,6 +2982,41 @@ static ir_node *create_set_32bit(dbg_info *dbgi, ir_node *new_block,
        return new_node;
 }
 
+/**
+ * Create instruction for an unsigned Difference or Zero.
+ */
+static ir_node *create_Doz(ir_node *psi, ir_node *a, ir_node *b) {
+       ir_graph *irg   = current_ir_graph;
+       ir_mode  *mode  = get_irn_mode(psi);
+       ir_node  *new_node, *sub, *sbb, *eflags, *block, *noreg, *tmpreg, *nomem;
+       dbg_info *dbgi;
+
+       new_node = gen_binop(psi, a, b, new_rd_ia32_Sub,
+               match_mode_neutral | match_am | match_immediate | match_two_users);
+
+       block = get_nodes_block(new_node);
+
+       if (is_Proj(new_node)) {
+               sub = get_Proj_pred(new_node);
+               assert(is_ia32_Sub(sub));
+       } else {
+               sub = new_node;
+               set_irn_mode(sub, mode_T);
+               new_node = new_rd_Proj(NULL, irg, block, sub, mode, pn_ia32_res);
+       }
+       eflags = new_rd_Proj(NULL, irg, block, sub, mode_Iu, pn_ia32_Sub_flags);
+
+       dbgi   = get_irn_dbg_info(psi);
+       noreg  = ia32_new_NoReg_gp(env_cg);
+       tmpreg = new_rd_ia32_ProduceVal(dbgi, irg, block);
+       nomem  = new_NoMem();
+       sbb    = new_rd_ia32_Sbb(dbgi, irg, block, noreg, noreg, nomem, tmpreg, tmpreg, eflags);
+
+       new_node = new_rd_ia32_And(dbgi, irg, block, noreg, noreg, nomem, new_node, sbb);
+       set_ia32_commutative(new_node);
+       return new_node;
+}
+
 /**
  * Transforms a Psi node into CMov.
  *
@@ -2903,24 +3030,79 @@ static ir_node *gen_Psi(ir_node *node)
        ir_node  *psi_true    = get_Psi_val(node, 0);
        ir_node  *psi_default = get_Psi_default(node);
        ir_node  *cond        = get_Psi_cond(node, 0);
-       ir_node  *flags       = NULL;
-       ir_node  *new_node;
-       pn_Cmp    pnc;
+       ir_mode  *mode        = get_irn_mode(node);
+       ir_node  *cmp         = get_Proj_pred(cond);
+       ir_node  *cmp_left    = get_Cmp_left(cmp);
+       ir_node  *cmp_right   = get_Cmp_right(cmp);
+       pn_Cmp   pnc          = get_Proj_proj(cond);
 
        assert(get_Psi_n_conds(node) == 1);
        assert(get_irn_mode(cond) == mode_b);
-       assert(mode_needs_gp_reg(get_irn_mode(node)));
 
-       flags = get_flags_node(cond, &pnc);
+       /* Note: a Psi node uses a Load two times IFF it's used in the compare AND in the result */
+       if (mode_is_float(mode)) {
+               if (ia32_cg_config.use_sse2) {
+                       if (pnc == pn_Cmp_Lt || pnc == pn_Cmp_Le) {
+                               if (cmp_left == psi_true && cmp_right == psi_default) {
+                                       /* psi(a <= b, a, b) => MIN */
+                                       return gen_binop(node, cmp_left, cmp_right, new_rd_ia32_xMin,
+                                        match_commutative | match_am | match_two_users);
+                               } else if (cmp_left == psi_default && cmp_right == psi_true) {
+                                       /* psi(a <= b, b, a) => MAX */
+                                       return gen_binop(node, cmp_left, cmp_right, new_rd_ia32_xMax,
+                                        match_commutative | match_am | match_two_users);
+                               }
+                       } else if (pnc == pn_Cmp_Gt || pnc == pn_Cmp_Ge) {
+                               if (cmp_left == psi_true && cmp_right == psi_default) {
+                                       /* psi(a >= b, a, b) => MAX */
+                                       return gen_binop(node, cmp_left, cmp_right, new_rd_ia32_xMax,
+                                        match_commutative | match_am | match_two_users);
+                               } else if (cmp_left == psi_default && cmp_right == psi_true) {
+                                       /* psi(a >= b, b, a) => MIN */
+                                       return gen_binop(node, cmp_left, cmp_right, new_rd_ia32_xMin,
+                                        match_commutative | match_am | match_two_users);
+                               }
+                       }
+               }
+               panic("cannot transform floating point Psi");
 
-       if(is_Const_1(psi_true) && is_Const_0(psi_default)) {
-               new_node = create_set_32bit(dbgi, new_block, flags, pnc, node, 0);
-       } else if(is_Const_0(psi_true) && is_Const_1(psi_default)) {
-               new_node = create_set_32bit(dbgi, new_block, flags, pnc, node, 1);
        } else {
-               new_node = create_CMov(node, cond, flags, pnc);
+               ir_node *flags;
+               ir_node *new_node;
+
+               assert(mode_needs_gp_reg(mode));
+
+               /* check for unsigned Doz first */
+               if ((pnc & pn_Cmp_Gt) && !mode_is_signed(mode) &&
+                   is_Const_0(psi_default) && is_Sub(psi_true) &&
+                   get_Sub_left(psi_true) == cmp_left && get_Sub_right(psi_true) == cmp_right) {
+                       /* Psi(a >=u b, a - b, 0) unsigned Doz */
+                       return create_Doz(node, cmp_left, cmp_right);
+               } else if ((pnc & pn_Cmp_Lt) && !mode_is_signed(mode) &&
+                                  is_Const_0(psi_true) && is_Sub(psi_default) &&
+                                  get_Sub_left(psi_default) == cmp_left && get_Sub_right(psi_default) == cmp_right) {
+                       /* Psi(a <=u b, 0, a - b) unsigned Doz */
+                       return create_Doz(node, cmp_left, cmp_right);
+               }
+
+               flags = get_flags_node(cond, &pnc);
+
+               if (is_Const(psi_true) && is_Const(psi_default)) {
+                       /* both are const, good */
+                       if (is_Const_1(psi_true) && is_Const_0(psi_default)) {
+                               new_node = create_set_32bit(dbgi, new_block, flags, pnc, node, /*is_premuted=*/0);
+                       } else if (is_Const_0(psi_true) && is_Const_1(psi_default)) {
+                               new_node = create_set_32bit(dbgi, new_block, flags, pnc, node, /*is_premuted=*/1);
+                       } else {
+                               /* Not that simple. */
+                               goto need_cmov;
+                       }
+               } else {
+need_cmov:
+                       new_node = create_CMov(node, cond, flags, pnc);
+               }
+               return new_node;
        }
-       return new_node;
 }
 
 
@@ -2935,14 +3117,10 @@ static ir_node *gen_x87_fp_to_gp(ir_node *node) {
        ir_graph        *irg        = current_ir_graph;
        dbg_info        *dbgi       = get_irn_dbg_info(node);
        ir_node         *noreg      = ia32_new_NoReg_gp(cg);
-       ir_node         *trunc_mode = ia32_new_Fpu_truncate(cg);
        ir_mode         *mode       = get_irn_mode(node);
-       ir_node         *fist, *load;
-
-       /* do a fist */
-       fist = new_rd_ia32_vfist(dbgi, irg, block, get_irg_frame(irg), noreg,
-                                new_NoMem(), new_op, trunc_mode);
+       ir_node         *fist, *load, *mem;
 
+       mem = gen_vfist(dbgi, irg, block, get_irg_frame(irg), noreg, new_NoMem(), new_op, &fist);
        set_irn_pinned(fist, op_pin_state_floats);
        set_ia32_use_frame(fist);
        set_ia32_op_type(fist, ia32_AddrModeD);
@@ -2958,7 +3136,7 @@ static ir_node *gen_x87_fp_to_gp(ir_node *node) {
        SET_IA32_ORIG_NODE(fist, ia32_get_old_node_name(cg, node));
 
        /* do a Load */
-       load = new_rd_ia32_Load(dbgi, irg, block, get_irg_frame(irg), noreg, fist);
+       load = new_rd_ia32_Load(dbgi, irg, block, get_irg_frame(irg), noreg, mem);
 
        set_irn_pinned(load, op_pin_state_floats);
        set_ia32_use_frame(load);
@@ -4318,24 +4496,21 @@ static ir_node *gen_ia32_l_vfist(ir_node *node) {
        dbg_info *dbgi       = get_irn_dbg_info(node);
        ir_node  *noreg      = ia32_new_NoReg_gp(env_cg);
        ir_mode  *mode       = get_ia32_ls_mode(node);
-       ir_node  *trunc_mode = ia32_new_Fpu_truncate(env_cg);
-       ir_node  *new_op;
+       ir_node  *memres, *fist;
        long     am_offs;
 
-       new_op = new_rd_ia32_vfist(dbgi, irg, block, new_ptr, noreg, new_mem,
-                                  new_val, trunc_mode);
-
+       memres = gen_vfist(dbgi, irg, block, new_ptr, noreg, new_mem, new_val, &fist);
        am_offs = get_ia32_am_offs_int(node);
-       add_ia32_am_offs_int(new_op, am_offs);
+       add_ia32_am_offs_int(fist, am_offs);
 
-       set_ia32_op_type(new_op, ia32_AddrModeD);
-       set_ia32_ls_mode(new_op, mode);
-       set_ia32_frame_ent(new_op, get_ia32_frame_ent(node));
-       set_ia32_use_frame(new_op);
+       set_ia32_op_type(fist, ia32_AddrModeD);
+       set_ia32_ls_mode(fist, mode);
+       set_ia32_frame_ent(fist, get_ia32_frame_ent(node));
+       set_ia32_use_frame(fist);
 
-       SET_IA32_ORIG_NODE(new_op, ia32_get_old_node_name(env_cg, node));
+       SET_IA32_ORIG_NODE(fist, ia32_get_old_node_name(env_cg, node));
 
-       return new_op;
+       return memres;
 }
 
 /**
@@ -4357,8 +4532,8 @@ static ir_node *gen_ia32_l_Mul(ir_node *node) {
  * @return the created ia32 IMul1OP node
  */
 static ir_node *gen_ia32_l_IMul(ir_node *node) {
-       ir_node  *left      = get_binop_left(node);
-       ir_node  *right     = get_binop_right(node);
+       ir_node  *left  = get_binop_left(node);
+       ir_node  *right = get_binop_right(node);
 
        return gen_binop(node, left, right, new_rd_ia32_IMul1OP,
                         match_commutative | match_am | match_mode_neutral);
@@ -4504,19 +4679,15 @@ static ir_node *gen_ia32_l_FloattoLL(ir_node *node) {
        ir_node  *nomem      = new_NoMem();
        ir_node  *val        = get_irn_n(node, n_ia32_l_FloattoLL_val);
        ir_node  *new_val    = be_transform_node(val);
-       ir_node  *trunc_mode = ia32_new_Fpu_truncate(env_cg);
+       ir_node  *fist, *mem;
 
-       ir_node  *fist;
-
-       /* do a fist */
-       fist = new_rd_ia32_vfist(dbgi, irg, block, frame, noreg, nomem, new_val,
-                                trunc_mode);
+       mem = gen_vfist(dbgi, irg, block, frame, noreg, nomem, new_val, &fist);
        SET_IA32_ORIG_NODE(fist, ia32_get_old_node_name(env_cg, node));
        set_ia32_use_frame(fist);
        set_ia32_op_type(fist, ia32_AddrModeD);
        set_ia32_ls_mode(fist, mode_Ls);
 
-       return fist;
+       return mem;
 }
 
 /**
@@ -4837,6 +5008,8 @@ static ir_node *gen_Proj_Quot(ir_node *node) {
                        return new_rd_Proj(dbgi, irg, block, new_pred, mode_vfp, pn_ia32_vfdiv_res);
                }
                break;
+       case pn_Quot_X_regular:
+       case pn_Quot_X_except:
        default:
                break;
        }
@@ -4970,17 +5143,14 @@ static ir_node *gen_Proj_Cmp(ir_node *node)
  * Transform and potentially renumber Proj nodes.
  */
 static ir_node *gen_Proj(ir_node *node) {
-       ir_graph *irg  = current_ir_graph;
-       dbg_info *dbgi = get_irn_dbg_info(node);
        ir_node  *pred = get_Proj_pred(node);
-       long     proj  = get_Proj_proj(node);
-
        if (is_Store(pred)) {
+               long proj = get_Proj_proj(node);
                if (proj == pn_Store_M) {
                        return be_transform_node(pred);
                } else {
                        assert(0);
-                       return new_r_Bad(irg);
+                       return new_r_Bad(current_ir_graph);
                }
        } else if (is_Load(pred)) {
                return gen_Proj_Load(node);
@@ -4999,13 +5169,15 @@ static ir_node *gen_Proj(ir_node *node) {
        } else if (is_Cmp(pred)) {
                return gen_Proj_Cmp(node);
        } else if (get_irn_op(pred) == op_Start) {
+               long proj = get_Proj_proj(node);
                if (proj == pn_Start_X_initial_exec) {
                        ir_node *block = get_nodes_block(pred);
+                       dbg_info *dbgi = get_irn_dbg_info(node);
                        ir_node *jump;
 
                        /* we exchange the ProjX with a jump */
                        block = be_transform_node(block);
-                       jump  = new_rd_Jmp(dbgi, irg, block);
+                       jump  = new_rd_Jmp(dbgi, current_ir_graph, block);
                        return jump;
                }
                if (node == be_get_old_anchor(anchor_tls)) {
@@ -5018,12 +5190,12 @@ static ir_node *gen_Proj(ir_node *node) {
 #else
        } else {
 #endif
-               ir_node *new_pred = be_transform_node(pred);
-               ir_node *block    = be_transform_node(get_nodes_block(node));
-               ir_mode *mode     = get_irn_mode(node);
+               ir_mode *mode = get_irn_mode(node);
                if (mode_needs_gp_reg(mode)) {
-                       ir_node *new_proj = new_r_Proj(irg, block, new_pred, mode_Iu,
-                                                      get_Proj_proj(node));
+                       ir_node *new_pred = be_transform_node(pred);
+                       ir_node *block    = be_transform_node(get_nodes_block(node));
+                       ir_node *new_proj = new_r_Proj(current_ir_graph, block, new_pred,
+                                                      mode_Iu, get_Proj_proj(node));
 #ifdef DEBUG_libfirm
                        new_proj->node_nr = node->node_nr;
 #endif