lower_dw: remove pointless comments at end of {}
[libfirm] / ir / lower / lower_dw.c
index 6db15f1..2264a33 100644 (file)
  * @author  Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef HAVE_STRING_H
-# include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
-# include <stdlib.h>
-#endif
+#include "config.h"
 
+#include <string.h>
+#include <stdlib.h>
 #include <assert.h>
 
+#include "error.h"
 #include "lowering.h"
 #include "irnode_t.h"
 #include "irgraph_t.h"
 #include "pdeq.h"
 #include "irdump.h"
 #include "array_t.h"
-#include "xmalloc.h"
-
-/** A map from mode to a primitive type. */
-static pmap *prim_types;
+#include "irpass_t.h"
 
 /** A map from (op, imode, omode) to Intrinsic functions entities. */
 static set *intrinsic_fkt;
@@ -81,7 +72,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 /**
  * An entry in the (op, imode, omode) -> entity map.
  */
-typedef struct _op_mode_entry {
+typedef struct op_mode_entry {
        const ir_op   *op;    /**< the op */
        const ir_mode *imode; /**< the input mode */
        const ir_mode *omode; /**< the output mode */
@@ -91,7 +82,7 @@ typedef struct _op_mode_entry {
 /**
  * An entry in the (imode, omode) -> tp map.
  */
-typedef struct _conv_tp_entry {
+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 */
@@ -101,7 +92,7 @@ typedef struct _conv_tp_entry {
  * Every double word node will be replaced,
  * we need some store to hold the replacement:
  */
-typedef struct _node_entry_t {
+typedef struct node_entry_t {
        ir_node *low_word;    /**< the low word */
        ir_node *high_word;   /**< the high word */
 } node_entry_t;
@@ -114,40 +105,32 @@ enum lower_flags {
 /**
  * The lower environment.
  */
-typedef struct _lower_env_t {
+typedef struct lower_env_t {
        node_entry_t **entries;       /**< entries per node */
+       ir_graph      *irg;
        struct obstack obst;          /**< an obstack holding the temporary data */
+       ir_type  *l_mtp;              /**< lowered method type of the current method */
        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 */
+       ir_mode  *high_signed;        /**< doubleword signed type */
+       ir_mode  *high_unsigned;      /**< doubleword unsigned type */
+       ir_mode  *low_signed;         /**< word signed type */
+       ir_mode  *low_unsigned;       /**< word unsigned type */
+       ident    *first_id;           /**< .l for little and .h for big endian */
+       ident    *next_id;            /**< .h for little and .l for big endian */
        const lwrdw_param_t *params;  /**< transformation parameter */
        unsigned flags;               /**< some flags */
-       int      n_entries;           /**< number of entries */
+       unsigned n_entries;           /**< number of entries */
+       ir_type  *value_param_tp;     /**< the old value param type */
 } 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) {
+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;
 
@@ -158,47 +141,45 @@ 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)
+               if (imode == env->high_signed || imode == env->high_unsigned)
                        n_param = 2;
-               if (omode == env->params->high_signed || omode == env->params->high_unsigned)
+               if (omode == env->high_signed || omode == env->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);
+               mtd = new_type_method(n_param, n_res);
 
                /* set param types and result types */
                n_param = 0;
-               if (imode == env->params->high_signed) {
+               if (imode == env->high_signed) {
                        set_method_param_type(mtd, n_param++, tp_u);
                        set_method_param_type(mtd, n_param++, tp_s);
-               } else if (imode == env->params->high_unsigned) {
+               } else if (imode == env->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);
+                       ir_type *tp = get_type_for_mode(imode);
                        set_method_param_type(mtd, n_param++, tp);
-               }  /* if */
+               }
 
                n_res = 0;
-               if (omode == env->params->high_signed) {
+               if (omode == env->high_signed) {
                        set_method_res_type(mtd, n_res++, tp_u);
                        set_method_res_type(mtd, n_res++, tp_s);
-               } else if (omode == env->params->high_unsigned) {
+               } else if (omode == env->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);
+                       ir_type *tp = get_type_for_mode(omode);
                        set_method_res_type(mtd, n_res++, tp);
-               }  /* if */
+               }
                entry->mtd = mtd;
        } else {
                mtd = entry->mtd;
-       }  /* if */
+       }
        return mtd;
-}  /* get_conv_type */
+}
 
 /**
  * Add an additional control flow input to a block.
@@ -219,13 +200,13 @@ static void add_block_cf_input_nr(ir_node *block, int nr, ir_node *cf)
 
        set_irn_in(block, i + 1, in);
 
-       for (phi = get_irn_link(block); phi; phi = get_irn_link(phi)) {
+       for (phi = get_Block_phis(block); phi != NULL; phi = get_Phi_next(phi)) {
                for (i = 0; i < arity; ++i)
                        in[i] = get_irn_n(phi, i);
                in[i] = in[nr];
                set_irn_in(phi, i + 1, in);
-       }  /* for */
-}  /* add_block_cf_input_nr */
+       }
+}
 
 /**
  * Add an additional control flow input to a block.
@@ -241,11 +222,11 @@ static void add_block_cf_input(ir_node *block, ir_node *tmpl, ir_node *cf)
                if (get_irn_n(block, i) == tmpl) {
                        nr = i;
                        break;
-               }  /* if */
-       }  /* for */
+               }
+       }
        assert(i < arity);
        add_block_cf_input_nr(block, nr, cf);
-}  /* add_block_cf_input */
+}
 
 /**
  * Return the "operational" mode of a Firm node.
@@ -267,8 +248,8 @@ static ir_mode *get_irn_op_mode(ir_node *node)
                return get_irn_mode(get_Cmp_left(node));
        default:
                return get_irn_mode(node);
-       }  /* switch */
-}  /* get_irn_op_mode */
+       }
+}
 
 /**
  * Walker, prepare the node links.
@@ -278,20 +259,18 @@ static void prepare_links(ir_node *node, void *env)
        lower_env_t  *lenv = env;
        ir_mode      *mode = get_irn_op_mode(node);
        node_entry_t *link;
-       int          i, idx;
+       int           i;
 
-       if (mode == lenv->params->high_signed ||
-               mode == lenv->params->high_unsigned) {
+       if (mode == lenv->high_signed || mode == lenv->high_unsigned) {
+               unsigned idx = get_irn_idx(node);
                /* 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) {
                        /* enlarge: this happens only for Rotl nodes which is RARELY */
-                       int old = lenv->n_entries;
-                       int n_idx = idx + (idx >> 3);
+                       unsigned old   = lenv->n_entries;
+                       unsigned n_idx = idx + (idx >> 3);
 
                        ARR_RESIZE(node_entry_t *, lenv->entries, n_idx);
                        memset(&lenv->entries[old], 0, (n_idx - old) * sizeof(lenv->entries[0]));
@@ -304,13 +283,13 @@ static void prepare_links(ir_node *node, void *env)
                ir_node *pred = get_Conv_op(node);
                mode = get_irn_mode(pred);
 
-               if (mode == lenv->params->high_signed ||
-                       mode == lenv->params->high_unsigned) {
+               if (mode == lenv->high_signed ||
+                       mode == lenv->high_unsigned) {
                        /* must lower this node either but don't need a link */
                        lenv->flags |= MUST_BE_LOWERED;
-               }  /* if */
+               }
                return;
-       }  /* if */
+       }
 
        if (is_Proj(node)) {
                /* link all Proj nodes to its predecessor:
@@ -322,9 +301,7 @@ static void prepare_links(ir_node *node, void *env)
        } else if (is_Phi(node)) {
                /* link all Phi nodes to its block */
                ir_node *block = get_nodes_block(node);
-
-               set_irn_link(node, get_irn_link(block));
-               set_irn_link(block, node);
+               add_Block_phi(block, node);
        } else if (is_Block(node)) {
                /* fill the Proj -> Block map */
                for (i = get_Block_n_cfgpreds(node) - 1; i >= 0; --i) {
@@ -332,69 +309,65 @@ static void prepare_links(ir_node *node, void *env)
 
                        if (is_Proj(pred))
                                pmap_insert(lenv->proj_2_block, pred, node);
-               }  /* for */
-       }  /* if */
-}  /* prepare_links */
+               }
+       }
+}
 
 /**
  * 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)
+{
+       ir_graph *irg      = get_irn_irg(node);
+       dbg_info *dbg      = get_irn_dbg_info(node);
+       ir_mode  *low_mode = env->low_unsigned;
+       unsigned  idx;
        tarval   *tv, *tv_l, *tv_h;
        ir_node  *low, *high;
-       dbg_info *dbg = get_irn_dbg_info(node);
-       ir_node  *block = get_nodes_block(node);
-       int      idx;
-       ir_graph *irg = current_ir_graph;
-       ir_mode  *low_mode = env->params->low_unsigned;
 
        tv   = get_Const_tarval(node);
 
        tv_l = tarval_convert_to(tv, low_mode);
-       low  = new_rd_Const(dbg, irg, block, low_mode, tv_l);
+       low  = new_rd_Const(dbg, irg, tv_l);
 
        tv_h = tarval_convert_to(tarval_shrs(tv, env->tv_mode_bits), mode);
-       high = new_rd_Const(dbg, irg, block, mode, tv_h);
+       high = new_rd_Const(dbg, irg, 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.
  */
-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);
-       ir_node  *mem = get_Load_mem(node);
-       ir_node  *low, *high, *proj;
-       dbg_info *dbg;
-       ir_node  *block = get_nodes_block(node);
-       int      idx;
+static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_mode    *low_mode = env->low_unsigned;
+       ir_graph   *irg = get_irn_irg(node);
+       ir_node    *adr = get_Load_ptr(node);
+       ir_node    *mem = get_Load_mem(node);
+       ir_node    *low, *high, *proj;
+       dbg_info   *dbg;
+       ir_node    *block = get_nodes_block(node);
+       unsigned    idx;
+       ir_cons_flags volatility = get_Load_volatility(node) == volatility_is_volatile
+                                ? cons_volatile : 0;
 
        if (env->params->little_endian) {
                low  = adr;
-               high = new_r_Add(irg, block, adr,
-                       new_r_Const(irg, block, get_tarval_mode(env->tv_mode_bytes), env->tv_mode_bytes),
-                       get_irn_mode(adr));
+               high = new_r_Add(block, adr, new_r_Const(irg, env->tv_mode_bytes), get_irn_mode(adr));
        } else {
-               low  = new_r_Add(irg, block, adr,
-                       new_r_Const(irg, block, get_tarval_mode(env->tv_mode_bytes), env->tv_mode_bytes),
-                       get_irn_mode(adr));
+               low  = new_r_Add(block, adr, new_r_Const(irg, env->tv_mode_bytes), get_irn_mode(adr));
                high = adr;
-       }  /* if */
+       }
 
        /* create two loads */
        dbg  = get_irn_dbg_info(node);
-       low  = new_rd_Load(dbg, irg, block, mem,  low,  low_mode);
-       proj = new_r_Proj(irg, block, low, mode_M, pn_Load_M);
-       high = new_rd_Load(dbg, irg, block, proj, high, mode);
-
-       set_Load_volatility(low,  get_Load_volatility(node));
-       set_Load_volatility(high, get_Load_volatility(node));
+       low  = new_rd_Load(dbg, block, mem,  low,  low_mode, volatility);
+       proj = new_r_Proj(low, mode_M, pn_Load_M);
+       high = new_rd_Load(dbg, block, proj, high, mode, volatility);
 
        idx = get_irn_idx(node);
        assert(idx < env->n_entries);
@@ -415,29 +388,31 @@ 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(irg, block, low,  low_mode, pn_Load_res);
-                       env->entries[idx]->high_word = new_r_Proj(irg, 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");
-               }  /* switch */
+               }
                /* mark this proj: we have handled it already, otherwise we might fall into
                 * out new nodes. */
                mark_irn_visited(proj);
-       }  /* for */
-}  /* lower_Load */
+       }
+}
 
 /**
  * Translate a Store: create two.
  */
-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;
-       dbg_info *dbg;
-       int      idx;
+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;
+       dbg_info     *dbg;
+       unsigned      idx;
        node_entry_t *entry;
-       (void) node;
+       ir_cons_flags    volatility = get_Store_volatility(node) == volatility_is_volatile
+                                  ? cons_volatile : 0;
        (void) mode;
 
        irn = get_Store_value(node);
@@ -448,33 +423,26 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
-       irg = current_ir_graph;
+       irg = get_irn_irg(node);
        adr = get_Store_ptr(node);
        mem = get_Store_mem(node);
        block = get_nodes_block(node);
 
        if (env->params->little_endian) {
                low  = adr;
-               high = new_r_Add(irg, block, adr,
-                       new_r_Const(irg, block, get_tarval_mode(env->tv_mode_bytes), env->tv_mode_bytes),
-                       get_irn_mode(adr));
+               high = new_r_Add(block, adr, new_r_Const(irg, env->tv_mode_bytes), get_irn_mode(adr));
        } else {
-               low  = new_r_Add(irg, block, adr,
-                       new_r_Const(irg, block, get_tarval_mode(env->tv_mode_bytes), env->tv_mode_bytes),
-                       get_irn_mode(adr));
+               low  = new_r_Add(block, adr, new_r_Const(irg, env->tv_mode_bytes), get_irn_mode(adr));
                high = adr;
-       }  /* if */
+       }
 
        /* create two Stores */
        dbg = get_irn_dbg_info(node);
-       low  = new_rd_Store(dbg, irg, block, mem, low,  entry->low_word);
-       proj = new_r_Proj(irg, block, low, mode_M, pn_Store_M);
-       high = new_rd_Store(dbg, irg, block, proj, high, entry->high_word);
-
-       set_Store_volatility(low,  get_Store_volatility(node));
-       set_Store_volatility(high, get_Store_volatility(node));
+       low  = new_rd_Store(dbg, block, mem, low,  entry->low_word, volatility);
+       proj = new_r_Proj(low, mode_M, pn_Store_M);
+       high = new_rd_Store(dbg, block, proj, high, entry->high_word, volatility);
 
        idx = get_irn_idx(node);
        assert(idx < env->n_entries);
@@ -495,12 +463,12 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        break;
                default:
                        assert(0 && "unexpected Proj number");
-               }  /* switch */
+               }
                /* mark this proj: we have handled it already, otherwise we might fall into
                 * out new nodes. */
                mark_irn_visited(proj);
-       }  /* for */
-}  /* lower_Store */
+       }
+}
 
 /**
  * Return a node containing the address of the intrinsic emulation function.
@@ -509,12 +477,12 @@ static void lower_Store(ir_node *node, ir_mode *mode, lower_env_t *env) {
  * @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 *imode, ir_mode *omode,
-                                      ir_node *block, lower_env_t *env) {
+                                      lower_env_t *env)
+{
        symconst_symbol sym;
        ir_entity *ent;
        op_mode_entry_t key, *entry;
@@ -534,24 +502,24 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op,
                entry->ent = ent;
        } else {
                ent = entry->ent;
-       }  /* if */
+       }
        sym.entity_p = ent;
-       return new_r_SymConst(current_ir_graph, block, mode_P_code, sym, symconst_addr_ent);
-}  /* get_intrinsic_address */
+       return new_r_SymConst(env->irg, mode_P_code, sym, symconst_addr_ent);
+}
 
 /**
  * Translate a Div.
  *
  * 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;
        dbg_info *dbg;
        ir_type  *mtp;
-       int      idx;
-       ir_graph *irg;
+       unsigned  idx;
        node_entry_t *entry;
 
        irn   = get_Div_left(node);
@@ -562,7 +530,7 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        in[0] = entry->low_word;
        in[1] = entry->high_word;
@@ -575,29 +543,27 @@ static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        in[2] = entry->low_word;
        in[3] = entry->high_word;
 
        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;
        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);
+       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(irg, 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 */
@@ -607,31 +573,31 @@ 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(current_ir_graph, block, irn, env->params->low_unsigned, 0);
-                       env->entries[idx]->high_word = new_r_Proj(current_ir_graph, block, irn, mode,                      1);
+                       env->entries[idx]->low_word  = new_r_Proj(irn, env->low_unsigned, 0);
+                       env->entries[idx]->high_word = new_r_Proj(irn, mode,                      1);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
-               }  /* switch */
+               }
                /* mark this proj: we have handled it already, otherwise we might fall into
                 * out new nodes. */
                mark_irn_visited(proj);
-       }  /* for */
-}  /* lower_Div */
+       }
+}
 
 /**
  * Translate a Mod.
  *
  * 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;
        dbg_info *dbg;
        ir_type  *mtp;
-       int      idx;
-       ir_graph *irg;
+       unsigned  idx;
        node_entry_t *entry;
 
        irn   = get_Mod_left(node);
@@ -642,7 +608,7 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        in[0] = entry->low_word;
        in[1] = entry->high_word;
@@ -655,29 +621,27 @@ static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        in[2] = entry->low_word;
        in[3] = entry->high_word;
 
        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;
        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);
+       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(irg, 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 */
@@ -687,24 +651,25 @@ 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(irg, block, irn, env->params->low_unsigned, 0);
-                       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode,                      1);
+                       env->entries[idx]->low_word  = new_r_Proj(irn, env->low_unsigned, 0);
+                       env->entries[idx]->high_word = new_r_Proj(irn, mode,                      1);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
-               }  /* switch */
+               }
                /* mark this proj: we have handled it already, otherwise we might fall into
                 * out new nodes. */
                mark_irn_visited(proj);
-       }  /* for */
-}  /* lower_Mod */
+       }
+}
 
 /**
  * Translate a DivMod.
  *
  * 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;
@@ -712,10 +677,9 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
        ir_mode  *opmode;
        dbg_info *dbg;
        ir_type  *mtp;
-       int      idx;
+       unsigned  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)) {
@@ -723,8 +687,8 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                case pn_DivMod_res_div: flags |= 1; break;
                case pn_DivMod_res_mod: flags |= 2; break;
                default: break;
-               }  /* switch */
-       }  /* for */
+               }
+       }
 
        irn   = get_DivMod_left(node);
        entry = env->entries[get_irn_idx(irn)];
@@ -734,7 +698,7 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        in[0] = entry->low_word;
        in[1] = entry->high_word;
@@ -747,14 +711,13 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        in[2] = entry->low_word;
        in[3] = entry->high_word;
 
        dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
-       irg   = current_ir_graph;
 
        mem = get_DivMod_mem(node);
 
@@ -762,29 +725,27 @@ static void lower_DivMod(ir_node *node, ir_mode *mode, lower_env_t *env) {
        mtp = mode_is_signed(mode) ? binop_tp_s : binop_tp_u;
        if (flags & 1) {
                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);
+               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(irg, block, callDiv, mode_T, pn_Call_T_result);
-       }  /* if */
+               resDiv = new_r_Proj(callDiv, mode_T, pn_Call_T_result);
+       }
        if (flags & 2) {
                if (flags & 1)
-                       mem = new_r_Proj(irg, 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, block, env);
-               callMod = new_rd_Call(dbg, irg, block, mem,
-                       irn, 4, in, mtp);
+               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(irg, block, callMod, mode_T, pn_Call_T_result);
-       }  /* if */
+               resMod = new_r_Proj(callMod, 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_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 */
@@ -794,34 +755,35 @@ 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(irg, block, resDiv, env->params->low_unsigned, 0);
-                       env->entries[idx]->high_word = new_r_Proj(irg, block, resDiv, mode,                      1);
+                       env->entries[idx]->low_word  = new_r_Proj(resDiv, env->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(irg, block, resMod, env->params->low_unsigned, 0);
-                       env->entries[idx]->high_word = new_r_Proj(irg, block, resMod, mode,                      1);
+                       env->entries[idx]->low_word  = new_r_Proj(resMod, env->low_unsigned, 0);
+                       env->entries[idx]->high_word = new_r_Proj(resMod, mode,                      1);
                        break;
                default:
                        assert(0 && "unexpected Proj number");
-               }  /* switch */
+               }
                /* mark this proj: we have handled it already, otherwise we might fall into
                 * out new nodes. */
                mark_irn_visited(proj);
-       }  /* for */
-}  /* lower_DivMod */
+       }
+}
 
 /**
  * Translate a Binop.
  *
  * 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;
        ir_type  *mtp;
-       int      idx;
+       unsigned  idx;
        ir_graph *irg;
        node_entry_t *entry;
 
@@ -833,7 +795,7 @@ static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        in[0] = entry->low_word;
        in[1] = entry->high_word;
@@ -846,39 +808,39 @@ static void lower_Binop(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        in[2] = entry->low_word;
        in[3] = entry->high_word;
 
        dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
-       irg   = current_ir_graph;
+       irg   = get_irn_irg(block);
 
        mtp = mode_is_signed(mode) ? binop_tp_s : binop_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, 4, in, mtp);
+       irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, env);
+       irn = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 4, in, mtp);
        set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(irg, 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(irg, block, irn, env->params->low_unsigned, 0);
-       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode,                      1);
-}  /* lower_Binop */
+       env->entries[idx]->low_word  = new_r_Proj(irn, env->low_unsigned, 0);
+       env->entries[idx]->high_word = new_r_Proj(irn, mode,              1);
+}
 
 /**
  * Translate a Shiftop.
  *
  * 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;
        ir_type  *mtp;
-       int      idx;
+       unsigned  idx;
        ir_graph *irg;
        node_entry_t *entry;
 
@@ -890,72 +852,86 @@ static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        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);
+       assert(get_irn_mode(in[2]) != env->high_signed
+                       && get_irn_mode(in[2]) != env->high_unsigned);
 
        dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
-       irg  = current_ir_graph;
+       irg   = get_irn_irg(block);
 
        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);
+       irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, env);
+       irn = new_rd_Call(dbg, block, get_irg_no_mem(irg), 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);
+       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(irg, block, irn, env->params->low_unsigned, 0);
-       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode,                      1);
-}  /* lower_Shiftop */
+       env->entries[idx]->low_word  = new_r_Proj(irn, env->low_unsigned, 0);
+       env->entries[idx]->high_word = new_r_Proj(irn, mode,              1);
+}
 
 /**
  * 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_graph *irg   = get_irn_irg(node);
        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) >= (long)get_mode_size_bits(mode)) {
-                       ir_node *block = get_nodes_block(node);
-                       ir_node *left = get_Shr_left(node);
+                       ir_node *block        = get_nodes_block(node);
+                       ir_node *left         = get_Shr_left(node);
+                       ir_mode *low_unsigned = env->low_unsigned;
                        ir_node *c;
                        long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
-                       int idx = get_irn_idx(left);
+                       unsigned 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);
+                       /* convert high word into low_unsigned mode if necessary */
+                       if (get_irn_mode(left) != low_unsigned)
+                               left = new_r_Conv(block, left, low_unsigned);
 
                        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);
+                               c = new_r_Const_long(irg, low_unsigned, shf_cnt);
+                               env->entries[idx]->low_word = new_r_Shr(block, left, c,
+                                                                       low_unsigned);
                        } else {
                                env->entries[idx]->low_word = left;
-                       }  /* if */
-                       env->entries[idx]->high_word = new_r_Const(irg, block, mode, get_mode_null(mode));
+                       }
+                       env->entries[idx]->high_word = new_r_Const(irg, get_mode_null(mode));
 
                        return;
-               }  /* if */
-       }  /* if */
+               }
+       }
        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) {
+static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_graph *irg   = get_irn_irg(node);
        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);
@@ -967,75 +943,97 @@ static void lower_Shl(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        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);
+                       unsigned idx = get_irn_idx(left);
 
-                       left = new_r_Conv(irg, 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->low_unsigned;
                        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);
+                               c = new_r_Const_long(irg, mode_l, shf_cnt);
+                               env->entries[idx]->high_word = new_r_Shl(block, left, c, mode);
                        } else {
                                env->entries[idx]->high_word = left;
-                       }  /* if */
-                       mode_l = env->params->low_unsigned;
-                       env->entries[idx]->low_word  = new_r_Const(irg, block, mode_l, get_mode_null(mode_l));
+                       }
+                       env->entries[idx]->low_word  = new_r_Const(irg, get_mode_null(mode_l));
 
                        return;
-               }  /* if */
-       }  /* if */
+               }
+       }
        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) {
+static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_graph *irg   = get_irn_irg(node);
        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) >= (long)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 *block         = get_nodes_block(node);
+                       ir_node *left          = get_Shrs_left(node);
+                       ir_mode *low_unsigned  = env->low_unsigned;
+                       long     shf_cnt       = get_tarval_long(tv) - get_mode_size_bits(mode);
+                       unsigned idx           = get_irn_idx(left);
+                       ir_node *left_unsigned = left;
+                       ir_node *low;
                        ir_node *c;
-                       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);
+                       /* convert high word into low_unsigned mode if necessary */
+                       if (get_irn_mode(left_unsigned) != low_unsigned)
+                               left_unsigned = new_r_Conv(block, left, low_unsigned);
 
                        if (shf_cnt > 0) {
-                               ir_node *tmp;
-                               c = new_r_Const_long(irg, block, mode_Iu, shf_cnt);
-                               tmp = new_r_Shrs(irg, block, left, c, mode);
-                               /* low word is expected to have mode_Iu */
-                               env->entries[idx]->low_word = new_r_Conv(irg, block, tmp, mode_Iu);
+                               c   = new_r_Const_long(irg, low_unsigned, shf_cnt);
+                               low = new_r_Shrs(block, left_unsigned, c, low_unsigned);
                        } else {
-                               env->entries[idx]->low_word = left;
-                       }  /* if */
-                       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);
+                               low = left_unsigned;
+                       }
+                       /* low word is expected to have low_unsigned */
+                       env->entries[idx]->low_word = new_r_Conv(block, low, low_unsigned);
+
+                       c = new_r_Const_long(irg, low_unsigned,
+                                            get_mode_size_bits(mode) - 1);
+                       env->entries[idx]->high_word = new_r_Shrs(block, left, c, mode);
 
                        return;
-               }  /* if */
-       }  /* if */
+               }
+       }
        lower_Shiftop(node, mode, env);
-}  /* lower_Shrs */
+}
 
 /**
  * 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)) {
                ir_mode *mode = get_irn_op_mode(node);
-                       if (mode == lenv->params->high_signed ||
-                           mode == lenv->params->high_unsigned) {
+                       if (mode == lenv->high_signed ||
+                           mode == lenv->high_unsigned) {
                                ir_node  *right = get_Rotl_right(node);
                                ir_node  *left, *shl, *shr, *or, *block, *sub, *c;
                                ir_mode  *omode, *rmode;
@@ -1054,21 +1052,21 @@ static void prepare_links_and_handle_rotl(ir_node *node, void *env) {
                                }
 
                                /* replace the Rotl(x,y) by an Or(Shl(x,y), Shr(x,64-y)) and lower those */
+                               irg   = get_irn_irg(node);
                                dbg   = get_irn_dbg_info(node);
                                omode = get_irn_mode(node);
                                left  = get_Rotl_left(node);
-                               irg   = current_ir_graph;
                                block = get_nodes_block(node);
-                               shl   = new_rd_Shl(dbg, irg, block, left, right, omode);
+                               shl   = new_rd_Shl(dbg, block, left, right, omode);
                                rmode = get_irn_mode(right);
-                               c     = new_Const_long(rmode, get_mode_size_bits(omode));
-                               sub   = new_rd_Sub(dbg, irg, block, c, right, rmode);
-                               shr   = new_rd_Shr(dbg, irg, block, left, sub, omode);
+                               c     = new_r_Const_long(irg, rmode, get_mode_size_bits(omode));
+                               sub   = new_rd_Sub(dbg, block, c, right, rmode);
+                               shr   = new_rd_Shr(dbg, block, left, sub, omode);
 
                                /* optimization must be switched off here, or we will get the Rotl back */
                                save_optimization_state(&state);
                                set_opt_algebraic_simplification(0);
-                               or = new_rd_Or(dbg, irg, block, shl, shr, omode);
+                               or = new_rd_Or(dbg, block, shl, shr, omode);
                                restore_optimization_state(&state);
 
                                exchange(node, or);
@@ -1088,11 +1086,12 @@ 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;
-       int idx = get_irn_idx(left);
+       unsigned idx = get_irn_idx(left);
        (void) right;
        (void) mode;
 
@@ -1106,20 +1105,21 @@ static void lower_Rotl(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
        env->entries[idx]->low_word  = h;
        env->entries[idx]->high_word = l;
-}  /* lower_Rotl */
+}
 
 /**
  * Translate an Unop.
  *
  * 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;
        ir_type  *mtp;
-       int      idx;
        ir_graph *irg;
+       unsigned  idx;
        node_entry_t *entry;
 
        irn   = get_unop_op(node);
@@ -1130,27 +1130,26 @@ static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        in[0] = entry->low_word;
        in[1] = entry->high_word;
 
        dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
-       irg   = current_ir_graph;
+       irg   = get_irn_irg(block);
 
        mtp = mode_is_signed(mode) ? unop_tp_s : unop_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, 2, in, mtp);
+       irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, env);
+       irn = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 2, in, mtp);
        set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(irg, 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(irg, block, irn, env->params->low_unsigned, 0);
-       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode,                      1);
-}  /* lower_Unop */
+       env->entries[idx]->low_word  = new_r_Proj(irn, env->low_unsigned, 0);
+       env->entries[idx]->high_word = new_r_Proj(irn, mode,              1);
+}
 
 /**
  * Translate a logical Binop.
@@ -1158,11 +1157,11 @@ static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env) {
  * Create two logical Binops.
  */
 static void lower_Binop_logical(ir_node *node, ir_mode *mode, lower_env_t *env,
-                                                               ir_node *(*constr_rd)(dbg_info *db, ir_graph *irg, ir_node *block, ir_node *op1, ir_node *op2, ir_mode *mode) ) {
+                                                               ir_node *(*constr_rd)(dbg_info *db, ir_node *block, ir_node *op1, ir_node *op2, ir_mode *mode) ) {
        ir_node  *block, *irn;
        ir_node  *lop_l, *lop_h, *rop_l, *rop_h;
        dbg_info *dbg;
-       int      idx;
+       unsigned  idx;
        ir_graph *irg;
        node_entry_t *entry;
 
@@ -1174,7 +1173,7 @@ static void lower_Binop_logical(ir_node *node, ir_mode *mode, lower_env_t *env,
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        lop_l = entry->low_word;
        lop_h = entry->high_word;
@@ -1187,7 +1186,7 @@ static void lower_Binop_logical(ir_node *node, ir_mode *mode, lower_env_t *env,
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        rop_l = entry->low_word;
        rop_h = entry->high_word;
@@ -1197,10 +1196,10 @@ 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);
-       irg = current_ir_graph;
-       env->entries[idx]->low_word  = constr_rd(dbg, irg, block, lop_l, rop_l, env->params->low_unsigned);
-       env->entries[idx]->high_word = constr_rd(dbg, irg, block, lop_h, rop_h, mode);
-}  /* lower_Binop_logical */
+       irg = get_irn_irg(node);
+       env->entries[idx]->low_word  = constr_rd(dbg, block, lop_l, rop_l, env->low_unsigned);
+       env->entries[idx]->high_word = constr_rd(dbg, block, lop_h, rop_h, mode);
+}
 
 /** create a logical operation transformation */
 #define lower_logical(op)                                                \
@@ -1217,12 +1216,12 @@ 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;
-       int      idx;
-       ir_graph *irg;
+       unsigned  idx;
        node_entry_t *entry;
 
        irn   = get_Not_op(node);
@@ -1233,29 +1232,29 @@ static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        op_l = entry->low_word;
        op_h = entry->high_word;
 
        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, env->params->low_unsigned);
-       env->entries[idx]->high_word = new_rd_Not(dbg, current_ir_graph, block, op_h, mode);
-}  /* lower_Not */
+       env->entries[idx]->low_word  = new_rd_Not(dbg, block, op_l, env->low_unsigned);
+       env->entries[idx]->high_word = new_rd_Not(dbg, block, op_h, mode);
+}
 
 /**
  * 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);
-       int     idx;
+       unsigned idx;
        (void) mode;
 
        if (m == mode_b) {
@@ -1264,15 +1263,15 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                ir_node  *new_bl, *cmpH, *cmpL, *irn;
                ir_node  *projHF, *projHT;
                ir_node  *dst_blk;
-               ir_graph *irg;
                pn_Cmp   pnc;
+               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);
@@ -1282,7 +1281,7 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                if (! lentry) {
                        /* a normal Cmp */
                        return;
-               }  /* if */
+               }
 
                right = get_Cmp_right(cmp);
                idx   = get_irn_idx(right);
@@ -1293,7 +1292,7 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        /* not yet ready */
                        pdeq_putr(env->waitq, node);
                        return;
-               }  /* if */
+               }
 
                /* all right, build the code */
                for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
@@ -1306,33 +1305,33 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                                assert(proj_nr == pn_Cond_false);
                                assert(projF == NULL && "more than one Proj(false)");
                                projF = proj;
-                       }  /* if */
+                       }
                        mark_irn_visited(proj);
-               }  /* for */
+               }
                assert(projT && projF);
 
                /* create a new high compare */
                block = get_nodes_block(node);
+               irg   = get_Block_irg(block);
                dbg   = get_irn_dbg_info(cmp);
-               irg   = current_ir_graph;
                pnc   = get_Proj_proj(sel);
 
                if (is_Const(right) && is_Const_null(right)) {
                        if (pnc == pn_Cmp_Eq || pnc == pn_Cmp_Lg) {
                                /* x ==/!= 0 ==> or(low,high) ==/!= 0 */
-                               ir_mode *mode = env->params->low_unsigned;
-                               ir_node *low  = new_r_Conv(irg, block, lentry->low_word, mode);
-                               ir_node *high = new_r_Conv(irg, block, lentry->high_word, mode);
-                               ir_node *or   = new_rd_Or(dbg, irg, block, low, high, mode);
-                               ir_node *cmp  = new_rd_Cmp(dbg, irg, block, or, new_Const_long(mode, 0));
+                               ir_mode *mode = env->low_unsigned;
+                               ir_node *low  = new_r_Conv(block, lentry->low_word, mode);
+                               ir_node *high = new_r_Conv(block, lentry->high_word, mode);
+                               ir_node *or   = new_rd_Or(dbg, block, low, high, mode);
+                               ir_node *cmp  = new_rd_Cmp(dbg, block, or, new_r_Const_long(irg, mode, 0));
 
-                               ir_node *proj = new_r_Proj(irg, block, cmp, mode_b, pnc);
+                               ir_node *proj = new_r_Proj(cmp, mode_b, pnc);
                                set_Cond_selector(node, proj);
                                return;
                        }
                }
 
-               cmpH = new_rd_Cmp(dbg, irg, block, lentry->high_word, rentry->high_word);
+               cmpH = new_rd_Cmp(dbg, block, lentry->high_word, rentry->high_word);
 
                if (pnc == pn_Cmp_Eq) {
                        /* simple case:a == b <==> a_h == b_h && a_l == b_l */
@@ -1341,30 +1340,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(irg, 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, irg, block, irn);
+                       irn = new_rd_Cond(dbg, block, irn);
 
-                       projHF = new_r_Proj(irg, 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(irg, 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, irg, new_bl, lentry->low_word, rentry->low_word);
-                       irn = new_r_Proj(irg, new_bl, cmpL, mode_b, pn_Cmp_Eq);
+                       cmpL = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word);
+                       irn = new_r_Proj(cmpL, mode_b, pn_Cmp_Eq);
                        dbg = get_irn_dbg_info(node);
-                       irn = new_rd_Cond(dbg, irg, new_bl, irn);
+                       irn = new_rd_Cond(dbg, new_bl, irn);
 
-                       proj = new_r_Proj(irg, 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(irg, 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) {
@@ -1374,30 +1373,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(irg, 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, irg, block, irn);
+                       irn = new_rd_Cond(dbg, block, irn);
 
-                       projHT = new_r_Proj(irg, 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(irg, 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, irg, new_bl, lentry->low_word, rentry->low_word);
-                       irn = new_r_Proj(irg, new_bl, cmpL, mode_b, pn_Cmp_Lg);
+                       cmpL = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word);
+                       irn = new_r_Proj(cmpL, mode_b, pn_Cmp_Lg);
                        dbg = get_irn_dbg_info(node);
-                       irn = new_rd_Cond(dbg, irg, new_bl, irn);
+                       irn = new_rd_Cond(dbg, new_bl, irn);
 
-                       proj = new_r_Proj(irg, 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(irg, 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 {
@@ -1413,47 +1412,47 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        assert(entry);
                        dstF = entry->value;
 
-                       irn = new_r_Proj(irg, 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, irg, block, irn);
+                       irn = new_rd_Cond(dbg, block, irn);
 
-                       projHT = new_r_Proj(irg, 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(irg, 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(irg, newbl_eq, cmpH, mode_b, pn_Cmp_Eq);
-                       irn = new_rd_Cond(dbg, irg, newbl_eq, irn);
+                       irn = new_r_Proj(cmpH, mode_b, pn_Cmp_Eq);
+                       irn = new_rd_Cond(dbg, newbl_eq, irn);
 
-                       proj = new_r_Proj(irg, 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(irg, 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, irg, newbl_l, lentry->low_word, rentry->low_word);
-                       irn = new_r_Proj(irg, newbl_l, cmpL, mode_b, pnc);
+                       cmpL = new_rd_Cmp(dbg, newbl_l, lentry->low_word, rentry->low_word);
+                       irn = new_r_Proj(cmpL, mode_b, pnc);
                        dbg = get_irn_dbg_info(node);
-                       irn = new_rd_Cond(dbg, irg, newbl_l, irn);
+                       irn = new_rd_Cond(dbg, newbl_l, irn);
 
-                       proj = new_r_Proj(irg, 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(irg, 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 */
+               }
 
                /* we have changed the control flow */
                env->flags |= CF_CHANGED;
@@ -1472,241 +1471,166 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
                                /* not ready yet, wait */
                                pdeq_putr(env->waitq, node);
                                return;
-                       }  /* if */
+                       }
                        set_Cond_selector(node, env->entries[idx]->low_word);
-               }  /* if */
-       }  /* if */
-}  /* 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  *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, irg, block, env->entries[op_idx]->low_word,  dst_mode_l);
-                       env->entries[idx]->high_word = new_rd_Conv(dbg, irg, 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, irg, block, op, dst_mode_l);
-
-                       env->entries[idx]->low_word  = op;
-
-                       if (mode_is_signed(imode)) {
-                               ir_node *op_conv = new_rd_Conv(dbg, irg, block, op, dst_mode_h);
-                               env->entries[idx]->high_word = new_rd_Shrs(dbg, irg, block, op_conv,
-                                       new_Const_long(mode_Iu, get_mode_size_bits(dst_mode_h) - 1), dst_mode_h);
-                       } else {
-                               env->entries[idx]->high_word = new_Const(dst_mode_h, 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, 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_l, 0);
-               env->entries[idx]->high_word = new_r_Proj(irg, 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);
+       unsigned  idx          = get_irn_idx(node);
+       ir_graph *irg          = get_irn_irg(node);
+       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->low_unsigned;
+       ir_mode  *low_signed
+               = mode_is_signed(omode) ? env->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->high_signed
+                               || imode == env->high_unsigned) {
+                       /* a Conv from Lu to Ls or Ls to Lu */
+                       unsigned      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, irg, block, env->entries[op_idx]->low_word, dst_mode);
-                       env->entries[idx]->high_word = new_rd_Conv(dbg, irg, 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, irg, 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, irg, block, op,
-                                       new_Const_long(mode_Iu, get_mode_size_bits(dst_mode) - 1), dst_mode);
+                               int      c       = get_mode_size_bits(low_signed) - 1;
+                               ir_node *cnst    = new_r_Const_long(irg, 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(dst_mode, get_mode_null(dst_mode));
-                       }  /* if */
-               }  /* if */
+                               entry->high_word = new_r_Const(irg, 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_r_Const(irg, 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, block, env);
-               call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 1, &op, mtp);
+               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(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);
-       }  /* 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, irg, 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 = new_r_Proj(call, mode_T, pn_Call_T_result);
 
-               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));
-       }  /* 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);
+       unsigned      idx   = get_irn_idx(op);
+       ir_graph     *irg   = get_irn_irg(node);
+       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, irg, block, op, omode);
+               if (omode != env->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->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, block, 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, irg, block, get_irg_no_mem(irg), irn, 2, in, mtp);
+               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(irg, block, call, mode_T, pn_Call_T_result);
+               irn = new_r_Proj(call, mode_T, pn_Call_T_result);
 
-               exchange(node, new_r_Proj(irg, 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->high_signed
+                       || mode == env->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->high_signed
+                               || mode == env->high_unsigned) {
+                       lower_Conv_from_Ll(node, env);
+               }
+       }
+}
 
 /**
  * Lower the method type.
+ *
+ * @param mtp  the method type to lower
+ * @param ent  the lower environment
+ *
+ * @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;
-       ir_type    *res;
+       ident      *lid;
+       ir_type    *res, *value_type;
 
        if (is_lowered_type(mtp))
                return mtp;
@@ -1723,11 +1647,11 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
                        if (is_Primitive_type(tp)) {
                                ir_mode *mode = get_type_mode(tp);
 
-                               if (mode == env->params->high_signed ||
-                                       mode == env->params->high_unsigned)
+                               if (mode == env->high_signed ||
+                                       mode == env->high_unsigned)
                                        ++n_param;
-                       }  /* if */
-               }  /* for */
+                       }
+               }
 
                /* count new number of results */
                n_res = r = get_method_n_ress(mtp);
@@ -1737,14 +1661,13 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
                        if (is_Primitive_type(tp)) {
                                ir_mode *mode = get_type_mode(tp);
 
-                               if (mode == env->params->high_signed ||
-                                       mode == env->params->high_unsigned)
+                               if (mode == env->high_signed ||
+                                       mode == env->high_unsigned)
                                        ++n_res;
-                       }  /* if */
-               }  /* for */
+                       }
+               }
 
-               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) {
@@ -1753,56 +1676,96 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
                        if (is_Primitive_type(tp)) {
                                ir_mode *mode = get_type_mode(tp);
 
-                               if (mode == env->params->high_signed) {
+                               if (mode == env->high_signed) {
                                        set_method_param_type(res, n_param++, tp_u);
                                        set_method_param_type(res, n_param++, tp_s);
-                               } else if (mode == env->params->high_unsigned) {
+                               } else if (mode == env->high_unsigned) {
                                        set_method_param_type(res, n_param++, tp_u);
                                        set_method_param_type(res, n_param++, tp_u);
                                } else {
                                        set_method_param_type(res, n_param++, tp);
-                               }  /* if */
+                               }
                        } else {
                                set_method_param_type(res, n_param++, tp);
-                       }  /* if */
-               }  /* for */
+                       }
+               }
                for (i = n_res = 0; i < r; ++i) {
                        ir_type *tp = get_method_res_type(mtp, i);
 
                        if (is_Primitive_type(tp)) {
                                ir_mode *mode = get_type_mode(tp);
 
-                               if (mode == env->params->high_signed) {
+                               if (mode == env->high_signed) {
                                        set_method_res_type(res, n_res++, tp_u);
                                        set_method_res_type(res, n_res++, tp_s);
-                               } else if (mode == env->params->high_unsigned) {
+                               } else if (mode == env->high_unsigned) {
                                        set_method_res_type(res, n_res++, tp_u);
                                        set_method_res_type(res, n_res++, tp_u);
                                } else {
                                        set_method_res_type(res, n_res++, tp);
-                               }  /* if */
+                               }
                        } else {
                                set_method_res_type(res, n_res++, tp);
-                       }  /* if */
-               }  /* for */
+                       }
+               }
                set_lowered_type(mtp, res);
                pmap_insert(lowered_type, mtp, res);
+
+               value_type = get_method_value_param_type(mtp);
+               if (value_type != NULL) {
+                       /* this creates a new value parameter type */
+                       (void)get_method_value_param_ent(res, 0);
+
+                       /* set new param positions */
+                       for (i = n_param = 0; i < n; ++i) {
+                               ir_type   *tp  = get_method_param_type(mtp, i);
+                               ident     *id  = get_method_param_ident(mtp, i);
+                               ir_entity *ent = get_method_value_param_ent(mtp, i);
+
+                               set_entity_link(ent, INT_TO_PTR(n_param));
+                               if (is_Primitive_type(tp)) {
+                                       ir_mode *mode = get_type_mode(tp);
+
+                                       if (mode == env->high_signed || mode == env->high_unsigned) {
+                                               if (id != NULL) {
+                                                       lid = id_mangle(id, env->first_id);
+                                                       set_method_param_ident(res, n_param, lid);
+                                                       set_entity_ident(get_method_value_param_ent(res, n_param), lid);
+                                                       lid = id_mangle(id, env->next_id);
+                                                       set_method_param_ident(res, n_param + 1, lid);
+                                                       set_entity_ident(get_method_value_param_ent(res, n_param + 1), lid);
+                                               }
+                                               n_param += 2;
+                                               continue;
+                                       }
+                               }
+                               if (id != NULL) {
+                                       set_method_param_ident(res, n_param, id);
+                                       set_entity_ident(get_method_value_param_ent(res, n_param), id);
+                               }
+                               ++n_param;
+                       }
+
+                       set_lowered_type(value_type, get_method_value_param_type(res));
+               }
        } else {
                res = entry->value;
-       }  /* if */
+       }
        return res;
-}  /* lower_mtp */
+}
 
 /**
  * Translate a Return.
  */
-static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) {
-       ir_graph  *irg = current_ir_graph;
+static void lower_Return(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   *mtp = get_entity_type(ent);
-       ir_node   **in;
-       int       i, j, n, idx;
-       int       need_conv = 0;
+       ir_node  **in;
+       int        i, j, n;
+       unsigned   idx;
+       int        need_conv = 0;
        (void) mode;
 
        /* check if this return must be lowered */
@@ -1810,17 +1773,17 @@ static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) {
                ir_node *pred = get_Return_res(node, i);
                ir_mode *mode = get_irn_op_mode(pred);
 
-               if (mode == env->params->high_signed ||
-                       mode == env->params->high_unsigned) {
+               if (mode == env->high_signed ||
+                       mode == env->high_unsigned) {
                        idx = get_irn_idx(pred);
                        if (! env->entries[idx]->low_word) {
                                /* not ready yet, wait */
                                pdeq_putr(env->waitq, node);
                                return;
-                       }  /* if */
+                       }
                        need_conv = 1;
-               }  /* if */
-       }  /* for */
+               }
+       }
        if (! need_conv)
                return;
 
@@ -1845,17 +1808,18 @@ static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        in[++j] = env->entries[idx]->high_word;
                } else {
                        in[++j] = pred;
-               }  /* if */
-       }  /* for */
+               }
+       }
 
        set_irn_in(node, j+1, in);
-}  /* lower_Return */
+}
 
 /**
  * Translate the parameters.
  */
-static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
-       ir_graph  *irg = current_ir_graph;
+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);
        ir_type   *mtp;
@@ -1868,7 +1832,7 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
                mtp = get_associated_type(tp);
        } else {
                mtp = tp;
-       }  /* if */
+       }
        assert(! is_lowered_type(mtp));
 
        n_params = get_method_n_params(mtp);
@@ -1885,11 +1849,11 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
                if (is_Primitive_type(tp)) {
                        ir_mode *mode = get_type_mode(tp);
 
-                       if (mode == env->params->high_signed ||
-                               mode == env->params->high_unsigned)
+                       if (mode == env->high_signed ||
+                               mode == env->high_unsigned)
                                ++j;
-               }  /* if */
-       }  /* for */
+               }
+       }
        if (i == j)
                return;
 
@@ -1906,7 +1870,7 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
        for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
                ir_node *pred = get_Proj_pred(proj);
                long proj_nr;
-               int idx;
+               unsigned idx;
                ir_mode *mode;
                dbg_info *dbg;
 
@@ -1921,31 +1885,31 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
                idx = get_irn_idx(proj);
                if (env->entries[idx]) {
-                       ir_mode *low_mode = env->params->low_unsigned;
+                       ir_mode *low_mode = env->low_unsigned;
 
                        mode = get_irn_mode(proj);
 
-                       if (mode == env->params->high_signed) {
-                               mode = env->params->low_signed;
+                       if (mode == env->high_signed) {
+                               mode = env->low_signed;
                        } else {
-                               mode = env->params->low_unsigned;
-                       }  /* if */
+                               mode = env->low_unsigned;
+                       }
 
                        dbg = get_irn_dbg_info(proj);
                        env->entries[idx]->low_word  =
-                               new_rd_Proj(dbg, irg, 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, irg, get_nodes_block(proj), args, mode, new_projs[proj_nr] + 1);
-               }  /* if */
-       }  /* for */
+                               new_rd_Proj(dbg, args, mode, new_projs[proj_nr] + 1);
+               }
+       }
        set_optimize(rem);
-}  /* lower_Start */
+}
 
 /**
  * Translate a Call.
  */
-static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
-       ir_graph *irg = current_ir_graph;
+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;
@@ -1958,7 +1922,7 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
                call_tp = get_associated_type(tp);
        } else {
                call_tp = tp;
-       }  /* if */
+       }
 
        assert(! is_lowered_type(call_tp));
 
@@ -1969,13 +1933,13 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
                if (is_Primitive_type(tp)) {
                        ir_mode *mode = get_type_mode(tp);
 
-                       if (mode == env->params->high_signed ||
-                               mode == env->params->high_unsigned) {
+                       if (mode == env->high_signed ||
+                               mode == env->high_unsigned) {
                                need_lower = 1;
                                break;
-                       }  /* if */
-               }  /* if */
-       }  /* for */
+                       }
+               }
+       }
        n_res = get_method_n_ress(call_tp);
        if (n_res > 0) {
                NEW_ARR_A(long, res_numbers, n_res);
@@ -1987,14 +1951,14 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        if (is_Primitive_type(tp)) {
                                ir_mode *mode = get_type_mode(tp);
 
-                               if (mode == env->params->high_signed ||
-                                       mode == env->params->high_unsigned) {
+                               if (mode == env->high_signed ||
+                                       mode == env->high_unsigned) {
                                        need_lower = 1;
                                        ++j;
-                               }  /* if */
-                       }  /* if */
-               }  /* for */
-       }  /* if */
+                               }
+                       }
+               }
+       }
 
        if (! need_lower)
                return;
@@ -2010,7 +1974,7 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
        for (j = 2, i = 0; i < n_params; ++i) {
                ir_node *pred = get_Call_param(node, i);
-               int     idx = get_irn_idx(pred);
+               unsigned idx = get_irn_idx(pred);
 
                if (env->entries[idx]) {
                        if (! env->entries[idx]->low_word) {
@@ -2022,8 +1986,8 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        in[j++] = env->entries[idx]->high_word;
                } else {
                        in[j++] = pred;
-               }  /* if */
-       }  /* for */
+               }
+       }
 
        set_irn_in(node, j, in);
 
@@ -2036,10 +2000,10 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        /* found the result proj */
                        results = proj;
                        break;
-               }  /* if */
-       }  /* for */
+               }
+       }
 
-       if (results) {          /* there are results */
+       if (results) {    /* there are results */
                int rem = get_optimize();
 
                /* switch off optimization for new Proj nodes or they might be CSE'ed
@@ -2048,60 +2012,63 @@ static void lower_Call(ir_node *node, ir_mode *mode, lower_env_t *env) {
                for (i = j = 0, proj = get_irn_link(results); proj; proj = get_irn_link(proj), ++i, ++j) {
                        if (get_Proj_pred(proj) == results) {
                                long proj_nr = get_Proj_proj(proj);
-                               int idx;
+                               unsigned idx;
 
                                /* found a result */
                                set_Proj_proj(proj, res_numbers[proj_nr]);
                                idx = get_irn_idx(proj);
                                if (env->entries[idx]) {
                                        ir_mode *mode = get_irn_mode(proj);
-                                       ir_mode *low_mode = env->params->low_unsigned;
+                                       ir_mode *low_mode = env->low_unsigned;
                                        dbg_info *dbg;
 
-                                       if (mode == env->params->high_signed) {
-                                               mode = env->params->low_signed;
+                                       if (mode == env->high_signed) {
+                                               mode = env->low_signed;
                                        } else {
-                                               mode = env->params->low_unsigned;
-                                       }  /* if */
+                                               mode = env->low_unsigned;
+                                       }
 
                                        dbg = get_irn_dbg_info(proj);
                                        env->entries[idx]->low_word  =
-                                               new_rd_Proj(dbg, irg, 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, irg, get_nodes_block(proj), results, mode, res_numbers[proj_nr] + 1);
-                               }  /* if */
+                                               new_rd_Proj(dbg, results, mode, res_numbers[proj_nr] + 1);
+                               }
                                mark_irn_visited(proj);
-                       }  /* if */
-               }  /* for */
+                       }
+               }
                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;
-       ir_mode  *low_mode = env->params->low_unsigned;
+static void lower_Unknown(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       unsigned  idx = get_irn_idx(node);
+       ir_graph *irg = get_irn_irg(node);
+       ir_mode  *low_mode = env->low_unsigned;
 
        env->entries[idx]->low_word  = new_r_Unknown(irg, low_mode);
        env->entries[idx]->high_word = new_r_Unknown(irg, mode);
-}  /* lower_Unknown */
+}
 
 /**
  * Translate a Phi.
  *
  * First step: just create two templates
  */
-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 = current_ir_graph;
+static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env)
+{
+       ir_mode  *mode_l = env->low_unsigned;
+       ir_graph *irg = get_irn_irg(phi);
        ir_node  *block, *unk_l, *unk_h, *phi_l, *phi_h;
        ir_node  **inl, **inh;
        dbg_info *dbg;
-       int      idx, i, arity = get_Phi_n_preds(phi);
-       int      enq = 0;
+       unsigned  idx;
+       int       i, arity = get_Phi_n_preds(phi);
+       int       enq = 0;
 
        idx = get_irn_idx(phi);
        if (env->entries[idx]->low_word) {
@@ -2111,7 +2078,7 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
 
                for (i = 0; i < arity; ++i) {
                        ir_node *pred = get_Phi_pred(phi, i);
-                       int     idx = get_irn_idx(pred);
+                       unsigned idx = get_irn_idx(pred);
 
                        if (env->entries[idx]->low_word) {
                                set_Phi_pred(phil, i, env->entries[idx]->low_word);
@@ -2120,19 +2087,19 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
                                /* still not ready */
                                pdeq_putr(env->waitq, phi);
                                return;
-                       }  /* if */
-               }  /* for */
-       }  /* if */
+                       }
+               }
+       }
 
        /* first create a new in array */
        NEW_ARR_A(ir_node *, inl, arity);
        NEW_ARR_A(ir_node *, inh, arity);
-       unk_l = new_r_Unknown(irg, mode_l);
-       unk_h = new_r_Unknown(irg, mode);
+       unk_l = new_r_Dummy(irg, mode_l);
+       unk_h = new_r_Dummy(irg, mode);
 
        for (i = 0; i < arity; ++i) {
                ir_node *pred = get_Phi_pred(phi, i);
-               int     idx = get_irn_idx(pred);
+               unsigned idx  = get_irn_idx(pred);
 
                if (env->entries[idx]->low_word) {
                        inl[i] = env->entries[idx]->low_word;
@@ -2141,37 +2108,39 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
                        inl[i] = unk_l;
                        inh[i] = unk_h;
                        enq = 1;
-               }  /* if */
-       }  /* for */
+               }
+       }
 
        dbg   = get_irn_dbg_info(phi);
        block = get_nodes_block(phi);
 
        idx = get_irn_idx(phi);
        assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = phi_l = new_rd_Phi(dbg, irg, block, arity, inl, mode_l);
-       env->entries[idx]->high_word = phi_h = new_rd_Phi(dbg, irg, block, arity, inh, mode);
+       env->entries[idx]->low_word  = phi_l = new_rd_Phi(dbg, block, arity, inl, mode_l);
+       env->entries[idx]->high_word = phi_h = new_rd_Phi(dbg, block, arity, inh, mode);
 
-       /* Don't forget to link the new Phi nodes into the block! */
-       set_irn_link(phi_l, get_irn_link(block));
-       set_irn_link(phi_h, phi_l);
-       set_irn_link(block, phi_h);
+       /* Don't forget to link the new Phi nodes into the block.
+        * Beware that some Phis might be optimized away. */
+       if (is_Phi(phi_l))
+               add_Block_phi(block, phi_l);
+       if (is_Phi(phi_h))
+               add_Block_phi(block, phi_h);
 
        if (enq) {
                /* not yet finished */
                pdeq_putr(env->waitq, phi);
-       }  /* if */
-}  /* lower_Phi */
+       }
+}
 
 /**
  * Translate a Mux.
  */
-static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) {
-       ir_graph *irg = current_ir_graph;
+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;
-       int      idx;
+       unsigned  idx;
 
        val = get_Mux_true(mux);
        idx = get_irn_idx(val);
@@ -2183,7 +2152,7 @@ static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) {
                /* still not ready */
                pdeq_putr(env->waitq, mux);
                return;
-       }  /* if */
+       }
 
        val = get_Mux_false(mux);
        idx = get_irn_idx(val);
@@ -2195,7 +2164,7 @@ static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) {
                /* still not ready */
                pdeq_putr(env->waitq, mux);
                return;
-       }  /* if */
+       }
 
 
        sel = get_Mux_sel(mux);
@@ -2205,36 +2174,93 @@ static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) {
 
        idx = get_irn_idx(mux);
        assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = new_rd_Mux(dbg, irg, block, sel, false_l, true_l, mode);
-       env->entries[idx]->high_word = new_rd_Mux(dbg, irg, block, sel, false_h, true_h, mode);
-}  /* lower_Mux */
+       env->entries[idx]->low_word  = new_rd_Mux(dbg, block, sel, false_l, true_l, env->low_unsigned);
+       env->entries[idx]->high_word = new_rd_Mux(dbg, block, sel, false_h, true_h, mode);
+}
+
+/**
+ * Translate an ASM node.
+ */
+static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env)
+{
+       ir_mode *his = env->high_signed;
+       ir_mode *hiu = env->high_unsigned;
+       int      i;
+       ir_node *n;
+
+       (void)mode;
+
+       for (i = get_irn_arity(asmn) - 1; i >= 0; --i) {
+               ir_mode *op_mode = get_irn_mode(get_irn_n(asmn, i));
+               if (op_mode == his || op_mode == hiu) {
+                       panic("lowering ASM unimplemented");
+               }
+       }
+
+       for (n = asmn;;) {
+               ir_mode *proj_mode;
+
+               n = get_irn_link(n);
+               if (n == NULL)
+                       break;
+
+               proj_mode = get_irn_mode(n);
+               if (proj_mode == his || proj_mode == hiu) {
+                       panic("lowering ASM unimplemented");
+               }
+       }
+}
+
+/**
+ * Translate a Sel node.
+ */
+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
+          value parameter type. */
+       if (env->value_param_tp != NULL) {
+               ir_entity *ent = get_Sel_entity(sel);
+           if (get_entity_owner(ent) == env->value_param_tp) {
+                       int pos = PTR_TO_INT(get_entity_link(ent));
+
+                       ent = get_method_value_param_ent(env->l_mtp, pos);
+                       set_Sel_entity(sel, ent);
+               }
+       }
+}
 
 /**
  * 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:
        case iro_Start:
        case iro_Call:
        case iro_Return:
        case iro_Cond:
        case iro_Conv:
+       case iro_Sel:
                return 1;
        default:
                return 0;
-       }  /* switch */
-}  /* always_lower */
+       }
+}
 
 /**
  * lower boolean Proj(Cmp)
  */
-static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t *env) {
-       int      lidx, ridx;
+static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t *env)
+{
+       unsigned  lidx;
+       unsigned  ridx;
        ir_node  *l, *r, *low, *high, *t, *res;
        pn_Cmp   pnc;
        ir_node  *blk;
-       ir_graph *irg = current_ir_graph;
        dbg_info *db;
 
        l    = get_Cmp_left(cmp);
@@ -2242,46 +2268,46 @@ static ir_node *lower_boolean_Proj_Cmp(ir_node *proj, ir_node *cmp, lower_env_t
        if (! env->entries[lidx]->low_word) {
                /* still not ready */
                return NULL;
-       }  /* if */
+       }
 
        r    = get_Cmp_right(cmp);
        ridx = get_irn_idx(r);
        if (! env->entries[ridx]->low_word) {
                /* still not ready */
                return NULL;
-       }  /* if */
+       }
 
        pnc  = get_Proj_proj(proj);
        blk  = get_nodes_block(cmp);
        db   = get_irn_dbg_info(cmp);
-       low  = new_rd_Cmp(db, irg, blk, env->entries[lidx]->low_word, env->entries[ridx]->low_word);
-       high = new_rd_Cmp(db, irg, blk, env->entries[lidx]->high_word, env->entries[ridx]->high_word);
+       low  = new_rd_Cmp(db, blk, env->entries[lidx]->low_word, env->entries[ridx]->low_word);
+       high = new_rd_Cmp(db, blk, env->entries[lidx]->high_word, env->entries[ridx]->high_word);
 
        if (pnc == pn_Cmp_Eq) {
                /* simple case:a == b <==> a_h == b_h && a_l == b_l */
-               res = new_rd_And(db, irg, blk,
-                       new_r_Proj(irg, blk, low, mode_b, pnc),
-                       new_r_Proj(irg, blk, high, mode_b, pnc),
+               res = new_rd_And(db, blk,
+                       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, irg, blk,
-                       new_r_Proj(irg, blk, low, mode_b, pnc),
-                       new_r_Proj(irg, blk, high, mode_b, pnc),
+               res = new_rd_Or(db, blk,
+                       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, irg, blk,
-                       new_r_Proj(irg, blk, low, mode_b, pnc),
-                       new_r_Proj(irg, blk, high, mode_b, pn_Cmp_Eq),
+               t = new_rd_And(db, blk,
+                       new_r_Proj(low, mode_b, pnc),
+                       new_r_Proj(high, mode_b, pn_Cmp_Eq),
                        mode_b);
-               res = new_rd_Or(db, irg, blk,
-                       new_r_Proj(irg, blk, high, mode_b, pnc & ~pn_Cmp_Eq),
+               res = new_rd_Or(db, blk,
+                       new_r_Proj(high, mode_b, pnc & ~pn_Cmp_Eq),
                        t,
                        mode_b);
-       }  /* if */
+       }
        return res;
-}  /* lower_boolean_Proj_Cmp */
+}
 
 /**
  * The type of a lower function.
@@ -2299,7 +2325,7 @@ static void lower_ops(ir_node *node, void *env)
 {
        lower_env_t  *lenv = env;
        node_entry_t *entry;
-       int          idx = get_irn_idx(node);
+       unsigned      idx = get_irn_idx(node);
        ir_mode      *mode = get_irn_mode(node);
 
        if (mode == mode_b || is_Mux(node) || is_Conv(node)) {
@@ -2315,21 +2341,21 @@ static void lower_ops(ir_node *node, void *env)
                                        ir_node *arg = get_Cmp_left(cmp);
 
                                        mode = get_irn_mode(arg);
-                                       if (mode == lenv->params->high_signed ||
-                                               mode == lenv->params->high_unsigned) {
+                                       if (mode == lenv->high_signed ||
+                                               mode == lenv->high_unsigned) {
                                                ir_node *res = lower_boolean_Proj_Cmp(proj, cmp, lenv);
 
                                                if (res == NULL) {
                                                        /* could not lower because predecessors not ready */
                                                        waitq_put(lenv->waitq, node);
                                                        return;
-                                               }  /* if */
+                                               }
                                                set_irn_n(node, i, res);
-                                       }  /* if */
-                               }  /* if */
-                       }  /* if */
-               }  /* for */
-       }  /* if */
+                                       }
+                               }
+                       }
+               }
+       }
 
        entry = idx < lenv->n_entries ? lenv->entries[idx] : NULL;
        if (entry || always_lower(get_irn_opcode(node))) {
@@ -2339,72 +2365,169 @@ static void lower_ops(ir_node *node, void *env)
                if (func) {
                        mode = get_irn_op_mode(node);
 
-                       if (mode == lenv->params->high_signed)
-                               mode = lenv->params->low_signed;
+                       if (mode == lenv->high_signed)
+                               mode = lenv->low_signed;
                        else
-                               mode = lenv->params->low_unsigned;
+                               mode = lenv->low_unsigned;
 
                        DB((dbg, LEVEL_1, "  %+F\n", node));
                        func(node, mode, lenv);
-               }  /* if */
-       }  /* if */
-}  /* lower_ops */
+               }
+       }
+}
 
 #define IDENT(s)  new_id_from_chars(s, sizeof(s)-1)
 
 /**
  * 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;
 
        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) {
+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;
 
        return (e1->imode - e2->imode) | (e1->omode - e2->omode);
-}  /* static int cmp_conv_tp */
+}
 
 /**
  * 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;
 }
 
+/**
+ * Returns non-zero if a method type must be lowered.
+ *
+ * @param mtp  the method type
+ */
+static int mtp_must_be_lowered(ir_type *mtp, lower_env_t *env)
+{
+       int i, n_params;
+
+       n_params = get_method_n_params(mtp);
+       if (n_params <= 0)
+               return 0;
+
+       /* first check if we have parameters that must be fixed */
+       for (i = 0; i < n_params; ++i) {
+               ir_type *tp = get_method_param_type(mtp, i);
+
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
+
+                       if (mode == env->high_signed ||
+                               mode == env->high_unsigned)
+                               return 1;
+               }
+       }
+       return 0;
+}
+
+static void setup_modes(lower_env_t *env)
+{
+       unsigned           size_bits           = env->params->doubleword_size;
+       ir_mode           *doubleword_signed   = NULL;
+       ir_mode           *doubleword_unsigned = NULL;
+       int                n_modes             = get_irp_n_modes();
+       ir_mode_arithmetic arithmetic;
+       unsigned           modulo_shift;
+       int                i;
+
+       /* search for doubleword modes... */
+       for (i = 0; i < n_modes; ++i) {
+               ir_mode *mode = get_irp_mode(i);
+               if (!mode_is_int(mode))
+                       continue;
+               if (get_mode_size_bits(mode) != size_bits)
+                       continue;
+               if (mode_is_signed(mode)) {
+                       if (doubleword_signed != NULL) {
+                               /* sigh - the lowerer should really just lower all mode with
+                                * size_bits it finds. Unfortunately this required a bigger
+                                * rewrite. */
+                               panic("multiple double word signed modes found");
+                       }
+                       doubleword_signed = mode;
+               } else {
+                       if (doubleword_unsigned != NULL) {
+                               /* sigh - the lowerer should really just lower all mode with
+                                * size_bits it finds. Unfortunately this required a bigger
+                                * rewrite. */
+                               panic("multiple double word unsigned modes found");
+                       }
+                       doubleword_unsigned = mode;
+               }
+       }
+       if (doubleword_signed == NULL || doubleword_unsigned == NULL) {
+               panic("Couldn't find doubleword modes");
+       }
+
+       arithmetic   = get_mode_arithmetic(doubleword_signed);
+       modulo_shift = get_mode_modulo_shift(doubleword_signed);
+
+       assert(get_mode_size_bits(doubleword_unsigned) == size_bits);
+       assert(size_bits % 2 == 0);
+       assert(get_mode_sign(doubleword_signed) == 1);
+       assert(get_mode_sign(doubleword_unsigned) == 0);
+       assert(get_mode_sort(doubleword_signed) == irms_int_number);
+       assert(get_mode_sort(doubleword_unsigned) == irms_int_number);
+       assert(get_mode_arithmetic(doubleword_unsigned) == arithmetic);
+       assert(get_mode_modulo_shift(doubleword_unsigned) == modulo_shift);
+
+       /* try to guess a sensible modulo shift for the new mode.
+        * (This is IMO another indication that this should really be a node
+        *  attribute instead of a mode thing) */
+       if (modulo_shift == size_bits) {
+               modulo_shift = modulo_shift / 2;
+       } else if (modulo_shift == 0) {
+               /* fine */
+       } else {
+               panic("Don't know what new modulo shift to use for lowered doubleword mode");
+       }
+       size_bits /= 2;
+
+       /* produce lowered modes */
+       env->high_signed   = doubleword_signed;
+       env->high_unsigned = doubleword_unsigned;
+       env->low_signed    = new_ir_mode("WS", irms_int_number, size_bits, 1,
+                                        arithmetic, modulo_shift);
+       env->low_unsigned  = new_ir_mode("WU", irms_int_number, size_bits, 0,
+                                        arithmetic, modulo_shift);
+}
+
 /*
  * Do the lowering.
  */
 void lower_dw_ops(const lwrdw_param_t *param)
 {
        lower_env_t lenv;
-       int i;
-       ir_graph *rem;
+       int         i;
 
        if (! param)
                return;
 
-       if (! param->enable)
-               return;
-
        FIRM_DBG_REGISTER(dbg, "firm.lower.dw");
 
-       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));
+       memset(&lenv, 0, sizeof(lenv));
+       lenv.params = param;
+       setup_modes(&lenv);
 
        /* create the necessary maps */
-       if (! prim_types)
-               prim_types = pmap_create();
        if (! intrinsic_fkt)
                intrinsic_fkt = new_set(cmp_op_mode, iro_Last + 1);
        if (! conv_types)
@@ -2414,115 +2537,102 @@ void lower_dw_ops(const lwrdw_param_t *param)
 
        /* create a primitive unsigned and signed type */
        if (! tp_u)
-               tp_u = get_primitive_type(param->low_unsigned);
+               tp_u = get_type_for_mode(lenv.low_unsigned);
        if (! tp_s)
-               tp_s = get_primitive_type(param->low_signed);
+               tp_s = get_type_for_mode(lenv.low_signed);
 
        /* 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);
                set_method_param_type(binop_tp_u, 3, tp_u);
                set_method_res_type(binop_tp_u, 0, tp_u);
                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);
                set_method_param_type(binop_tp_s, 3, tp_s);
                set_method_res_type(binop_tp_s, 0, tp_u);
                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);
                set_method_res_type(shiftop_tp_u, 0, tp_u);
                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);
-               /* 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_u);
                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);
                set_method_res_type(unop_tp_s, 1, tp_s);
-       }  /* if */
+       }
 
-       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.tv_mode_bytes = new_tarval_from_long(param->doubleword_size/(2*8), lenv.low_unsigned);
+       lenv.tv_mode_bits  = new_tarval_from_long(param->doubleword_size/2, lenv.low_unsigned);
        lenv.waitq         = new_pdeq();
-       lenv.params        = param;
+       lenv.first_id      = new_id_from_chars(param->little_endian ? ".l" : ".h", 2);
+       lenv.next_id       = new_id_from_chars(param->little_endian ? ".h" : ".l", 2);
 
-       /* first clear the generic function pointer for all ops */
        clear_irp_opcodes_generic_func();
-
-#define LOWER2(op, fkt)   enter_lower_func(op_##op, fkt)
-#define LOWER(op)         LOWER2(op, lower_##op)
-#define LOWER_BIN(op)     LOWER2(op, lower_Binop)
-#define LOWER_UN(op)      LOWER2(op, lower_Unop)
-
-       /* the table of all operations that must be lowered follows */
-       LOWER(Load);
-       LOWER(Store);
-       LOWER(Const);
-       LOWER(And);
-       LOWER(Or);
-       LOWER(Eor);
-       LOWER(Not);
-       LOWER(Cond);
-       LOWER(Return);
-       LOWER(Call);
-       LOWER(Unknown);
-       LOWER(Phi);
-       LOWER(Mux);
-       LOWER(Start);
-
-       LOWER_BIN(Add);
-       LOWER_BIN(Sub);
-       LOWER_BIN(Mul);
-       LOWER(Shl);
-       LOWER(Shr);
-       LOWER(Shrs);
-       LOWER(Rotl);
-       LOWER(DivMod);
-       LOWER(Div);
-       LOWER(Mod);
-       LOWER_UN(Abs);
-       LOWER_UN(Minus);
-
-       LOWER(Conv);
-
-#undef LOWER_UN
-#undef LOWER_BIN
-#undef LOWER
-#undef LOWER2
+       enter_lower_func(op_Add,     lower_Binop);
+       enter_lower_func(op_And,     lower_And);
+       enter_lower_func(op_ASM,     lower_ASM);
+       enter_lower_func(op_Call,    lower_Call);
+       enter_lower_func(op_Cond,    lower_Cond);
+       enter_lower_func(op_Const,   lower_Const);
+       enter_lower_func(op_Conv,    lower_Conv);
+       enter_lower_func(op_Div,     lower_Div);
+       enter_lower_func(op_DivMod,  lower_DivMod);
+       enter_lower_func(op_Eor,     lower_Eor);
+       enter_lower_func(op_Load,    lower_Load);
+       enter_lower_func(op_Minus,   lower_Unop);
+       enter_lower_func(op_Mod,     lower_Mod);
+       enter_lower_func(op_Mul,     lower_Binop);
+       enter_lower_func(op_Mux,     lower_Mux);
+       enter_lower_func(op_Not,     lower_Not);
+       enter_lower_func(op_Or,      lower_Or);
+       enter_lower_func(op_Phi,     lower_Phi);
+       enter_lower_func(op_Return,  lower_Return);
+       enter_lower_func(op_Rotl,    lower_Rotl);
+       enter_lower_func(op_Sel,     lower_Sel);
+       enter_lower_func(op_Shl,     lower_Shl);
+       enter_lower_func(op_Shr,     lower_Shr);
+       enter_lower_func(op_Shrs,    lower_Shrs);
+       enter_lower_func(op_Start,   lower_Start);
+       enter_lower_func(op_Store,   lower_Store);
+       enter_lower_func(op_Sub,     lower_Binop);
+       enter_lower_func(op_Unknown, lower_Unknown);
 
        /* 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;
+               ir_graph  *irg = get_irp_irg(i);
+               ir_entity *ent;
+               ir_type   *mtp;
+               unsigned n_idx;
 
                obstack_init(&lenv.obst);
 
@@ -2532,10 +2642,26 @@ void lower_dw_ops(const lwrdw_param_t *param)
                lenv.entries   = NEW_ARR_F(node_entry_t *, n_idx);
                memset(lenv.entries, 0, n_idx * sizeof(lenv.entries[0]));
 
-               /* first step: link all nodes and allocate data */
-               lenv.flags = 0;
+               lenv.irg          = irg;
+               lenv.l_mtp        = NULL;
+               lenv.flags        = 0;
                lenv.proj_2_block = pmap_create();
-               irg_walk_graph(irg, firm_clear_link, prepare_links_and_handle_rotl, &lenv);
+               lenv.value_param_tp = NULL;
+               ir_reserve_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK);
+
+               ent = get_irg_entity(irg);
+               mtp = get_entity_type(ent);
+
+               if (mtp_must_be_lowered(mtp, &lenv)) {
+                       ir_type *ltp = lower_mtp(mtp, &lenv);
+                       lenv.flags |= MUST_BE_LOWERED;
+                       set_entity_type(ent, ltp);
+                       lenv.l_mtp = ltp;
+                       lenv.value_param_tp = get_method_value_param_type(mtp);
+               }
+
+               /* first step: link all nodes and allocate data */
+               irg_walk_graph(irg, firm_clear_node_and_phi_links, prepare_links_and_handle_rotl, &lenv);
 
                if (lenv.flags & MUST_BE_LOWERED) {
                        DB((dbg, LEVEL_1, "Lowering graph %+F\n", irg));
@@ -2545,12 +2671,13 @@ 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);
 
                                lower_ops(node, &lenv);
-                       }  /* while */
+                       }
+
+                       ir_free_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK);
 
                        /* outs are invalid, we changed the graph */
                        set_irg_outs_inconsistent(irg);
@@ -2560,15 +2687,16 @@ void lower_dw_ops(const lwrdw_param_t *param)
                                set_irg_doms_inconsistent(irg);
                                set_irg_extblk_inconsistent(irg);
                                set_irg_loopinfo_inconsistent(irg);
-                       }  /* if */
-               }  /* if */
+                       }
+               } else {
+                       ir_free_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK);
+               }
                pmap_destroy(lenv.proj_2_block);
                DEL_ARR_F(lenv.entries);
                obstack_free(&lenv.obst, NULL);
-       }  /* for */
+       }
        del_pdeq(lenv.waitq);
-       current_ir_graph = rem;
-}  /* lower_dw_ops */
+}
 
 /* Default implementation. */
 ir_entity *def_create_intrinsic_fkt(ir_type *method, const ir_op *op,
@@ -2585,11 +2713,10 @@ ir_entity *def_create_intrinsic_fkt(ir_type *method, const ir_op *op,
        } else {
                snprintf(buf, sizeof(buf), "__l%s%s%s", get_op_name(op),
                        get_mode_name(imode), get_mode_name(omode));
-       }  /* if */
+       }
        id = new_id_from_str(buf);
 
        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 */
+}