remove unnecessary comments before functions
[libfirm] / ir / lower / lower_dw.c
index 53a2d21..9a24a80 100644 (file)
@@ -22,7 +22,6 @@
  * @brief   Lower double word operations, i.e. 64bit -> 32bit, 32bit -> 16bit etc.
  * @date    8.10.2004
  * @author  Michael Beck
- * @version $Id$
  */
 #include "config.h"
 
 #include <stdbool.h>
 #include <assert.h>
 
+#include "be.h"
 #include "error.h"
 #include "lowering.h"
 #include "irnode_t.h"
+#include "irnodeset.h"
 #include "irgraph_t.h"
 #include "irmode_t.h"
 #include "iropt_t.h"
@@ -46,6 +47,7 @@
 #include "irgwalk.h"
 #include "ircons.h"
 #include "irflag.h"
+#include "iroptimize.h"
 #include "irtools.h"
 #include "debug.h"
 #include "set.h"
@@ -65,9 +67,15 @@ static set *conv_types;
 /** A map from a method type to its lowered type. */
 static pmap *lowered_type;
 
+/** A map from a builtin type to its lower and higher type. */
+static pmap *lowered_builtin_type_high;
+static pmap *lowered_builtin_type_low;
+
 /** The types for the binop and unop intrinsics. */
 static ir_type *binop_tp_u, *binop_tp_s, *unop_tp_u, *unop_tp_s, *tp_s, *tp_u;
 
+static ir_nodeset_t created_mux_nodes;
+
 /** the debug handle */
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -102,7 +110,6 @@ typedef struct lower_dw_env_t {
        lower64_entry_t **entries;     /**< entries per node */
        ir_graph      *irg;
        struct obstack obst;           /**< an obstack holding the temporary data */
-       ir_type   *l_mtp;              /**< lowered method type of the current method */
        ir_tarval *tv_mode_bytes;      /**< a tarval containing the number of bytes in the lowered modes */
        ir_tarval *tv_mode_bits;       /**< a tarval containing the number of bits in the lowered modes */
        pdeq      *waitq;              /**< a wait queue of all nodes that must be handled later */
@@ -116,13 +123,11 @@ typedef struct lower_dw_env_t {
        const lwrdw_param_t *params;   /**< transformation parameter */
        unsigned flags;                /**< some flags */
        unsigned n_entries;            /**< number of entries */
-       ir_type  *value_param_tp;      /**< the old value param type */
 } lower_dw_env_t;
 
 static lower_dw_env_t *env;
 
 static void lower_node(ir_node *node);
-static bool mtp_must_be_lowered(ir_type *mtp);
 
 /**
  * Create a method type for a Conv emulation from imode to omode.
@@ -287,6 +292,27 @@ static void prepare_links(ir_node *node)
                        env->flags |= MUST_BE_LOWERED;
                }
                return;
+       } else if (is_Call(node)) {
+               /* Special case:  If the result of the Call is never used, we won't
+                * find a Proj with a mode that potentially triggers MUST_BE_LOWERED
+                * to be set.  Thus, if we see a call, we check its result types and
+                * decide whether MUST_BE_LOWERED has to be set.
+                */
+               ir_type *tp = get_Call_type(node);
+               size_t   n_res, i;
+
+               n_res = get_method_n_ress(tp);
+               for (i = 0; i < n_res; ++i) {
+                       ir_type *rtp = get_method_res_type(tp, i);
+
+                       if (is_Primitive_type(rtp)) {
+                               ir_mode *rmode = get_type_mode(rtp);
+
+                               if (rmode == env->high_signed || rmode == env->high_unsigned) {
+                                       env->flags |= MUST_BE_LOWERED;
+                               }
+                       }
+               }
        }
 }
 
@@ -336,7 +362,9 @@ static void lower_Load(ir_node *node, ir_mode *mode)
        ir_graph   *irg = get_irn_irg(node);
        ir_node    *adr = get_Load_ptr(node);
        ir_node    *mem = get_Load_mem(node);
-       ir_node    *low, *high, *proj;
+       ir_node    *low;
+       ir_node    *high;
+       ir_node    *proj_m;
        dbg_info   *dbg;
        ir_node    *block = get_nodes_block(node);
        ir_cons_flags volatility = get_Load_volatility(node) == volatility_is_volatile
@@ -353,10 +381,10 @@ static void lower_Load(ir_node *node, ir_mode *mode)
        }
 
        /* create two loads */
-       dbg  = get_irn_dbg_info(node);
-       low  = new_rd_Load(dbg, block, mem,  low,  low_mode, volatility);
-       proj = new_r_Proj(low, mode_M, pn_Load_M);
-       high = new_rd_Load(dbg, block, proj, high, mode, volatility);
+       dbg    = get_irn_dbg_info(node);
+       low    = new_rd_Load(dbg, block, mem,  low,  low_mode, volatility);
+       proj_m = new_r_Proj(low, mode_M, pn_Load_M);
+       high   = new_rd_Load(dbg, block, proj_m, high, mode, volatility);
 
        foreach_out_edge_safe(node, edge, next) {
                ir_node *proj = get_edge_src_irn(edge);
@@ -394,7 +422,7 @@ static void lower_Store(ir_node *node, ir_mode *mode)
 {
        ir_graph              *irg;
        ir_node               *block, *adr, *mem;
-       ir_node               *low, *high, *proj;
+       ir_node               *low, *high, *proj_m;
        dbg_info              *dbg;
        ir_node               *value = get_Store_value(node);
        const lower64_entry_t *entry = get_node_entry(value);
@@ -426,10 +454,10 @@ static void lower_Store(ir_node *node, ir_mode *mode)
        }
 
        /* create two Stores */
-       dbg = get_irn_dbg_info(node);
-       low  = new_rd_Store(dbg, block, mem, low,  entry->low_word, volatility);
-       proj = new_r_Proj(low, mode_M, pn_Store_M);
-       high = new_rd_Store(dbg, block, proj, high, entry->high_word, volatility);
+       dbg    = get_irn_dbg_info(node);
+       low    = new_rd_Store(dbg, block, mem, low,  entry->low_word, volatility);
+       proj_m = new_r_Proj(low, mode_M, pn_Store_M);
+       high   = new_rd_Store(dbg, block, proj_m, high, entry->high_word, volatility);
 
        foreach_out_edge_safe(node, edge, next) {
                ir_node *proj = get_edge_src_irn(edge);
@@ -816,6 +844,8 @@ static void lower_shr_helper(ir_node *node, ir_mode *mode,
                panic("Shr lowering only implemented for two-complement modes");
        }
 
+       block = get_nodes_block(node);
+
        /* if the right operand is a 64bit value, we're only interested in the
         * lower word */
        if (get_irn_mode(right) == env->high_unsigned) {
@@ -823,7 +853,6 @@ static void lower_shr_helper(ir_node *node, ir_mode *mode,
        } else {
                /* shift should never have signed mode on the right */
                assert(get_irn_mode(right) != env->high_signed);
-               ir_node *block = get_nodes_block(node);
                right = create_conv(block, right, low_unsigned);
        }
 
@@ -831,7 +860,7 @@ static void lower_shr_helper(ir_node *node, ir_mode *mode,
        env->flags |= CF_CHANGED;
        block = get_nodes_block(node);
 
-       /* add a Cmp to test if highest bit is set <=> wether we shift more
+       /* add a Cmp to test if highest bit is set <=> whether we shift more
         * than half the word width */
        cnst       = new_r_Const_long(irg, low_unsigned, modulo_shift2);
        and        = new_r_And(block, right, cnst, low_unsigned);
@@ -879,10 +908,10 @@ static void lower_shr_helper(ir_node *node, ir_mode *mode,
                ir_node *res_low     = new_rd_shrs(dbgi, block_false, conv, right,
                                                   low_unsigned);
                int      cnsti       = modulo_shift2-1;
-               ir_node *cnst        = new_r_Const_long(irg, low_unsigned, cnsti);
+               ir_node *cnst2       = new_r_Const_long(irg, low_unsigned, cnsti);
                ir_node *res_high;
                if (new_rd_shrs == new_rd_Shrs) {
-                       res_high = new_rd_shrs(dbgi, block_false, left_high, cnst, mode);
+                       res_high = new_rd_shrs(dbgi, block_false, left_high, cnst2, mode);
                } else {
                        res_high = new_r_Const(irg, get_mode_null(mode));
                }
@@ -940,14 +969,14 @@ static void lower_Shl(ir_node *node, ir_mode *mode)
         * (and can't handle anything else) */
        if (modulo_shift != get_mode_size_bits(shr_mode)
                        || modulo_shift2<<1 != modulo_shift) {
-               panic("Shr lowering only implemented for modulo shift shr operations");
+               panic("Shl lowering only implemented for modulo shift shl operations");
        }
        if (!is_po2(modulo_shift) || !is_po2(modulo_shift2)) {
-               panic("Shr lowering only implemented for power-of-2 modes");
+               panic("Shl lowering only implemented for power-of-2 modes");
        }
        /* without 2-complement the -x instead of (bit_width-x) trick won't work */
        if (get_mode_arithmetic(shr_mode) != irma_twos_complement) {
-               panic("Shr lowering only implemented for two-complement modes");
+               panic("Shl lowering only implemented for two-complement modes");
        }
 
        /* if the right operand is a 64bit value, we're only interested in the
@@ -964,7 +993,7 @@ static void lower_Shl(ir_node *node, ir_mode *mode)
        env->flags |= CF_CHANGED;
        block = get_nodes_block(node);
 
-       /* add a Cmp to test if highest bit is set <=> wether we shift more
+       /* add a Cmp to test if highest bit is set <=> whether we shift more
         * than half the word width */
        cnst       = new_r_Const_long(irg, low_unsigned, modulo_shift2);
        and        = new_r_And(block, right, cnst, low_unsigned);
@@ -1168,7 +1197,7 @@ static void lower_Not(ir_node *node, ir_mode *mode)
        ir_set_dw_lowered(node, res_low, res_high);
 }
 
-static bool is_equality_cmp_0(const ir_node *node)
+static bool is_equality_cmp(const ir_node *node)
 {
        ir_relation relation = get_Cmp_relation(node);
        ir_node    *left     = get_Cmp_left(node);
@@ -1178,10 +1207,11 @@ static bool is_equality_cmp_0(const ir_node *node)
        /* this probably makes no sense if unordered is involved */
        assert(!mode_is_float(mode));
 
+       if (relation == ir_relation_equal || relation == ir_relation_less_greater)
+               return true;
+
        if (!is_Const(right) || !is_Const_null(right))
                return false;
-       if (relation == ir_relation_equal)
-               return true;
        if (mode_is_signed(mode)) {
                return relation == ir_relation_less_greater;
        } else {
@@ -1197,17 +1227,28 @@ static ir_node *get_cfop_destination(const ir_node *cfop)
        return get_edge_src_irn(first);
 }
 
+static void lower_Switch(ir_node *node, ir_mode *high_mode)
+{
+       ir_node *selector = get_Switch_selector(node);
+       ir_mode *mode     = get_irn_mode(selector);
+       (void)high_mode;
+       if (mode == env->high_signed || mode == env->high_unsigned) {
+               /* we can't really handle Switch with 64bit offsets */
+               panic("Switch with 64bit jumptable not supported");
+       }
+       lower_node(selector);
+}
+
 /**
  * Translate a Cond.
  */
-static void lower_Cond(ir_node *node, ir_mode *mode)
+static void lower_Cond(ir_node *node, ir_mode *high_mode)
 {
        ir_node *left, *right, *block;
        ir_node *sel = get_Cond_selector(node);
-       ir_mode *m = get_irn_mode(sel);
        ir_mode *cmp_mode;
        const lower64_entry_t *lentry, *rentry;
-       ir_node  *proj, *projT = NULL, *projF = NULL;
+       ir_node  *projT = NULL, *projF = NULL;
        ir_node  *new_bl, *irn;
        ir_node  *projHF, *projHT;
        ir_node  *dst_blk;
@@ -1217,16 +1258,7 @@ static void lower_Cond(ir_node *node, ir_mode *mode)
        const ir_edge_t *edge;
        const ir_edge_t *next;
 
-       (void) mode;
-
-       if (m != mode_b) {
-               if (m == env->high_signed || m == env->high_unsigned) {
-                       /* bad we can't really handle Switch with 64bit offsets */
-                       panic("Cond with 64bit jumptable not supported");
-               }
-               lower_node(sel);
-               return;
-       }
+       (void) high_mode;
 
        if (!is_Cmp(sel)) {
                lower_node(sel);
@@ -1272,18 +1304,23 @@ static void lower_Cond(ir_node *node, ir_mode *mode)
        dbg      = get_irn_dbg_info(sel);
        relation = get_Cmp_relation(sel);
 
-       if (is_equality_cmp_0(sel)) {
-               /* x ==/!= 0 ==> or(low,high) ==/!= 0 */
-               ir_mode *mode   = env->low_unsigned;
-               ir_node *low    = new_r_Conv(block, lentry->low_word, mode);
-               ir_node *high   = new_r_Conv(block, lentry->high_word, mode);
-               ir_node *ornode = new_rd_Or(dbg, block, low, high, mode);
-               ir_node *cmp    = new_rd_Cmp(dbg, block, ornode, new_r_Const_long(irg, mode, 0), relation);
+       if (is_equality_cmp(sel)) {
+               /* x ==/!= y ==> or(x_low^y_low,x_high^y_high) ==/!= 0 */
+               ir_mode *mode       = env->low_unsigned;
+               ir_node *low_left   = new_rd_Conv(dbg, block, lentry->low_word, mode);
+               ir_node *high_left  = new_rd_Conv(dbg, block, lentry->high_word, mode);
+               ir_node *low_right  = new_rd_Conv(dbg, block, rentry->low_word, mode);
+               ir_node *high_right = new_rd_Conv(dbg, block, rentry->high_word, mode);
+               ir_node *xor_low    = new_rd_Eor(dbg, block, low_left, low_right, mode);
+               ir_node *xor_high   = new_rd_Eor(dbg, block, high_left, high_right, mode);
+               ir_node *ornode = new_rd_Or(dbg, block, xor_low, xor_high, mode);
+               ir_node *cmp    = new_rd_Cmp(dbg, block, ornode, new_r_Const(irg, get_mode_null(mode)), relation);
                set_Cond_selector(node, cmp);
                return;
        }
 
        if (relation == ir_relation_equal) {
+               ir_node *proj;
                /* simple case:a == b <==> a_h == b_h && a_l == b_l */
                dst_blk = get_cfop_destination(projF);
 
@@ -1315,6 +1352,7 @@ static void lower_Cond(ir_node *node, ir_mode *mode)
                mark_irn_visited(proj);
                exchange(projT, proj);
        } else if (relation == ir_relation_less_greater) {
+               ir_node *proj;
                /* simple case:a != b <==> a_h != b_h || a_l != b_l */
                dst_blk = get_cfop_destination(projT);
 
@@ -1346,6 +1384,7 @@ static void lower_Cond(ir_node *node, ir_mode *mode)
                mark_irn_visited(proj);
                exchange(projF, proj);
        } else {
+               ir_node *proj;
                /* a rel b <==> a_h REL b_h || (a_h == b_h && a_l rel b_l) */
                ir_node *dstT, *dstF, *newbl_eq, *newbl_l;
                ir_node *projEqF;
@@ -1509,8 +1548,8 @@ static void lower_Conv_from_Ll(ir_node *node)
  */
 static void lower_Cmp(ir_node *cmp, ir_mode *m)
 {
-       ir_node  *l    = get_Cmp_left(cmp);
-       ir_mode  *mode = get_irn_mode(l);
+       ir_node  *l        = get_Cmp_left(cmp);
+       ir_mode  *cmp_mode = get_irn_mode(l);
        ir_node  *r, *low, *high, *t, *res;
        ir_relation relation;
        ir_node  *block;
@@ -1519,7 +1558,7 @@ static void lower_Cmp(ir_node *cmp, ir_mode *m)
        const lower64_entry_t *rentry;
        (void) m;
 
-       if (mode != env->high_signed && mode != env->high_unsigned)
+       if (cmp_mode != env->high_signed && cmp_mode != env->high_unsigned)
                return;
 
        r        = get_Cmp_right(cmp);
@@ -1530,13 +1569,17 @@ static void lower_Cmp(ir_node *cmp, ir_mode *m)
        dbg      = get_irn_dbg_info(cmp);
 
        /* easy case for x ==/!= 0 (see lower_Cond for details) */
-       if (is_equality_cmp_0(cmp)) {
-               ir_graph *irg     = get_irn_irg(cmp);
-               ir_mode  *mode    = env->low_unsigned;
-               ir_node  *low     = new_r_Conv(block, lentry->low_word, mode);
-               ir_node  *high    = new_r_Conv(block, lentry->high_word, mode);
-               ir_node  *ornode  = new_rd_Or(dbg, block, low, high, mode);
-               ir_node  *new_cmp = new_rd_Cmp(dbg, block, ornode, new_r_Const_long(irg, mode, 0), relation);
+       if (is_equality_cmp(cmp)) {
+               ir_graph *irg        = get_irn_irg(cmp);
+               ir_mode  *mode       = env->low_unsigned;
+               ir_node  *low_left   = new_rd_Conv(dbg, block, lentry->low_word, mode);
+               ir_node  *high_left  = new_rd_Conv(dbg, block, lentry->high_word, mode);
+               ir_node  *low_right  = new_rd_Conv(dbg, block, rentry->low_word, mode);
+               ir_node  *high_right = new_rd_Conv(dbg, block, rentry->high_word, mode);
+               ir_node  *xor_low    = new_rd_Eor(dbg, block, low_left, low_right, mode);
+               ir_node  *xor_high   = new_rd_Eor(dbg, block, high_left, high_right, mode);
+               ir_node  *ornode     = new_rd_Or(dbg, block, xor_low, xor_high, mode);
+               ir_node  *new_cmp    = new_rd_Cmp(dbg, block, ornode, new_r_Const(irg, get_mode_null(mode)), relation);
                exchange(cmp, new_cmp);
                return;
        }
@@ -1587,25 +1630,62 @@ static void lower_Conv(ir_node *node, ir_mode *mode)
        }
 }
 
-/**
- * Remember the new argument index of this value type entity in the lowered
- * method type.
- *
- * @param ent  the entity
- * @param pos  the argument index of this entity
- */
-static inline void set_entity_arg_idx(ir_entity *ent, size_t pos)
+static void fix_parameter_entities(ir_graph *irg)
 {
-       set_entity_link(ent, INT_TO_PTR(pos));
-}
+       ir_entity *entity   = get_irg_entity(irg);
+       ir_type   *mtp      = get_entity_type(entity);
+       ir_type   *orig_mtp = get_type_link(mtp);
 
-/**
- * Retrieve the argument index of a value type entity.
- *
- * @param ent  the entity
- */
-static size_t get_entity_arg_idx(const ir_entity *ent) {
-       return PTR_TO_INT(get_entity_link(ent));
+       size_t      orig_n_params      = get_method_n_params(orig_mtp);
+       ir_entity **parameter_entities;
+
+       parameter_entities = ALLOCANZ(ir_entity*, orig_n_params);
+
+       ir_type *frame_type = get_irg_frame_type(irg);
+       size_t   n          = get_compound_n_members(frame_type);
+       size_t   i;
+       size_t   n_param;
+
+       /* collect parameter entities */
+       for (i = 0; i < n; ++i) {
+               ir_entity *entity = get_compound_member(frame_type, i);
+               size_t     p;
+               if (!is_parameter_entity(entity))
+                       continue;
+               p = get_entity_parameter_number(entity);
+               if (p == IR_VA_START_PARAMETER_NUMBER)
+                       continue;
+               assert(p < orig_n_params);
+               assert(parameter_entities[p] == NULL);
+               parameter_entities[p] = entity;
+       }
+
+       /* adjust indices */
+       n_param = 0;
+       for (i = 0; i < orig_n_params; ++i, ++n_param) {
+               ir_entity *entity = parameter_entities[i];
+               ir_type   *tp;
+
+               if (entity != NULL)
+                       set_entity_parameter_number(entity, n_param);
+
+               tp = get_method_param_type(orig_mtp, i);
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
+                       if (mode == env->high_signed || mode == env->high_unsigned) {
+                               ++n_param;
+                               /* note that we do not change the type of the parameter
+                                * entities, as calling convention fixup later still needs to
+                                * know which is/was a lowered doubleword.
+                                * So we just mark/remember it for later */
+                               if (entity != NULL) {
+                                       assert(entity->attr.parameter.doubleword_low_mode == NULL);
+                                       entity->attr.parameter.doubleword_low_mode
+                                               = env->low_unsigned;
+                               }
+                       }
+               }
+       }
 }
 
 /**
@@ -1618,121 +1698,118 @@ static size_t get_entity_arg_idx(const ir_entity *ent) {
  */
 static ir_type *lower_mtp(ir_type *mtp)
 {
-       pmap_entry *entry;
-       ir_type    *res, *value_type;
-
-       entry = pmap_find(lowered_type, mtp);
-       if (! entry) {
-               size_t i, orig_n_params, orig_n_res, n_param, n_res;
-
-               /* count new number of params */
-               n_param = orig_n_params = get_method_n_params(mtp);
-               for (i = orig_n_params; i > 0;) {
-                       ir_type *tp = get_method_param_type(mtp, --i);
+       ir_type *res;
+       size_t   i;
+       size_t   orig_n_params;
+       size_t   orig_n_res;
+       size_t   n_param;
+       size_t   n_res;
+       bool     must_be_lowered;
+
+       res = (ir_type*)pmap_get(lowered_type, mtp);
+       if (res != NULL)
+               return res;
+
+       orig_n_params   = get_method_n_params(mtp);
+       orig_n_res      = get_method_n_ress(mtp);
+       n_param         = orig_n_params;
+       n_res           = orig_n_res;
+       must_be_lowered = false;
+
+       /* count new number of params */
+       for (i = orig_n_params; i > 0;) {
+               ir_type *tp = get_method_param_type(mtp, --i);
 
-                       if (is_Primitive_type(tp)) {
-                               ir_mode *mode = get_type_mode(tp);
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
 
-                               if (mode == env->high_signed || mode == env->high_unsigned)
-                                       ++n_param;
+                       if (mode == env->high_signed || mode == env->high_unsigned) {
+                               ++n_param;
+                               must_be_lowered = true;
                        }
                }
+       }
 
-               /* count new number of results */
-               n_res = orig_n_res = get_method_n_ress(mtp);
-               for (i = orig_n_res; i > 0;) {
-                       ir_type *tp = get_method_res_type(mtp, --i);
+       /* count new number of results */
+       for (i = orig_n_res; i > 0;) {
+               ir_type *tp = get_method_res_type(mtp, --i);
 
-                       if (is_Primitive_type(tp)) {
-                               ir_mode *mode = get_type_mode(tp);
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
 
-                               if (mode == env->high_signed || mode == env->high_unsigned)
-                                       ++n_res;
+                       if (mode == env->high_signed || mode == env->high_unsigned) {
+                               ++n_res;
+                               must_be_lowered = true;
                        }
                }
+       }
+       if (!must_be_lowered) {
+               set_type_link(mtp, NULL);
+               return mtp;
+       }
 
-               res = new_type_method(n_param, n_res);
+       res = new_d_type_method(n_param, n_res, get_type_dbg_info(mtp));
 
-               /* set param types and result types */
-               for (i = n_param = 0; i < orig_n_params; ++i) {
-                       ir_type *tp = get_method_param_type(mtp, i);
-
-                       if (is_Primitive_type(tp)) {
-                               ir_mode *mode = get_type_mode(tp);
-
-                               if (mode == env->high_signed) {
-                                       if (env->params->little_endian) {
-                                               set_method_param_type(res, n_param++, tp_u);
-                                               set_method_param_type(res, n_param++, tp_s);
-                                       } else {
-                                               set_method_param_type(res, n_param++, tp_s);
-                                               set_method_param_type(res, n_param++, tp_u);
-                                       }
-                               } else if (mode == env->high_unsigned) {
-                                       set_method_param_type(res, n_param++, tp_u);
+       /* set param types and result types */
+       for (i = n_param = 0; i < orig_n_params; ++i) {
+               ir_type *tp = get_method_param_type(mtp, i);
+
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
+
+                       if (mode == env->high_signed) {
+                               if (env->params->little_endian) {
                                        set_method_param_type(res, n_param++, tp_u);
+                                       set_method_param_type(res, n_param++, tp_s);
                                } else {
-                                       set_method_param_type(res, n_param++, tp);
+                                       set_method_param_type(res, n_param++, tp_s);
+                                       set_method_param_type(res, n_param++, tp_u);
                                }
+                       } else if (mode == env->high_unsigned) {
+                               set_method_param_type(res, n_param++, tp_u);
+                               set_method_param_type(res, n_param++, tp_u);
                        } else {
-                               set_method_param_type(res, n_param++, tp);
+                               set_method_param_type(res, n_param, tp);
+                               ++n_param;
                        }
+               } else {
+                       set_method_param_type(res, n_param, tp);
+                       ++n_param;
                }
-               for (i = n_res = 0; i < orig_n_res; ++i) {
-                       ir_type *tp = get_method_res_type(mtp, i);
-
-                       if (is_Primitive_type(tp)) {
-                               ir_mode *mode = get_type_mode(tp);
-
-                               if (mode == env->high_signed) {
-                                       if (env->params->little_endian) {
-                                               set_method_res_type(res, n_res++, tp_u);
-                                               set_method_res_type(res, n_res++, tp_s);
-                                       } else {
-                                               set_method_res_type(res, n_res++, tp_s);
-                                               set_method_res_type(res, n_res++, tp_u);
-                                       }
-                               } else if (mode == env->high_unsigned) {
-                                       set_method_res_type(res, n_res++, tp_u);
+       }
+       for (i = n_res = 0; i < orig_n_res; ++i) {
+               ir_type *tp = get_method_res_type(mtp, i);
+
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
+
+                       if (mode == env->high_signed) {
+                               if (env->params->little_endian) {
                                        set_method_res_type(res, n_res++, tp_u);
+                                       set_method_res_type(res, n_res++, tp_s);
                                } else {
-                                       set_method_res_type(res, n_res++, tp);
+                                       set_method_res_type(res, n_res++, tp_s);
+                                       set_method_res_type(res, n_res++, tp_u);
                                }
+                       } else if (mode == env->high_unsigned) {
+                               set_method_res_type(res, n_res++, tp_u);
+                               set_method_res_type(res, n_res++, tp_u);
                        } else {
                                set_method_res_type(res, n_res++, tp);
                        }
+               } else {
+                       set_method_res_type(res, n_res++, tp);
                }
-               set_lowered_type(mtp, res);
-               pmap_insert(lowered_type, mtp, res);
-
-               value_type = get_method_value_param_type(mtp);
-               if (value_type != NULL) {
-                       /* this creates a new value parameter type */
-                       (void)get_method_value_param_ent(res, 0);
-
-                       /* set new param positions for all entities of the value type */
-                       for (i = n_param = 0; i < orig_n_params; ++i) {
-                               ir_type   *tp  = get_method_param_type(mtp, i);
-                               ir_entity *ent = get_method_value_param_ent(mtp, i);
-
-                               set_entity_arg_idx(ent, n_param);
-                               if (is_Primitive_type(tp)) {
-                                       ir_mode *mode = get_type_mode(tp);
-
-                                       if (mode == env->high_signed
-                                           || mode == env->high_unsigned) {
-                                               n_param += 2;
-                                               continue;
-                                       }
-                               }
-                               ++n_param;
-                       }
-
-                       set_lowered_type(value_type, get_method_value_param_type(res));
-               }
-       } else {
-               res = (ir_type*)entry->value;
        }
+
+       set_method_variadicity(res, get_method_variadicity(mtp));
+       set_method_calling_convention(res, get_method_calling_convention(mtp));
+       set_method_additional_properties(res, get_method_additional_properties(mtp));
+
+       set_higher_type(res, mtp);
+       set_type_link(res, mtp);
+
+       pmap_insert(lowered_type, mtp, res);
        return res;
 }
 
@@ -1751,10 +1828,10 @@ static void lower_Return(ir_node *node, ir_mode *mode)
 
        /* check if this return must be lowered */
        for (i = 0, n = get_Return_n_ress(node); i < n; ++i) {
-               ir_node *pred = get_Return_res(node, i);
-               ir_mode *mode = get_irn_op_mode(pred);
+               ir_node *pred  = get_Return_res(node, i);
+               ir_mode *rmode = get_irn_op_mode(pred);
 
-               if (mode == env->high_signed || mode == env->high_unsigned)
+               if (rmode == env->high_signed || rmode == env->high_unsigned)
                        need_conv = 1;
        }
        if (! need_conv)
@@ -1763,73 +1840,71 @@ static void lower_Return(ir_node *node, ir_mode *mode)
        ent = get_irg_entity(irg);
        mtp = get_entity_type(ent);
 
-       mtp = lower_mtp(mtp);
-       set_entity_type(ent, mtp);
-
        /* create a new in array */
        NEW_ARR_A(ir_node *, in, get_method_n_ress(mtp) + 1);
-       in[0] = get_Return_mem(node);
+       j = 0;
+       in[j++] = get_Return_mem(node);
 
-       for (j = i = 0, n = get_Return_n_ress(node); i < n; ++i) {
+       for (i = 0, n = get_Return_n_ress(node); i < n; ++i) {
                ir_node *pred      = get_Return_res(node, i);
                ir_mode *pred_mode = get_irn_mode(pred);
 
                if (pred_mode == env->high_signed || pred_mode == env->high_unsigned) {
                        const lower64_entry_t *entry = get_node_entry(pred);
                        if (env->params->little_endian) {
-                               in[++j] = entry->low_word;
-                               in[++j] = entry->high_word;
+                               in[j++] = entry->low_word;
+                               in[j++] = entry->high_word;
                        } else {
-                               in[++j] = entry->high_word;
-                               in[++j] = entry->low_word;
+                               in[j++] = entry->high_word;
+                               in[j++] = entry->low_word;
                        }
                } else {
-                       in[++j] = pred;
+                       in[j++] = pred;
                }
        }
+       assert(j == get_method_n_ress(mtp)+1);
 
-       set_irn_in(node, j+1, in);
+       set_irn_in(node, j, in);
 }
 
 /**
  * Translate the parameters.
  */
-static void lower_Start(ir_node *node, ir_mode *mode)
+static void lower_Start(ir_node *node, ir_mode *high_mode)
 {
-       ir_graph  *irg = get_irn_irg(node);
-       ir_entity *ent = get_irg_entity(irg);
-       ir_type   *tp  = get_entity_type(ent);
+       ir_graph  *irg      = get_irn_irg(node);
+       ir_entity *ent      = get_irg_entity(irg);
+       ir_type   *mtp      = get_entity_type(ent);
+       ir_type   *orig_mtp = get_type_link(mtp);
        ir_node   *args;
        long      *new_projs;
        size_t    i, j, n_params;
        const ir_edge_t *edge;
        const ir_edge_t *next;
-       (void) mode;
+       (void) high_mode;
 
-       if (!mtp_must_be_lowered(tp))
+       /* if type link is NULL then the type was not lowered, hence no changes
+        * at Start necessary */
+       if (orig_mtp == NULL)
                return;
 
-       n_params = get_method_n_params(tp);
+       n_params = get_method_n_params(orig_mtp);
 
        NEW_ARR_A(long, new_projs, n_params);
 
        /* Calculate mapping of proj numbers in new_projs */
        for (i = j = 0; i < n_params; ++i, ++j) {
-               ir_type *ptp = get_method_param_type(tp, i);
+               ir_type *ptp = get_method_param_type(orig_mtp, i);
 
                new_projs[i] = j;
                if (is_Primitive_type(ptp)) {
-                       ir_mode *mode = get_type_mode(ptp);
-
-                       if (mode == env->high_signed || mode == env->high_unsigned)
+                       ir_mode *amode = get_type_mode(ptp);
+                       if (amode == env->high_signed || amode == env->high_unsigned)
                                ++j;
                }
        }
 
        /* lower method type */
-       tp = lower_mtp(tp);
-       set_entity_type(ent, tp);
-
        args = NULL;
        foreach_out_edge(node, edge) {
                ir_node *proj = get_edge_src_irn(edge);
@@ -1853,6 +1928,7 @@ static void lower_Start(ir_node *node, ir_mode *mode)
                ir_mode *mode_h;
                ir_node *res_low;
                ir_node *res_high;
+               int      old_cse;
                dbg_info *dbg;
 
                if (!is_Proj(proj))
@@ -1870,6 +1946,9 @@ static void lower_Start(ir_node *node, ir_mode *mode)
                        continue;
                }
 
+               /* Switch off CSE or we might get an already existing Proj. */
+               old_cse = get_opt_cse();
+               set_opt_cse(0);
                dbg = get_irn_dbg_info(proj);
                if (env->params->little_endian) {
                        res_low  = new_rd_Proj(dbg, pred, mode_l, new_projs[proj_nr]);
@@ -1878,6 +1957,7 @@ static void lower_Start(ir_node *node, ir_mode *mode)
                        res_high = new_rd_Proj(dbg, pred, mode_h, new_projs[proj_nr]);
                        res_low  = new_rd_Proj(dbg, pred, mode_l, new_projs[proj_nr] + 1);
                }
+               set_opt_cse(old_cse);
                ir_set_dw_lowered(proj, res_low, res_high);
        }
 }
@@ -1904,9 +1984,8 @@ static void lower_Call(ir_node *node, ir_mode *mode)
                ir_type *ptp = get_method_param_type(tp, p);
 
                if (is_Primitive_type(ptp)) {
-                       ir_mode *mode = get_type_mode(ptp);
-
-                       if (mode == env->high_signed || mode == env->high_unsigned) {
+                       ir_mode *pmode = get_type_mode(ptp);
+                       if (pmode == env->high_signed || pmode == env->high_unsigned) {
                                need_lower = true;
                                break;
                        }
@@ -1921,9 +2000,8 @@ static void lower_Call(ir_node *node, ir_mode *mode)
 
                        res_numbers[i] = j;
                        if (is_Primitive_type(ptp)) {
-                               ir_mode *mode = get_type_mode(ptp);
-
-                               if (mode == env->high_signed || mode == env->high_unsigned) {
+                               ir_mode *rmode = get_type_mode(ptp);
+                               if (rmode == env->high_signed || rmode == env->high_unsigned) {
                                        need_lower = true;
                                        ++j;
                                }
@@ -2181,7 +2259,6 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode)
                ir_node           *block      = get_nodes_block(asmn);
                int                arity      = get_irn_arity(asmn);
                ir_node          **in         = get_irn_in(asmn) + 1;
-               int                n_outs     = get_ASM_n_output_constraints(asmn);
                int                new_n_outs = 0;
                int                n_clobber  = get_ASM_n_clobbers(asmn);
                long              *proj_map   = ALLOCAN(long, n_outs);
@@ -2249,23 +2326,317 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode)
 }
 
 /**
- * Translate a Sel node.
+ * Lower the builtin type to its higher part.
+ *
+ * @param mtp  the builtin type to lower
+ *
+ * @return the lowered type
  */
-static void lower_Sel(ir_node *sel, ir_mode *mode)
+static ir_type *lower_Builtin_type_high(ir_type *mtp)
 {
-       (void) mode;
+       ir_type *res;
+       size_t   i;
+       size_t   n_params;
+       size_t   n_results;
+       bool     must_be_lowered;
 
-       /* we must only lower value parameter Sels if we change the
-          value parameter type. */
-       if (env->value_param_tp != NULL) {
-               ir_entity *ent = get_Sel_entity(sel);
-           if (get_entity_owner(ent) == env->value_param_tp) {
-                       size_t pos = get_entity_arg_idx(ent);
+       res = (ir_type*)pmap_get(lowered_builtin_type_high, mtp);
+       if (res != NULL)
+               return res;
 
-                       ent = get_method_value_param_ent(env->l_mtp, pos);
-                       set_Sel_entity(sel, ent);
+       n_params        = get_method_n_params(mtp);
+       n_results       = get_method_n_ress(mtp);
+       must_be_lowered = false;
+
+       /* check for double word parameter */
+       for (i = n_params; i > 0;) {
+               ir_type *tp = get_method_param_type(mtp, --i);
+
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
+
+                       if (mode == env->high_signed || mode == env->high_unsigned) {
+                               must_be_lowered = true;
+                               break;
+                       }
                }
        }
+
+       if (!must_be_lowered) {
+               set_type_link(mtp, NULL);
+               return mtp;
+       }
+
+       res = new_d_type_method(n_params, n_results, get_type_dbg_info(mtp));
+
+       /* set param types and result types */
+       for (i = 0; i < n_params; ++i) {
+               ir_type *tp = get_method_param_type(mtp, i);
+
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
+
+                       if (mode == env->high_signed) {
+                               if (env->params->little_endian) {
+                                       set_method_param_type(res, i, tp_u);
+                               } else {
+                                       set_method_param_type(res, i, tp_s);
+                               }
+                       } else if (mode == env->high_unsigned) {
+                               set_method_param_type(res, i, tp_u);
+                       } else {
+                               set_method_param_type(res, i, tp);
+                       }
+               } else {
+                       set_method_param_type(res, i, tp);
+               }
+       }
+       for (i = n_results = 0; i < n_results; ++i) {
+               ir_type *tp = get_method_res_type(mtp, i);
+
+               set_method_res_type(res, i, tp);
+       }
+
+       set_method_variadicity(res, get_method_variadicity(mtp));
+       set_method_calling_convention(res, get_method_calling_convention(mtp));
+       set_method_additional_properties(res, get_method_additional_properties(mtp));
+
+       pmap_insert(lowered_builtin_type_high, mtp, res);
+       return res;
+}
+
+/**
+ * Lower the builtin type to its lower part.
+ *
+ * @param mtp  the builtin type to lower
+ *
+ * @return the lowered type
+ */
+static ir_type *lower_Builtin_type_low(ir_type *mtp)
+{
+       ir_type *res;
+       size_t   i;
+       size_t   n_params;
+       size_t   n_results;
+       bool     must_be_lowered;
+
+       res = (ir_type*)pmap_get(lowered_builtin_type_low, mtp);
+       if (res != NULL)
+               return res;
+
+       n_params        = get_method_n_params(mtp);
+       n_results       = get_method_n_ress(mtp);
+       must_be_lowered = false;
+
+       /* check for double word parameter */
+       for (i = n_params; i > 0;) {
+               ir_type *tp = get_method_param_type(mtp, --i);
+
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
+
+                       if (mode == env->high_signed || mode == env->high_unsigned) {
+                               must_be_lowered = true;
+                               break;
+                       }
+               }
+       }
+
+       if (!must_be_lowered) {
+               set_type_link(mtp, NULL);
+               return mtp;
+       }
+
+       res = new_d_type_method(n_params, n_results, get_type_dbg_info(mtp));
+
+       /* set param types and result types */
+       for (i = 0; i < n_params; ++i) {
+               ir_type *tp = get_method_param_type(mtp, i);
+
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
+
+                       if (mode == env->high_signed) {
+                               if (env->params->little_endian) {
+                                       set_method_param_type(res, i, tp_s);
+                               } else {
+                                       set_method_param_type(res, i, tp_u);
+                               }
+                       } else if (mode == env->high_unsigned) {
+                               set_method_param_type(res, i, tp_u);
+                       } else {
+                               set_method_param_type(res, i, tp);
+                       }
+               } else {
+                       set_method_param_type(res, i, tp);
+               }
+       }
+       for (i = 0; i < n_results; ++i) {
+               ir_type *tp = get_method_res_type(mtp, i);
+
+               set_method_res_type(res, i, tp);
+       }
+
+       set_method_variadicity(res, get_method_variadicity(mtp));
+       set_method_calling_convention(res, get_method_calling_convention(mtp));
+       set_method_additional_properties(res, get_method_additional_properties(mtp));
+
+       pmap_insert(lowered_builtin_type_low, mtp, res);
+       return res;
+}
+
+/**
+ * Lower double word builtins.
+ */
+static void lower_Builtin(ir_node *builtin, ir_mode *mode)
+{
+       ir_builtin_kind  kind         = get_Builtin_kind(builtin);
+       ir_node         *operand;
+       ir_mode         *operand_mode;
+
+       switch (kind) {
+       case ir_bk_trap:
+       case ir_bk_debugbreak:
+       case ir_bk_return_address:
+       case ir_bk_frame_address:
+       case ir_bk_prefetch:
+       case ir_bk_bswap:
+       case ir_bk_inport:
+       case ir_bk_outport:
+       case ir_bk_inner_trampoline:
+               /* Nothing to do. */
+               return;
+       case ir_bk_ffs:
+       case ir_bk_clz:
+       case ir_bk_ctz:
+       case ir_bk_popcount:
+       case ir_bk_parity:
+               break;
+       default:
+               panic("unknown builtin");
+       }
+
+       operand      = get_Builtin_param(builtin, 0);
+       operand_mode = get_irn_mode(operand);
+
+       if (operand_mode != env->high_signed && operand_mode != env->high_unsigned)
+               return;
+
+       arch_allow_ifconv_func  allow_ifconv      = be_get_backend_param()->allow_ifconv;
+       int                     arity             = get_irn_arity(builtin);
+       dbg_info               *dbgi              = get_irn_dbg_info(builtin);
+       ir_graph               *irg               = get_irn_irg(builtin);
+       ir_type                *type              = get_Builtin_type(builtin);
+       ir_type                *lowered_type_high = lower_Builtin_type_high(type);
+       ir_type                *lowered_type_low  = lower_Builtin_type_low(type);
+       ir_node                *block             = get_nodes_block(builtin);
+       ir_node                *mem               = get_Builtin_mem(builtin);
+       ir_node                *res;
+
+       assert(is_NoMem(mem));
+       assert(arity == 2);
+
+       switch (kind) {
+       case ir_bk_ffs: {
+               const lower64_entry_t *entry          = get_node_entry(operand);
+               ir_node               *in_high[1]     = {entry->high_word};
+               ir_node               *in_low[1]      = {entry->low_word};
+               ir_node               *number_of_bits = new_r_Const_long(irg, mode_Is, get_mode_size_bits(env->low_unsigned));
+               ir_node               *zero_signed    = new_rd_Const(dbgi, irg, get_mode_null(mode_Is));
+               ir_node               *zero_unsigned  = new_rd_Const(dbgi, irg, get_mode_null(mode_Iu));
+               ir_node               *cmp_low        = new_rd_Cmp(dbgi, block, entry->low_word, zero_unsigned, ir_relation_equal);
+               ir_node               *cmp_high       = new_rd_Cmp(dbgi, block, entry->high_word, zero_unsigned, ir_relation_equal);
+               ir_node               *ffs_high       = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high);
+               ir_node               *high_proj      = new_r_Proj(ffs_high, mode_Is, pn_Builtin_max+1);
+               ir_node               *high           = new_rd_Add(dbgi, block, high_proj, number_of_bits, mode_Is);
+               ir_node               *ffs_low        = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low);
+               ir_node               *low            = new_r_Proj(ffs_low, mode_Is, pn_Builtin_max+1);
+               ir_node               *mux_high       = new_rd_Mux(dbgi, block, cmp_high, high, zero_signed, mode_Is);
+
+               if (! allow_ifconv(cmp_high, high, zero_signed))
+                       ir_nodeset_insert(&created_mux_nodes, mux_high);
+
+               res = new_rd_Mux(dbgi, block, cmp_low, low, mux_high, mode_Is);
+
+               if (! allow_ifconv(cmp_low, low, mux_high))
+                       ir_nodeset_insert(&created_mux_nodes, res);
+               break;
+       }
+       case ir_bk_clz: {
+               const lower64_entry_t *entry          = get_node_entry(operand);
+               ir_node               *in_high[1]     = {entry->high_word};
+               ir_node               *in_low[1]      = {entry->low_word};
+               ir_node               *number_of_bits = new_r_Const_long(irg, mode_Is, get_mode_size_bits(mode));
+               ir_node               *zero_unsigned  = new_rd_Const(dbgi, irg, get_mode_null(mode_Iu));
+               ir_node               *cmp_high       = new_rd_Cmp(dbgi, block, entry->high_word, zero_unsigned, ir_relation_equal);
+               ir_node               *clz_high       = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high);
+               ir_node               *high           = new_r_Proj(clz_high, mode_Is, pn_Builtin_max+1);
+               ir_node               *clz_low        = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low);
+               ir_node               *low_proj       = new_r_Proj(clz_low, mode_Is, pn_Builtin_max+1);
+               ir_node               *low            = new_rd_Add(dbgi, block, low_proj, number_of_bits, mode_Is);
+
+               res = new_rd_Mux(dbgi, block, cmp_high, high, low, mode_Is);
+
+               if (! allow_ifconv(cmp_high, high, low))
+                       ir_nodeset_insert(&created_mux_nodes, res);
+               break;
+       }
+       case ir_bk_ctz: {
+               const lower64_entry_t *entry          = get_node_entry(operand);
+               ir_node               *in_high[1]     = {entry->high_word};
+               ir_node               *in_low[1]      = {entry->low_word};
+               ir_node               *number_of_bits = new_r_Const_long(irg, mode_Is, get_mode_size_bits(env->low_unsigned));
+               ir_node               *zero_unsigned  = new_rd_Const(dbgi, irg, get_mode_null(mode_Iu));
+               ir_node               *cmp_low        = new_rd_Cmp(dbgi, block, entry->low_word, zero_unsigned, ir_relation_equal);
+               ir_node               *ffs_high       = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high);
+               ir_node               *high_proj      = new_r_Proj(ffs_high, mode_Is, pn_Builtin_max+1);
+               ir_node               *high           = new_rd_Add(dbgi, block, high_proj, number_of_bits, mode_Is);
+               ir_node               *ffs_low        = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low);
+               ir_node               *low            = new_r_Proj(ffs_low, mode_Is, pn_Builtin_max+1);
+
+               res = new_rd_Mux(dbgi, block, cmp_low, low, high, mode_Is);
+
+               if (! allow_ifconv(cmp_low, low, high))
+                       ir_nodeset_insert(&created_mux_nodes, res);
+               break;
+       }
+       case ir_bk_popcount: {
+               const lower64_entry_t *entry         = get_node_entry(operand);
+               ir_node               *in_high[1]    = {entry->high_word};
+               ir_node               *in_low[1]     = {entry->low_word};
+               ir_node               *popcount_high = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high);
+               ir_node               *popcount_low  = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low);
+               ir_node               *high          = new_r_Proj(popcount_high, mode_Is, pn_Builtin_max+1);
+               ir_node               *low           = new_r_Proj(popcount_low, mode_Is, pn_Builtin_max+1);
+
+               res = new_rd_Add(dbgi, block, high, low, mode_Is);
+               break;
+       }
+       case ir_bk_parity: {
+               const lower64_entry_t *entry = get_node_entry(operand);
+               ir_node *in_high[1] = {entry->high_word};
+               ir_node *in_low[1] = {entry->low_word};
+               ir_node  *parity_high;
+               ir_node  *parity_low;
+               ir_node  *high;
+               ir_node  *low;
+
+               assert(arity == 2);
+
+               parity_high = new_rd_Builtin(dbgi, block, mem, 1, in_high, kind, lowered_type_high);
+               high        = new_r_Proj(parity_high, mode_Is, pn_Builtin_max+1);
+               parity_low  = new_rd_Builtin(dbgi, block, mem, 1, in_low, kind, lowered_type_low);
+               low         = new_r_Proj(parity_low, mode_Is, pn_Builtin_max+1);
+               res         = new_rd_Eor(dbgi, block, high, low, mode_Is);
+               break;
+       }
+       default:
+               panic("unexpected builtin");
+       }
+
+       turn_into_tuple(builtin, 2);
+       set_irn_n(builtin, pn_Builtin_M, mem);
+       set_irn_n(builtin, pn_Builtin_max+1, res);
 }
 
 /**
@@ -2275,6 +2646,7 @@ static bool always_lower(unsigned code)
 {
        switch (code) {
        case iro_ASM:
+       case iro_Builtin:
        case iro_Proj:
        case iro_Start:
        case iro_Call:
@@ -2320,29 +2692,6 @@ void ir_register_dw_lower_function(ir_op *op, lower_dw_func func)
        op->ops.generic = (op_func)func;
 }
 
-/**
- * Returns non-zero if a method type must be lowered.
- *
- * @param mtp  the method type
- */
-static bool mtp_must_be_lowered(ir_type *mtp)
-{
-       size_t i, n_params = get_method_n_params(mtp);
-
-       /* first check if we have parameters that must be fixed */
-       for (i = 0; i < n_params; ++i) {
-               ir_type *tp = get_method_param_type(mtp, i);
-
-               if (is_Primitive_type(tp)) {
-                       ir_mode *mode = get_type_mode(tp);
-
-                       if (mode == env->high_signed || mode == env->high_unsigned)
-                               return true;
-               }
-       }
-       return false;
-}
-
 /* Determine which modes need to be lowered */
 static void setup_modes(void)
 {
@@ -2410,10 +2759,10 @@ static void setup_modes(void)
        /* produce lowered modes */
        env->high_signed   = doubleword_signed;
        env->high_unsigned = doubleword_unsigned;
-       env->low_signed    = new_ir_mode("WS", irms_int_number, size_bits, 1,
-                                        arithmetic, modulo_shift);
-       env->low_unsigned  = new_ir_mode("WU", irms_int_number, size_bits, 0,
-                                        arithmetic, modulo_shift);
+       env->low_signed    = new_int_mode("WS", arithmetic, size_bits, 1,
+                                         modulo_shift);
+       env->low_unsigned  = new_int_mode("WU", arithmetic, size_bits, 0,
+                                         modulo_shift);
 }
 
 static void enqueue_preds(ir_node *node)
@@ -2501,6 +2850,7 @@ static void lower_irg(ir_graph *irg)
 {
        ir_entity *ent;
        ir_type   *mtp;
+       ir_type   *lowered_mtp;
        unsigned   n_idx;
 
        obstack_init(&env->obst);
@@ -2516,19 +2866,17 @@ static void lower_irg(ir_graph *irg)
        memset(env->entries, 0, sizeof(env->entries[0]) * n_idx);
 
        env->irg            = irg;
-       env->l_mtp          = NULL;
        env->flags          = 0;
-       env->value_param_tp = NULL;
 
        ent = get_irg_entity(irg);
        mtp = get_entity_type(ent);
+       lowered_mtp = lower_mtp(mtp);
 
-       if (mtp_must_be_lowered(mtp)) {
-               ir_type *ltp = lower_mtp(mtp);
-               /* Do not update the entity type yet, this will be done by lower_Start! */
+       if (lowered_mtp != mtp) {
+               set_entity_type(ent, lowered_mtp);
                env->flags |= MUST_BE_LOWERED;
-               env->l_mtp = ltp;
-               env->value_param_tp = get_method_value_param_type(mtp);
+
+               fix_parameter_entities(irg);
        }
 
        /* first step: link all nodes and allocate data */
@@ -2562,9 +2910,10 @@ static void lower_irg(ir_graph *irg)
 
                if (env->flags & CF_CHANGED) {
                        /* control flow changed, dominance info is invalid */
-                       set_irg_doms_inconsistent(irg);
-                       set_irg_extblk_inconsistent(irg);
+                       clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE
+                                          | IR_GRAPH_STATE_VALID_EXTENDED_BLOCKS);
                }
+               edges_deactivate(irg);
        }
 
        ir_free_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK);
@@ -2587,6 +2936,7 @@ void ir_prepare_dw_lowering(const lwrdw_param_t *new_param)
        ir_register_dw_lower_function(op_Add,     lower_binop);
        ir_register_dw_lower_function(op_And,     lower_And);
        ir_register_dw_lower_function(op_Bad,     lower_Bad);
+       ir_register_dw_lower_function(op_Builtin, lower_Builtin);
        ir_register_dw_lower_function(op_Call,    lower_Call);
        ir_register_dw_lower_function(op_Cmp,     lower_Cmp);
        ir_register_dw_lower_function(op_Cond,    lower_Cond);
@@ -2602,16 +2952,24 @@ void ir_prepare_dw_lowering(const lwrdw_param_t *new_param)
        ir_register_dw_lower_function(op_Not,     lower_Not);
        ir_register_dw_lower_function(op_Or,      lower_Or);
        ir_register_dw_lower_function(op_Return,  lower_Return);
-       ir_register_dw_lower_function(op_Sel,     lower_Sel);
        ir_register_dw_lower_function(op_Shl,     lower_Shl);
        ir_register_dw_lower_function(op_Shr,     lower_Shr);
        ir_register_dw_lower_function(op_Shrs,    lower_Shrs);
        ir_register_dw_lower_function(op_Start,   lower_Start);
        ir_register_dw_lower_function(op_Store,   lower_Store);
        ir_register_dw_lower_function(op_Sub,     lower_binop);
+       ir_register_dw_lower_function(op_Switch,  lower_Switch);
        ir_register_dw_lower_function(op_Unknown, lower_Unknown);
 }
 
+/**
+ * Callback to lower only the Mux nodes we created.
+ */
+static int lower_mux_cb(ir_node *mux)
+{
+       return ir_nodeset_contains(&created_mux_nodes, mux);
+}
+
 /*
  * Do the lowering.
  */
@@ -2633,6 +2991,10 @@ void ir_lower_dw_ops(void)
                conv_types = new_set(cmp_conv_tp, 16);
        if (! lowered_type)
                lowered_type = pmap_create();
+       if (! lowered_builtin_type_low)
+               lowered_builtin_type_low = pmap_create();
+       if (! lowered_builtin_type_high)
+               lowered_builtin_type_high = pmap_create();
 
        /* create a primitive unsigned and signed type */
        if (! tp_u)
@@ -2696,11 +3058,21 @@ void ir_lower_dw_ops(void)
        lenv.first_id      = new_id_from_chars(param->little_endian ? ".l" : ".h", 2);
        lenv.next_id       = new_id_from_chars(param->little_endian ? ".h" : ".l", 2);
 
+       irp_reserve_resources(irp, IRP_RESOURCE_TYPE_LINK);
        /* transform all graphs */
        for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
                ir_graph *irg = get_irp_irg(i);
+
+               ir_nodeset_init(&created_mux_nodes);
+
                lower_irg(irg);
+
+               if (ir_nodeset_size(&created_mux_nodes) > 0)
+                       lower_mux(irg, lower_mux_cb);
+
+               ir_nodeset_destroy(&created_mux_nodes);
        }
+       irp_free_resources(irp, IRP_RESOURCE_TYPE_LINK);
        del_pdeq(lenv.waitq);
 
        env = NULL;