we can do without the odd align.h
[libfirm] / ir / lower / lower_dw.c
index a0a060f..1eba625 100644 (file)
@@ -127,7 +127,8 @@ typedef struct _lower_env_t {
 /**
  * Get a primitive mode for a mode.
  */
-static ir_type *get_primitive_type(ir_mode *mode) {
+static ir_type *get_primitive_type(ir_mode *mode)
+{
        pmap_entry *entry = pmap_find(prim_types, mode);
        ir_type *tp;
        char buf[64];
@@ -136,7 +137,7 @@ static ir_type *get_primitive_type(ir_mode *mode) {
                return entry->value;
 
        snprintf(buf, sizeof(buf), "_prim_%s", get_mode_name(mode));
-       tp = new_type_primitive(new_id_from_str(buf), mode);
+       tp = new_type_primitive(mode);
 
        pmap_insert(prim_types, mode, tp);
        return tp;
@@ -145,7 +146,8 @@ static ir_type *get_primitive_type(ir_mode *mode) {
 /**
  * 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) {
+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;
 
@@ -156,7 +158,6 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env)
        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;
@@ -164,8 +165,7 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env)
                        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);
+               mtd = new_type_method(n_param, n_res);
 
                /* set param types and result types */
                n_param = 0;
@@ -281,9 +281,7 @@ static void prepare_links(ir_node *node, void *env)
        if (mode == lenv->params->high_signed ||
                mode == lenv->params->high_unsigned) {
                /* ok, found a node that will be lowered */
-               link = obstack_alloc(&lenv->obst, sizeof(*link));
-
-               memset(link, 0, sizeof(*link));
+               link = OALLOCZ(&lenv->obst, node_entry_t);
 
                idx = get_irn_idx(node);
                if (idx >= lenv->n_entries) {
@@ -335,7 +333,8 @@ static void prepare_links(ir_node *node, void *env)
 /**
  * Translate a Constant: create two.
  */
-static void lower_Const(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Const(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        tarval   *tv, *tv_l, *tv_h;
        ir_node  *low, *high;
        dbg_info *dbg = get_irn_dbg_info(node);
@@ -360,7 +359,8 @@ static void lower_Const(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate a Load: create two.
  */
-static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_mode    *low_mode = env->params->low_unsigned;
        ir_graph   *irg = current_ir_graph;
        ir_node    *adr = get_Load_ptr(node);
@@ -383,7 +383,7 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) {
        /* create two loads */
        dbg  = get_irn_dbg_info(node);
        low  = new_rd_Load(dbg, block, mem,  low,  low_mode, volatility);
-       proj = new_r_Proj(block, low, mode_M, pn_Load_M);
+       proj = new_r_Proj(low, mode_M, pn_Load_M);
        high = new_rd_Load(dbg, block, proj, high, mode, volatility);
 
        idx = get_irn_idx(node);
@@ -405,8 +405,8 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        break;
                case pn_Load_res:       /* Result of load operation. */
                        assert(idx < env->n_entries);
-                       env->entries[idx]->low_word  = new_r_Proj(block, low,  low_mode, pn_Load_res);
-                       env->entries[idx]->high_word = new_r_Proj(block, high, mode,     pn_Load_res);
+                       env->entries[idx]->low_word  = new_r_Proj(low,  low_mode, pn_Load_res);
+                       env->entries[idx]->high_word = new_r_Proj(high, mode,     pn_Load_res);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
@@ -420,7 +420,8 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate a Store: create two.
  */
-static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_graph     *irg;
        ir_node      *block, *adr, *mem;
        ir_node      *low, *high, *irn, *proj;
@@ -457,7 +458,7 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) {
        /* 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(block, low, mode_M, pn_Store_M);
+       proj = new_r_Proj(low, mode_M, pn_Store_M);
        high = new_rd_Store(dbg, block, proj, high, entry->high_word, volatility);
 
        idx = get_irn_idx(node);
@@ -497,7 +498,8 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) {
  */
 static ir_node *get_intrinsic_address(ir_type *method, ir_op *op,
                                       ir_mode *imode, ir_mode *omode,
-                                      lower_env_t *env) {
+                                      lower_env_t *env)
+{
        symconst_symbol sym;
        ir_entity *ent;
        op_mode_entry_t key, *entry;
@@ -527,7 +529,8 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op,
  *
  * Create an intrinsic Call.
  */
-static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
+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;
@@ -570,14 +573,14 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
        irn = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, env);
        call = new_rd_Call(dbg, block, get_Div_mem(node), irn, 4, in, mtp);
        set_irn_pinned(call, get_irn_pinned(node));
-       irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
+       irn = new_r_Proj(call, mode_T, pn_Call_T_result);
 
        for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
                switch (get_Proj_proj(proj)) {
                case pn_Div_M:         /* Memory result. */
                        /* reroute to the call */
                        set_Proj_pred(proj, call);
-                       set_Proj_proj(proj, pn_Call_M_except);
+                       set_Proj_proj(proj, pn_Call_M);
                        break;
                case pn_Div_X_except:  /* Execution result if exception occurred. */
                        /* reroute to the call */
@@ -587,8 +590,8 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
                case pn_Div_res:       /* Result of computation. */
                        idx = get_irn_idx(proj);
                        assert(idx < env->n_entries);
-                       env->entries[idx]->low_word  = new_r_Proj(block, irn, env->params->low_unsigned, 0);
-                       env->entries[idx]->high_word = new_r_Proj(block, irn, mode,                      1);
+                       env->entries[idx]->low_word  = new_r_Proj(irn, env->params->low_unsigned, 0);
+                       env->entries[idx]->high_word = new_r_Proj(irn, mode,                      1);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
@@ -604,7 +607,8 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
  *
  * Create an intrinsic Call.
  */
-static void lower_Mod(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;
@@ -647,14 +651,14 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
        irn = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, env);
        call = new_rd_Call(dbg, block, get_Mod_mem(node), irn, 4, in, mtp);
        set_irn_pinned(call, get_irn_pinned(node));
-       irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
+       irn = new_r_Proj(call, mode_T, pn_Call_T_result);
 
        for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
                switch (get_Proj_proj(proj)) {
                case pn_Mod_M:         /* Memory result. */
                        /* reroute to the call */
                        set_Proj_pred(proj, call);
-                       set_Proj_proj(proj, pn_Call_M_except);
+                       set_Proj_proj(proj, pn_Call_M);
                        break;
                case pn_Mod_X_except:  /* Execution result if exception occurred. */
                        /* reroute to the call */
@@ -664,8 +668,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(block, irn, env->params->low_unsigned, 0);
-                       env->entries[idx]->high_word = new_r_Proj(block, irn, mode,                      1);
+                       env->entries[idx]->low_word  = new_r_Proj(irn, env->params->low_unsigned, 0);
+                       env->entries[idx]->high_word = new_r_Proj(irn, mode,                      1);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
@@ -681,7 +685,8 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
  *
  * Create two intrinsic Calls.
  */
-static void lower_DivMod(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;
        ir_node  *resDiv = NULL;
        ir_node  *resMod = NULL;
@@ -740,16 +745,16 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                irn = get_intrinsic_address(mtp, op_Div, opmode, opmode, env);
                callDiv = new_rd_Call(dbg, block, mem, irn, 4, in, mtp);
                set_irn_pinned(callDiv, get_irn_pinned(node));
-               resDiv = new_r_Proj(block, callDiv, mode_T, pn_Call_T_result);
+               resDiv = new_r_Proj(callDiv, mode_T, pn_Call_T_result);
        }  /* if */
        if (flags & 2) {
                if (flags & 1)
-                       mem = new_r_Proj(block, callDiv, mode_M, pn_Call_M);
+                       mem = new_r_Proj(callDiv, mode_M, pn_Call_M);
                opmode = get_irn_op_mode(node);
                irn = get_intrinsic_address(mtp, op_Mod, opmode, opmode, env);
                callMod = new_rd_Call(dbg, block, mem, irn, 4, in, mtp);
                set_irn_pinned(callMod, get_irn_pinned(node));
-               resMod = new_r_Proj(block, callMod, mode_T, pn_Call_T_result);
+               resMod = new_r_Proj(callMod, mode_T, pn_Call_T_result);
        }  /* if */
 
        for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
@@ -757,7 +762,7 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                case pn_DivMod_M:         /* Memory result. */
                        /* reroute to the first call */
                        set_Proj_pred(proj, callDiv ? callDiv : (callMod ? callMod : mem));
-                       set_Proj_proj(proj, pn_Call_M_except);
+                       set_Proj_proj(proj, pn_Call_M);
                        break;
                case pn_DivMod_X_except:  /* Execution result if exception occurred. */
                        /* reroute to the first call */
@@ -767,13 +772,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(block, resDiv, env->params->low_unsigned, 0);
-                       env->entries[idx]->high_word = new_r_Proj(block, resDiv, mode,                      1);
+                       env->entries[idx]->low_word  = new_r_Proj(resDiv, env->params->low_unsigned, 0);
+                       env->entries[idx]->high_word = new_r_Proj(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(block, resMod, env->params->low_unsigned, 0);
-                       env->entries[idx]->high_word = new_r_Proj(block, resMod, mode,                      1);
+                       env->entries[idx]->low_word  = new_r_Proj(resMod, env->params->low_unsigned, 0);
+                       env->entries[idx]->high_word = new_r_Proj(resMod, mode,                      1);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
@@ -789,7 +794,8 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
  *
  * Create an intrinsic Call.
  */
-static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_node  *block, *irn;
        ir_node  *in[4];
        dbg_info *dbg;
@@ -833,12 +839,12 @@ static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) {
        irn = new_rd_Call(dbg, block, get_irg_no_mem(current_ir_graph),
                irn, 4, in, mtp);
        set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(block, irn, mode_T, pn_Call_T_result);
+       irn = new_r_Proj(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(block, irn, env->params->low_unsigned, 0);
-       env->entries[idx]->high_word = new_r_Proj(block, irn, mode,                      1);
+       env->entries[idx]->low_word  = new_r_Proj(irn, env->params->low_unsigned, 0);
+       env->entries[idx]->high_word = new_r_Proj(irn, mode,                      1);
 }  /* lower_Binop */
 
 /**
@@ -846,7 +852,8 @@ static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) {
  *
  * Create an intrinsic Call.
  */
-static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) {
+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;
@@ -870,6 +877,8 @@ static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
        /* The shift count is always mode_Iu in firm, so there is no need for lowering */
        in[2] = get_binop_right(node);
+       assert(get_irn_mode(in[2]) != env->params->high_signed
+                       && get_irn_mode(in[2]) != env->params->high_unsigned);
 
        dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
@@ -880,18 +889,19 @@ static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) {
        irn = new_rd_Call(dbg, block, get_irg_no_mem(current_ir_graph),
                irn, 3, in, mtp);
        set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(block, irn, mode_T, pn_Call_T_result);
+       irn = new_r_Proj(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(block, irn, env->params->low_unsigned, 0);
-       env->entries[idx]->high_word = new_r_Proj(block, irn, mode,                      1);
+       env->entries[idx]->low_word  = new_r_Proj(irn, env->params->low_unsigned, 0);
+       env->entries[idx]->high_word = new_r_Proj(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) {
+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;
 
@@ -907,6 +917,12 @@ static void lower_Shr(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        int idx = get_irn_idx(left);
 
                        left = env->entries[idx]->high_word;
+                       if (left == NULL) {
+                               /* not ready yet, wait */
+                               pdeq_putr(env->waitq, node);
+                               return;
+                       }
+
                        idx = get_irn_idx(node);
 
                        if (shf_cnt > 0) {
@@ -926,7 +942,8 @@ static void lower_Shr(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate a Shl and handle special cases.
  */
-static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env) {
+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;
 
@@ -942,7 +959,14 @@ static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
                        int idx = get_irn_idx(left);
 
-                       left = new_r_Conv(block, env->entries[idx]->low_word, mode);
+                       left = env->entries[idx]->low_word;
+                       if (left == NULL) {
+                               /* not ready yet, wait */
+                               pdeq_putr(env->waitq, node);
+                               return;
+                       }
+
+                       left = new_r_Conv(block, left, mode);
                        idx = get_irn_idx(node);
 
                        mode_l = env->params->low_unsigned;
@@ -963,7 +987,8 @@ static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate a Shrs and handle special cases.
  */
-static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) {
+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;
 
@@ -981,8 +1006,13 @@ static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        ir_node *c;
 
                        left = env->entries[idx]->high_word;
-                       idx = get_irn_idx(node);
+                       if (left == NULL) {
+                               /* not ready yet, wait */
+                               pdeq_putr(env->waitq, node);
+                               return;
+                       }
 
+                       idx    = get_irn_idx(node);
                        mode_l = env->params->low_unsigned;
                        if (shf_cnt > 0) {
                                c   = new_r_Const_long(irg, mode_l, shf_cnt);
@@ -1005,7 +1035,8 @@ static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Rebuild Rotl nodes into Or(Shl, Shr) and prepare all nodes.
  */
-static void prepare_links_and_handle_rotl(ir_node *node, void *env) {
+static void prepare_links_and_handle_rotl(ir_node *node, void *env)
+{
        lower_env_t *lenv = env;
 
        if (is_Rotl(node)) {
@@ -1062,7 +1093,8 @@ static void prepare_links_and_handle_rotl(ir_node *node, void *env) {
 /**
  * Translate a special case Rotl(x, sizeof(w)).
  */
-static void lower_Rotl(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Rotl(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_node *right = get_Rotl_right(node);
        ir_node *left = get_Rotl_left(node);
        ir_node *h, *l;
@@ -1087,7 +1119,8 @@ static void lower_Rotl(ir_node *node, ir_mode *mode, lower_env_t *env) {
  *
  * Create an intrinsic Call.
  */
-static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_node  *block, *irn;
        ir_node  *in[2];
        dbg_info *dbg;
@@ -1116,12 +1149,12 @@ static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) {
        irn = new_rd_Call(dbg, block, get_irg_no_mem(current_ir_graph),
                irn, 2, in, mtp);
        set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(block, irn, mode_T, pn_Call_T_result);
+       irn = new_r_Proj(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(block, irn, env->params->low_unsigned, 0);
-       env->entries[idx]->high_word = new_r_Proj(block, irn, mode,                      1);
+       env->entries[idx]->low_word  = new_r_Proj(irn, env->params->low_unsigned, 0);
+       env->entries[idx]->high_word = new_r_Proj(irn, mode,                      1);
 }  /* lower_Unop */
 
 /**
@@ -1189,7 +1222,8 @@ lower_logical(Eor)
  *
  * Create two logical Nots.
  */
-static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_node  *block, *irn;
        ir_node  *op_l, *op_h;
        dbg_info *dbg;
@@ -1221,7 +1255,8 @@ static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate a Cond.
  */
-static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_node *cmp, *left, *right, *block;
        ir_node *sel = get_Cond_selector(node);
        ir_mode *m = get_irn_mode(sel);
@@ -1238,11 +1273,11 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                ir_graph *irg;
                dbg_info *dbg;
 
-               if(!is_Proj(sel))
+               if (!is_Proj(sel))
                        return;
 
                cmp   = get_Proj_pred(sel);
-               if(!is_Cmp(cmp))
+               if (!is_Cmp(cmp))
                        return;
 
                left  = get_Cmp_left(cmp);
@@ -1296,7 +1331,7 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                                ir_node *or   = new_rd_Or(dbg, block, low, high, mode);
                                ir_node *cmp  = new_rd_Cmp(dbg, block, or, new_Const_long(mode, 0));
 
-                               ir_node *proj = new_r_Proj(block, cmp, mode_b, pnc);
+                               ir_node *proj = new_r_Proj(cmp, mode_b, pnc);
                                set_Cond_selector(node, proj);
                                return;
                        }
@@ -1311,30 +1346,30 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        assert(entry);
                        dst_blk = entry->value;
 
-                       irn = new_r_Proj(block, cmpH, mode_b, pn_Cmp_Eq);
+                       irn = new_r_Proj(cmpH, mode_b, pn_Cmp_Eq);
                        dbg = get_irn_dbg_info(node);
                        irn = new_rd_Cond(dbg, block, irn);
 
-                       projHF = new_r_Proj(block, irn, mode_X, pn_Cond_false);
+                       projHF = new_r_Proj(irn, mode_X, pn_Cond_false);
                        mark_irn_visited(projHF);
                        exchange(projF, projHF);
 
-                       projHT = new_r_Proj(block, irn, mode_X, pn_Cond_true);
+                       projHT = new_r_Proj(irn, mode_X, pn_Cond_true);
                        mark_irn_visited(projHT);
 
                        new_bl = new_r_Block(irg, 1, &projHT);
 
                        dbg   = get_irn_dbg_info(cmp);
                        cmpL = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word);
-                       irn = new_r_Proj(new_bl, cmpL, mode_b, pn_Cmp_Eq);
+                       irn = new_r_Proj(cmpL, mode_b, pn_Cmp_Eq);
                        dbg = get_irn_dbg_info(node);
                        irn = new_rd_Cond(dbg, new_bl, irn);
 
-                       proj = new_r_Proj(new_bl, irn, mode_X, pn_Cond_false);
+                       proj = new_r_Proj(irn, mode_X, pn_Cond_false);
                        mark_irn_visited(proj);
                        add_block_cf_input(dst_blk, projHF, proj);
 
-                       proj = new_r_Proj(new_bl, irn, mode_X, pn_Cond_true);
+                       proj = new_r_Proj(irn, mode_X, pn_Cond_true);
                        mark_irn_visited(proj);
                        exchange(projT, proj);
                } else if (pnc == pn_Cmp_Lg) {
@@ -1344,30 +1379,30 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        assert(entry);
                        dst_blk = entry->value;
 
-                       irn = new_r_Proj(block, cmpH, mode_b, pn_Cmp_Lg);
+                       irn = new_r_Proj(cmpH, mode_b, pn_Cmp_Lg);
                        dbg = get_irn_dbg_info(node);
                        irn = new_rd_Cond(dbg, block, irn);
 
-                       projHT = new_r_Proj(block, irn, mode_X, pn_Cond_true);
+                       projHT = new_r_Proj(irn, mode_X, pn_Cond_true);
                        mark_irn_visited(projHT);
                        exchange(projT, projHT);
 
-                       projHF = new_r_Proj(block, irn, mode_X, pn_Cond_false);
+                       projHF = new_r_Proj(irn, mode_X, pn_Cond_false);
                        mark_irn_visited(projHF);
 
                        new_bl = new_r_Block(irg, 1, &projHF);
 
                        dbg   = get_irn_dbg_info(cmp);
                        cmpL = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word);
-                       irn = new_r_Proj(new_bl, cmpL, mode_b, pn_Cmp_Lg);
+                       irn = new_r_Proj(cmpL, mode_b, pn_Cmp_Lg);
                        dbg = get_irn_dbg_info(node);
                        irn = new_rd_Cond(dbg, new_bl, irn);
 
-                       proj = new_r_Proj(new_bl, irn, mode_X, pn_Cond_true);
+                       proj = new_r_Proj(irn, mode_X, pn_Cond_true);
                        mark_irn_visited(proj);
                        add_block_cf_input(dst_blk, projHT, proj);
 
-                       proj = new_r_Proj(new_bl, irn, mode_X, pn_Cond_false);
+                       proj = new_r_Proj(irn, mode_X, pn_Cond_false);
                        mark_irn_visited(proj);
                        exchange(projF, proj);
                } else {
@@ -1383,44 +1418,44 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        assert(entry);
                        dstF = entry->value;
 
-                       irn = new_r_Proj(block, cmpH, mode_b, pnc & ~pn_Cmp_Eq);
+                       irn = new_r_Proj(cmpH, mode_b, pnc & ~pn_Cmp_Eq);
                        dbg = get_irn_dbg_info(node);
                        irn = new_rd_Cond(dbg, block, irn);
 
-                       projHT = new_r_Proj(block, irn, mode_X, pn_Cond_true);
+                       projHT = new_r_Proj(irn, mode_X, pn_Cond_true);
                        mark_irn_visited(projHT);
                        exchange(projT, projHT);
                        projT = projHT;
 
-                       projHF = new_r_Proj(block, irn, mode_X, pn_Cond_false);
+                       projHF = new_r_Proj(irn, mode_X, pn_Cond_false);
                        mark_irn_visited(projHF);
 
                        newbl_eq = new_r_Block(irg, 1, &projHF);
 
-                       irn = new_r_Proj(block, cmpH, mode_b, pn_Cmp_Eq);
+                       irn = new_r_Proj(cmpH, mode_b, pn_Cmp_Eq);
                        irn = new_rd_Cond(dbg, newbl_eq, irn);
 
-                       proj = new_r_Proj(newbl_eq, irn, mode_X, pn_Cond_false);
+                       proj = new_r_Proj(irn, mode_X, pn_Cond_false);
                        mark_irn_visited(proj);
                        exchange(projF, proj);
                        projF = proj;
 
-                       proj = new_r_Proj(newbl_eq, irn, mode_X, pn_Cond_true);
+                       proj = new_r_Proj(irn, mode_X, pn_Cond_true);
                        mark_irn_visited(proj);
 
                        newbl_l = new_r_Block(irg, 1, &proj);
 
                        dbg   = get_irn_dbg_info(cmp);
                        cmpL = new_rd_Cmp(dbg, newbl_l, lentry->low_word, rentry->low_word);
-                       irn = new_r_Proj(newbl_l, cmpL, mode_b, pnc);
+                       irn = new_r_Proj(cmpL, mode_b, pnc);
                        dbg = get_irn_dbg_info(node);
                        irn = new_rd_Cond(dbg, newbl_l, irn);
 
-                       proj = new_r_Proj(newbl_l, irn, mode_X, pn_Cond_true);
+                       proj = new_r_Proj(irn, mode_X, pn_Cond_true);
                        mark_irn_visited(proj);
                        add_block_cf_input(dstT, projT, proj);
 
-                       proj = new_r_Proj(newbl_l, irn, mode_X, pn_Cond_false);
+                       proj = new_r_Proj(irn, mode_X, pn_Cond_false);
                        mark_irn_visited(proj);
                        add_block_cf_input(dstF, projF, proj);
                }  /* if */
@@ -1451,224 +1486,143 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * 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  *imode = get_irn_mode(op);
-       ir_mode  *dst_mode_l = env->params->low_unsigned;
-       ir_mode  *dst_mode_h = 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);
-
-       if (mode_is_int(imode) || mode_is_reference(imode)) {
-               if (imode == env->params->high_unsigned) {
-                       /* a Conv from Lu to Ls */
-                       int op_idx = get_irn_idx(op);
-
-                       if (! env->entries[op_idx]->low_word) {
-                               /* not ready yet, wait */
-                               pdeq_putr(env->waitq, node);
-                               return;
-                       }  /* if */
-                       env->entries[idx]->low_word  = new_rd_Conv(dbg, block, env->entries[op_idx]->low_word,  dst_mode_l);
-                       env->entries[idx]->high_word = new_rd_Conv(dbg, block, env->entries[op_idx]->high_word, dst_mode_h);
-               } else {
-                       /* simple case: create a high word */
-                       if (imode != dst_mode_l)
-                               op = new_rd_Conv(dbg, block, op, dst_mode_l);
-
-                       env->entries[idx]->low_word  = op;
-
-                       if (mode_is_signed(imode)) {
-                               ir_node *op_conv = new_rd_Conv(dbg, block, op, dst_mode_h);
-                               env->entries[idx]->high_word = new_rd_Shrs(dbg, block, op_conv,
-                                       new_Const_long(dst_mode_l, get_mode_size_bits(dst_mode_h) - 1), dst_mode_h);
-                       } else {
-                               env->entries[idx]->high_word = new_Const(get_mode_null(dst_mode_h));
-                       }  /* if */
-               }  /* if */
-       } else {
-               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, env);
-               call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 1, &op, mtp);
-               set_irn_pinned(call, get_irn_pinned(node));
-               irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
-
-               env->entries[idx]->low_word  = new_r_Proj(block, irn, dst_mode_l, 0);
-               env->entries[idx]->high_word = new_r_Proj(block, irn, dst_mode_h, 1);
-       }  /* if */
-}  /* 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  *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);
+static void lower_Conv_to_Ll(ir_node *node, lower_env_t *env)
+{
+       ir_mode  *omode        = get_irn_mode(node);
+       ir_node  *op           = get_Conv_op(node);
+       ir_mode  *imode        = get_irn_mode(op);
+       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);
+       node_entry_t *entry = env->entries[idx];
+       ir_mode  *low_unsigned = env->params->low_unsigned;
+       ir_mode  *low_signed
+               = mode_is_signed(omode) ? env->params->low_signed : low_unsigned;
 
        assert(idx < env->n_entries);
 
        if (mode_is_int(imode) || mode_is_reference(imode)) {
-               if (imode == env->params->high_signed) {
-                       /* a Conv from Ls to Lu */
-                       int op_idx = get_irn_idx(op);
+               if (imode == env->params->high_signed
+                               || imode == env->params->high_unsigned) {
+                       /* a Conv from Lu to Ls or Ls to Lu */
+                       int           op_idx   = get_irn_idx(op);
+                       node_entry_t *op_entry = env->entries[op_idx];
 
-                       if (! env->entries[op_idx]->low_word) {
+                       if (! op_entry->low_word) {
                                /* not ready yet, wait */
                                pdeq_putr(env->waitq, node);
                                return;
-                       }  /* if */
-                       env->entries[idx]->low_word  = new_rd_Conv(dbg, block, env->entries[op_idx]->low_word, dst_mode);
-                       env->entries[idx]->high_word = new_rd_Conv(dbg, block, env->entries[op_idx]->high_word, dst_mode);
+                       }
+                       entry->low_word  = op_entry->low_word;
+                       entry->high_word = new_rd_Conv(dbg, block, op_entry->high_word,
+                                                      low_signed);
                } else {
                        /* simple case: create a high word */
-                       if (imode != dst_mode)
-                               op = new_rd_Conv(dbg, block, op, dst_mode);
+                       if (imode != low_unsigned)
+                               op = new_rd_Conv(dbg, block, op, low_unsigned);
 
-                       env->entries[idx]->low_word  = op;
+                       entry->low_word = op;
 
                        if (mode_is_signed(imode)) {
-                               env->entries[idx]->high_word = new_rd_Shrs(dbg, block, op,
-                                       new_Const_long(dst_mode, get_mode_size_bits(dst_mode) - 1), dst_mode);
+                               int      c       = get_mode_size_bits(low_signed) - 1;
+                               ir_node *cnst    = new_Const_long(low_unsigned, c);
+                               if (get_irn_mode(op) != low_signed)
+                                       op = new_rd_Conv(dbg, block, op, low_signed);
+                               entry->high_word = new_rd_Shrs(dbg, block, op, cnst,
+                                                              low_signed);
                        } else {
-                               env->entries[idx]->high_word = new_Const(get_mode_null(dst_mode));
-                       }  /* if */
-               }  /* if */
+                               entry->high_word = new_Const(get_mode_null(low_signed));
+                       }
+               }
+       } else if (imode == mode_b) {
+               entry->low_word = new_rd_Conv(dbg, block, op, low_unsigned);
+               entry->high_word = new_Const(get_mode_null(low_signed));
        } else {
                ir_node *irn, *call;
-               ir_mode *omode = env->params->high_unsigned;
                ir_type *mtp = get_conv_type(imode, omode, env);
 
-               /* do an intrinsic call */
                irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env);
                call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 1, &op, mtp);
                set_irn_pinned(call, get_irn_pinned(node));
-               irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
-
-               env->entries[idx]->low_word  = new_r_Proj(block, irn, dst_mode, 0);
-               env->entries[idx]->high_word = new_r_Proj(block, irn, dst_mode, 1);
-       }  /* if */
-}  /* 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  *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;
-
-       assert(idx < env->n_entries);
-
-       if (! env->entries[idx]->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
-               return;
-       }  /* if */
-
-       if (mode_is_int(omode) || mode_is_reference(omode)) {
-               op = env->entries[idx]->low_word;
-
-               /* simple case: create a high word */
-               if (omode != env->params->low_signed)
-                       op = new_rd_Conv(dbg, block, op, omode);
-
-               set_Conv_op(node, op);
-       } else {
-               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, env);
-               in[0] = env->entries[idx]->low_word;
-               in[1] = env->entries[idx]->high_word;
-
-               call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 2, in, mtp);
-               set_irn_pinned(call, get_irn_pinned(node));
-               irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
+               irn = new_r_Proj(call, mode_T, pn_Call_T_result);
 
-               exchange(node, new_r_Proj(block, irn, omode, 0));
-       }  /* if */
-}  /* lower_Conv_from_Ls */
+               entry->low_word  = new_r_Proj(irn, low_unsigned, 0);
+               entry->high_word = new_r_Proj(irn, low_signed, 1);
+       }
+}
 
 /**
  * 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  *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;
+static void lower_Conv_from_Ll(ir_node *node, lower_env_t *env)
+{
+       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;
+       node_entry_t *entry = env->entries[idx];
 
        assert(idx < env->n_entries);
 
-       if (! env->entries[idx]->low_word) {
+       if (! entry->low_word) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        if (mode_is_int(omode) || mode_is_reference(omode)) {
-               op = env->entries[idx]->low_word;
+               op = entry->low_word;
 
                /* simple case: create a high word */
                if (omode != env->params->low_unsigned)
                        op = new_rd_Conv(dbg, block, op, omode);
 
                set_Conv_op(node, op);
+       } else if (omode == mode_b) {
+               /* llu ? true : false  <=> (low|high) ? true : false */
+               ir_mode *mode = env->params->low_unsigned;
+               ir_node *or   = new_rd_Or(dbg, block, entry->low_word, entry->high_word,
+                                         mode);
+               set_Conv_op(node, or);
        } else {
                ir_node *irn, *call, *in[2];
-               ir_mode *imode = env->params->high_unsigned;
-               ir_type *mtp = get_conv_type(imode, omode, env);
+               ir_mode *imode = get_irn_mode(op);
+               ir_type *mtp   = get_conv_type(imode, omode, env);
 
-               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env);
-               in[0] = env->entries[idx]->low_word;
-               in[1] = env->entries[idx]->high_word;
+               irn   = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env);
+               in[0] = entry->low_word;
+               in[1] = entry->high_word;
 
                call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 2, in, mtp);
                set_irn_pinned(call, get_irn_pinned(node));
-               irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
+               irn = new_r_Proj(call, mode_T, pn_Call_T_result);
 
-               exchange(node, new_r_Proj(block, irn, omode, 0));
-       }  /* if */
-}  /* lower_Conv_from_Lu */
+               exchange(node, new_r_Proj(irn, omode, 0));
+       }
+}
 
 /**
  * Translate a Conv.
  */
-static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        mode = get_irn_mode(node);
 
-       if (mode == env->params->high_signed) {
-               lower_Conv_to_Ls(node, env);
-       } else if (mode == env->params->high_unsigned) {
-               lower_Conv_to_Lu(node, env);
+       if (mode == env->params->high_signed
+                       || mode == env->params->high_unsigned) {
+               lower_Conv_to_Ll(node, env);
        } else {
                ir_mode *mode = get_irn_mode(get_Conv_op(node));
 
-               if (mode == env->params->high_signed) {
-                       lower_Conv_from_Ls(node, env);
-               } else if (mode == env->params->high_unsigned) {
-                       lower_Conv_from_Lu(node, env);
-               }  /* if */
-       }  /* if */
-}  /* lower_Conv */
+               if (mode == env->params->high_signed
+                               || mode == env->params->high_unsigned) {
+                       lower_Conv_from_Ll(node, env);
+               }
+       }
+}
 
 /**
  * Lower the method type.
@@ -1678,9 +1632,10 @@ static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env) {
  *
  * @return the lowered type
  */
-static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
+static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env)
+{
        pmap_entry *entry;
-       ident      *id, *lid;
+       ident      *lid;
        ir_type    *res, *value_type;
 
        if (is_lowered_type(mtp))
@@ -1718,8 +1673,7 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
                        }  /* if */
                }  /* for */
 
-               id  = id_mangle_u(new_id_from_chars("L", 1), get_type_ident(mtp));
-               res = new_type_method(id, n_param, n_res);
+               res = new_type_method(n_param, n_res);
 
                /* set param types and result types */
                for (i = n_param = 0; i < n; ++i) {
@@ -1809,7 +1763,8 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
 /**
  * Translate a Return.
  */
-static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_graph  *irg = current_ir_graph;
        ir_entity *ent = get_irg_entity(irg);
        ir_type   *mtp = get_entity_type(ent);
@@ -1867,7 +1822,8 @@ static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate the parameters.
  */
-static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_graph  *irg = get_irn_irg(node);
        ir_entity *ent = get_irg_entity(irg);
        ir_type   *tp  = get_entity_type(ent);
@@ -1946,9 +1902,9 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
                        dbg = get_irn_dbg_info(proj);
                        env->entries[idx]->low_word  =
-                               new_rd_Proj(dbg, get_nodes_block(proj), args, low_mode, new_projs[proj_nr]);
+                               new_rd_Proj(dbg, args, low_mode, new_projs[proj_nr]);
                        env->entries[idx]->high_word =
-                               new_rd_Proj(dbg, get_nodes_block(proj), args, mode, new_projs[proj_nr] + 1);
+                               new_rd_Proj(dbg, args, mode, new_projs[proj_nr] + 1);
                }  /* if */
        }  /* for */
        set_optimize(rem);
@@ -1957,7 +1913,8 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate a Call.
  */
-static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        ir_type  *tp = get_Call_type(node);
        ir_type  *call_tp;
        ir_node  **in, *proj, *results;
@@ -2078,9 +2035,9 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
                                        dbg = get_irn_dbg_info(proj);
                                        env->entries[idx]->low_word  =
-                                               new_rd_Proj(dbg, get_nodes_block(proj), results, low_mode, res_numbers[proj_nr]);
+                                               new_rd_Proj(dbg, results, low_mode, res_numbers[proj_nr]);
                                        env->entries[idx]->high_word =
-                                               new_rd_Proj(dbg, get_nodes_block(proj), results, mode, res_numbers[proj_nr] + 1);
+                                               new_rd_Proj(dbg, results, mode, res_numbers[proj_nr] + 1);
                                }  /* if */
                                mark_irn_visited(proj);
                        }  /* if */
@@ -2092,7 +2049,8 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate an Unknown into two.
  */
-static void lower_Unknown(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Unknown(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        int      idx = get_irn_idx(node);
        ir_graph *irg = get_irn_irg(node);
        ir_mode  *low_mode = env->params->low_unsigned;
@@ -2106,7 +2064,8 @@ 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) {
+static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env)
+{
        ir_mode  *mode_l = env->params->low_unsigned;
        ir_graph *irg = get_irn_irg(phi);
        ir_node  *block, *unk_l, *unk_h, *phi_l, *phi_h;
@@ -2180,7 +2139,8 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate a Mux.
  */
-static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) {
+static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env)
+{
        ir_node  *block, *val;
        ir_node  *true_l, *true_h, *false_l, *false_h, *sel;
        dbg_info *dbg;
@@ -2225,7 +2185,8 @@ static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate an ASM node.
  */
-static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env) {
+static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env)
+{
        ir_mode *his = env->params->high_signed;
        ir_mode *hiu = env->params->high_unsigned;
        int      i;
@@ -2257,7 +2218,8 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate a Sel node.
  */
-static void lower_Sel(ir_node *sel, ir_mode *mode, lower_env_t *env) {
+static void lower_Sel(ir_node *sel, ir_mode *mode, lower_env_t *env)
+{
        (void) mode;
 
        /* we must only lower value parameter Sels if we change the
@@ -2276,7 +2238,8 @@ static void lower_Sel(ir_node *sel, ir_mode *mode, lower_env_t *env) {
 /**
  * check for opcodes that must always be lowered.
  */
-static int always_lower(ir_opcode code) {
+static int always_lower(ir_opcode code)
+{
        switch (code) {
        case iro_ASM:
        case iro_Proj:
@@ -2295,7 +2258,8 @@ static int always_lower(ir_opcode code) {
 /**
  * lower boolean Proj(Cmp)
  */
-static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t *env) {
+static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t *env)
+{
        int      lidx, ridx;
        ir_node  *l, *r, *low, *high, *t, *res;
        pn_Cmp   pnc;
@@ -2325,23 +2289,23 @@ static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t
        if (pnc == pn_Cmp_Eq) {
                /* simple case:a == b <==> a_h == b_h && a_l == b_l */
                res = new_rd_And(db, blk,
-                       new_r_Proj(blk, low, mode_b, pnc),
-                       new_r_Proj(blk, high, mode_b, pnc),
+                       new_r_Proj(low, mode_b, pnc),
+                       new_r_Proj(high, mode_b, pnc),
                        mode_b);
        } else if (pnc == pn_Cmp_Lg) {
                /* simple case:a != b <==> a_h != b_h || a_l != b_l */
                res = new_rd_Or(db, blk,
-                       new_r_Proj(blk, low, mode_b, pnc),
-                       new_r_Proj(blk, high, mode_b, pnc),
+                       new_r_Proj(low, mode_b, pnc),
+                       new_r_Proj(high, mode_b, pnc),
                        mode_b);
        } else {
                /* a rel b <==> a_h REL b_h || (a_h == b_h && a_l rel b_l) */
                t = new_rd_And(db, blk,
-                       new_r_Proj(blk, low, mode_b, pnc),
-                       new_r_Proj(blk, high, mode_b, pn_Cmp_Eq),
+                       new_r_Proj(low, mode_b, pnc),
+                       new_r_Proj(high, mode_b, pn_Cmp_Eq),
                        mode_b);
                res = new_rd_Or(db, blk,
-                       new_r_Proj(blk, high, mode_b, pnc & ~pn_Cmp_Eq),
+                       new_r_Proj(high, mode_b, pnc & ~pn_Cmp_Eq),
                        t,
                        mode_b);
        }  /* if */
@@ -2420,7 +2384,8 @@ static void lower_ops(ir_node *node, void *env)
 /**
  * Compare two op_mode_entry_t's.
  */
-static int cmp_op_mode(const void *elt, const void *key, size_t size) {
+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;
        (void) size;
@@ -2431,7 +2396,8 @@ static int cmp_op_mode(const void *elt, const void *key, size_t size) {
 /**
  * Compare two conv_tp_entry_t's.
  */
-static int cmp_conv_tp(const void *elt, const void *key, size_t size) {
+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;
        (void) size;
@@ -2442,7 +2408,8 @@ static int cmp_conv_tp(const void *elt, const void *key, size_t size) {
 /**
  * Enter a lowering function into an ir_op.
  */
-static void enter_lower_func(ir_op *op, lower_func func) {
+static void enter_lower_func(ir_op *op, lower_func func)
+{
        op->ops.generic = (op_func)func;
 }  /* enter_lower_func */
 
@@ -2451,7 +2418,8 @@ static void enter_lower_func(ir_op *op, lower_func func) {
  *
  * @param mtp  the method type
  */
-static int mtp_must_to_lowered(ir_type *mtp, lower_env_t *env) {
+static int mtp_must_to_lowered(ir_type *mtp, lower_env_t *env)
+{
        int i, n_params;
 
        n_params = get_method_n_params(mtp);
@@ -2512,7 +2480,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
 
        /* create method types for the created binop calls */
        if (! binop_tp_u) {
-               binop_tp_u = new_type_method(IDENT("binop_u_intrinsic"), 4, 2);
+               binop_tp_u = new_type_method(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);
@@ -2521,7 +2489,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
                set_method_res_type(binop_tp_u, 1, tp_u);
        }  /* if */
        if (! binop_tp_s) {
-               binop_tp_s = new_type_method(IDENT("binop_s_intrinsic"), 4, 2);
+               binop_tp_s = new_type_method(4, 2);
                set_method_param_type(binop_tp_s, 0, tp_u);
                set_method_param_type(binop_tp_s, 1, tp_s);
                set_method_param_type(binop_tp_s, 2, tp_u);
@@ -2530,7 +2498,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
                set_method_res_type(binop_tp_s, 1, tp_s);
        }  /* if */
        if (! shiftop_tp_u) {
-               shiftop_tp_u = new_type_method(IDENT("shiftop_u_intrinsic"), 3, 2);
+               shiftop_tp_u = new_type_method(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);
@@ -2538,7 +2506,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
                set_method_res_type(shiftop_tp_u, 1, tp_u);
        }  /* if */
        if (! shiftop_tp_s) {
-               shiftop_tp_s = new_type_method(IDENT("shiftop_s_intrinsic"), 3, 2);
+               shiftop_tp_s = new_type_method(3, 2);
                set_method_param_type(shiftop_tp_s, 0, tp_u);
                set_method_param_type(shiftop_tp_s, 1, tp_s);
                set_method_param_type(shiftop_tp_s, 2, tp_u);
@@ -2546,14 +2514,14 @@ void lower_dw_ops(const lwrdw_param_t *param)
                set_method_res_type(shiftop_tp_s, 1, tp_s);
        }  /* if */
        if (! unop_tp_u) {
-               unop_tp_u = new_type_method(IDENT("unop_u_intrinsic"), 2, 2);
+               unop_tp_u = new_type_method(2, 2);
                set_method_param_type(unop_tp_u, 0, tp_u);
                set_method_param_type(unop_tp_u, 1, tp_u);
                set_method_res_type(unop_tp_u, 0, tp_u);
                set_method_res_type(unop_tp_u, 1, tp_u);
        }  /* if */
        if (! unop_tp_s) {
-               unop_tp_s = new_type_method(IDENT("unop_s_intrinsic"), 2, 2);
+               unop_tp_s = new_type_method(2, 2);
                set_method_param_type(unop_tp_s, 0, tp_u);
                set_method_param_type(unop_tp_s, 1, tp_s);
                set_method_res_type(unop_tp_s, 0, tp_u);
@@ -2694,15 +2662,17 @@ struct pass_t {
 /**
  * Creates a wrapper around lower_dw_ops().
  */
-static int pass_wrapper(ir_prog *irp, void *context) {
+static int pass_wrapper(ir_prog *irp, void *context)
+{
        struct pass_t *pass = context;
 
        (void)irp;
        lower_dw_ops(pass->param);
        return 0;
-}  /* pass_wrapper */
+}
 
-ir_prog_pass_t *lower_dw_ops_pass(const char *name, const lwrdw_param_t *param) {
+ir_prog_pass_t *lower_dw_ops_pass(const char *name, const lwrdw_param_t *param)
+{
        struct pass_t *pass = XMALLOCZ(struct pass_t);
 
        pass->param = param;
@@ -2730,6 +2700,5 @@ ir_entity *def_create_intrinsic_fkt(ir_type *method, const ir_op *op,
 
        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 */