Every node has now a pinned attribute that is inherited from the op.
[libfirm] / ir / lower / lower_dw.c
index bf10ea5..a161c10 100644 (file)
 #include "set.h"
 #include "pmap.h"
 #include "pdeq.h"
+#include "irdump.h"
 
-/** A map from ir_op to Intrinsic functions entities. */
+/** A map from mode to a primitive type. */
+static pmap *prim_types;
+
+/** A map from (op, imode, omode) to Intrinsic functions entities. */
 static set *intrinsic_fkt;
 
+/** A map from (imode, omode) to conv function types. */
+static set *conv_types;
+
 /** A map from a method type to its lowered type. */
 static pmap *lowered_type;
 
 /** 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_type *binop_tp_u, *binop_tp_s, *unop_tp_u, *unop_tp_s, *shiftop_tp_u, *shiftop_tp_s, *tp_s, *tp_u;
 
 /** the debug handle */
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
 /**
- * An entry in the (op, mode) -> entity map.
+ * An entry in the (op, imode, omode) -> entity map.
  */
 typedef struct _op_mode_entry {
        const ir_op   *op;    /**< the op */
-       const ir_mode *mode;  /**< the mode */
-       entity        *ent;   /**< the associated entity of this (op, mode) pair */
+       const ir_mode *imode; /**< the input mode */
+       const ir_mode *omode; /**< the output mode */
+       entity        *ent;   /**< the associated entity of this (op, imode, omode) triple */
 } op_mode_entry_t;
 
+/**
+ * An entry in the (imode, omode) -> tp map.
+ */
+typedef struct _conv_tp_entry {
+       const ir_mode *imode; /**< the input mode */
+       const ir_mode *omode; /**< the output mode */
+       ir_type       *mtd;   /**< the associated method type of this (imode, omode) pair */
+} conv_tp_entry_t;
+
 /**
  * Every double word node will be replaced,
  * we need some store to hold the replacement:
@@ -86,7 +103,8 @@ enum lower_flags {
 typedef struct _lower_env_t {
        node_entry_t **entries;       /**< entries per node */
        struct obstack obst;          /**< an obstack holding the temporary data */
-       tarval   *tv_mode_bytes;      /**< a tarval containing the number of bits in the lowered modes */
+       tarval   *tv_mode_bytes;      /**< a tarval containing the number of bytes in the lowered modes */
+       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 */
        pmap     *proj_2_block;       /**< a map from ProjX to its destination blocks */
        const lwrdw_param_t *params;  /**< transformation parameter */
@@ -94,6 +112,85 @@ typedef struct _lower_env_t {
        int      n_entries;           /**< number of entries */
 } lower_env_t;
 
+/**
+ * Get a primitive mode for a mode.
+ */
+static ir_type *get_primitive_type(ir_mode *mode) {
+       pmap_entry *entry = pmap_find(prim_types, mode);
+       ir_type *tp;
+       char buf[64];
+
+       if (entry)
+               return entry->value;
+
+       snprintf(buf, sizeof(buf), "_prim_%s", get_mode_name(mode));
+       tp = new_type_primitive(new_id_from_str(buf), mode);
+
+       pmap_insert(prim_types, mode, tp);
+       return tp;
+}  /* get_primitive_type */
+
+/**
+ * Create a method type for a Conv emulation from imode to omode.
+ */
+static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env) {
+       conv_tp_entry_t key, *entry;
+       ir_type *mtd;
+
+       key.imode = imode;
+       key.omode = omode;
+       key.mtd   = NULL;
+
+       entry = set_insert(conv_types, &key, sizeof(key), HASH_PTR(imode) ^ HASH_PTR(omode));
+       if (! entry->mtd) {
+               int n_param = 1, n_res = 1;
+               char buf[64];
+
+               if (imode == env->params->high_signed || imode == env->params->high_unsigned)
+                       n_param = 2;
+               if (omode == env->params->high_signed || omode == env->params->high_unsigned)
+                       n_res = 2;
+
+               /* create a new one */
+               snprintf(buf, sizeof(buf), "LConv%s%s", get_mode_name(imode), get_mode_name(omode));
+               mtd = new_type_method(new_id_from_str(buf), n_param, n_res);
+
+               /* set param types and result types */
+               n_param = 0;
+               if (imode == env->params->high_signed) {
+                       set_method_param_type(mtd, n_param++, tp_s);
+                       set_method_param_type(mtd, n_param++, tp_s);
+               }
+               else if (imode == env->params->high_unsigned) {
+                       set_method_param_type(mtd, n_param++, tp_u);
+                       set_method_param_type(mtd, n_param++, tp_u);
+               }
+               else {
+                       ir_type *tp = get_primitive_type(imode);
+                       set_method_param_type(mtd, n_param++, tp);
+               }
+
+               n_res = 0;
+               if (omode == env->params->high_signed) {
+                       set_method_res_type(mtd, n_res++, tp_s);
+                       set_method_res_type(mtd, n_res++, tp_s);
+               }
+               else if (omode == env->params->high_unsigned) {
+                       set_method_res_type(mtd, n_res++, tp_u);
+                       set_method_res_type(mtd, n_res++, tp_u);
+               }
+               else {
+                       ir_type *tp = get_primitive_type(omode);
+                       set_method_res_type(mtd, n_res++, tp);
+               }
+
+               entry->mtd = mtd;
+       }
+       else
+               mtd = entry->mtd;
+       return mtd;
+}  /* get_conv_type */
+
 /**
  * Add an additional control flow input to a block.
  * Patch all Phi nodes. The new Phi inputs are copied from
@@ -119,7 +216,7 @@ static void add_block_cf_input_nr(ir_node *block, int nr, ir_node *cf)
                in[i] = in[nr];
                set_irn_in(phi, i + 1, in);
        }
-}
+}  /* add_block_cf_input_nr */
 
 /**
  * Add an additional control flow input to a block.
@@ -139,7 +236,7 @@ static void add_block_cf_input(ir_node *block, ir_node *tmpl, ir_node *cf)
        }
        assert(i < arity);
        add_block_cf_input_nr(block, nr, cf);
-}
+}  /* add_block_cf_input */
 
 /**
  * Return the "operational" mode of a Firm node.
@@ -168,10 +265,10 @@ static ir_mode *get_irn_op_mode(ir_node *node)
        default:
                return get_irn_mode(node);
        }
-}
+}  /* get_irn_op_mode */
 
 /**
- * walker, prepare the node links
+ * Walker, prepare the node links.
  */
 static void prepare_links(ir_node *node, void *env)
 {
@@ -232,7 +329,7 @@ static void prepare_links(ir_node *node, void *env)
                                pmap_insert(lenv->proj_2_block, pred, node);
                }
        }
-}
+}  /* prepare_links */
 
 /**
  * Translate a Constant: create two.
@@ -243,20 +340,21 @@ static void lower_Const(ir_node *node, ir_mode *mode, lower_env_t *env) {
        dbg_info *dbg = get_irn_dbg_info(node);
        ir_node  *block = get_nodes_block(node);
        int      idx;
+       ir_graph *irg = current_ir_graph;
 
        tv   = get_Const_tarval(node);
 
        tv_l = tarval_convert_to(tv, mode);
-       low  = new_rd_Const(dbg, current_ir_graph, block, mode, tv_l);
+       low  = new_rd_Const(dbg, irg, block, mode, tv_l);
 
-       tv_h = tarval_convert_to(tarval_shrs(tv, env->tv_mode_bytes), mode);
-       high = new_rd_Const(dbg, current_ir_graph, block, mode, tv_h);
+       tv_h = tarval_convert_to(tarval_shrs(tv, env->tv_mode_bits), mode);
+       high = new_rd_Const(dbg, irg, block, mode, tv_h);
 
        idx = get_irn_idx(node);
        assert(idx < env->n_entries);
        env->entries[idx]->low_word  = low;
        env->entries[idx]->high_word = high;
-}
+}  /* lower_Const */
 
 /**
  * Translate a Load: create two.
@@ -321,7 +419,7 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) {
                 * out new nodes. */
                mark_irn_visited(proj);
        }
-}
+}  /* lower_Load */
 
 /**
  * Translate a Store: create two.
@@ -395,24 +493,35 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) {
                 * out new nodes. */
                mark_irn_visited(proj);
        }
-}
+}  /* lower_Store */
 
 /**
  * Return a node containing the address of the intrinsic emulation function.
+ *
+ * @param method  the method type of the emulation function
+ * @param op      the emulated ir_op
+ * @param imode   the input mode of the emulated opcode
+ * @param omode   the output mode of the emulated opcode
+ * @param block   where the new mode is created
+ * @param env     the lower environment
  */
-static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, ir_mode *mode, ir_node *block, lower_env_t *env) {
+static ir_node *get_intrinsic_address(ir_type *method, ir_op *op,
+                                      ir_mode *imode, ir_mode *omode,
+                                      ir_node *block, lower_env_t *env) {
        symconst_symbol sym;
        entity *ent;
        op_mode_entry_t key, *entry;
 
-       key.op   = op;
-       key.mode = mode;
-       key.ent  = NULL;
+       key.op    = op;
+       key.imode = imode;
+       key.omode = omode;
+       key.ent   = NULL;
 
-       entry = set_insert(intrinsic_fkt, &key, sizeof(key), HASH_PTR(op) ^ HASH_PTR(mode));
+       entry = set_insert(intrinsic_fkt, &key, sizeof(key),
+                               HASH_PTR(op) ^ HASH_PTR(imode) ^ (HASH_PTR(omode) << 8));
        if (! entry->ent) {
                /* create a new one */
-               ent = env->params->create_intrinsic(method, op, mode, env->params->ctx);
+               ent = env->params->create_intrinsic(method, op, imode, omode, env->params->ctx);
 
                assert(ent && "Intrinsic creator must return an entity");
                entry->ent = ent;
@@ -422,7 +531,7 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, ir_mode *mode,
 
        sym.entity_p = ent;
        return new_r_SymConst(current_ir_graph, block, sym, symconst_addr_ent);
-}
+}  /* get_intrinsic_address */
 
 /**
  * Translate a Div.
@@ -432,9 +541,11 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op, ir_mode *mode,
 static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
        ir_node  *block, *irn, *call, *proj;
        ir_node  *in[4];
+       ir_mode  *opmode;
        dbg_info *dbg;
        ir_type  *mtp;
        int      idx;
+       ir_graph *irg;
        node_entry_t *entry;
 
        irn   = get_Div_left(node);
@@ -463,15 +574,17 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
        in[2] = entry->low_word;
        in[3] = entry->high_word;
 
-       dbg = get_irn_dbg_info(node);
+       dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
+       irg   = current_ir_graph;
 
        mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u;
-       irn = get_intrinsic_address(mtp, get_irn_op(node), get_irn_op_mode(node), block, env);
-       call = new_rd_Call(dbg, current_ir_graph, block, get_Div_mem(node),
+       opmode = get_irn_op_mode(node);
+       irn = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, block, env);
+       call = new_rd_Call(dbg, irg, block, get_Div_mem(node),
                irn, 4, in, mtp);
        set_irn_pinned(call, get_irn_pinned(node));
-       irn = new_r_Proj(current_ir_graph, block, call, mode_T, pn_Call_T_result);
+       irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result);
 
        for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
                switch (get_Proj_proj(proj)) {
@@ -498,7 +611,7 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
                 * out new nodes. */
                mark_irn_visited(proj);
        }
-}
+}  /* lower_Div */
 
 /**
  * Translate a Mod.
@@ -508,9 +621,11 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
 static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
        ir_node  *block, *proj, *irn, *call;
        ir_node  *in[4];
+       ir_mode  *opmode;
        dbg_info *dbg;
        ir_type  *mtp;
        int      idx;
+       ir_graph *irg;
        node_entry_t *entry;
 
        irn   = get_Mod_left(node);
@@ -539,15 +654,17 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
        in[2] = entry->low_word;
        in[3] = entry->high_word;
 
-       dbg = get_irn_dbg_info(node);
+       dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
+       irg   = current_ir_graph;
 
        mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u;
-       irn = get_intrinsic_address(mtp, get_irn_op(node), get_irn_op_mode(node), block, env);
-       call = new_rd_Call(dbg, current_ir_graph, block, get_Mod_mem(node),
+       opmode = get_irn_op_mode(node);
+       irn = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, block, env);
+       call = new_rd_Call(dbg, irg, block, get_Mod_mem(node),
                irn, 4, in, mtp);
        set_irn_pinned(call, get_irn_pinned(node));
-       irn = new_r_Proj(current_ir_graph, block, call, mode_T, pn_Call_T_result);
+       irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result);
 
        for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
                switch (get_Proj_proj(proj)) {
@@ -564,8 +681,8 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                case pn_Mod_res:       /* Result of computation. */
                        idx = get_irn_idx(proj);
                        assert(idx < env->n_entries);
-                       env->entries[idx]->low_word  = new_r_Proj(current_ir_graph, block, irn, mode, 0);
-                       env->entries[idx]->high_word = new_r_Proj(current_ir_graph, block, irn, mode, 1);
+                       env->entries[idx]->low_word  = new_r_Proj(irg, block, irn, mode, 0);
+                       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode, 1);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
@@ -574,7 +691,7 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                 * out new nodes. */
                mark_irn_visited(proj);
        }
-}
+}  /* lower_Mod */
 
 /**
  * Translate a DivMod.
@@ -584,11 +701,13 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
 static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
        ir_node  *block, *proj, *irn, *mem, *callDiv, *callMod, *resDiv, *resMod;
        ir_node  *in[4];
+       ir_mode  *opmode;
        dbg_info *dbg;
        ir_type  *mtp;
        int      idx;
        node_entry_t *entry;
        unsigned flags = 0;
+       ir_graph *irg;
 
        /* check if both results are needed */
        for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
@@ -625,28 +744,31 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
        in[2] = entry->low_word;
        in[3] = entry->high_word;
 
-       dbg = get_irn_dbg_info(node);
+       dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
+       irg   = current_ir_graph;
 
        mem = get_DivMod_mem(node);
 
        callDiv = callMod = NULL;
        mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u;
        if (flags & 1) {
-               irn = get_intrinsic_address(mtp, op_Div, get_irn_op_mode(node), block, env);
-               callDiv = new_rd_Call(dbg, current_ir_graph, block, mem,
+               opmode = get_irn_op_mode(node);
+               irn = get_intrinsic_address(mtp, op_Div, opmode, opmode, block, env);
+               callDiv = new_rd_Call(dbg, irg, block, mem,
                        irn, 4, in, mtp);
                set_irn_pinned(callDiv, get_irn_pinned(node));
-               resDiv = new_r_Proj(current_ir_graph, block, callDiv, mode_T, pn_Call_T_result);
+               resDiv = new_r_Proj(irg, block, callDiv, mode_T, pn_Call_T_result);
        }
        if (flags & 2) {
                if (flags & 1)
-                       mem = new_r_Proj(current_ir_graph, block, callDiv, mode_M, pn_Call_M);
-               irn = get_intrinsic_address(mtp, op_Mod, get_irn_op_mode(node), block, env);
-               callMod = new_rd_Call(dbg, current_ir_graph, block, mem,
+                       mem = new_r_Proj(irg, block, callDiv, mode_M, pn_Call_M);
+               opmode = get_irn_op_mode(node);
+               irn = get_intrinsic_address(mtp, op_Mod, opmode, opmode, block, env);
+               callMod = new_rd_Call(dbg, irg, block, mem,
                        irn, 4, in, mtp);
                set_irn_pinned(callMod, get_irn_pinned(node));
-               resMod = new_r_Proj(current_ir_graph, block, callMod, mode_T, pn_Call_T_result);
+               resMod = new_r_Proj(irg, block, callMod, mode_T, pn_Call_T_result);
        }
 
        for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
@@ -664,13 +786,13 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                case pn_DivMod_res_div:   /* Result of Div. */
                        idx = get_irn_idx(proj);
                        assert(idx < env->n_entries);
-                       env->entries[idx]->low_word  = new_r_Proj(current_ir_graph, block, resDiv, mode, 0);
-                       env->entries[idx]->high_word = new_r_Proj(current_ir_graph, block, resDiv, mode, 1);
+                       env->entries[idx]->low_word  = new_r_Proj(irg, block, resDiv, mode, 0);
+                       env->entries[idx]->high_word = new_r_Proj(irg, block, resDiv, mode, 1);
                        break;
                case pn_DivMod_res_mod:   /* Result of Mod. */
                        idx = get_irn_idx(proj);
-                       env->entries[idx]->low_word  = new_r_Proj(current_ir_graph, block, resMod, mode, 0);
-                       env->entries[idx]->high_word = new_r_Proj(current_ir_graph, block, resMod, mode, 1);
+                       env->entries[idx]->low_word  = new_r_Proj(irg, block, resMod, mode, 0);
+                       env->entries[idx]->high_word = new_r_Proj(irg, block, resMod, mode, 1);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
@@ -679,7 +801,7 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                 * out new nodes. */
                mark_irn_visited(proj);
        }
-}
+}  /* lower_DivMod */
 
 /**
  * Translate a Binop.
@@ -692,6 +814,7 @@ static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) {
        dbg_info *dbg;
        ir_type  *mtp;
        int      idx;
+       ir_graph *irg;
        node_entry_t *entry;
 
        irn   = get_binop_left(node);
@@ -720,21 +843,204 @@ static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) {
        in[2] = entry->low_word;
        in[3] = entry->high_word;
 
-       dbg = get_irn_dbg_info(node);
+       dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
+       irg   = current_ir_graph;
 
        mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u;
-       irn = get_intrinsic_address(mtp, get_irn_op(node), get_irn_mode(node), block, env);
-       irn = new_rd_Call(dbg, current_ir_graph, block, get_irg_no_mem(current_ir_graph),
+       irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, block, env);
+       irn = new_rd_Call(dbg, irg, block, get_irg_no_mem(current_ir_graph),
                irn, 4, in, mtp);
        set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(current_ir_graph, block, irn, mode_T, pn_Call_T_result);
+       irn = new_r_Proj(irg, block, irn, mode_T, pn_Call_T_result);
 
        idx = get_irn_idx(node);
        assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = new_r_Proj(current_ir_graph, block, irn, mode, 0);
-       env->entries[idx]->high_word = new_r_Proj(current_ir_graph, block, irn, mode, 1);
-}
+       env->entries[idx]->low_word  = new_r_Proj(irg, block, irn, mode, 0);
+       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode, 1);
+}  /* lower_Binop */
+
+/**
+ * Translate a Shiftop.
+ *
+ * Create an intrinsic Call.
+ */
+static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) {
+       ir_node  *block, *irn;
+       ir_node  *in[3];
+       dbg_info *dbg;
+       ir_type  *mtp;
+       int      idx;
+       ir_graph *irg;
+       node_entry_t *entry;
+
+       irn   = get_binop_left(node);
+       entry = env->entries[get_irn_idx(irn)];
+       assert(entry);
+
+       if (! entry->low_word) {
+               /* not ready yet, wait */
+               pdeq_putr(env->waitq, node);
+               return;
+       }
+
+       in[0] = entry->low_word;
+       in[1] = entry->high_word;
+
+       /* The shift count is always mode_Iu in firm, so there is no need for lowering */
+       in[2] = get_binop_right(node);
+
+       dbg   = get_irn_dbg_info(node);
+       block = get_nodes_block(node);
+       irg  = current_ir_graph;
+
+       mtp = mode_is_signed(mode) ? shiftop_tp_s : shiftop_tp_u;
+       irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, block, env);
+       irn = new_rd_Call(dbg, irg, block, get_irg_no_mem(current_ir_graph),
+               irn, 3, in, mtp);
+       set_irn_pinned(irn, get_irn_pinned(node));
+       irn = new_r_Proj(irg, block, irn, mode_T, pn_Call_T_result);
+
+       idx = get_irn_idx(node);
+       assert(idx < env->n_entries);
+       env->entries[idx]->low_word  = new_r_Proj(irg, block, irn, mode, 0);
+       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode, 1);
+}  /* lower_Shiftop */
+
+/**
+ * Translate a Shr and handle special cases.
+ */
+static void lower_Shr(ir_node *node, ir_mode *mode, lower_env_t *env) {
+       ir_node  *right = get_Shr_right(node);
+       ir_graph *irg = current_ir_graph;
+
+       if (get_mode_arithmetic(mode) == irma_twos_complement && is_Const(right)) {
+               tarval *tv = get_Const_tarval(right);
+
+               if (tarval_is_long(tv) &&
+                       get_tarval_long(tv) >= get_mode_size_bits(mode)) {
+                       ir_node *block = get_nodes_block(node);
+                       ir_node *left = get_Shr_left(node);
+                       ir_node *c;
+                       long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
+                       int idx = get_irn_idx(left);
+
+                       left = env->entries[idx]->high_word;
+                       idx = get_irn_idx(node);
+
+                       if (shf_cnt > 0) {
+                               c = new_r_Const_long(irg, block, mode_Iu, shf_cnt);
+                               env->entries[idx]->low_word = new_r_Shr(irg, block, left, c, mode);
+                       }
+                       else
+                               env->entries[idx]->low_word = left;
+                       env->entries[idx]->high_word = new_r_Const(irg, block, mode, get_mode_null(mode));
+
+                       return;
+               }
+       }
+       lower_Shiftop(node, mode, env);
+}  /* lower_Shr */
+
+/**
+ * Translate a Shl and handle special cases.
+ */
+static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env) {
+       ir_node  *right = get_Shl_right(node);
+       ir_graph *irg = current_ir_graph;
+
+       if (get_mode_arithmetic(mode) == irma_twos_complement && is_Const(right)) {
+               tarval *tv = get_Const_tarval(right);
+
+               if (tarval_is_long(tv) &&
+                       get_tarval_long(tv) >= get_mode_size_bits(mode)) {
+                       ir_node *block = get_nodes_block(node);
+                       ir_node *left = get_Shl_left(node);
+                       ir_node *c;
+                       long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
+                       int idx = get_irn_idx(left);
+
+                       left = env->entries[idx]->low_word;
+                       idx = get_irn_idx(node);
+
+                       if (shf_cnt > 0) {
+                               c = new_r_Const_long(irg, block, mode_Iu, shf_cnt);
+                               env->entries[idx]->high_word = new_r_Shl(irg, block, left, c, mode);
+                       }
+                       else
+                               env->entries[idx]->high_word = left;
+                       env->entries[idx]->low_word  = new_r_Const(irg, block, mode, get_mode_null(mode));
+
+                       return;
+               }
+       }
+       lower_Shiftop(node, mode, env);
+}  /* lower_Shl */
+
+/**
+ * Translate a Shrs and handle special cases.
+ */
+static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) {
+       ir_node  *right = get_Shrs_right(node);
+       ir_graph *irg = current_ir_graph;
+
+       if (get_mode_arithmetic(mode) == irma_twos_complement && is_Const(right)) {
+               tarval *tv = get_Const_tarval(right);
+
+               if (tarval_is_long(tv) &&
+                       get_tarval_long(tv) >= get_mode_size_bits(mode)) {
+                       ir_node *block = get_nodes_block(node);
+                       ir_node *left = get_Shrs_left(node);
+                       long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
+                       ir_node *c;
+                       int idx = get_irn_idx(left);
+
+                       left = env->entries[idx]->high_word;
+                       idx = get_irn_idx(node);
+
+                       if (shf_cnt > 0) {
+                               c = new_r_Const_long(irg, block, mode_Iu, shf_cnt);
+                               env->entries[idx]->low_word = new_r_Shrs(irg, block, left, c, mode);
+                       }
+                       else
+                               env->entries[idx]->low_word = left;
+
+                       c = new_r_Const_long(irg, block, mode_Iu, get_mode_size_bits(mode) - 1);
+                       env->entries[idx]->high_word = new_r_Shrs(irg, block, left, c, mode);
+
+                       return;
+               }
+       }
+       lower_Shiftop(node, mode, env);
+}  /* lower_Shrs */
+
+/**
+ * Translate a Rot and handle special cases.
+ */
+static void lower_Rot(ir_node *node, ir_mode *mode, lower_env_t *env) {
+       ir_node  *right = get_Rot_right(node);
+
+       if (get_mode_arithmetic(mode) == irma_twos_complement && is_Const(right)) {
+               tarval *tv = get_Const_tarval(right);
+
+               if (tarval_is_long(tv) &&
+                       get_tarval_long(tv) == get_mode_size_bits(mode)) {
+                       ir_node *left = get_Rot_left(node);
+                       ir_node *h, *l;
+                       int idx = get_irn_idx(left);
+
+                       l = env->entries[idx]->low_word;
+                       h = env->entries[idx]->high_word;
+                       idx = get_irn_idx(node);
+
+                       env->entries[idx]->low_word  = h;
+                       env->entries[idx]->high_word = l;
+
+                       return;
+               }
+       }
+       lower_Shiftop(node, mode, env);
+}  /* lower_Rot */
 
 /**
  * Translate an Unop.
@@ -747,6 +1053,7 @@ static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) {
        dbg_info *dbg;
        ir_type  *mtp;
        int      idx;
+       ir_graph *irg;
        node_entry_t *entry;
 
        irn   = get_unop_op(node);
@@ -762,21 +1069,22 @@ static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) {
        in[0] = entry->low_word;
        in[1] = entry->high_word;
 
-       dbg = get_irn_dbg_info(node);
+       dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
+       irg   = current_ir_graph;
 
        mtp = mode_is_signed(mode) ? unop_tp_s : unop_tp_u;
-       irn = get_intrinsic_address(mtp, get_irn_op(node), get_irn_mode(node), block, env);
-       irn = new_rd_Call(dbg, current_ir_graph, block, get_irg_no_mem(current_ir_graph),
+       irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, block, env);
+       irn = new_rd_Call(dbg, irg, block, get_irg_no_mem(current_ir_graph),
                irn, 2, in, mtp);
        set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(current_ir_graph, block, irn, mode_T, pn_Call_T_result);
+       irn = new_r_Proj(irg, block, irn, mode_T, pn_Call_T_result);
 
        idx = get_irn_idx(node);
        assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = new_r_Proj(current_ir_graph, block, irn, mode, 0);
-       env->entries[idx]->high_word = new_r_Proj(current_ir_graph, block, irn, mode, 1);
-}
+       env->entries[idx]->low_word  = new_r_Proj(irg, block, irn, mode, 0);
+       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode, 1);
+}  /* lower_Unop */
 
 /**
  * Translate a logical Binop.
@@ -789,6 +1097,7 @@ static void lower_Binop_logical(ir_node *node, ir_mode *mode, lower_env_t *env,
        ir_node  *lop_l, *lop_h, *rop_l, *rop_h;
        dbg_info *dbg;
        int      idx;
+       ir_graph *irg;
        node_entry_t *entry;
 
        irn   = get_binop_left(node);
@@ -822,10 +1131,12 @@ static void lower_Binop_logical(ir_node *node, ir_mode *mode, lower_env_t *env,
 
        idx = get_irn_idx(node);
        assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = constr_rd(dbg, current_ir_graph, block, lop_l, rop_l, mode);
-       env->entries[idx]->high_word = constr_rd(dbg, current_ir_graph, block, lop_h, rop_h, mode);
-}
+       irg = current_ir_graph;
+       env->entries[idx]->low_word  = constr_rd(dbg, irg, block, lop_l, rop_l, mode);
+       env->entries[idx]->high_word = constr_rd(dbg, irg, block, lop_h, rop_h, mode);
+}  /* lower_Binop_logical */
 
+/** create a logical operation tranformation */
 #define lower_logical(op)                                                \
 static void lower_##op(ir_node *node, ir_mode *mode, lower_env_t *env) { \
        lower_Binop_logical(node, mode, env, new_rd_##op);                   \
@@ -845,6 +1156,7 @@ static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) {
        ir_node  *op_l, *op_h;
        dbg_info *dbg;
        int      idx;
+       ir_graph *irg;
        node_entry_t *entry;
 
        irn   = get_Not_op(node);
@@ -860,14 +1172,15 @@ static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) {
        op_l = entry->low_word;
        op_h = entry->high_word;
 
-       dbg = get_irn_dbg_info(node);
+       dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
+       irg   = current_ir_graph;
 
        idx = get_irn_idx(node);
        assert(idx < env->n_entries);
        env->entries[idx]->low_word  = new_rd_Not(dbg, current_ir_graph, block, op_l, mode);
        env->entries[idx]->high_word = new_rd_Not(dbg, current_ir_graph, block, op_h, mode);
-}
+}  /* lower_Not */
 
 /**
  * Translate a Cond.
@@ -1078,26 +1391,25 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        set_Cond_selector(node, env->entries[idx]->low_word);
                }
        }
-}
+}  /* lower_Cond */
 
 /**
  * Translate a Conv to higher_signed
  */
 static void lower_Conv_to_Ls(ir_node *node, lower_env_t *env) {
-       ir_node *op    = get_Conv_op(node);
-       ir_mode *mode  = get_irn_mode(op);
-
-       if (mode_is_int(mode) || mode_is_reference(mode)) {
-               ir_node  *block = get_nodes_block(node);
-               dbg_info *dbg = get_irn_dbg_info(node);
-               int      idx = get_irn_idx(node);
-               ir_graph *irg = current_ir_graph;
-               ir_mode  *dst_mode = env->params->low_signed;
+       ir_node  *op    = get_Conv_op(node);
+       ir_mode  *imode = get_irn_mode(op);
+       ir_mode  *dst_mode = env->params->low_signed;
+       int      idx = get_irn_idx(node);
+       ir_graph *irg = current_ir_graph;
+       ir_node  *block = get_nodes_block(node);
+       dbg_info *dbg = get_irn_dbg_info(node);
 
-               assert(idx < env->n_entries);
+       assert(idx < env->n_entries);
 
+       if (mode_is_int(imode) || mode_is_reference(imode)) {
                /* simple case: create a high word */
-               if (mode != dst_mode)
+               if (imode != dst_mode)
                        op = new_rd_Conv(dbg, irg, block, op, dst_mode);
 
                env->entries[idx]->low_word  = op;
@@ -1105,91 +1417,134 @@ static void lower_Conv_to_Ls(ir_node *node, lower_env_t *env) {
                        new_Const_long(mode_Iu, get_mode_size_bits(dst_mode) - 1), dst_mode);
        }
        else {
-               assert(0);
+               ir_node *irn, *call;
+               ir_mode *omode = env->params->high_signed;
+               ir_type *mtp = get_conv_type(imode, omode, env);
+
+               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, block, env);
+               call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 1, &op, mtp);
+               set_irn_pinned(call, get_irn_pinned(node));
+               irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result);
+
+               env->entries[idx]->low_word  = new_r_Proj(irg, block, irn, dst_mode, 0);
+               env->entries[idx]->high_word = new_r_Proj(irg, block, irn, dst_mode, 1);
        }
-}
+}  /* lower_Conv_to_Ls */
 
 /**
  * Translate a Conv to higher_unsigned
  */
 static void lower_Conv_to_Lu(ir_node *node, lower_env_t *env) {
-       ir_node *op    = get_Conv_op(node);
-       ir_mode *mode  = get_irn_mode(op);
-
-       if (mode_is_int(mode) || mode_is_reference(mode)) {
-               ir_node  *block = get_nodes_block(node);
-               dbg_info *dbg = get_irn_dbg_info(node);
-               int      idx = get_irn_idx(node);
-               ir_graph *irg = current_ir_graph;
-               ir_mode  *dst_mode = env->params->low_unsigned;
+       ir_node  *op    = get_Conv_op(node);
+       ir_mode  *imode  = get_irn_mode(op);
+       ir_mode  *dst_mode = env->params->low_unsigned;
+       int      idx = get_irn_idx(node);
+       ir_graph *irg = current_ir_graph;
+       ir_node  *block = get_nodes_block(node);
+       dbg_info *dbg = get_irn_dbg_info(node);
 
-               assert(idx < env->n_entries);
+       assert(idx < env->n_entries);
 
+       if (mode_is_int(imode) || mode_is_reference(imode)) {
                /* simple case: create a high word */
-               if (mode != env->params->low_unsigned)
+               if (imode != dst_mode)
                        op = new_rd_Conv(dbg, irg, block, op, dst_mode);
 
                env->entries[idx]->low_word  = op;
                env->entries[idx]->high_word = new_Const(dst_mode, get_mode_null(dst_mode));
        }
        else {
-               assert(0);
+               ir_node *irn, *call;
+               ir_mode *omode = env->params->high_unsigned;
+               ir_type *mtp = get_conv_type(imode, omode, env);
+
+               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, block, env);
+               call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 1, &op, mtp);
+               set_irn_pinned(call, get_irn_pinned(node));
+               irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result);
+
+               env->entries[idx]->low_word  = new_r_Proj(irg, block, irn, dst_mode, 0);
+               env->entries[idx]->high_word = new_r_Proj(irg, block, irn, dst_mode, 1);
        }
-}
+}  /* lower_Conv_to_Lu */
 
 /**
  * Translate a Conv from higher_signed
  */
 static void lower_Conv_from_Ls(ir_node *node, lower_env_t *env) {
-       ir_node *op    = get_Conv_op(node);
-       ir_mode *mode  = get_irn_mode(node);
+       ir_node  *op    = get_Conv_op(node);
+       ir_mode  *omode = get_irn_mode(node);
+       ir_node  *block = get_nodes_block(node);
+       dbg_info *dbg = get_irn_dbg_info(node);
+       int      idx = get_irn_idx(op);
+       ir_graph *irg = current_ir_graph;
 
-       if (mode_is_int(mode) || mode_is_reference(mode)) {
-               ir_node  *block = get_nodes_block(node);
-               dbg_info *dbg = get_irn_dbg_info(node);
-               int      idx = get_irn_idx(op);
-               ir_graph *irg = current_ir_graph;
+       assert(idx < env->n_entries);
 
-               assert(idx < env->n_entries);
+       if (mode_is_int(omode) || mode_is_reference(omode)) {
                op = env->entries[idx]->low_word;
 
                /* simple case: create a high word */
-               if (mode != env->params->low_signed)
-                       op = new_rd_Conv(dbg, irg, block, op, mode);
+               if (omode != env->params->low_signed)
+                       op = new_rd_Conv(dbg, irg, block, op, omode);
 
                set_Conv_op(node, op);
        }
        else {
-               assert(0);
+               ir_node *irn, *call, *in[2];
+               ir_mode *imode = env->params->high_signed;
+               ir_type *mtp = get_conv_type(imode, omode, env);
+
+               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, block, env);
+               in[0] = env->entries[idx]->low_word;
+               in[1] = env->entries[idx]->high_word;
+
+               call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 2, in, mtp);
+               set_irn_pinned(call, get_irn_pinned(node));
+               irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result);
+
+               exchange(node, new_r_Proj(irg, block, irn, omode, 0));
        }
-}
+}  /* lower_Conv_from_Ls */
 
 /**
  * Translate a Conv from higher_unsigned
  */
 static void lower_Conv_from_Lu(ir_node *node, lower_env_t *env) {
-       ir_node *op    = get_Conv_op(node);
-       ir_mode *mode  = get_irn_mode(node);
+       ir_node  *op    = get_Conv_op(node);
+       ir_mode  *omode = get_irn_mode(node);
+       ir_node  *block = get_nodes_block(node);
+       dbg_info *dbg = get_irn_dbg_info(node);
+       int      idx = get_irn_idx(op);
+       ir_graph *irg = current_ir_graph;
 
-       if (mode_is_int(mode) || mode_is_reference(mode)) {
-               ir_node  *block = get_nodes_block(node);
-               dbg_info *dbg = get_irn_dbg_info(node);
-               int      idx = get_irn_idx(op);
-               ir_graph *irg = current_ir_graph;
+       assert(idx < env->n_entries);
 
-               assert(idx < env->n_entries);
+       if (mode_is_int(omode) || mode_is_reference(omode)) {
                op = env->entries[idx]->low_word;
 
                /* simple case: create a high word */
-               if (mode != env->params->low_unsigned)
-                       op = new_rd_Conv(dbg, irg, block, op, mode);
+               if (omode != env->params->low_unsigned)
+                       op = new_rd_Conv(dbg, irg, block, op, omode);
 
                set_Conv_op(node, op);
        }
        else {
-               assert(0);
+               ir_node *irn, *call, *in[2];
+               ir_mode *imode = env->params->high_unsigned;
+               ir_type *mtp = get_conv_type(imode, omode, env);
+
+               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, block, env);
+               in[0] = env->entries[idx]->low_word;
+               in[1] = env->entries[idx]->high_word;
+
+               call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 2, in, mtp);
+               set_irn_pinned(call, get_irn_pinned(node));
+               irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result);
+
+               exchange(node, new_r_Proj(irg, block, irn, omode, 0));
        }
-}
+}  /* lower_Conv_from_Lu */
 
 /**
  * Translate a Conv.
@@ -1211,7 +1566,7 @@ static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        lower_Conv_from_Lu(node, env);
                }
        }
-}
+}  /* lower_Conv */
 
 /**
  * Lower the method type.
@@ -1277,6 +1632,8 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
                                else
                                        set_method_param_type(res, n_param++, tp);
                        }
+                       else
+                               set_method_param_type(res, n_param++, tp);
                }
                for (i = n_res = 0; i < r; ++i) {
                        ir_type *tp = get_method_res_type(mtp, i);
@@ -1295,6 +1652,8 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
                                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);
@@ -1302,7 +1661,7 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
        else
                res = entry->value;
        return res;
-}
+}  /* lower_mtp */
 
 /**
  * Translate a Return.
@@ -1359,7 +1718,7 @@ static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) {
        }
 
        set_irn_in(node, j+1, in);
-}
+}  /* lower_Return */
 
 /**
  * Translate the parameters.
@@ -1435,7 +1794,7 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        if (mode == env->params->high_signed)
                                mode = env->params->low_signed;
                        else
-                               mode = env->params->high_signed;
+                               mode = env->params->low_unsigned;
 
                        dbg = get_irn_dbg_info(proj);
                        env->entries[idx]->low_word  =
@@ -1445,7 +1804,7 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
                }
        }
        set_optimize(rem);
-}
+}  /* lower_Start */
 
 /**
  * Translate a Call.
@@ -1561,7 +1920,7 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
                                        ir_mode *mode = get_irn_mode(proj);
                                        dbg_info *dbg;
 
-                                       if (mode = env->params->high_signed)
+                                       if (mode == env->params->high_signed)
                                                mode = env->params->low_signed;
                                        else
                                                mode = env->params->low_unsigned;
@@ -1577,17 +1936,18 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
                }
                set_optimize(rem);
        }
-}
+}  /* lower_Call */
 
 /**
  * Translate an Unknown into two.
  */
 static void lower_Unknown(ir_node *node, ir_mode *mode, lower_env_t *env) {
        int idx = get_irn_idx(node);
+       ir_graph *irg = current_ir_graph;
 
        env->entries[idx]->low_word  =
-       env->entries[idx]->high_word = new_r_Unknown(current_ir_graph, mode);
-}
+       env->entries[idx]->high_word = new_r_Unknown(irg, mode);
+}  /* lower_Unknown */
 
 /**
  * Translate a Phi.
@@ -1595,6 +1955,7 @@ static void lower_Unknown(ir_node *node, ir_mode *mode, lower_env_t *env) {
  * First step: just create two templates
  */
 static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
+       ir_graph *irg = current_ir_graph;
        ir_node  *block, *unk;
        ir_node  **inl, **inh;
        dbg_info *dbg;
@@ -1613,7 +1974,7 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
 
                        if (env->entries[idx]->low_word) {
                                set_Phi_pred(phil, i, env->entries[idx]->low_word);
-                               set_Phi_pred(phil, i, env->entries[idx]->high_word);
+                               set_Phi_pred(phih, i, env->entries[idx]->high_word);
                        }
                        else {
                                /* still not ready */
@@ -1626,7 +1987,7 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
        /* first create a new in array */
        NEW_ARR_A(ir_node *, inl, arity);
        NEW_ARR_A(ir_node *, inh, arity);
-       unk = new_r_Unknown(current_ir_graph, mode);
+       unk = new_r_Unknown(irg, mode);
 
        for (i = 0; i < arity; ++i) {
                ir_node *pred = get_Phi_pred(phi, i);
@@ -1648,14 +2009,14 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
 
        idx = get_irn_idx(phi);
        assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = new_rd_Phi(dbg, current_ir_graph, block, arity, inl, mode);
-       env->entries[idx]->high_word = new_rd_Phi(dbg, current_ir_graph, block, arity, inh, mode);
+       env->entries[idx]->low_word  = new_rd_Phi(dbg, irg, block, arity, inl, mode);
+       env->entries[idx]->high_word = new_rd_Phi(dbg, irg, block, arity, inh, mode);
 
        if (enq) {
                /* not yet finished */
                pdeq_putr(env->waitq, phi);
        }
-}
+}  /* lower_Phi */
 
 /**
  * check for opcodes that must always be lowered.
@@ -1670,13 +2031,13 @@ static int always_lower(opcode code) {
        default:
                return 0;
        }
-}
+}  /* always_lower */
 
 /** The type of a lower function. */
 typedef void (*lower_func)(ir_node *node, ir_mode *mode, lower_env_t *env);
 
 /**
- * lower a node.
+ * Lower a node.
  */
 static void lower_ops(ir_node *node, void *env)
 {
@@ -1701,7 +2062,7 @@ static void lower_ops(ir_node *node, void *env)
                        func(node, mode, lenv);
                }
        }
-}
+}  /* lower_ops */
 
 #define IDENT(s)  new_id_from_chars(s, sizeof(s)-1)
 
@@ -1712,8 +2073,19 @@ static int cmp_op_mode(const void *elt, const void *key, size_t size) {
        const op_mode_entry_t *e1 = elt;
        const op_mode_entry_t *e2 = key;
 
-       return (e1->op - e2->op) | (e1->mode - e2->mode);
-}
+       return (e1->op - e2->op) | (e1->imode - e2->imode) | (e1->omode - e2->omode);
+}  /* cmp_op_mode */
+
+/**
+ * Compare two conv_tp_entry_t's.
+ */
+static int cmp_conv_tp(const void *elt, const void *key, size_t size) {
+       const conv_tp_entry_t *e1 = elt;
+       const conv_tp_entry_t *e2 = key;
+
+       return (e1->imode - e2->imode) | (e1->omode - e2->omode);
+}  /*
+static int cmp_conv_tp */
 
 /*
  * Do the lowering.
@@ -1722,6 +2094,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
 {
        lower_env_t lenv;
        int i;
+       ir_graph *rem;
 
        if (! param)
                return;
@@ -1730,25 +2103,28 @@ void lower_dw_ops(const lwrdw_param_t *param)
                return;
 
        FIRM_DBG_REGISTER(dbg, "firm.lower.dw");
-       firm_dbg_set_mask(dbg, SET_LEVEL_2);
 
        assert(2 * get_mode_size_bits(param->low_signed)   == get_mode_size_bits(param->high_signed));
        assert(2 * get_mode_size_bits(param->low_unsigned) == get_mode_size_bits(param->high_unsigned));
        assert(get_mode_size_bits(param->low_signed) == get_mode_size_bits(param->low_unsigned));
 
+       if (! prim_types)
+               prim_types = pmap_create();
        if (! intrinsic_fkt)
                intrinsic_fkt = new_set(cmp_op_mode, iro_MaxOpcode);
+       if (! conv_types)
+               conv_types = new_set(cmp_conv_tp, 16);
        if (! lowered_type)
                lowered_type = pmap_create();
 
        if (! tp_u)
-               tp_u = new_type_primitive(IDENT("_i_uint"), param->low_unsigned);
+               tp_u = get_primitive_type(param->low_unsigned);
        if (! tp_s)
-               tp_s = new_type_primitive(IDENT("_i_int"), param->low_signed);
+               tp_s = get_primitive_type(param->low_signed);
+
 
        if (! binop_tp_u) {
                binop_tp_u = new_type_method(IDENT("binop_u_intrinsic"), 4, 2);
-
                set_method_param_type(binop_tp_u, 0, tp_u);
                set_method_param_type(binop_tp_u, 1, tp_u);
                set_method_param_type(binop_tp_u, 2, tp_u);
@@ -1765,6 +2141,23 @@ void lower_dw_ops(const lwrdw_param_t *param)
                set_method_res_type(binop_tp_s, 0, tp_s);
                set_method_res_type(binop_tp_s, 1, tp_s);
        }
+       if (! shiftop_tp_u) {
+               shiftop_tp_u = new_type_method(IDENT("shiftop_u_intrinsic"), 3, 2);
+               set_method_param_type(shiftop_tp_u, 0, tp_u);
+               set_method_param_type(shiftop_tp_u, 1, tp_u);
+               set_method_param_type(shiftop_tp_u, 2, tp_u);
+               set_method_res_type(shiftop_tp_u, 0, tp_u);
+               set_method_res_type(shiftop_tp_u, 1, tp_u);
+       }
+       if (! shiftop_tp_s) {
+               shiftop_tp_s = new_type_method(IDENT("shiftop_s_intrinsic"), 3, 2);
+               set_method_param_type(shiftop_tp_s, 0, tp_s);
+               set_method_param_type(shiftop_tp_s, 1, tp_s);
+               /* beware: shift count is always mode_Iu */
+               set_method_param_type(shiftop_tp_s, 2, tp_u);
+               set_method_res_type(shiftop_tp_s, 0, tp_s);
+               set_method_res_type(shiftop_tp_s, 1, tp_s);
+       }
        if (! unop_tp_u) {
                unop_tp_u = new_type_method(IDENT("unop_u_intrinsic"), 2, 2);
                set_method_param_type(unop_tp_u, 0, tp_u);
@@ -1781,6 +2174,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
        }
 
        lenv.tv_mode_bytes = new_tarval_from_long(get_mode_size_bytes(param->low_unsigned), mode_Iu);
+       lenv.tv_mode_bits  = new_tarval_from_long(get_mode_size_bits(param->low_unsigned), mode_Iu);
        lenv.waitq         = new_pdeq();
        lenv.params        = param;
 
@@ -1809,10 +2203,10 @@ void lower_dw_ops(const lwrdw_param_t *param)
        LOWER_BIN(Add);
        LOWER_BIN(Sub);
        LOWER_BIN(Mul);
-       LOWER_BIN(Shl);
-       LOWER_BIN(Shr);
-       LOWER_BIN(Shrs);
-       LOWER_BIN(Rot);
+       LOWER(Shl);
+       LOWER(Shr);
+       LOWER(Shrs);
+       LOWER(Rot);
        LOWER_UN(Minus);
        LOWER(DivMod);
        LOWER(Div);
@@ -1827,6 +2221,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
 #undef LOWER2
 
        /* transform all graphs */
+       rem = current_ir_graph;
        for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
                ir_graph *irg = get_irp_irg(i);
                int n_idx;
@@ -1851,6 +2246,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
 
                        /* last step: all waiting nodes */
                        DB((dbg, LEVEL_1, "finishing waiting nodes:\n"));
+                       current_ir_graph = irg;
                        while (! pdeq_empty(lenv.waitq)) {
                                ir_node *node = pdeq_getl(lenv.waitq);
 
@@ -1863,6 +2259,8 @@ void lower_dw_ops(const lwrdw_param_t *param)
                        if (lenv.flags & CF_CHANGED) {
                                /* control flow changed, dominance info is invalid */
                                set_irg_doms_inconsistent(irg);
+                               set_irg_extblk_inconsistent(irg);
+                               set_irg_loopinfo_inconsistent(irg);
                        }
 
                        dump_ir_block_graph(irg, "-dw");
@@ -1872,16 +2270,27 @@ void lower_dw_ops(const lwrdw_param_t *param)
                obstack_free(&lenv.obst, NULL);
        }
        del_pdeq(lenv.waitq);
-}
+       current_ir_graph = rem;
+}  /* lower_dw_ops */
 
 /* Default implementation. */
-entity *def_create_intrinsic_fkt(ir_type *method, const ir_op *op, const ir_mode *mode, void *context)
+entity *def_create_intrinsic_fkt(ir_type *method, const ir_op *op,
+                                 const ir_mode *imode, const ir_mode *omode,
+                                 void *context)
 {
        char buf[64];
        ident *id;
+       entity *ent;
 
-       snprintf(buf, sizeof(buf), "__l%s%s", get_op_name(op), get_mode_name(mode));
+       if (imode == omode)
+               snprintf(buf, sizeof(buf), "__l%s%s", get_op_name(op), get_mode_name(imode));
+       else
+               snprintf(buf, sizeof(buf), "__l%s%s%s", get_op_name(op),
+                       get_mode_name(imode), get_mode_name(omode));
        id = new_id_from_str(buf);
 
-       return new_entity(get_glob_type(), id, method);
-}
+       ent = new_entity(get_glob_type(), id, method);
+       set_entity_ld_ident(ent, get_entity_ident(ent));
+       set_entity_visibility(ent, visibility_external_allocated);
+       return ent;
+}  /* def_create_intrinsic_fkt */