Small optimization. Note that the else case crashes libFirm and must be fixed, or...
[libfirm] / ir / lower / lower_dw.c
index 483ad47..f751108 100644 (file)
@@ -136,7 +136,7 @@ static ir_type *get_primitive_type(ir_mode *mode) {
                return entry->value;
 
        snprintf(buf, sizeof(buf), "_prim_%s", get_mode_name(mode));
-       tp = new_type_primitive(new_id_from_str(buf), mode);
+       tp = new_type_primitive(mode);
 
        pmap_insert(prim_types, mode, tp);
        return tp;
@@ -156,7 +156,6 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env)
        entry = set_insert(conv_types, &key, sizeof(key), HASH_PTR(imode) ^ HASH_PTR(omode));
        if (! entry->mtd) {
                int n_param = 1, n_res = 1;
-               char buf[64];
 
                if (imode == env->params->high_signed || imode == env->params->high_unsigned)
                        n_param = 2;
@@ -164,8 +163,7 @@ static ir_type *get_conv_type(ir_mode *imode, ir_mode *omode, lower_env_t *env)
                        n_res = 2;
 
                /* create a new one */
-               snprintf(buf, sizeof(buf), "LConv%s%s", get_mode_name(imode), get_mode_name(omode));
-               mtd = new_type_method(new_id_from_str(buf), n_param, n_res);
+               mtd = new_type_method(n_param, n_res);
 
                /* set param types and result types */
                n_param = 0;
@@ -868,6 +866,8 @@ static void lower_Shiftop(ir_node *node, ir_mode *mode, lower_env_t *env) {
 
        /* The shift count is always mode_Iu in firm, so there is no need for lowering */
        in[2] = get_binop_right(node);
+       assert(get_irn_mode(in[2]) != env->params->high_signed
+                       && get_irn_mode(in[2]) != env->params->high_unsigned);
 
        dbg   = get_irn_dbg_info(node);
        block = get_nodes_block(node);
@@ -905,6 +905,12 @@ static void lower_Shr(ir_node *node, ir_mode *mode, lower_env_t *env) {
                        int idx = get_irn_idx(left);
 
                        left = env->entries[idx]->high_word;
+                       if (left == NULL) {
+                               /* not ready yet, wait */
+                               pdeq_putr(env->waitq, node);
+                               return;
+                       }
+
                        idx = get_irn_idx(node);
 
                        if (shf_cnt > 0) {
@@ -1449,224 +1455,143 @@ static void lower_Cond(ir_node *node, ir_mode *mode, lower_env_t *env) {
 /**
  * Translate a Conv to higher_signed
  */
-static void lower_Conv_to_Ls(ir_node *node, lower_env_t *env) {
-       ir_node  *op    = get_Conv_op(node);
-       ir_mode  *imode = get_irn_mode(op);
-       ir_mode  *dst_mode_l = env->params->low_unsigned;
-       ir_mode  *dst_mode_h = env->params->low_signed;
-       int      idx = get_irn_idx(node);
-       ir_graph *irg = current_ir_graph;
-       ir_node  *block = get_nodes_block(node);
-       dbg_info *dbg = get_irn_dbg_info(node);
-
-       assert(idx < env->n_entries);
-
-       if (mode_is_int(imode) || mode_is_reference(imode)) {
-               if (imode == env->params->high_unsigned) {
-                       /* a Conv from Lu to Ls */
-                       int op_idx = get_irn_idx(op);
-
-                       if (! env->entries[op_idx]->low_word) {
-                               /* not ready yet, wait */
-                               pdeq_putr(env->waitq, node);
-                               return;
-                       }  /* if */
-                       env->entries[idx]->low_word  = new_rd_Conv(dbg, block, env->entries[op_idx]->low_word,  dst_mode_l);
-                       env->entries[idx]->high_word = new_rd_Conv(dbg, block, env->entries[op_idx]->high_word, dst_mode_h);
-               } else {
-                       /* simple case: create a high word */
-                       if (imode != dst_mode_l)
-                               op = new_rd_Conv(dbg, block, op, dst_mode_l);
-
-                       env->entries[idx]->low_word  = op;
-
-                       if (mode_is_signed(imode)) {
-                               ir_node *op_conv = new_rd_Conv(dbg, block, op, dst_mode_h);
-                               env->entries[idx]->high_word = new_rd_Shrs(dbg, block, op_conv,
-                                       new_Const_long(dst_mode_l, get_mode_size_bits(dst_mode_h) - 1), dst_mode_h);
-                       } else {
-                               env->entries[idx]->high_word = new_Const(get_mode_null(dst_mode_h));
-                       }  /* if */
-               }  /* if */
-       } else {
-               ir_node *irn, *call;
-               ir_mode *omode = env->params->high_signed;
-               ir_type *mtp = get_conv_type(imode, omode, env);
-
-               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env);
-               call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 1, &op, mtp);
-               set_irn_pinned(call, get_irn_pinned(node));
-               irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
-
-               env->entries[idx]->low_word  = new_r_Proj(block, irn, dst_mode_l, 0);
-               env->entries[idx]->high_word = new_r_Proj(block, irn, dst_mode_h, 1);
-       }  /* if */
-}  /* lower_Conv_to_Ls */
-
-/**
- * Translate a Conv to higher_unsigned
- */
-static void lower_Conv_to_Lu(ir_node *node, lower_env_t *env) {
-       ir_node  *op    = get_Conv_op(node);
-       ir_mode  *imode = get_irn_mode(op);
-       ir_mode  *dst_mode = env->params->low_unsigned;
-       int      idx = get_irn_idx(node);
-       ir_graph *irg = current_ir_graph;
-       ir_node  *block = get_nodes_block(node);
-       dbg_info *dbg = get_irn_dbg_info(node);
+static void lower_Conv_to_Ll(ir_node *node, lower_env_t *env)
+{
+       ir_mode  *omode        = get_irn_mode(node);
+       ir_node  *op           = get_Conv_op(node);
+       ir_mode  *imode        = get_irn_mode(op);
+       int      idx           = get_irn_idx(node);
+       ir_graph *irg          = current_ir_graph;
+       ir_node  *block        = get_nodes_block(node);
+       dbg_info *dbg          = get_irn_dbg_info(node);
+       node_entry_t *entry = env->entries[idx];
+       ir_mode  *low_unsigned = env->params->low_unsigned;
+       ir_mode  *low_signed
+               = mode_is_signed(omode) ? env->params->low_signed : low_unsigned;
 
        assert(idx < env->n_entries);
 
        if (mode_is_int(imode) || mode_is_reference(imode)) {
-               if (imode == env->params->high_signed) {
-                       /* a Conv from Ls to Lu */
-                       int op_idx = get_irn_idx(op);
+               if (imode == env->params->high_signed
+                               || imode == env->params->high_unsigned) {
+                       /* a Conv from Lu to Ls or Ls to Lu */
+                       int           op_idx   = get_irn_idx(op);
+                       node_entry_t *op_entry = env->entries[op_idx];
 
-                       if (! env->entries[op_idx]->low_word) {
+                       if (! op_entry->low_word) {
                                /* not ready yet, wait */
                                pdeq_putr(env->waitq, node);
                                return;
-                       }  /* if */
-                       env->entries[idx]->low_word  = new_rd_Conv(dbg, block, env->entries[op_idx]->low_word, dst_mode);
-                       env->entries[idx]->high_word = new_rd_Conv(dbg, block, env->entries[op_idx]->high_word, dst_mode);
+                       }
+                       entry->low_word  = op_entry->low_word;
+                       entry->high_word = new_rd_Conv(dbg, block, op_entry->high_word,
+                                                      low_signed);
                } else {
                        /* simple case: create a high word */
-                       if (imode != dst_mode)
-                               op = new_rd_Conv(dbg, block, op, dst_mode);
+                       if (imode != low_unsigned)
+                               op = new_rd_Conv(dbg, block, op, low_unsigned);
 
-                       env->entries[idx]->low_word  = op;
+                       entry->low_word = op;
 
                        if (mode_is_signed(imode)) {
-                               env->entries[idx]->high_word = new_rd_Shrs(dbg, block, op,
-                                       new_Const_long(dst_mode, get_mode_size_bits(dst_mode) - 1), dst_mode);
+                               int      c       = get_mode_size_bits(low_signed) - 1;
+                               ir_node *cnst    = new_Const_long(low_unsigned, c);
+                               if (get_irn_mode(op) != low_signed)
+                                       op = new_rd_Conv(dbg, block, op, low_signed);
+                               entry->high_word = new_rd_Shrs(dbg, block, op, cnst,
+                                                              low_signed);
                        } else {
-                               env->entries[idx]->high_word = new_Const(get_mode_null(dst_mode));
-                       }  /* if */
-               }  /* if */
+                               entry->high_word = new_Const(get_mode_null(low_signed));
+                       }
+               }
+       } else if (imode == mode_b) {
+               entry->low_word = new_rd_Conv(dbg, block, op, low_unsigned);
+               entry->high_word = new_Const(get_mode_null(low_signed));
        } else {
                ir_node *irn, *call;
-               ir_mode *omode = env->params->high_unsigned;
                ir_type *mtp = get_conv_type(imode, omode, env);
 
-               /* do an intrinsic call */
                irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env);
                call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 1, &op, mtp);
                set_irn_pinned(call, get_irn_pinned(node));
                irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
 
-               env->entries[idx]->low_word  = new_r_Proj(block, irn, dst_mode, 0);
-               env->entries[idx]->high_word = new_r_Proj(block, irn, dst_mode, 1);
-       }  /* if */
-}  /* lower_Conv_to_Lu */
-
-/**
- * Translate a Conv from higher_signed
- */
-static void lower_Conv_from_Ls(ir_node *node, lower_env_t *env) {
-       ir_node  *op    = get_Conv_op(node);
-       ir_mode  *omode = get_irn_mode(node);
-       ir_node  *block = get_nodes_block(node);
-       dbg_info *dbg = get_irn_dbg_info(node);
-       int      idx = get_irn_idx(op);
-       ir_graph *irg = current_ir_graph;
-
-       assert(idx < env->n_entries);
-
-       if (! env->entries[idx]->low_word) {
-               /* not ready yet, wait */
-               pdeq_putr(env->waitq, node);
-               return;
-       }  /* if */
-
-       if (mode_is_int(omode) || mode_is_reference(omode)) {
-               op = env->entries[idx]->low_word;
-
-               /* simple case: create a high word */
-               if (omode != env->params->low_signed)
-                       op = new_rd_Conv(dbg, block, op, omode);
-
-               set_Conv_op(node, op);
-       } else {
-               ir_node *irn, *call, *in[2];
-               ir_mode *imode = env->params->high_signed;
-               ir_type *mtp = get_conv_type(imode, omode, env);
-
-               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env);
-               in[0] = env->entries[idx]->low_word;
-               in[1] = env->entries[idx]->high_word;
-
-               call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 2, in, mtp);
-               set_irn_pinned(call, get_irn_pinned(node));
-               irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
-
-               exchange(node, new_r_Proj(block, irn, omode, 0));
-       }  /* if */
-}  /* lower_Conv_from_Ls */
+               entry->low_word  = new_r_Proj(block, irn, low_unsigned, 0);
+               entry->high_word = new_r_Proj(block, irn, low_signed, 1);
+       }
+}
 
 /**
  * Translate a Conv from higher_unsigned
  */
-static void lower_Conv_from_Lu(ir_node *node, lower_env_t *env) {
-       ir_node  *op    = get_Conv_op(node);
-       ir_mode  *omode = get_irn_mode(node);
-       ir_node  *block = get_nodes_block(node);
-       dbg_info *dbg = get_irn_dbg_info(node);
-       int      idx = get_irn_idx(op);
-       ir_graph *irg = current_ir_graph;
+static void lower_Conv_from_Ll(ir_node *node, lower_env_t *env)
+{
+       ir_node      *op    = get_Conv_op(node);
+       ir_mode      *omode = get_irn_mode(node);
+       ir_node      *block = get_nodes_block(node);
+       dbg_info     *dbg   = get_irn_dbg_info(node);
+       int          idx    = get_irn_idx(op);
+       ir_graph     *irg   = current_ir_graph;
+       node_entry_t *entry = env->entries[idx];
 
        assert(idx < env->n_entries);
 
-       if (! env->entries[idx]->low_word) {
+       if (! entry->low_word) {
                /* not ready yet, wait */
                pdeq_putr(env->waitq, node);
                return;
-       }  /* if */
+       }
 
        if (mode_is_int(omode) || mode_is_reference(omode)) {
-               op = env->entries[idx]->low_word;
+               op = entry->low_word;
 
                /* simple case: create a high word */
                if (omode != env->params->low_unsigned)
                        op = new_rd_Conv(dbg, block, op, omode);
 
                set_Conv_op(node, op);
+       } else if (omode == mode_b) {
+               /* llu ? true : false  <=> (low|high) ? true : false */
+               ir_mode *mode = env->params->low_unsigned;
+               ir_node *or   = new_rd_Or(dbg, block, entry->low_word, entry->high_word,
+                                         mode);
+               set_Conv_op(node, or);
        } else {
                ir_node *irn, *call, *in[2];
-               ir_mode *imode = env->params->high_unsigned;
-               ir_type *mtp = get_conv_type(imode, omode, env);
+               ir_mode *imode = get_irn_mode(op);
+               ir_type *mtp   = get_conv_type(imode, omode, env);
 
-               irn = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env);
-               in[0] = env->entries[idx]->low_word;
-               in[1] = env->entries[idx]->high_word;
+               irn   = get_intrinsic_address(mtp, get_irn_op(node), imode, omode, env);
+               in[0] = entry->low_word;
+               in[1] = entry->high_word;
 
                call = new_rd_Call(dbg, block, get_irg_no_mem(irg), irn, 2, in, mtp);
                set_irn_pinned(call, get_irn_pinned(node));
                irn = new_r_Proj(block, call, mode_T, pn_Call_T_result);
 
                exchange(node, new_r_Proj(block, irn, omode, 0));
-       }  /* if */
-}  /* lower_Conv_from_Lu */
+       }
+}
 
 /**
  * Translate a Conv.
  */
-static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env) {
+static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env)
+{
        mode = get_irn_mode(node);
 
-       if (mode == env->params->high_signed) {
-               lower_Conv_to_Ls(node, env);
-       } else if (mode == env->params->high_unsigned) {
-               lower_Conv_to_Lu(node, env);
+       if (mode == env->params->high_signed
+                       || mode == env->params->high_unsigned) {
+               lower_Conv_to_Ll(node, env);
        } else {
                ir_mode *mode = get_irn_mode(get_Conv_op(node));
 
-               if (mode == env->params->high_signed) {
-                       lower_Conv_from_Ls(node, env);
-               } else if (mode == env->params->high_unsigned) {
-                       lower_Conv_from_Lu(node, env);
-               }  /* if */
-       }  /* if */
-}  /* lower_Conv */
+               if (mode == env->params->high_signed
+                               || mode == env->params->high_unsigned) {
+                       lower_Conv_from_Ll(node, env);
+               }
+       }
+}
 
 /**
  * Lower the method type.
@@ -1678,7 +1603,7 @@ static void lower_Conv(ir_node *node, ir_mode *mode, lower_env_t *env) {
  */
 static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
        pmap_entry *entry;
-       ident      *id, *lid;
+       ident      *lid;
        ir_type    *res, *value_type;
 
        if (is_lowered_type(mtp))
@@ -1716,8 +1641,7 @@ static ir_type *lower_mtp(ir_type *mtp, lower_env_t *env) {
                        }  /* if */
                }  /* for */
 
-               id  = id_mangle_u(new_id_from_chars("L", 1), get_type_ident(mtp));
-               res = new_type_method(id, n_param, n_res);
+               res = new_type_method(n_param, n_res);
 
                /* set param types and result types */
                for (i = n_param = 0; i < n; ++i) {
@@ -2510,7 +2434,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
 
        /* create method types for the created binop calls */
        if (! binop_tp_u) {
-               binop_tp_u = new_type_method(IDENT("binop_u_intrinsic"), 4, 2);
+               binop_tp_u = new_type_method(4, 2);
                set_method_param_type(binop_tp_u, 0, tp_u);
                set_method_param_type(binop_tp_u, 1, tp_u);
                set_method_param_type(binop_tp_u, 2, tp_u);
@@ -2519,7 +2443,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
                set_method_res_type(binop_tp_u, 1, tp_u);
        }  /* if */
        if (! binop_tp_s) {
-               binop_tp_s = new_type_method(IDENT("binop_s_intrinsic"), 4, 2);
+               binop_tp_s = new_type_method(4, 2);
                set_method_param_type(binop_tp_s, 0, tp_u);
                set_method_param_type(binop_tp_s, 1, tp_s);
                set_method_param_type(binop_tp_s, 2, tp_u);
@@ -2528,7 +2452,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
                set_method_res_type(binop_tp_s, 1, tp_s);
        }  /* if */
        if (! shiftop_tp_u) {
-               shiftop_tp_u = new_type_method(IDENT("shiftop_u_intrinsic"), 3, 2);
+               shiftop_tp_u = new_type_method(3, 2);
                set_method_param_type(shiftop_tp_u, 0, tp_u);
                set_method_param_type(shiftop_tp_u, 1, tp_u);
                set_method_param_type(shiftop_tp_u, 2, tp_u);
@@ -2536,7 +2460,7 @@ void lower_dw_ops(const lwrdw_param_t *param)
                set_method_res_type(shiftop_tp_u, 1, tp_u);
        }  /* if */
        if (! shiftop_tp_s) {
-               shiftop_tp_s = new_type_method(IDENT("shiftop_s_intrinsic"), 3, 2);
+               shiftop_tp_s = new_type_method(3, 2);
                set_method_param_type(shiftop_tp_s, 0, tp_u);
                set_method_param_type(shiftop_tp_s, 1, tp_s);
                set_method_param_type(shiftop_tp_s, 2, tp_u);
@@ -2544,14 +2468,14 @@ void lower_dw_ops(const lwrdw_param_t *param)
                set_method_res_type(shiftop_tp_s, 1, tp_s);
        }  /* if */
        if (! unop_tp_u) {
-               unop_tp_u = new_type_method(IDENT("unop_u_intrinsic"), 2, 2);
+               unop_tp_u = new_type_method(2, 2);
                set_method_param_type(unop_tp_u, 0, tp_u);
                set_method_param_type(unop_tp_u, 1, tp_u);
                set_method_res_type(unop_tp_u, 0, tp_u);
                set_method_res_type(unop_tp_u, 1, tp_u);
        }  /* if */
        if (! unop_tp_s) {
-               unop_tp_s = new_type_method(IDENT("unop_s_intrinsic"), 2, 2);
+               unop_tp_s = new_type_method(2, 2);
                set_method_param_type(unop_tp_s, 0, tp_u);
                set_method_param_type(unop_tp_s, 1, tp_s);
                set_method_res_type(unop_tp_s, 0, tp_u);