fix an intrinsic lower not reporting changes
[libfirm] / ir / lower / lower_dw.c
index edcf1e4..936e07c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -19,7 +19,7 @@
 
 /**
  * @file
- * @brief   Lower Double word operations, ie 64bit -> 32bit, 32bit -> 16bit etc.
+ * @brief   Lower double word operations, i.e. 64bit -> 32bit, 32bit -> 16bit etc.
  * @date    8.10.2004
  * @author  Michael Beck
  * @version $Id$
@@ -28,6 +28,7 @@
 
 #include <string.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <assert.h>
 
 #include "error.h"
 #include "pdeq.h"
 #include "irdump.h"
 #include "array_t.h"
+#include "irpass_t.h"
 
-/** A map from mode to a primitive type. */
-static pmap *prim_types;
+typedef struct lower_env_t lower_env_t;
+
+/**
+ * The type of a lower function.
+ *
+ * @param node   the node to be lowered
+ * @param env    the lower environment
+ */
+typedef void (*lower_func)(ir_node *node, ir_mode *mode, lower_env_t *env);
 
 /** A map from (op, imode, omode) to Intrinsic functions entities. */
 static set *intrinsic_fkt;
@@ -74,7 +83,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 */
@@ -84,7 +93,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 */
@@ -94,7 +103,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;
@@ -107,40 +116,36 @@ enum lower_flags {
 /**
  * The lower environment.
  */
-typedef struct _lower_env_t {
+struct lower_env_t {
        node_entry_t **entries;       /**< entries per node */
+       ir_graph      *irg;
        struct obstack obst;          /**< an obstack holding the temporary data */
-       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_type   *l_mtp;              /**< lowered method type of the current method */
+       ir_tarval *tv_mode_bytes;     /**< a tarval containing the number of bytes in the lowered modes */
+       ir_tarval *tv_mode_bits;      /**< a tarval containing the number of bits in the lowered modes */
+       pdeq      *waitq;              /**< a wait queue of all nodes that must be handled later */
+       ir_node  **lowered_phis;       /**< list of lowered phis */
+       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 */
-} 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);
+       unsigned n_entries;           /**< number of entries */
+       ir_type  *value_param_tp;     /**< the old value param type */
+};
 
-       pmap_insert(prim_types, mode, tp);
-       return tp;
-}  /* get_primitive_type */
+static void lower_node(lower_env_t *env, ir_node *node);
+static bool mtp_must_be_lowered(lower_env_t *env, ir_type *mtp);
 
 /**
  * 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;
 
@@ -148,50 +153,48 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env)
        key.omode = omode;
        key.mtd   = NULL;
 
-       entry = set_insert(conv_types, &key, sizeof(key), HASH_PTR(imode) ^ HASH_PTR(omode));
+       entry = (conv_tp_entry_t*)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.
@@ -217,8 +220,8 @@ static void add_block_cf_input_nr(ir_node *block, int nr, ir_node *cf)
                        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.
@@ -234,11 +237,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.
@@ -250,8 +253,6 @@ static ir_mode *get_irn_op_mode(ir_node *node)
                return get_Load_mode(node);
        case iro_Store:
                return get_irn_mode(get_Store_value(node));
-       case iro_DivMod:
-               return get_irn_mode(get_DivMod_left(node));
        case iro_Div:
                return get_irn_mode(get_Div_left(node));
        case iro_Mod:
@@ -260,50 +261,46 @@ 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.
+ * Walker, prepare the node links and determine which nodes need to be lowered
+ * at all.
  */
-static void prepare_links(ir_node *node, void *env)
+static void prepare_links(lower_env_t *env, ir_node *node)
 {
-       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 == env->high_signed || mode == env->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(&env->obst, node_entry_t);
 
-               idx = get_irn_idx(node);
-               if (idx >= lenv->n_entries) {
+               if (idx >= env->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   = env->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]));
-                       lenv->n_entries = n_idx;
+                       ARR_RESIZE(node_entry_t *, env->entries, n_idx);
+                       memset(&env->entries[old], 0, (n_idx - old) * sizeof(env->entries[0]));
+                       env->n_entries = n_idx;
                }
-               lenv->entries[idx] = link;
-               lenv->flags |= MUST_BE_LOWERED;
+               env->entries[idx] = link;
+               env->flags |= MUST_BE_LOWERED;
        } else if (is_Conv(node)) {
                /* Conv nodes have two modes */
                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 == env->high_signed || mode == env->high_unsigned) {
                        /* must lower this node either but don't need a link */
-                       lenv->flags |= MUST_BE_LOWERED;
-               }  /* if */
+                       env->flags |= MUST_BE_LOWERED;
+               }
                return;
-       }  /* if */
+       }
 
        if (is_Proj(node)) {
                /* link all Proj nodes to its predecessor:
@@ -322,78 +319,77 @@ static void prepare_links(ir_node *node, void *env)
                        ir_node *pred = get_Block_cfgpred(node, i);
 
                        if (is_Proj(pred))
-                               pmap_insert(lenv->proj_2_block, pred, node);
-               }  /* for */
-       }  /* if */
-}  /* prepare_links */
+                               pmap_insert(env->proj_2_block, pred, node);
+               }
+       }
+}
+
+static node_entry_t *get_node_entry(lower_env_t *env, ir_node *node)
+{
+       unsigned idx = get_irn_idx(node);
+       assert(idx < env->n_entries);
+       return env->entries[idx];
+}
+
+static void set_lowered(lower_env_t *env, ir_node *old,
+                        ir_node *new_low, ir_node *new_high)
+{
+       node_entry_t *entry = get_node_entry(env, old);
+       entry->low_word  = new_low;
+       entry->high_word = new_high;
+}
 
 /**
  * Translate a Constant: create two.
  */
-static void lower_Const(ir_node *node, ir_mode *mode, lower_env_t *env) {
-       tarval   *tv, *tv_l, *tv_h;
-       ir_node  *low, *high;
-       dbg_info *dbg = get_irn_dbg_info(node);
-       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, tv_l);
-
-       tv_h = tarval_convert_to(tarval_shrs(tv, env->tv_mode_bits), mode);
-       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 */
+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;
+       ir_tarval *tv       = get_Const_tarval(node);
+       ir_tarval *tv_l     = tarval_convert_to(tv, low_mode);
+       ir_node   *res_low  = new_rd_Const(dbg, irg, tv_l);
+       ir_tarval *tv_shrs  = tarval_shrs(tv, env->tv_mode_bits);
+       ir_tarval *tv_h     = tarval_convert_to(tv_shrs, mode);
+       ir_node   *res_high = new_rd_Const(dbg, irg, tv_h);
+
+       set_lowered(env, node, res_low, res_high);
+}
 
 /**
  * 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);
+       ir_cons_flags volatility = get_Load_volatility(node) == volatility_is_volatile
+                                ? cons_volatile : cons_none;
 
        if (env->params->little_endian) {
                low  = adr;
-               high = new_r_Add(irg, block, adr,
-                       new_r_Const(irg, 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, 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));
-
-       idx = get_irn_idx(node);
-       assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = low;
-       env->entries[idx]->high_word = high;
+       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);
 
-       for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
-               idx = get_irn_idx(proj);
+       set_lowered(env, node, low, high);
 
+       for (proj = (ir_node*)get_irn_link(node); proj;
+            proj = (ir_node*)get_irn_link(proj)) {
                switch (get_Proj_proj(proj)) {
                case pn_Load_M:         /* Memory result. */
                        /* put it to the second one */
@@ -403,77 +399,67 @@ static void lower_Load(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        /* put it to the first one */
                        set_Proj_pred(proj, low);
                        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);
+               case pn_Load_res:       /* Result of load operation. */
+                       ir_node *res_low  = new_r_Proj(low,  low_mode, pn_Load_res);
+                       ir_node *res_high = new_r_Proj(high, mode,     pn_Load_res);
+                       set_lowered(env, proj, res_low, res_high);
                        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 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;
-       node_entry_t *entry;
-       (void) node;
+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, *proj;
+       dbg_info     *dbg;
+       ir_node            *value = get_Store_value(node);
+       const node_entry_t *entry = get_node_entry(env, value);
+       ir_cons_flags volatility = get_Store_volatility(node) == volatility_is_volatile
+                                  ? cons_volatile : cons_none;
        (void) mode;
 
-       irn = get_Store_value(node);
-       entry = env->entries[get_irn_idx(irn)];
        assert(entry);
 
        if (! entry->low_word) {
                /* 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, 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, 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));
-
-       idx = get_irn_idx(node);
-       assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = low;
-       env->entries[idx]->high_word = high;
+       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);
 
-       for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
-               idx = get_irn_idx(proj);
+       set_lowered(env, node, low, high);
 
+       for (proj = (ir_node*)get_irn_link(node); proj;
+            proj = (ir_node*)get_irn_link(proj)) {
                switch (get_Proj_proj(proj)) {
                case pn_Store_M:         /* Memory result. */
                        /* put it to the second one */
@@ -485,12 +471,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.
@@ -499,12 +485,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;
@@ -514,7 +500,7 @@ static ir_node *get_intrinsic_address(ir_type *method, ir_op *op,
        key.omode = omode;
        key.ent   = NULL;
 
-       entry = set_insert(intrinsic_fkt, &key, sizeof(key),
+       entry = (op_mode_entry_t*)set_insert(intrinsic_fkt, &key, sizeof(key),
                                HASH_PTR(op) ^ HASH_PTR(imode) ^ (HASH_PTR(omode) << 8));
        if (! entry->ent) {
                /* create a new one */
@@ -524,1278 +510,1046 @@ 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) {
-       ir_node  *block, *irn, *call, *proj;
-       ir_node  *in[4];
-       ir_mode  *opmode;
-       dbg_info *dbg;
-       ir_type  *mtp;
-       int      idx;
-       ir_graph *irg;
-       node_entry_t *entry;
-
-       irn   = get_Div_left(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
-               return;
-       }  /* if */
-
-       in[0] = entry->low_word;
-       in[1] = entry->high_word;
-
-       irn   = get_Div_right(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* 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;
+static void lower_Div(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_node            *left        = get_Div_left(node);
+       ir_node            *right       = get_Div_right(node);
+       const node_entry_t *left_entry  = get_node_entry(env, left);
+       const node_entry_t *right_entry = get_node_entry(env, right);
+       ir_node            *block       = get_nodes_block(node);
+       dbg_info           *dbgi        = get_irn_dbg_info(node);
+       ir_type            *mtp
+               = mode_is_signed(mode) ? binop_tp_s : binop_tp_u;
+       ir_mode            *opmode = get_irn_op_mode(node);
+       ir_node            *addr
+               = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, env);
+       ir_node  *in[4] = {
+               left_entry->low_word, left_entry->high_word,
+               right_entry->low_word, right_entry->high_word };
+       ir_node            *call
+               = new_rd_Call(dbgi, block, get_Div_mem(node), addr, 4, in, mtp);
+       ir_node            *resproj = new_r_Proj(call, mode_T, pn_Call_T_result);
+       ir_node            *proj;
 
-       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);
        set_irn_pinned(call, get_irn_pinned(node));
-       irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result);
 
-       for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
+       for (proj = (ir_node*)get_irn_link(node); proj;
+            proj = (ir_node*)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 */
                        set_Proj_pred(proj, call);
                        set_Proj_proj(proj, pn_Call_X_except);
                        break;
-               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);
+               case pn_Div_res: {
+                       /* Result of computation. */
+                       ir_node *res_low  = new_r_Proj(resproj, env->low_unsigned, 0);
+                       ir_node *res_high = new_r_Proj(resproj, mode,              1);
+                       set_lowered(env, proj, res_low, res_high);
                        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) {
-       ir_node  *block, *proj, *irn, *call;
-       ir_node  *in[4];
-       ir_mode  *opmode;
-       dbg_info *dbg;
-       ir_type  *mtp;
-       int      idx;
-       ir_graph *irg;
-       node_entry_t *entry;
-
-       irn   = get_Mod_left(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
-               return;
-       }  /* if */
-
-       in[0] = entry->low_word;
-       in[1] = entry->high_word;
-
-       irn   = get_Mod_right(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* 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);
+static void lower_Mod(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_node            *left        = get_Mod_left(node);
+       ir_node            *right       = get_Mod_right(node);
+       const node_entry_t *left_entry  = get_node_entry(env, left);
+       const node_entry_t *right_entry = get_node_entry(env, right);
+       ir_node            *in[4]       = {
+               left_entry->low_word, left_entry->high_word,
+               right_entry->low_word, right_entry->high_word
+       };
+       dbg_info           *dbgi        = get_irn_dbg_info(node);
+       ir_node            *block       = get_nodes_block(node);
+       ir_type            *mtp
+               = mode_is_signed(mode) ? binop_tp_s : binop_tp_u;
+       ir_mode            *opmode = get_irn_op_mode(node);
+       ir_node            *addr
+               = get_intrinsic_address(mtp, get_irn_op(node), opmode, opmode, env);
+       ir_node            *call
+               = new_rd_Call(dbgi, block, get_Mod_mem(node), addr, 4, in, mtp);
+       ir_node            *resproj = new_r_Proj(call, mode_T, pn_Call_T_result);
+       ir_node            *proj;
        set_irn_pinned(call, get_irn_pinned(node));
-       irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result);
 
-       for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
+       for (proj = (ir_node*)get_irn_link(node); proj;
+            proj = (ir_node*)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 */
                        set_Proj_pred(proj, call);
                        set_Proj_proj(proj, pn_Call_X_except);
                        break;
-               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);
-                       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) {
-       ir_node  *block, *proj, *irn, *mem, *callDiv, *callMod;
-       ir_node  *resDiv = NULL;
-       ir_node  *resMod = NULL;
-       ir_node  *in[4];
-       ir_mode  *opmode;
-       dbg_info *dbg;
-       ir_type  *mtp;
-       int      idx;
-       node_entry_t *entry;
-       unsigned flags = 0;
-       ir_graph *irg;
-
-       /* check if both results are needed */
-       for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
-               switch (get_Proj_proj(proj)) {
-               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)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
-               return;
-       }  /* if */
-
-       in[0] = entry->low_word;
-       in[1] = entry->high_word;
-
-       irn   = get_DivMod_right(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* 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);
-
-       callDiv = callMod = NULL;
-       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);
-               set_irn_pinned(callDiv, get_irn_pinned(node));
-               resDiv = new_r_Proj(irg, block, callDiv, mode_T, pn_Call_T_result);
-       }  /* if */
-       if (flags & 2) {
-               if (flags & 1)
-                       mem = new_r_Proj(irg, block, callDiv, mode_M, pn_Call_M);
-               opmode = get_irn_op_mode(node);
-               irn = get_intrinsic_address(mtp, op_Mod, opmode, opmode, block, env);
-               callMod = new_rd_Call(dbg, irg, block, mem,
-                       irn, 4, in, mtp);
-               set_irn_pinned(callMod, get_irn_pinned(node));
-               resMod = new_r_Proj(irg, block, callMod, mode_T, pn_Call_T_result);
-       }  /* if */
-
-       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);
-                       break;
-               case pn_DivMod_X_except:  /* Execution result if exception occurred. */
-                       /* reroute to the first call */
-                       set_Proj_pred(proj, callDiv ? callDiv : (callMod ? callMod : mem));
-                       set_Proj_proj(proj, pn_Call_X_except);
-                       break;
-               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);
-                       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);
+               case pn_Mod_res: {
+                       /* Result of computation. */
+                       ir_node *res_low  = new_r_Proj(resproj, env->low_unsigned, 0);
+                       ir_node *res_high = new_r_Proj(resproj, mode,              1);
+                       set_lowered(env, proj, res_low, res_high);
                        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 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.
+ * Translate a binop.
  *
  * Create an intrinsic Call.
  */
-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;
-       ir_graph *irg;
-       node_entry_t *entry;
-
-       irn   = get_binop_left(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
-               return;
-       }  /* if */
-
-       in[0] = entry->low_word;
-       in[1] = entry->high_word;
-
-       irn   = get_binop_right(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* 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;
-       irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, block, env);
-       irn = new_rd_Call(dbg, irg, block, get_irg_no_mem(current_ir_graph),
-               irn, 4, in, mtp);
-       set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(irg, block, irn, mode_T, pn_Call_T_result);
-
-       idx = get_irn_idx(node);
-       assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = new_r_Proj(irg, block, irn, env->params->low_unsigned, 0);
-       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode,                      1);
-}  /* lower_Binop */
+static void lower_binop(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_node            *left        = get_binop_left(node);
+       ir_node            *right       = get_binop_right(node);
+       const node_entry_t *left_entry  = get_node_entry(env, left);
+       const node_entry_t *right_entry = get_node_entry(env, right);
+       ir_node            *in[4]       = {
+               left_entry->low_word, left_entry->high_word,
+               right_entry->low_word, right_entry->high_word
+       };
+       dbg_info           *dbgi        = get_irn_dbg_info(node);
+       ir_node            *block       = get_nodes_block(node);
+       ir_graph           *irg         = get_irn_irg(block);
+       ir_type            *mtp
+               = mode_is_signed(mode) ? binop_tp_s : binop_tp_u;
+       ir_node            *addr
+               = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, env);
+       ir_node            *call
+               = new_rd_Call(dbgi, block, get_irg_no_mem(irg), addr, 4, in, mtp);
+       ir_node            *resproj  = new_r_Proj(call, mode_T, pn_Call_T_result);
+       ir_node            *res_low  = new_r_Proj(resproj, env->low_unsigned, 0);
+       ir_node            *res_high = new_r_Proj(resproj, mode,              1);
+       set_irn_pinned(call, get_irn_pinned(node));
+       set_lowered(env, node, res_low, res_high);
+}
 
 /**
  * Translate a Shiftop.
  *
  * Create an intrinsic Call.
  */
-static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) {
-       ir_node  *block, *irn;
-       ir_node  *in[3];
-       dbg_info *dbg;
-       ir_type  *mtp;
-       int      idx;
-       ir_graph *irg;
-       node_entry_t *entry;
-
-       irn   = get_binop_left(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
-               return;
-       }  /* 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);
-
-       dbg   = get_irn_dbg_info(node);
-       block = get_nodes_block(node);
-       irg  = current_ir_graph;
-
-       mtp = mode_is_signed(mode) ? shiftop_tp_s : shiftop_tp_u;
-       irn = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, block, env);
-       irn = new_rd_Call(dbg, irg, block, get_irg_no_mem(current_ir_graph),
-               irn, 3, in, mtp);
-       set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(irg, block, irn, mode_T, pn_Call_T_result);
+static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_node            *block      = get_nodes_block(node);
+       ir_node            *left       = get_binop_left(node);
+       const node_entry_t *left_entry = get_node_entry(env, left);
+       ir_node            *right      = get_binop_right(node);
+       ir_node            *in[3]      = {
+               left_entry->low_word, left_entry->high_word,
+               /* it should be safe to conv to low_unsigned */
+               new_r_Conv(block, right, env->low_unsigned)
+       };
+       dbg_info           *dbgi       = get_irn_dbg_info(node);
+       ir_graph           *irg        = get_irn_irg(block);
+       ir_type            *mtp
+               = mode_is_signed(mode) ? shiftop_tp_s : shiftop_tp_u;
+       ir_node            *addr
+               = get_intrinsic_address(mtp, get_irn_op(node), mode, mode, env);
+       ir_node            *call
+               = new_rd_Call(dbgi, block, get_irg_no_mem(irg), addr, 3, in, mtp);
+       ir_node            *resproj  = new_r_Proj(call, mode_T, pn_Call_T_result);
+       ir_node            *res_low  = new_r_Proj(resproj, env->low_unsigned, 0);
+       ir_node            *res_high = new_r_Proj(resproj, mode,              1);
 
-       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 */
+       set_irn_pinned(call, get_irn_pinned(node));
+       set_lowered(env, node, res_low, res_high);
+}
 
 /**
  * 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);
+               ir_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 *c;
+                       ir_node *block        = get_nodes_block(node);
+                       ir_node *left         = get_Shr_left(node);
+                       ir_mode *low_unsigned = env->low_unsigned;
                        long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
-                       int idx = get_irn_idx(left);
+                       const node_entry_t *left_entry = get_node_entry(env, left);
+                       ir_node *res_low;
+                       ir_node *res_high;
 
-                       left = env->entries[idx]->high_word;
-                       idx = get_irn_idx(node);
+                       left = left_entry->high_word;
+
+                       /* 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, env->params->low_unsigned, shf_cnt);
-                               env->entries[idx]->low_word = new_r_Shr(irg, block, left, c, mode);
+                               ir_node *c = new_r_Const_long(irg, low_unsigned, shf_cnt);
+                               res_low = 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, get_mode_null(mode));
+                               res_low = left;
+                       }
+                       res_high = new_r_Const(irg, get_mode_null(mode));
+                       set_lowered(env, node, res_low, res_high);
 
                        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);
-
-               if (tarval_is_long(tv) &&
-                   get_tarval_long(tv) >= (long)get_mode_size_bits(mode)) {
-                       ir_mode *mode_l;
-                       ir_node *block = get_nodes_block(node);
-                       ir_node *left = get_Shl_left(node);
-                       ir_node *c;
-                       long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
-                       int idx = get_irn_idx(left);
-
-                       left = new_r_Conv(irg, block, env->entries[idx]->low_word, mode);
-                       idx = get_irn_idx(node);
+               ir_tarval *tv = get_Const_tarval(right);
+
+               if (tarval_is_long(tv)) {
+                       long value = get_tarval_long(tv);
+                   if (value >= (long)get_mode_size_bits(mode)) {
+                               /* simple case: shift above the lower word */
+                               ir_mode *mode_l;
+                               ir_node *block = get_nodes_block(node);
+                               ir_node *left = get_Shl_left(node);
+                               ir_node *c;
+                               long shf_cnt = get_tarval_long(tv) - get_mode_size_bits(mode);
+                               const node_entry_t *left_entry = get_node_entry(env, left);
+                               ir_node  *res_low;
+                               ir_node  *res_high;
+
+                               left = left_entry->low_word;
+                               left = new_r_Conv(block, left, mode);
+
+                               mode_l = env->low_unsigned;
+                               if (shf_cnt > 0) {
+                                       c        = new_r_Const_long(irg, mode_l, shf_cnt);
+                                       res_high = new_r_Shl(block, left, c, mode);
+                               } else {
+                                       res_high = left;
+                               }
+                               res_low = new_r_Const(irg, get_mode_null(mode_l));
+                               set_lowered(env, node, res_low, res_high);
 
-                       mode_l = env->params->low_unsigned;
-                       if (shf_cnt > 0) {
-                               c = new_r_Const_long(irg, mode_l, shf_cnt);
-                               env->entries[idx]->high_word = new_r_Shl(irg, block, left, c, mode);
-                       } else {
-                               env->entries[idx]->high_word = left;
-                       }  /* if */
-                       env->entries[idx]->low_word  = new_r_Const(irg, get_mode_null(mode_l));
+                               return;
+                       }
+                       if (value == 1) {
+                               /* left << 1 == left + left */
+                               ir_node            *left        = get_binop_left(node);
+                               const node_entry_t *left_entry  = get_node_entry(env, left);
+                               ir_node            *in[4]       = {
+                                       left_entry->low_word, left_entry->high_word,
+                                       left_entry->low_word, left_entry->high_word,
+                               };
+                               dbg_info           *dbgi        = get_irn_dbg_info(node);
+                               ir_node            *block       = get_nodes_block(node);
+                               ir_graph           *irg         = get_irn_irg(block);
+                               ir_type            *mtp
+                                       = mode_is_signed(mode) ? binop_tp_s : binop_tp_u;
+                               ir_node            *addr
+                                       = get_intrinsic_address(mtp, op_Add, mode, mode, env);
+                               ir_node            *call
+                                       = new_rd_Call(dbgi, block, get_irg_no_mem(irg), addr, 4, in, mtp);
+                               ir_node            *resproj  = new_r_Proj(call, mode_T, pn_Call_T_result);
+                               ir_node            *res_low  = new_r_Proj(resproj, env->low_unsigned, 0);
+                               ir_node            *res_high = new_r_Proj(resproj, mode,              1);
+                               set_irn_pinned(call, get_irn_pinned(node));
+                               set_lowered(env, node, res_low, res_high);
 
-                       return;
-               }  /* if */
-       }  /* if */
+                               return;
+                       }
+               }
+       }
        lower_Shiftop(node, mode, env);
-}  /* lower_Shl */
+}
 
 /**
  * Translate a Shrs and handle special cases.
  */
-static void lower_Shrs(ir_node *node, ir_mode *mode, lower_env_t *env) {
+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);
+               ir_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);
-                       int      idx     = get_irn_idx(left);
-                       ir_mode *mode_l;
-                       ir_node *low;
+                       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);
+                       const node_entry_t *left_entry = get_node_entry(env, left);
+                       ir_node *left_unsigned = left;
+                       ir_node *res_low;
+                       ir_node *res_high;
                        ir_node *c;
 
-                       left = env->entries[idx]->high_word;
-                       idx = get_irn_idx(node);
+                       left = left_entry->high_word;
+
+                       /* 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);
 
-                       mode_l = env->params->low_unsigned;
                        if (shf_cnt > 0) {
-                               c   = new_r_Const_long(irg, mode_l, shf_cnt);
-                               low = new_r_Shrs(irg, block, left, c, mode);
+                               c       = new_r_Const_long(irg, low_unsigned, shf_cnt);
+                               res_low = new_r_Shrs(block, left_unsigned, c, low_unsigned);
                        } else {
-                               low = left;
-                       }  /* if */
-                       /* low word is expected to have mode_l */
-                       env->entries[idx]->low_word = new_r_Conv(irg, block, low, mode_l);
-
-                       c = new_r_Const_long(irg, mode_l, get_mode_size_bits(mode) - 1);
-                       env->entries[idx]->high_word = new_r_Shrs(irg, block, left, c, mode);
+                               res_low = left_unsigned;
+                       }
 
+                       c        = new_r_Const(irg, get_mode_all_one(low_unsigned));
+                       res_high = new_r_Shrs(block, left, c, mode);
+                       set_lowered(env, node, res_low, res_high);
                        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) {
-       lower_env_t *lenv = env;
+static void prepare_links_and_handle_rotl(ir_node *node, void *env)
+{
+       lower_env_t *lenv = (lower_env_t*)env;
 
        if (is_Rotl(node)) {
-               ir_mode *mode = get_irn_op_mode(node);
-                       if (mode == lenv->params->high_signed ||
-                           mode == lenv->params->high_unsigned) {
-                               ir_node  *right = get_Rotl_right(node);
-                               ir_node  *left, *shl, *shr, *or, *block, *sub, *c;
-                               ir_mode  *omode, *rmode;
-                               ir_graph *irg;
-                               dbg_info *dbg;
-                               optimization_state_t state;
+               ir_mode  *mode = get_irn_op_mode(node);
+               ir_node  *right;
+               ir_node  *left, *shl, *shr, *ornode, *block, *sub, *c;
+               ir_mode  *omode, *rmode;
+               ir_graph *irg;
+               dbg_info *dbg;
+               optimization_state_t state;
 
-                               if (get_mode_arithmetic(mode) == irma_twos_complement && is_Const(right)) {
-                                       tarval *tv = get_Const_tarval(right);
+               if (mode != lenv->high_signed && mode != lenv->high_unsigned) {
+                       prepare_links(lenv, node);
+                       return;
+               }
 
-                                       if (tarval_is_long(tv) &&
-                                           get_tarval_long(tv) == (long)get_mode_size_bits(mode)) {
-                                               /* will be optimized in lower_Rotl() */
-                                               return;
-                                       }
-                               }
+               /* replace the Rotl(x,y) by an Or(Shl(x,y), Shr(x,64-y)) */
+               right = get_Rotl_right(node);
+               irg   = get_irn_irg(node);
+               dbg   = get_irn_dbg_info(node);
+               omode = get_irn_mode(node);
+               left  = get_Rotl_left(node);
+               block = get_nodes_block(node);
+               shl   = new_rd_Shl(dbg, block, left, right, omode);
+               rmode = get_irn_mode(right);
+               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);
+
+               /* switch optimization off here, or we will get the Rotl back */
+               save_optimization_state(&state);
+               set_opt_algebraic_simplification(0);
+               ornode = new_rd_Or(dbg, block, shl, shr, omode);
+               restore_optimization_state(&state);
+
+               exchange(node, ornode);
+
+               /* do lowering on the new nodes */
+               prepare_links(lenv, shl);
+               prepare_links(lenv, c);
+               prepare_links(lenv, sub);
+               prepare_links(lenv, shr);
+               prepare_links(lenv, ornode);
+               return;
+       }
 
-                               /* replace the Rotl(x,y) by an Or(Shl(x,y), Shr(x,64-y)) and lower those */
-                               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);
-                               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);
-
-                               /* 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);
-                               restore_optimization_state(&state);
-
-                               exchange(node, or);
-
-                               /* do lowering on the new nodes */
-                               prepare_links(shl, env);
-                               prepare_links(c, env);
-                               prepare_links(sub, env);
-                               prepare_links(shr, env);
-                               prepare_links(or, env);
-                       }
-       } else {
-               prepare_links(node, env);
-       }
+       prepare_links(lenv, node);
 }
 
-/**
- * Translate a special case Rotl(x, sizeof(w)).
- */
-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);
-       (void) right;
-       (void) mode;
-
-       assert(get_mode_arithmetic(mode) == irma_twos_complement &&
-              is_Const(right) && tarval_is_long(get_Const_tarval(right)) &&
-              get_tarval_long(get_Const_tarval(right)) == (long)get_mode_size_bits(mode));
-
-       l = env->entries[idx]->low_word;
-       h = env->entries[idx]->high_word;
-       idx = get_irn_idx(node);
-
-       env->entries[idx]->low_word  = h;
-       env->entries[idx]->high_word = l;
-}  /* lower_Rotl */
-
 /**
  * Translate an Unop.
  *
  * Create an intrinsic Call.
  */
-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;
-       node_entry_t *entry;
-
-       irn   = get_unop_op(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* 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;
-
-       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);
-       set_irn_pinned(irn, get_irn_pinned(node));
-       irn = new_r_Proj(irg, block, irn, mode_T, pn_Call_T_result);
-
-       idx = get_irn_idx(node);
-       assert(idx < env->n_entries);
-       env->entries[idx]->low_word  = new_r_Proj(irg, block, irn, env->params->low_unsigned, 0);
-       env->entries[idx]->high_word = new_r_Proj(irg, block, irn, mode,                      1);
-}  /* lower_Unop */
+static void lower_Unop(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_node            *op       = get_unop_op(node);
+       const node_entry_t *op_entry = get_node_entry(env, op);
+       ir_node            *in[2]    = { op_entry->low_word, op_entry->high_word };
+       dbg_info           *dbgi     = get_irn_dbg_info(node);
+       ir_node            *block    = get_nodes_block(node);
+       ir_graph           *irg      = get_irn_irg(block);
+       ir_type            *mtp      = mode_is_signed(mode) ? unop_tp_s : unop_tp_u;
+       ir_op              *irop     = get_irn_op(node);
+       ir_node            *addr     = get_intrinsic_address(mtp, irop, mode, mode, env);
+       ir_node            *nomem    = get_irg_no_mem(irg);
+       ir_node            *call     = new_rd_Call(dbgi, block, nomem, addr, 2, in, mtp);
+       ir_node            *resproj  = new_r_Proj(call, mode_T, pn_Call_T_result);
+       ir_node            *res_low  = new_r_Proj(resproj, env->low_unsigned, 0);
+       ir_node            *res_high = new_r_Proj(resproj, mode,              1);
+       set_irn_pinned(call, get_irn_pinned(node));
+       set_lowered(env, node, res_low, res_high);
+}
 
 /**
- * Translate a logical Binop.
+ * Translate a logical binop.
  *
- * Create two logical Binops.
+ * 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  *block, *irn;
-       ir_node  *lop_l, *lop_h, *rop_l, *rop_h;
-       dbg_info *dbg;
-       int      idx;
-       ir_graph *irg;
-       node_entry_t *entry;
-
-       irn   = get_binop_left(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
-               return;
-       }  /* if */
-
-       lop_l = entry->low_word;
-       lop_h = entry->high_word;
-
-       irn   = get_binop_right(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
-               return;
-       }  /* if */
-
-       rop_l = entry->low_word;
-       rop_h = entry->high_word;
+static void lower_binop_logical(ir_node *node, ir_mode *mode, lower_env_t *env,
+                                                               ir_node *(*constr_rd)(dbg_info *db, ir_node *block, ir_node *op1, ir_node *op2, ir_mode *mode) )
+{
+       ir_node            *left        = get_binop_left(node);
+       ir_node            *right       = get_binop_right(node);
+       const node_entry_t *left_entry  = get_node_entry(env, left);
+       const node_entry_t *right_entry = get_node_entry(env, right);
+       dbg_info           *dbgi        = get_irn_dbg_info(node);
+       ir_node            *block       = get_nodes_block(node);
+       ir_node            *res_low
+               = constr_rd(dbgi, block, left_entry->low_word, right_entry->low_word,
+                           env->low_unsigned);
+       ir_node            *res_high
+               = constr_rd(dbgi, block, left_entry->high_word, right_entry->high_word,
+                           mode);
+       set_lowered(env, node, res_low, res_high);
+}
 
-       dbg = get_irn_dbg_info(node);
-       block = get_nodes_block(node);
+static void lower_And(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       lower_binop_logical(node, mode, env, new_rd_And);
+}
 
-       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 */
-
-/** create a logical operation transformation */
-#define lower_logical(op)                                                \
-static void lower_##op(ir_node *node, ir_mode *mode, lower_env_t *env) { \
-       lower_Binop_logical(node, mode, env, new_rd_##op);                   \
+static void lower_Or(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       lower_binop_logical(node, mode, env, new_rd_Or);
 }
 
-lower_logical(And)
-lower_logical(Or)
-lower_logical(Eor)
+static void lower_Eor(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       lower_binop_logical(node, mode, env, new_rd_Eor);
+}
 
 /**
  * Translate a Not.
  *
  * Create two logical Nots.
  */
-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;
-       node_entry_t *entry;
-
-       irn   = get_Not_op(node);
-       entry = env->entries[get_irn_idx(irn)];
-       assert(entry);
-
-       if (! entry->low_word) {
-               /* 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;
+static void lower_Not(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_node            *op       = get_Not_op(node);
+       const node_entry_t *op_entry = get_node_entry(env, op);
+       dbg_info           *dbgi     = get_irn_dbg_info(node);
+       ir_node            *block    = get_nodes_block(node);
+       ir_node            *res_low
+               = new_rd_Not(dbgi, block, op_entry->low_word, env->low_unsigned);
+       ir_node            *res_high
+               = new_rd_Not(dbgi, block, op_entry->high_word, mode);
+       set_lowered(env, node, res_low, res_high);
+}
 
-       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 */
+static bool is_equality_cmp_0(const ir_node *node)
+{
+       ir_relation relation = get_Cmp_relation(node);
+       ir_node    *left     = get_Cmp_left(node);
+       ir_node    *right    = get_Cmp_right(node);
+       ir_mode    *mode     = get_irn_mode(left);
+
+       /* this probably makes no sense if unordered is involved */
+       assert(!mode_is_float(mode));
+
+       if (!is_Const(right) || !is_Const_null(right))
+               return false;
+       if (relation == ir_relation_equal)
+               return true;
+       if (mode_is_signed(mode)) {
+               return relation == ir_relation_less_greater;
+       } else {
+               return relation == ir_relation_greater;
+       }
+}
 
 /**
  * Translate a Cond.
  */
-static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
-       ir_node *cmp, *left, *right, *block;
+static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
+       ir_node *left, *right, *block;
        ir_node *sel = get_Cond_selector(node);
        ir_mode *m = get_irn_mode(sel);
-       int     idx;
-       (void) mode;
-
-       if (m == mode_b) {
-               node_entry_t *lentry, *rentry;
-               ir_node  *proj, *projT = NULL, *projF = NULL;
-               ir_node  *new_bl, *cmpH, *cmpL, *irn;
-               ir_node  *projHF, *projHT;
-               ir_node  *dst_blk;
-               ir_graph *irg;
-               pn_Cmp   pnc;
-               dbg_info *dbg;
-
-               if(!is_Proj(sel))
-                       return;
+       ir_mode *cmp_mode;
+       const node_entry_t *lentry, *rentry;
+       ir_node  *proj, *projT = NULL, *projF = NULL;
+       ir_node  *new_bl, *irn;
+       ir_node  *projHF, *projHT;
+       ir_node  *dst_blk;
+       ir_relation relation;
+       ir_graph *irg;
+       dbg_info *dbg;
 
-               cmp   = get_Proj_pred(sel);
-               if(!is_Cmp(cmp))
-                       return;
+       (void) mode;
 
-               left  = get_Cmp_left(cmp);
-               idx   = get_irn_idx(left);
-               lentry = env->entries[idx];
+       if (m != mode_b) {
+               if (m == env->high_signed || m == env->high_unsigned) {
+                       /* bad we can't really handle Switch with 64bit offsets */
+                       panic("Cond with 64bit jumptable not supported");
+               }
+               lower_node(env, sel);
+               return;
+       }
 
-               if (! lentry) {
-                       /* a normal Cmp */
-                       return;
-               }  /* if */
+       if (!is_Cmp(sel)) {
+               lower_node(env, sel);
+               return;
+       }
 
-               right = get_Cmp_right(cmp);
-               idx   = get_irn_idx(right);
-               rentry = env->entries[idx];
-               assert(rentry);
+       left     = get_Cmp_left(sel);
+       cmp_mode = get_irn_mode(left);
+       if (cmp_mode != env->high_signed && cmp_mode != env->high_unsigned) {
+               lower_node(env, sel);
+               return;
+       }
 
-               if (! lentry->low_word || !rentry->low_word) {
-                       /* not yet ready */
-                       pdeq_putr(env->waitq, node);
-                       return;
-               }  /* if */
+       right  = get_Cmp_right(sel);
+       lower_node(env, left);
+       lower_node(env, right);
+       lentry = get_node_entry(env, left);
+       rentry = get_node_entry(env, right);
 
-               /* all right, build the code */
-               for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
-                       long proj_nr = get_Proj_proj(proj);
+       /* all right, build the code */
+       for (proj = (ir_node*)get_irn_link(node); proj;
+            proj = (ir_node*)get_irn_link(proj)) {
+               long proj_nr = get_Proj_proj(proj);
 
-                       if (proj_nr == pn_Cond_true) {
-                               assert(projT == NULL && "more than one Proj(true)");
-                               projT = proj;
-                       } else {
-                               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);
-               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_node *proj = new_r_Proj(irg, block, cmp, mode_b, pnc);
-                               set_Cond_selector(node, proj);
-                               return;
-                       }
+               if (proj_nr == pn_Cond_true) {
+                       assert(projT == NULL && "more than one Proj(true)");
+                       projT = proj;
+               } else {
+                       assert(proj_nr == pn_Cond_false);
+                       assert(projF == NULL && "more than one Proj(false)");
+                       projF = proj;
                }
+               mark_irn_visited(proj);
+       }
+       assert(projT && projF);
+
+       /* create a new high compare */
+       block    = get_nodes_block(node);
+       irg      = get_Block_irg(block);
+       dbg      = get_irn_dbg_info(sel);
+       relation = get_Cmp_relation(sel);
+
+       if (is_equality_cmp_0(sel)) {
+               /* x ==/!= 0 ==> or(low,high) ==/!= 0 */
+               ir_mode *mode   = env->low_unsigned;
+               ir_node *low    = new_r_Conv(block, lentry->low_word, mode);
+               ir_node *high   = new_r_Conv(block, lentry->high_word, mode);
+               ir_node *ornode = new_rd_Or(dbg, block, low, high, mode);
+               ir_node *cmp    = new_rd_Cmp(dbg, block, ornode, new_r_Const_long(irg, mode, 0), relation);
+               set_Cond_selector(node, cmp);
+               return;
+       }
 
-               cmpH = new_rd_Cmp(dbg, irg, block, lentry->high_word, rentry->high_word);
-
-               if (pnc == pn_Cmp_Eq) {
-                       /* simple case:a == b <==> a_h == b_h && a_l == b_l */
-                       pmap_entry *entry = pmap_find(env->proj_2_block, projF);
+       if (relation == ir_relation_equal) {
+               /* simple case:a == b <==> a_h == b_h && a_l == b_l */
+               pmap_entry *entry = pmap_find(env->proj_2_block, projF);
 
-                       assert(entry);
-                       dst_blk = entry->value;
+               assert(entry);
+               dst_blk = (ir_node*)entry->value;
 
-                       irn = new_r_Proj(irg, block, cmpH, mode_b, pn_Cmp_Eq);
-                       dbg = get_irn_dbg_info(node);
-                       irn = new_rd_Cond(dbg, irg, block, irn);
+               irn = new_rd_Cmp(dbg, block, lentry->high_word, rentry->high_word,
+                                ir_relation_equal);
+               dbg = get_irn_dbg_info(node);
+               irn = new_rd_Cond(dbg, block, irn);
 
-                       projHF = new_r_Proj(irg, block, irn, mode_X, pn_Cond_false);
-                       mark_irn_visited(projHF);
-                       exchange(projF, projHF);
+               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);
-                       mark_irn_visited(projHT);
+               projHT = new_r_Proj(irn, mode_X, pn_Cond_true);
+               mark_irn_visited(projHT);
 
-                       new_bl = new_r_Block(irg, 1, &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);
-                       dbg = get_irn_dbg_info(node);
-                       irn = new_rd_Cond(dbg, irg, new_bl, irn);
+               dbg = get_irn_dbg_info(sel);
+               irn = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word,
+                                 ir_relation_equal);
+               dbg = get_irn_dbg_info(node);
+               irn = new_rd_Cond(dbg, new_bl, irn);
 
-                       proj = new_r_Proj(irg, new_bl, irn, mode_X, pn_Cond_false);
-                       mark_irn_visited(proj);
-                       add_block_cf_input(dst_blk, projHF, proj);
+               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);
-                       mark_irn_visited(proj);
-                       exchange(projT, proj);
-               } else if (pnc == pn_Cmp_Lg) {
-                       /* simple case:a != b <==> a_h != b_h || a_l != b_l */
-                       pmap_entry *entry = pmap_find(env->proj_2_block, projT);
+               proj = new_r_Proj(irn, mode_X, pn_Cond_true);
+               mark_irn_visited(proj);
+               exchange(projT, proj);
+       } else if (relation == ir_relation_less_greater) {
+               /* simple case:a != b <==> a_h != b_h || a_l != b_l */
+               pmap_entry *entry = pmap_find(env->proj_2_block, projT);
 
-                       assert(entry);
-                       dst_blk = entry->value;
+               assert(entry);
+               dst_blk = (ir_node*)entry->value;
 
-                       irn = new_r_Proj(irg, block, cmpH, mode_b, pn_Cmp_Lg);
-                       dbg = get_irn_dbg_info(node);
-                       irn = new_rd_Cond(dbg, irg, block, irn);
+               irn = new_rd_Cmp(dbg, block, lentry->high_word, rentry->high_word,
+                                ir_relation_less_greater);
+               dbg = get_irn_dbg_info(node);
+               irn = new_rd_Cond(dbg, block, irn);
 
-                       projHT = new_r_Proj(irg, block, irn, mode_X, pn_Cond_true);
-                       mark_irn_visited(projHT);
-                       exchange(projT, projHT);
+               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);
-                       mark_irn_visited(projHF);
+               projHF = new_r_Proj(irn, mode_X, pn_Cond_false);
+               mark_irn_visited(projHF);
 
-                       new_bl = new_r_Block(irg, 1, &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);
-                       dbg = get_irn_dbg_info(node);
-                       irn = new_rd_Cond(dbg, irg, new_bl, irn);
+               dbg = get_irn_dbg_info(sel);
+               irn = new_rd_Cmp(dbg, new_bl, lentry->low_word, rentry->low_word,
+                                ir_relation_less_greater);
+               dbg = get_irn_dbg_info(node);
+               irn = new_rd_Cond(dbg, new_bl, irn);
 
-                       proj = new_r_Proj(irg, new_bl, irn, mode_X, pn_Cond_true);
-                       mark_irn_visited(proj);
-                       add_block_cf_input(dst_blk, projHT, proj);
+               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);
-                       mark_irn_visited(proj);
-                       exchange(projF, proj);
-               } else {
-                       /* a rel b <==> a_h REL b_h || (a_h == b_h && a_l rel b_l) */
-                       ir_node *dstT, *dstF, *newbl_eq, *newbl_l;
-                       pmap_entry *entry;
+               proj = new_r_Proj(irn, mode_X, pn_Cond_false);
+               mark_irn_visited(proj);
+               exchange(projF, proj);
+       } else {
+               /* a rel b <==> a_h REL b_h || (a_h == b_h && a_l rel b_l) */
+               ir_node *dstT, *dstF, *newbl_eq, *newbl_l;
+               pmap_entry *entry;
 
-                       entry = pmap_find(env->proj_2_block, projT);
-                       assert(entry);
-                       dstT = entry->value;
+               entry = pmap_find(env->proj_2_block, projT);
+               assert(entry);
+               dstT = (ir_node*)entry->value;
 
-                       entry = pmap_find(env->proj_2_block, projF);
-                       assert(entry);
-                       dstF = entry->value;
+               entry = pmap_find(env->proj_2_block, projF);
+               assert(entry);
+               dstF = (ir_node*)entry->value;
 
-                       irn = new_r_Proj(irg, block, cmpH, mode_b, pnc & ~pn_Cmp_Eq);
-                       dbg = get_irn_dbg_info(node);
-                       irn = new_rd_Cond(dbg, irg, block, irn);
+               irn = new_rd_Cmp(dbg, block, lentry->high_word, rentry->high_word,
+                                relation & ~ir_relation_equal);
+               dbg = get_irn_dbg_info(node);
+               irn = new_rd_Cond(dbg, block, irn);
 
-                       projHT = new_r_Proj(irg, block, irn, mode_X, pn_Cond_true);
-                       mark_irn_visited(projHT);
-                       exchange(projT, projHT);
-                       projT = projHT;
+               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);
-                       mark_irn_visited(projHF);
+               projHF = new_r_Proj(irn, mode_X, pn_Cond_false);
+               mark_irn_visited(projHF);
 
-                       newbl_eq = new_r_Block(irg, 1, &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_rd_Cmp(dbg, block, lentry->high_word, rentry->high_word,
+                                ir_relation_equal);
+               irn = new_rd_Cond(dbg, newbl_eq, irn);
 
-                       proj = new_r_Proj(irg, newbl_eq, irn, mode_X, pn_Cond_false);
-                       mark_irn_visited(proj);
-                       exchange(projF, proj);
-                       projF = proj;
+               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);
-                       mark_irn_visited(proj);
+               proj = new_r_Proj(irn, mode_X, pn_Cond_true);
+               mark_irn_visited(proj);
 
-                       newbl_l = new_r_Block(irg, 1, &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);
-                       dbg = get_irn_dbg_info(node);
-                       irn = new_rd_Cond(dbg, irg, newbl_l, irn);
+               dbg = get_irn_dbg_info(sel);
+               irn = new_rd_Cmp(dbg, newbl_l, lentry->low_word, rentry->low_word,
+                                relation);
+               dbg = get_irn_dbg_info(node);
+               irn = new_rd_Cond(dbg, newbl_l, irn);
 
-                       proj = new_r_Proj(irg, newbl_l, irn, mode_X, pn_Cond_true);
-                       mark_irn_visited(proj);
-                       add_block_cf_input(dstT, projT, proj);
+               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);
-                       mark_irn_visited(proj);
-                       add_block_cf_input(dstF, projF, proj);
-               }  /* if */
+               proj = new_r_Proj(irn, mode_X, pn_Cond_false);
+               mark_irn_visited(proj);
+               add_block_cf_input(dstF, projF, proj);
+       }
 
-               /* we have changed the control flow */
-               env->flags |= CF_CHANGED;
-       } else {
-               idx = get_irn_idx(sel);
-
-               if (env->entries[idx]) {
-                       /*
-                          Bad, a jump-table with double-word index.
-                          This should not happen, but if it does we handle
-                          it like a Conv were between (in other words, ignore
-                          the high part.
-                        */
-
-                       if (! env->entries[idx]->low_word) {
-                               /* not ready yet, wait */
-                               pdeq_putr(env->waitq, node);
-                               return;
-                       }  /* if */
-                       set_Cond_selector(node, env->entries[idx]->low_word);
-               }  /* if */
-       }  /* if */
-}  /* lower_Cond */
+       /* we have changed the control flow */
+       env->flags |= CF_CHANGED;
+}
 
 /**
  * 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(dst_mode_l, get_mode_size_bits(dst_mode_h) - 1), dst_mode_h);
-                       } else {
-                               env->entries[idx]->high_word = new_Const(get_mode_null(dst_mode_h));
-                       }  /* if */
-               }  /* if */
-       } else {
-               ir_node *irn, *call;
-               ir_mode *omode = env->params->high_signed;
-               ir_type *mtp = get_conv_type(imode, omode, env);
-
-               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, 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);
-
-       assert(idx < env->n_entries);
+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);
+       ir_graph *irg          = get_irn_irg(node);
+       ir_node  *block        = get_nodes_block(node);
+       dbg_info *dbg          = get_irn_dbg_info(node);
+       ir_node  *res_low;
+       ir_node  *res_high;
+
+       ir_mode  *low_unsigned = env->low_unsigned;
+       ir_mode  *low_signed
+               = mode_is_signed(omode) ? env->low_signed : low_unsigned;
 
        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 (! 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);
-                       env->entries[idx]->high_word = new_rd_Conv(dbg, irg, block, env->entries[op_idx]->high_word, dst_mode);
+               if (imode == env->high_signed || imode == env->high_unsigned) {
+                       /* a Conv from Lu to Ls or Ls to Lu */
+                       const node_entry_t *op_entry = get_node_entry(env, op);
+                       res_low  = op_entry->low_word;
+                       res_high = 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;
+                       res_low = op;
 
                        if (mode_is_signed(imode)) {
-                               env->entries[idx]->high_word = new_rd_Shrs(dbg, irg, block, op,
-                                       new_Const_long(dst_mode, get_mode_size_bits(dst_mode) - 1), dst_mode);
+                               int      c       = get_mode_size_bits(low_signed) - 1;
+                               ir_node *cnst    = new_r_Const_long(irg, low_unsigned, c);
+                               if (get_irn_mode(op) != low_signed)
+                                       op = new_rd_Conv(dbg, block, op, low_signed);
+                               res_high = new_rd_Shrs(dbg, block, op, cnst, low_signed);
                        } else {
-                               env->entries[idx]->high_word = new_Const(get_mode_null(dst_mode));
-                       }  /* if */
-               }  /* if */
+                               res_high = new_r_Const(irg, get_mode_null(low_signed));
+                       }
+               }
+       } else if (imode == mode_b) {
+               res_low  = new_rd_Conv(dbg, block, op, low_unsigned);
+               res_high = 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);
+               irn = new_r_Proj(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 */
+               res_low  = new_r_Proj(irn, low_unsigned, 0);
+               res_high = new_r_Proj(irn, low_signed, 1);
+       }
+       set_lowered(env, node, res_low, res_high);
+}
 
 /**
- * Translate a Conv from higher_signed
+ * Translate a Conv from higher_unsigned
  */
-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 */
+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);
+       ir_graph           *irg   = get_irn_irg(node);
+       const node_entry_t *entry = get_node_entry(env, op);
 
        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_signed)
-                       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 *ornode = new_rd_Or(dbg, block, entry->low_word,
+                                           entry->high_word, mode);
+               set_Conv_op(node, ornode);
        } else {
                ir_node *irn, *call, *in[2];
-               ir_mode *imode = env->params->high_signed;
-               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_Ls */
+               exchange(node, new_r_Proj(irn, omode, 0));
+       }
+}
 
 /**
- * Translate a Conv from higher_unsigned
+ * lower Cmp
  */
-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;
-
-       assert(idx < env->n_entries);
+static void lower_Cmp(ir_node *cmp, ir_mode *m, lower_env_t *env)
+{
+       ir_node  *l    = get_Cmp_left(cmp);
+       ir_mode  *mode = get_irn_mode(l);
+       ir_node  *r, *low, *high, *t, *res;
+       ir_relation relation;
+       ir_node  *block;
+       dbg_info *dbg;
+       const node_entry_t *lentry;
+       const node_entry_t *rentry;
+       (void) m;
 
-       if (! env->entries[idx]->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
+       if (mode != env->high_signed && mode != env->high_unsigned)
                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_unsigned)
-                       op = new_rd_Conv(dbg, irg, block, op, omode);
+       r        = get_Cmp_right(cmp);
+       lentry   = get_node_entry(env, l);
+       rentry   = get_node_entry(env, r);
+       relation = get_Cmp_relation(cmp);
+       block    = get_nodes_block(cmp);
+       dbg      = get_irn_dbg_info(cmp);
+
+       /* easy case for x ==/!= 0 (see lower_Cond for details) */
+       if (is_equality_cmp_0(cmp)) {
+               ir_graph *irg     = get_irn_irg(cmp);
+               ir_mode  *mode    = env->low_unsigned;
+               ir_node  *low     = new_r_Conv(block, lentry->low_word, mode);
+               ir_node  *high    = new_r_Conv(block, lentry->high_word, mode);
+               ir_node  *ornode  = new_rd_Or(dbg, block, low, high, mode);
+               ir_node  *new_cmp = new_rd_Cmp(dbg, block, ornode, new_r_Const_long(irg, mode, 0), relation);
+               exchange(cmp, new_cmp);
+               return;
+       }
 
-               set_Conv_op(node, op);
+       if (relation == ir_relation_equal) {
+               /* simple case:a == b <==> a_h == b_h && a_l == b_l */
+               low  = new_rd_Cmp(dbg, block, lentry->low_word, rentry->low_word,
+                                 relation);
+               high = new_rd_Cmp(dbg, block, lentry->high_word, rentry->high_word,
+                                 relation);
+               res  = new_rd_And(dbg, block, low, high, mode_b);
+       } else if (relation == ir_relation_less_greater) {
+               /* simple case:a != b <==> a_h != b_h || a_l != b_l */
+               low  = new_rd_Cmp(dbg, block, lentry->low_word, rentry->low_word,
+                                 relation);
+               high = new_rd_Cmp(dbg, block, lentry->high_word, rentry->high_word,
+                                 relation);
+               res = new_rd_Or(dbg, block, low, high, mode_b);
        } else {
-               ir_node *irn, *call, *in[2];
-               ir_mode *imode = env->params->high_unsigned;
-               ir_type *mtp = get_conv_type(imode, omode, env);
-
-               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, block, env);
-               in[0] = env->entries[idx]->low_word;
-               in[1] = env->entries[idx]->high_word;
-
-               call = new_rd_Call(dbg, irg, block, get_irg_no_mem(irg), irn, 2, in, mtp);
-               set_irn_pinned(call, get_irn_pinned(node));
-               irn = new_r_Proj(irg, block, call, mode_T, pn_Call_T_result);
-
-               exchange(node, new_r_Proj(irg, block, irn, omode, 0));
-       }  /* if */
-}  /* lower_Conv_from_Lu */
+               /* a rel b <==> a_h REL b_h || (a_h == b_h && a_l rel b_l) */
+               ir_node *high1 = new_rd_Cmp(dbg, block, lentry->high_word,
+                       rentry->high_word, relation & ~ir_relation_equal);
+               low  = new_rd_Cmp(dbg, block, lentry->low_word, rentry->low_word,
+                                 relation);
+               high = new_rd_Cmp(dbg, block, lentry->high_word, rentry->high_word,
+                                 ir_relation_equal);
+               t = new_rd_And(dbg, block, low, high, mode_b);
+               res = new_rd_Or(dbg, block, high1, t, mode_b);
+       }
+       exchange(cmp, res);
+}
 
 /**
  * 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));
+               ir_mode *op_mode = get_irn_mode(get_Conv_op(node));
+
+               if (op_mode == env->high_signed || op_mode == env->high_unsigned) {
+                       lower_Conv_from_Ll(node, env);
+               }
+       }
+}
+
+/**
+ * Remember the new argument index of this value type entity in the lowered
+ * method type.
+ *
+ * @param ent  the entity
+ * @param pos  the argument index of this entity
+ */
+static inline void set_entity_arg_idx(ir_entity *ent, size_t pos)
+{
+       set_entity_link(ent, INT_TO_PTR(pos));
+}
 
-               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 */
+/**
+ * Retrieve the argument index of a value type entity.
+ *
+ * @param ent  the entity
+ */
+static size_t get_entity_arg_idx(const ir_entity *ent) {
+       return PTR_TO_INT(get_entity_link(ent));
+}
 
 /**
  * Lower the method type.
+ *
+ * @param env  the lower environment
+ * @param mtp  the method type to lower
+ *
+ * @return the lowered type
  */
-static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
+static ir_type *lower_mtp(lower_env_t *env, ir_type *mtp)
+{
        pmap_entry *entry;
-       ident      *id;
-       ir_type    *res;
-
-       if (is_lowered_type(mtp))
-               return mtp;
+       ir_type    *res, *value_type;
 
        entry = pmap_find(lowered_type, mtp);
        if (! entry) {
-               int i, n, r, n_param, n_res;
+               size_t i, orig_n_params, orig_n_res, n_param, n_res;
 
                /* count new number of params */
-               n_param = n = get_method_n_params(mtp);
-               for (i = n_param - 1; i >= 0; --i) {
-                       ir_type *tp = get_method_param_type(mtp, i);
+               n_param = orig_n_params = get_method_n_params(mtp);
+               for (i = orig_n_params; i > 0;) {
+                       ir_type *tp = get_method_param_type(mtp, --i);
 
                        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);
-               for (i = n_res - 1; i >= 0; --i) {
-                       ir_type *tp = get_method_res_type(mtp, i);
+               n_res = orig_n_res = get_method_n_ress(mtp);
+               for (i = orig_n_res; i > 0;) {
+                       ir_type *tp = get_method_res_type(mtp, --i);
 
                        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 = 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) {
+               for (i = n_param = 0; i < orig_n_params; ++i) {
                        ir_type *tp = get_method_param_type(mtp, i);
 
                        if (is_Primitive_type(tp)) {
                                ir_mode *mode = get_type_mode(tp);
 
-                               if (mode == env->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) {
+                       }
+               }
+               for (i = n_res = 0; i < orig_n_res; ++i) {
                        ir_type *tp = get_method_res_type(mtp, i);
 
                        if (is_Primitive_type(tp)) {
                                ir_mode *mode = get_type_mode(tp);
 
-                               if (mode == env->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 all entities of the value type */
+                       for (i = n_param = 0; i < orig_n_params; ++i) {
+                               ir_type   *tp  = get_method_param_type(mtp, i);
+                               ir_entity *ent = get_method_value_param_ent(mtp, i);
+
+                               set_entity_arg_idx(ent, n_param);
+                               if (is_Primitive_type(tp)) {
+                                       ir_mode *mode = get_type_mode(tp);
+
+                                       if (mode == env->high_signed || mode == env->high_unsigned) {
+                                               n_param += 2;
+                                               continue;
+                                       }
+                               }
+                               ++n_param;
+                       }
+
+                       set_lowered_type(value_type, get_method_value_param_type(res));
+               }
        } else {
-               res = entry->value;
-       }  /* if */
+               res = (ir_type*)entry->value;
+       }
        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;
+       size_t     i, j, n;
+       int        need_conv = 0;
        (void) mode;
 
        /* check if this return must be lowered */
@@ -1803,24 +1557,16 @@ 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) {
-                       idx = get_irn_idx(pred);
-                       if (! env->entries[idx]->low_word) {
-                               /* not ready yet, wait */
-                               pdeq_putr(env->waitq, node);
-                               return;
-                       }  /* if */
+               if (mode == env->high_signed || mode == env->high_unsigned)
                        need_conv = 1;
-               }  /* if */
-       }  /* for */
+       }
        if (! need_conv)
                return;
 
        ent = get_irg_entity(irg);
        mtp = get_entity_type(ent);
 
-       mtp = lower_mtp(mtp, env);
+       mtp = lower_mtp(env, mtp);
        set_entity_type(ent, mtp);
 
        /* create a new in array */
@@ -1828,79 +1574,75 @@ static void lower_Return(ir_node *node, ir_mode *mode, lower_env_t *env) {
        in[0] = get_Return_mem(node);
 
        for (j = i = 0, n = get_Return_n_ress(node); i < n; ++i) {
-               ir_node *pred = get_Return_res(node, i);
-
-               idx = get_irn_idx(pred);
-               assert(idx < env->n_entries);
+               ir_node *pred      = get_Return_res(node, i);
+               ir_mode *pred_mode = get_irn_mode(pred);
 
-               if (env->entries[idx]) {
-                       in[++j] = env->entries[idx]->low_word;
-                       in[++j] = env->entries[idx]->high_word;
+               if (pred_mode == env->high_signed || pred_mode == env->high_unsigned) {
+                       const node_entry_t *entry = get_node_entry(env, pred);
+                       in[++j] = entry->low_word;
+                       in[++j] = entry->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;
        long      *new_projs;
-       int       i, j, n_params, rem;
+       size_t    i, j, n_params;
+       int       rem;
        ir_node   *proj, *args;
        (void) mode;
 
-       if (is_lowered_type(tp)) {
-               mtp = get_associated_type(tp);
-       } else {
-               mtp = tp;
-       }  /* if */
-       assert(! is_lowered_type(mtp));
+       if (!mtp_must_be_lowered(env, tp)) return;
 
-       n_params = get_method_n_params(mtp);
-       if (n_params <= 0)
-               return;
+       n_params = get_method_n_params(tp);
 
        NEW_ARR_A(long, new_projs, n_params);
 
-       /* first check if we have parameters that must be fixed */
+       /* Calculate mapping of proj numbers in new_projs */
        for (i = j = 0; i < n_params; ++i, ++j) {
-               ir_type *tp = get_method_param_type(mtp, i);
+               ir_type *ptp = get_method_param_type(tp, i);
 
                new_projs[i] = j;
-               if (is_Primitive_type(tp)) {
-                       ir_mode *mode = get_type_mode(tp);
+               if (is_Primitive_type(ptp)) {
+                       ir_mode *mode = get_type_mode(ptp);
 
-                       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;
+               }
+       }
 
-       mtp = lower_mtp(mtp, env);
-       set_entity_type(ent, mtp);
+       /* lower method type */
+       tp = lower_mtp(env, tp);
+       set_entity_type(ent, tp);
 
        /* switch off optimization for new Proj nodes or they might be CSE'ed
           with not patched one's */
        rem = get_optimize();
        set_optimize(0);
 
-       /* ok, fix all Proj's and create new ones */
+       /* fix all Proj's and create new ones */
        args = get_irg_args(irg);
-       for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
+       for (proj = (ir_node*)get_irn_link(node); proj;
+            proj = (ir_node*)get_irn_link(proj)) {
                ir_node *pred = get_Proj_pred(proj);
                long proj_nr;
-               int idx;
                ir_mode *mode;
+               ir_mode *mode_l;
+               ir_mode *mode_h;
+               ir_node *res_low;
+               ir_node *res_high;
                dbg_info *dbg;
 
                /* do not visit this node again */
@@ -1912,238 +1654,216 @@ static void lower_Start(ir_node *node, ir_mode *mode, lower_env_t *env) {
                proj_nr = get_Proj_proj(proj);
                set_Proj_proj(proj, new_projs[proj_nr]);
 
-               idx = get_irn_idx(proj);
-               if (env->entries[idx]) {
-                       ir_mode *low_mode = env->params->low_unsigned;
-
-                       mode = get_irn_mode(proj);
+               mode = get_irn_mode(proj);
+               mode_l = env->low_unsigned;
+               if (mode == env->high_signed) {
+                       mode_h = env->low_signed;
+               } else if (mode == env->high_unsigned) {
+                       mode_h = env->low_unsigned;
+               } else {
+                       continue;
+               }
 
-                       if (mode == env->params->high_signed) {
-                               mode = env->params->low_signed;
-                       } else {
-                               mode = env->params->low_unsigned;
-                       }  /* if */
-
-                       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]);
-                       env->entries[idx]->high_word =
-                               new_rd_Proj(dbg, irg, get_nodes_block(proj), args, mode, new_projs[proj_nr] + 1);
-               }  /* if */
-       }  /* for */
+               dbg = get_irn_dbg_info(proj);
+               res_low  = new_rd_Proj(dbg, args, mode_l, new_projs[proj_nr]);
+               res_high = new_rd_Proj(dbg, args, mode_h, new_projs[proj_nr] + 1);
+               set_lowered(env, proj, res_low, res_high);
+       }
        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;
-       int      n_params, n_res, need_lower = 0;
-       int      i, j;
+       size_t   n_params, n_res;
+       bool     need_lower = false;
+       size_t   i, j;
+       size_t   p;
        long     *res_numbers = NULL;
        (void) mode;
 
-       if (is_lowered_type(tp)) {
-               call_tp = get_associated_type(tp);
-       } else {
-               call_tp = tp;
-       }  /* if */
-
-       assert(! is_lowered_type(call_tp));
-
-       n_params = get_method_n_params(call_tp);
-       for (i = 0; i < n_params; ++i) {
-               ir_type *tp = get_method_param_type(call_tp, i);
+       n_params = get_method_n_params(tp);
+       for (p = 0; p < n_params; ++p) {
+               ir_type *ptp = get_method_param_type(tp, p);
 
-               if (is_Primitive_type(tp)) {
-                       ir_mode *mode = get_type_mode(tp);
+               if (is_Primitive_type(ptp)) {
+                       ir_mode *mode = get_type_mode(ptp);
 
-                       if (mode == env->params->high_signed ||
-                               mode == env->params->high_unsigned) {
-                               need_lower = 1;
+                       if (mode == env->high_signed || mode == env->high_unsigned) {
+                               need_lower = true;
                                break;
-                       }  /* if */
-               }  /* if */
-       }  /* for */
-       n_res = get_method_n_ress(call_tp);
+                       }
+               }
+       }
+       n_res = get_method_n_ress(tp);
        if (n_res > 0) {
                NEW_ARR_A(long, res_numbers, n_res);
 
                for (i = j = 0; i < n_res; ++i, ++j) {
-                       ir_type *tp = get_method_res_type(call_tp, i);
+                       ir_type *ptp = get_method_res_type(tp, i);
 
                        res_numbers[i] = j;
-                       if (is_Primitive_type(tp)) {
-                               ir_mode *mode = get_type_mode(tp);
+                       if (is_Primitive_type(ptp)) {
+                               ir_mode *mode = get_type_mode(ptp);
 
-                               if (mode == env->params->high_signed ||
-                                       mode == env->params->high_unsigned) {
-                                       need_lower = 1;
+                               if (mode == env->high_signed || mode == env->high_unsigned) {
+                                       need_lower = true;
                                        ++j;
-                               }  /* if */
-                       }  /* if */
-               }  /* for */
-       }  /* if */
+                               }
+                       }
+               }
+       }
 
        if (! need_lower)
                return;
 
        /* let's lower it */
-       call_tp = lower_mtp(call_tp, env);
-       set_Call_type(node, call_tp);
+       tp = lower_mtp(env, tp);
+       set_Call_type(node, tp);
 
-       NEW_ARR_A(ir_node *, in, get_method_n_params(call_tp) + 2);
+       NEW_ARR_A(ir_node *, in, get_method_n_params(tp) + 2);
 
        in[0] = get_Call_mem(node);
        in[1] = get_Call_ptr(node);
 
        for (j = 2, i = 0; i < n_params; ++i) {
-               ir_node *pred = get_Call_param(node, i);
-               int     idx = get_irn_idx(pred);
+               ir_node *pred      = get_Call_param(node, i);
+               ir_mode *pred_mode = get_irn_mode(pred);
 
-               if (env->entries[idx]) {
-                       if (! env->entries[idx]->low_word) {
-                               /* not ready yet, wait */
-                               pdeq_putr(env->waitq, node);
-                               return;
-                       }
-                       in[j++] = env->entries[idx]->low_word;
-                       in[j++] = env->entries[idx]->high_word;
+               if (pred_mode == env->high_signed || pred_mode == env->high_unsigned) {
+                       const node_entry_t *pred_entry = get_node_entry(env, pred);
+                       in[j++] = pred_entry->low_word;
+                       in[j++] = pred_entry->high_word;
                } else {
                        in[j++] = pred;
-               }  /* if */
-       }  /* for */
+               }
+       }
 
        set_irn_in(node, j, in);
 
        /* fix the results */
        results = NULL;
-       for (proj = get_irn_link(node); proj; proj = get_irn_link(proj)) {
+       for (proj = (ir_node*)get_irn_link(node); proj;
+            proj = (ir_node*)get_irn_link(proj)) {
                long proj_nr = get_Proj_proj(proj);
 
                if (proj_nr == pn_Call_T_result && get_Proj_pred(proj) == node) {
                        /* found the result proj */
                        results = proj;
                        break;
-               }  /* if */
-       }  /* for */
+               }
+       }
 
-       if (results) {          /* there are results */
+       if (results != NULL) {    /* there are results */
                int rem = get_optimize();
 
                /* switch off optimization for new Proj nodes or they might be CSE'ed
                   with not patched one's */
                set_optimize(0);
-               for (i = j = 0, proj = get_irn_link(results); proj; proj = get_irn_link(proj), ++i, ++j) {
+               for (proj = (ir_node*)get_irn_link(results); proj; proj = (ir_node*)get_irn_link(proj)) {
                        if (get_Proj_pred(proj) == results) {
-                               long proj_nr = get_Proj_proj(proj);
-                               int idx;
+                               long      proj_nr   = get_Proj_proj(proj);
+                               ir_mode  *proj_mode = get_irn_mode(proj);
+                               ir_mode  *mode_l;
+                               ir_mode  *mode_h;
+                               ir_node  *res_low;
+                               ir_node  *res_high;
+                               dbg_info *dbg;
 
                                /* 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;
-                                       dbg_info *dbg;
-
-                                       if (mode == env->params->high_signed) {
-                                               mode = env->params->low_signed;
-                                       } else {
-                                               mode = env->params->low_unsigned;
-                                       }  /* if */
-
-                                       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]);
-                                       env->entries[idx]->high_word =
-                                               new_rd_Proj(dbg, irg, get_nodes_block(proj), results, mode, res_numbers[proj_nr] + 1);
-                               }  /* if */
                                mark_irn_visited(proj);
-                       }  /* if */
-               }  /* for */
+
+                               set_Proj_proj(proj, res_numbers[proj_nr]);
+
+                               mode_l = env->low_unsigned;
+                               if (proj_mode == env->high_signed) {
+                                       mode_h = env->low_signed;
+                               } else if (proj_mode == env->high_unsigned) {
+                                       mode_h = env->low_unsigned;
+                               } else {
+                                       continue;
+                               }
+
+                               dbg      = get_irn_dbg_info(proj);
+                               res_low  = new_rd_Proj(dbg, results, mode_l, res_numbers[proj_nr]);
+                               res_high = new_rd_Proj(dbg, results, mode_h, res_numbers[proj_nr] + 1);
+                               set_lowered(env, proj, res_low, res_high);
+                       }
+               }
                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;
-
-       env->entries[idx]->low_word  = new_r_Unknown(irg, low_mode);
-       env->entries[idx]->high_word = new_r_Unknown(irg, mode);
-}  /* lower_Unknown */
+static void lower_Unknown(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  *res_low  = new_r_Unknown(irg, low_mode);
+       ir_node  *res_high = new_r_Unknown(irg, mode);
+       set_lowered(env, node, res_low, res_high);
+}
 
 /**
  * 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;
-       ir_node  *block, *unk_l, *unk_h, *phi_l, *phi_h;
-       ir_node  **inl, **inh;
+static void lower_Phi(lower_env_t *env, ir_node *phi)
+{
+       ir_mode  *mode = get_irn_mode(phi);
+       int       i;
+       int       arity;
+       ir_node **in_l;
+       ir_node **in_h;
+       ir_node  *unk_l;
+       ir_node  *unk_h;
+       ir_node  *phi_l;
+       ir_node  *phi_h;
        dbg_info *dbg;
-       int      idx, i, arity = get_Phi_n_preds(phi);
-       int      enq = 0;
-
-       idx = get_irn_idx(phi);
-       if (env->entries[idx]->low_word) {
-               /* Phi nodes already build, check for inputs */
-               ir_node *phil = env->entries[idx]->low_word;
-               ir_node *phih = env->entries[idx]->high_word;
+       ir_node  *block;
+       ir_graph *irg;
+       ir_mode  *mode_l;
+       ir_mode  *mode_h;
 
-               for (i = 0; i < arity; ++i) {
-                       ir_node *pred = get_Phi_pred(phi, i);
-                       int     idx = get_irn_idx(pred);
+       /* enqueue predecessors */
+       arity = get_Phi_n_preds(phi);
+       for (i = 0; i < arity; ++i) {
+               ir_node *pred = get_Phi_pred(phi, i);
+               pdeq_putr(env->waitq, pred);
+       }
 
-                       if (env->entries[idx]->low_word) {
-                               set_Phi_pred(phil, i, env->entries[idx]->low_word);
-                               set_Phi_pred(phih, i, env->entries[idx]->high_word);
-                       } else {
-                               /* still not ready */
-                               pdeq_putr(env->waitq, phi);
-                               return;
-                       }  /* if */
-               }  /* for */
-       }  /* if */
+       if (mode != env->high_signed && mode != env->high_unsigned)
+               return;
 
        /* 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);
-
+       NEW_ARR_A(ir_node *, in_l, arity);
+       NEW_ARR_A(ir_node *, in_h, arity);
+       irg    = get_irn_irg(phi);
+       mode_l = env->low_unsigned;
+       mode_h = mode == env->high_signed ? env->low_signed : env->low_unsigned;
+       unk_l  = new_r_Dummy(irg, mode_l);
+       unk_h  = new_r_Dummy(irg, mode_h);
        for (i = 0; i < arity; ++i) {
-               ir_node *pred = get_Phi_pred(phi, i);
-               int     idx = get_irn_idx(pred);
-
-               if (env->entries[idx]->low_word) {
-                       inl[i] = env->entries[idx]->low_word;
-                       inh[i] = env->entries[idx]->high_word;
-               } else {
-                       inl[i] = unk_l;
-                       inh[i] = unk_h;
-                       enq = 1;
-               }  /* if */
-       }  /* for */
+               in_l[i] = unk_l;
+               in_h[i] = unk_h;
+       }
 
        dbg   = get_irn_dbg_info(phi);
        block = get_nodes_block(phi);
+       phi_l = new_rd_Phi(dbg, block, arity, in_l, mode_l);
+       phi_h = new_rd_Phi(dbg, block, arity, in_h, mode_h);
 
-       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);
+       set_lowered(env, phi, phi_l, phi_h);
+
+       /* remember that we need to fixup the predecessors later */
+       ARR_APP1(ir_node*, env->lowered_phis, phi);
 
        /* Don't forget to link the new Phi nodes into the block.
         * Beware that some Phis might be optimized away. */
@@ -2151,85 +1871,174 @@ static void lower_Phi(ir_node *phi, ir_mode *mode, lower_env_t *env) {
                add_Block_phi(block, phi_l);
        if (is_Phi(phi_h))
                add_Block_phi(block, phi_h);
+}
+
+static void fixup_phi(lower_env_t *env, ir_node *phi)
+{
+       const node_entry_t *entry = get_node_entry(env, phi);
+       ir_node            *phi_l = entry->low_word;
+       ir_node            *phi_h = entry->high_word;
+       int                 arity = get_Phi_n_preds(phi);
+       int                 i;
+
+       /* exchange phi predecessors which are lowered by now */
+       for (i = 0; i < arity; ++i) {
+               ir_node            *pred       = get_Phi_pred(phi, i);
+               const node_entry_t *pred_entry = get_node_entry(env, pred);
 
-       if (enq) {
-               /* not yet finished */
-               pdeq_putr(env->waitq, phi);
-       }  /* if */
-}  /* lower_Phi */
+               set_Phi_pred(phi_l, i, pred_entry->low_word);
+               set_Phi_pred(phi_h, i, pred_entry->high_word);
+       }
+}
 
 /**
  * Translate a Mux.
  */
-static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env) {
-       ir_graph *irg = current_ir_graph;
-       ir_node  *block, *val;
-       ir_node  *true_l, *true_h, *false_l, *false_h, *sel;
-       dbg_info *dbg;
-       int      idx;
-
-       val = get_Mux_true(mux);
-       idx = get_irn_idx(val);
-       if (env->entries[idx]->low_word) {
-               /* Values already build */
-               true_l = env->entries[idx]->low_word;
-               true_h = env->entries[idx]->high_word;
-       } else {
-               /* still not ready */
-               pdeq_putr(env->waitq, mux);
-               return;
-       }  /* if */
-
-       val = get_Mux_false(mux);
-       idx = get_irn_idx(val);
-       if (env->entries[idx]->low_word) {
-               /* Values already build */
-               false_l = env->entries[idx]->low_word;
-               false_h = env->entries[idx]->high_word;
-       } else {
-               /* still not ready */
-               pdeq_putr(env->waitq, mux);
-               return;
-       }  /* if */
-
-
-       sel = get_Mux_sel(mux);
-
-       dbg   = get_irn_dbg_info(mux);
-       block = get_nodes_block(mux);
-
-       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 */
+static void lower_Mux(ir_node *mux, ir_mode *mode, lower_env_t *env)
+{
+       ir_node            *truen       = get_Mux_true(mux);
+       ir_node            *falsen      = get_Mux_false(mux);
+       ir_node            *sel         = get_Mux_sel(mux);
+       const node_entry_t *true_entry  = get_node_entry(env, truen);
+       const node_entry_t *false_entry = get_node_entry(env, falsen);
+       ir_node            *true_l      = true_entry->low_word;
+       ir_node            *true_h      = true_entry->high_word;
+       ir_node            *false_l     = false_entry->low_word;
+       ir_node            *false_h     = false_entry->high_word;
+       dbg_info           *dbgi        = get_irn_dbg_info(mux);
+       ir_node            *block       = get_nodes_block(mux);
+       ir_node            *res_low
+               = new_rd_Mux(dbgi, block, sel, false_l, true_l, env->low_unsigned);
+       ir_node            *res_high
+               = new_rd_Mux(dbgi, block, sel, false_h, true_h, mode);
+       set_lowered(env, mux, res_low, res_high);
+}
 
+/**
+ * Translate an ASM node.
+ */
 static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env)
 {
-       ir_mode *his = env->params->high_signed;
-       ir_mode *hiu = env->params->high_unsigned;
+       ir_mode           *high_signed        = env->high_signed;
+       ir_mode           *high_unsigned      = env->high_unsigned;
+       int                n_outs             = get_ASM_n_output_constraints(asmn);
+       ir_asm_constraint *output_constraints = get_ASM_output_constraints(asmn);
+       ir_asm_constraint *input_constraints  = get_ASM_input_constraints(asmn);
+       unsigned           n_64bit_outs       = 0;
        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");
+               ir_node *op      = get_irn_n(asmn, i);
+               ir_mode *op_mode = get_irn_mode(op);
+               if (op_mode == high_signed || op_mode == high_unsigned) {
+                       panic("lowering ASM 64bit input unimplemented");
                }
        }
 
-       for (n = asmn;;) {
-               ir_mode *proj_mode;
+       for (i = 0; i < n_outs; ++i) {
+               const ir_asm_constraint *constraint = &output_constraints[i];
+               if (constraint->mode == high_signed || constraint->mode == high_unsigned) {
+                       const char *constr = get_id_str(constraint->constraint);
+                       ++n_64bit_outs;
+                       /* TODO: How to do this architecture neutral? This is very
+                        * i386 specific... */
+                       if (constr[0] != '=' || constr[1] != 'A') {
+                               panic("lowering ASM 64bit output only supports '=A' currently");
+                       }
+               }
+       }
 
-               n = get_irn_link(n);
-               if (n == NULL)
-                       break;
+       if (n_64bit_outs == 0)
+               return;
+
+       {
+               dbg_info          *dbgi       = get_irn_dbg_info(asmn);
+               ir_node           *block      = get_nodes_block(asmn);
+               int                arity      = get_irn_arity(asmn);
+               ir_node          **in         = get_irn_in(asmn) + 1;
+               int                n_outs     = get_ASM_n_output_constraints(asmn);
+               int                new_n_outs = 0;
+               int                n_clobber  = get_ASM_n_clobbers(asmn);
+               long              *proj_map   = ALLOCAN(long, n_outs);
+               ident            **clobbers   = get_ASM_clobbers(asmn);
+               ident             *asm_text   = get_ASM_text(asmn);
+               ir_asm_constraint *new_outputs
+                       = ALLOCAN(ir_asm_constraint, n_outs+n_64bit_outs);
+               ir_node           *new_asm;
+
+               for (i = 0; i < n_outs; ++i) {
+                       const ir_asm_constraint *constraint = &output_constraints[i];
+                       if (constraint->mode == high_signed || constraint->mode == high_unsigned) {
+                               new_outputs[new_n_outs].pos        = constraint->pos;
+                               new_outputs[new_n_outs].constraint = new_id_from_str("=a");
+                               new_outputs[new_n_outs].mode       = env->low_unsigned;
+                               proj_map[i] = new_n_outs;
+                               ++new_n_outs;
+                               new_outputs[new_n_outs].pos        = constraint->pos;
+                               new_outputs[new_n_outs].constraint = new_id_from_str("=d");
+                               if (constraint->mode == high_signed)
+                                       new_outputs[new_n_outs].mode = env->low_signed;
+                               else
+                                       new_outputs[new_n_outs].mode = env->low_unsigned;
+                               ++new_n_outs;
+                       } else {
+                               new_outputs[new_n_outs] = *constraint;
+                               proj_map[i] = new_n_outs;
+                               ++new_n_outs;
+                       }
+               }
+               assert(new_n_outs == n_outs+(int)n_64bit_outs);
+
+               new_asm = new_rd_ASM(dbgi, block, arity, in, input_constraints,
+                                    new_n_outs, new_outputs, n_clobber, clobbers,
+                                    asm_text);
+
+               for (n = asmn;;) {
+                       long pn;
+                       ir_mode *proj_mode;
+                       n = (ir_node*)get_irn_link(n);
+                       if (n == NULL)
+                               break;
+                       proj_mode = get_irn_mode(n);
+                       pn = get_Proj_proj(n);
+                       if (pn < n_outs)
+                               pn = proj_map[pn];
+                       else
+                               pn = new_n_outs + pn - n_outs;
+
+                       if (proj_mode == high_signed || proj_mode == high_unsigned) {
+                               ir_mode *high_mode
+                                       = proj_mode == high_signed ? env->low_signed : env->low_unsigned;
+                               ir_node *np_low  = new_r_Proj(new_asm, env->low_unsigned, pn);
+                               ir_node *np_high = new_r_Proj(new_asm, high_mode, pn+1);
+                               set_lowered(env, n, np_low, np_high);
+                       } else {
+                               ir_node *np = new_r_Proj(new_asm, proj_mode, pn);
+                               exchange(n, np);
+                       }
+               }
+       }
+}
+
+/**
+ * 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) {
+                       size_t pos = get_entity_arg_idx(ent);
 
-               proj_mode = get_irn_mode(n);
-               if (proj_mode == his || proj_mode == hiu) {
-                       panic("lowering ASM unimplemented");
+                       ent = get_method_value_param_ent(env->l_mtp, pos);
+                       set_Sel_entity(sel, ent);
                }
        }
 }
@@ -2237,7 +2046,8 @@ static void lower_ASM(ir_node *asmn, ir_mode *mode, lower_env_t *env)
 /**
  * check for opcodes that must always be lowered.
  */
-static int always_lower(ir_opcode code) {
+static bool always_lower(unsigned code)
+{
        switch (code) {
        case iro_ASM:
        case iro_Proj:
@@ -2246,191 +2056,303 @@ static int always_lower(ir_opcode code) {
        case iro_Return:
        case iro_Cond:
        case iro_Conv:
-               return 1;
+       case iro_Sel:
+               return true;
        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;
-       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);
-       lidx = get_irn_idx(l);
-       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);
-
-       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),
-                       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),
-                       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),
-                       mode_b);
-               res = new_rd_Or(db, irg, blk,
-                       new_r_Proj(irg, blk, high, mode_b, pnc & ~pn_Cmp_Eq),
-                       t,
-                       mode_b);
-       }  /* if */
-       return res;
-}  /* lower_boolean_Proj_Cmp */
-
-/**
- * The type of a lower function.
- *
- * @param node   the node to be lowered
- * @param mode   the low mode for the destination node
- * @param env    the lower environment
- */
-typedef void (*lower_func)(ir_node *node, ir_mode *mode, lower_env_t *env);
-
-/**
- * Lower a node.
- */
-static void lower_ops(ir_node *node, void *env)
-{
-       lower_env_t  *lenv = env;
-       node_entry_t *entry;
-       int          idx = get_irn_idx(node);
-       ir_mode      *mode = get_irn_mode(node);
-
-       if (mode == mode_b || is_Mux(node) || is_Conv(node)) {
-               int i;
-
-               for (i = get_irn_arity(node) - 1; i >= 0; --i) {
-                       ir_node *proj = get_irn_n(node, i);
-
-                       if (is_Proj(proj)) {
-                               ir_node *cmp = get_Proj_pred(proj);
-
-                               if (is_Cmp(cmp)) {
-                                       ir_node *arg = get_Cmp_left(cmp);
-
-                                       mode = get_irn_mode(arg);
-                                       if (mode == lenv->params->high_signed ||
-                                               mode == lenv->params->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))) {
-               ir_op      *op = get_irn_op(node);
-               lower_func func = (lower_func)op->ops.generic;
-
-               if (func) {
-                       mode = get_irn_op_mode(node);
-
-                       if (mode == lenv->params->high_signed)
-                               mode = lenv->params->low_signed;
-                       else
-                               mode = lenv->params->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)
+               return false;
+       }
+}
 
 /**
  * Compare two op_mode_entry_t's.
  */
-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;
+static int cmp_op_mode(const void *elt, const void *key, size_t size)
+{
+       const op_mode_entry_t *e1 = (const op_mode_entry_t*)elt;
+       const op_mode_entry_t *e2 = (const op_mode_entry_t*)key;
        (void) size;
 
-       return (e1->op - e2->op) | (e1->imode - e2->imode) | (e1->omode - e2->omode);
-}  /* cmp_op_mode */
+       return (e1->op != e2->op) | (e1->imode != e2->imode) | (e1->omode != e2->omode);
+}
 
 /**
  * Compare two conv_tp_entry_t's.
  */
-static int cmp_conv_tp(const void *elt, const void *key, size_t size) {
-       const conv_tp_entry_t *e1 = elt;
-       const conv_tp_entry_t *e2 = key;
+static int cmp_conv_tp(const void *elt, const void *key, size_t size)
+{
+       const conv_tp_entry_t *e1 = (const conv_tp_entry_t*)elt;
+       const conv_tp_entry_t *e2 = (const conv_tp_entry_t*)key;
        (void) size;
 
-       return (e1->imode - e2->imode) | (e1->omode - e2->omode);
-}  /* static int cmp_conv_tp */
+       return (e1->imode != e2->imode) | (e1->omode != e2->omode);
+}
 
 /**
  * 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;
 }
 
-/*
- * Do the lowering.
+/**
+ * Returns non-zero if a method type must be lowered.
+ *
+ * @param mtp  the method type
  */
-void lower_dw_ops(const lwrdw_param_t *param)
+static bool mtp_must_be_lowered(lower_env_t *env, ir_type *mtp)
 {
-       lower_env_t lenv;
+       size_t i, n_params = get_method_n_params(mtp);
+
+       /* first check if we have parameters that must be fixed */
+       for (i = 0; i < n_params; ++i) {
+               ir_type *tp = get_method_param_type(mtp, i);
+
+               if (is_Primitive_type(tp)) {
+                       ir_mode *mode = get_type_mode(tp);
+
+                       if (mode == env->high_signed ||
+                               mode == env->high_unsigned)
+                               return true;
+               }
+       }
+       return false;
+}
+
+/* Determine which modes need to be lowered */
+static void setup_modes(lower_env_t *env)
+{
+       unsigned           size_bits           = env->params->doubleword_size;
+       ir_mode           *doubleword_signed   = NULL;
+       ir_mode           *doubleword_unsigned = NULL;
+       size_t             n_modes             = get_irp_n_modes();
+       ir_mode_arithmetic arithmetic;
+       unsigned           modulo_shift;
+       size_t             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);
+}
+
+static void enqueue_preds(lower_env_t *env, ir_node *node)
+{
+       int arity = get_irn_arity(node);
        int i;
-       ir_graph *rem;
 
-       if (! param)
+       for (i = 0; i < arity; ++i) {
+               ir_node *pred = get_irn_n(node, i);
+               pdeq_putr(env->waitq, pred);
+       }
+}
+
+static void lower_node(lower_env_t *env, ir_node *node)
+{
+       int           arity;
+       int           i;
+       lower_func    func;
+       ir_op        *op;
+       ir_mode      *mode;
+       unsigned      idx;
+       node_entry_t *entry;
+
+       if (irn_visited_else_mark(node))
                return;
 
-       if (! param->enable)
+       /* cycles are always broken at Phi and Block nodes. So we don't need special
+        * magic in all the other lower functions */
+       if (is_Block(node)) {
+               enqueue_preds(env, node);
+               return;
+       } else if (is_Phi(node)) {
+               lower_Phi(env, node);
+               return;
+       }
+
+       /* depth-first: descend into operands */
+       if (!is_Block(node)) {
+               ir_node *block = get_nodes_block(node);
+               lower_node(env, block);
+       }
+
+       if (!is_Cond(node)) {
+               arity = get_irn_arity(node);
+               for (i = 0; i < arity; ++i) {
+                       ir_node *pred = get_irn_n(node, i);
+                       lower_node(env, pred);
+               }
+       }
+
+       op   = get_irn_op(node);
+       func = (lower_func) op->ops.generic;
+       if (func == NULL)
                return;
 
+       idx   = get_irn_idx(node);
+       entry = idx < env->n_entries ? env->entries[idx] : NULL;
+       if (entry != NULL || always_lower(get_irn_opcode(node))) {
+               mode = get_irn_op_mode(node);
+               if (mode == env->high_signed) {
+                       mode = env->low_signed;
+               } else {
+                       mode = env->low_unsigned;
+               }
+               DB((dbg, LEVEL_1, "  %+F\n", node));
+               func(node, mode, env);
+       }
+}
+
+static void lower_irg(lower_env_t *env, ir_graph *irg)
+{
+       ir_entity *ent;
+       ir_type   *mtp;
+       unsigned   n_idx;
+
+       obstack_init(&env->obst);
+
+       n_idx = get_irg_last_idx(irg);
+       n_idx = n_idx + (n_idx >> 2);  /* add 25% */
+       env->n_entries = n_idx;
+       env->entries   = NEW_ARR_F(node_entry_t*, n_idx);
+       memset(env->entries, 0, sizeof(env->entries[0]) * n_idx);
+
+       env->irg            = irg;
+       env->l_mtp          = NULL;
+       env->flags          = 0;
+       env->proj_2_block   = pmap_create();
+       env->value_param_tp = NULL;
+
+       ent = get_irg_entity(irg);
+       mtp = get_entity_type(ent);
+
+       if (mtp_must_be_lowered(env, mtp)) {
+               ir_type *ltp = lower_mtp(env, mtp);
+               /* Do not update the entity type yet, this will be done by lower_Start! */
+               env->flags |= MUST_BE_LOWERED;
+               env->l_mtp = ltp;
+               env->value_param_tp = get_method_value_param_type(mtp);
+       }
+
+       /* first step: link all nodes and allocate data */
+       ir_reserve_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK);
+       irg_walk_graph(irg, firm_clear_node_and_phi_links,
+                      prepare_links_and_handle_rotl, env);
+
+       if (env->flags & MUST_BE_LOWERED) {
+               size_t i;
+               ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
+               inc_irg_visited(irg);
+
+               assert(pdeq_empty(env->waitq));
+               pdeq_putr(env->waitq, get_irg_end(irg));
+
+               env->lowered_phis = NEW_ARR_F(ir_node*, 0);
+               while (!pdeq_empty(env->waitq)) {
+                       ir_node *node = (ir_node*)pdeq_getl(env->waitq);
+                       lower_node(env, node);
+               }
+
+               /* we need to fixup phis */
+               for (i = 0; i < ARR_LEN(env->lowered_phis); ++i) {
+                       ir_node *phi = env->lowered_phis[i];
+                       fixup_phi(env, phi);
+               }
+               DEL_ARR_F(env->lowered_phis);
+
+
+               ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
+
+               /* outs are invalid, we changed the graph */
+               set_irg_outs_inconsistent(irg);
+
+               if (env->flags & CF_CHANGED) {
+                       /* control flow changed, dominance info is invalid */
+                       set_irg_doms_inconsistent(irg);
+                       set_irg_extblk_inconsistent(irg);
+                       set_irg_loopinfo_inconsistent(irg);
+               }
+       }
+
+       ir_free_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK);
+
+       pmap_destroy(env->proj_2_block);
+       DEL_ARR_F(env->entries);
+       obstack_free(&env->obst, NULL);
+}
+
+/*
+ * Do the lowering.
+ */
+void lower_dw_ops(const lwrdw_param_t *param)
+{
+       lower_env_t lenv;
+       size_t      i, n;
+
+       assert(param != NULL);
        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)
@@ -2440,168 +2362,101 @@ 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);
                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), param->low_unsigned);
-       lenv.tv_mode_bits  = new_tarval_from_long(get_mode_size_bits(param->low_unsigned), param->low_unsigned);
-       lenv.waitq         = new_pdeq();
-       lenv.params        = param;
+       }
 
-       /* 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(ASM);
-       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_ASM,     lower_ASM);
+       enter_lower_func(op_Add,     lower_binop);
+       enter_lower_func(op_And,     lower_And);
+       enter_lower_func(op_Call,    lower_Call);
+       enter_lower_func(op_Cmp,     lower_Cmp);
+       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_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_Return,  lower_Return);
+       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);
+
+       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.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);
 
        /* transform all graphs */
-       rem = current_ir_graph;
-       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+       for (i = 0, n = get_irp_n_irgs(); i < n; ++i) {
                ir_graph *irg = get_irp_irg(i);
-               int n_idx;
-
-               obstack_init(&lenv.obst);
-
-               n_idx = get_irg_last_idx(irg);
-               n_idx = n_idx + (n_idx >> 2);  /* add 25% */
-               lenv.n_entries = n_idx;
-               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.proj_2_block = pmap_create();
-
-               ir_reserve_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK);
-
-               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));
-
-                       /* must do some work */
-                       irg_walk_graph(irg, NULL, lower_ops, &lenv);
-
-                       /* 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);
-
-                       if (lenv.flags & CF_CHANGED) {
-                               /* control flow changed, dominance info is invalid */
-                               set_irg_doms_inconsistent(irg);
-                               set_irg_extblk_inconsistent(irg);
-                               set_irg_loopinfo_inconsistent(irg);
-                       }  /* if */
-               } else {
-                       ir_free_resources(irg, IR_RESOURCE_PHI_LIST | IR_RESOURCE_IRN_LINK);
-               }  /* if */
-               pmap_destroy(lenv.proj_2_block);
-               DEL_ARR_F(lenv.entries);
-               obstack_free(&lenv.obst, NULL);
-       }  /* for */
+               lower_irg(&lenv, irg);
+       }
        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,
@@ -2618,11 +2473,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 */
+}