simplify/rework lower_calls interface and code
[libfirm] / ir / lower / lower_mode_b.c
index ee2f459..6a381be 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.
  *
@@ -32,7 +32,7 @@
  *   - The only nodes producing mode_b are: Proj(Cmp) and ConvB(X) (where X
  *     is some mode that can be converted to the lowered mode).
  *     ConvB will usually be implemented by a comparison with 0 producing some
- *     flags in the backends. It's debatable wether ConvB(X) is a goode idea.
+ *     flags in the backends. It's debatable whether ConvB(X) is a good idea.
  *     Maybe we should rather introduce a Test node.
  * All other former uses should be converted to manipulations with an integer
  * mode that was specified in the pass configuration.
@@ -69,32 +69,19 @@ static ir_node                    **check_later;
  */
 static void maybe_kill_node(ir_node *node)
 {
-       ir_graph *irg;
-       int       i, arity;
-
        if (get_irn_n_edges(node) != 0)
                return;
 
-       irg = get_irn_irg(node);
-
-       assert(!is_Bad(node));
-
-       arity = get_irn_arity(node);
-       for (i = 0; i < arity; ++i) {
-               set_irn_n(node, i, new_r_Bad(irg));
-       }
-       set_nodes_block(node, new_r_Bad(irg));
-
-       edges_node_deleted(node, irg);
+       kill_node(node);
 }
 
 static ir_node *create_not(dbg_info *dbgi, ir_node *node)
 {
-       ir_node  *block  = get_nodes_block(node);
-       ir_mode  *mode   = config->lowered_mode;
-       tarval   *tv_one = get_mode_one(mode);
-       ir_graph *irg    = get_irn_irg(node);
-       ir_node  *one    = new_rd_Const(dbgi, irg, tv_one);
+       ir_node   *block  = get_nodes_block(node);
+       ir_mode   *mode   = config->lowered_mode;
+       ir_tarval *tv_one = get_mode_one(mode);
+       ir_graph  *irg    = get_irn_irg(node);
+       ir_node   *one    = new_rd_Const(dbgi, irg, tv_one);
 
        return new_rd_Eor(dbgi, block, node, one, mode);
 }
@@ -117,13 +104,13 @@ static ir_type *create_lowered_type(void)
 
 ir_node *ir_create_mux_set(ir_node *cond, ir_mode *dest_mode)
 {
-       ir_graph *irg     = get_irn_irg(cond);
-       ir_node  *block   = get_nodes_block(cond);
-       tarval   *tv_one  = get_mode_one(dest_mode);
-       ir_node  *one     = new_r_Const(irg, tv_one);
-       tarval   *tv_zero = get_mode_null(dest_mode);
-       ir_node  *zero    = new_r_Const(irg, tv_zero);
-       ir_node  *set     = new_r_Mux(block, cond, zero, one, dest_mode);
+       ir_graph  *irg     = get_irn_irg(cond);
+       ir_node   *block   = get_nodes_block(cond);
+       ir_tarval *tv_one  = get_mode_one(dest_mode);
+       ir_node   *one     = new_r_Const(irg, tv_one);
+       ir_tarval *tv_zero = get_mode_null(dest_mode);
+       ir_node   *zero    = new_r_Const(irg, tv_zero);
+       ir_node   *set     = new_r_Mux(block, cond, zero, one, dest_mode);
        return set;
 }
 
@@ -149,9 +136,6 @@ ir_node *ir_create_cond_set(ir_node *cond_value, ir_mode *dest_mode)
 
        set_irn_in(lower_block, ARRAY_SIZE(lower_in), lower_in);
        phi = new_r_Phi(lower_block, ARRAY_SIZE(phi_in), phi_in, dest_mode);
-       assert(get_Block_phis(lower_block) == NULL);
-       set_Block_phis(lower_block, phi);
-       set_Phi_next(phi, NULL);
 
        /* make sure we do visit the cond_value later... */
        ARR_APP1(ir_node*, check_later, cond_value);
@@ -161,9 +145,9 @@ ir_node *ir_create_cond_set(ir_node *cond_value, ir_mode *dest_mode)
 
 static void adjust_method_type(ir_type *method_type)
 {
-       int i;
-       int n_params;
-       int n_res;
+       size_t i;
+       size_t n_params;
+       size_t n_res;
 
        n_params = get_method_n_params(method_type);
        for (i = 0; i < n_params; ++i) {
@@ -187,13 +171,14 @@ static ir_node *lower_node(ir_node *node)
        dbg_info *dbgi  = get_irn_dbg_info(node);
        ir_node  *block = get_nodes_block(node);
        ir_mode  *mode  = config->lowered_mode;
+       ir_node  *res   = (ir_node*)get_irn_link(node);
        ir_graph *irg;
-       ir_node  *res;
 
-       res = get_irn_link(node);
        if (res != NULL)
                return res;
 
+       node = skip_Tuple(node);
+
        assert(get_irn_mode(node) == mode_b);
 
        irg = get_irn_irg(node);
@@ -201,13 +186,14 @@ static ir_node *lower_node(ir_node *node)
        case iro_Phi: {
                int       i, arity;
                ir_node **in;
-               ir_node  *unknown, *new_phi;
+               ir_node  *dummy;
+               ir_node  *new_phi;
 
-               arity   = get_irn_arity(node);
-               in      = ALLOCAN(ir_node*, arity);
-               unknown = new_r_Unknown(irg, mode);
+               arity = get_irn_arity(node);
+               in    = ALLOCAN(ir_node*, arity);
+               dummy = new_r_Dummy(irg, mode);
                for (i = 0; i < arity; ++i) {
-                       in[i] = unknown;
+                       in[i] = dummy;
                }
                new_phi = new_r_Phi(block, arity, in, mode);
                /* FIXME This does not correctly break cycles: The Phi might not be the
@@ -218,10 +204,10 @@ static ir_node *lower_node(ir_node *node)
                ARR_APP1(ir_node*, lowered_nodes, node);
 
                for (i = 0; i < arity; ++i) {
-                       ir_node *in     = get_irn_n(node, i);
-                       ir_node *low_in = lower_node(in);
+                       ir_node *in         = get_irn_n(node, i);
+                       ir_node *lowered_in = is_Bad(in) ? in : lower_node(in);
 
-                       set_irn_n(new_phi, i, low_in);
+                       set_irn_n(new_phi, i, lowered_in);
                }
 
                return new_phi;
@@ -270,78 +256,80 @@ static ir_node *lower_node(ir_node *node)
        }
 
        case iro_Conv: {
-               ir_node *pred     = get_Conv_op(node);
-               ir_mode *mode     = get_irn_mode(pred);
-               tarval  *tv_zeroc = get_mode_null(mode);
-               ir_node *zero_cmp = new_rd_Const(dbgi, irg, tv_zeroc);
-
-               ir_node *cmp      = new_rd_Cmp(dbgi, block, pred, zero_cmp);
-               ir_node *proj     = new_rd_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg);
-               res = config->create_set(proj);
+               ir_node   *pred     = get_Conv_op(node);
+               ir_mode   *mode     = get_irn_mode(pred);
+               ir_tarval *tv_zeroc = get_mode_null(mode);
+               ir_node   *zero_cmp = new_rd_Const(dbgi, irg, tv_zeroc);
+
+               ir_node *cmp      = new_rd_Cmp(dbgi, block, pred, zero_cmp, ir_relation_less_greater);
+               res = config->create_set(cmp);
                break;
        }
 
-       case iro_Proj: {
-               ir_node *pred = get_Proj_pred(node);
-
-               if (is_Cmp(pred)) {
-                       ir_node *left  = get_Cmp_left(pred);
-                       ir_node *right = get_Cmp_right(pred);
-                       ir_mode *cmp_mode  = get_irn_mode(left);
-
-                       if ((mode_is_int(cmp_mode) || mode_is_reference(cmp_mode)) &&
-                           (get_mode_size_bits(cmp_mode) < get_mode_size_bits(mode) ||
-                           (mode_is_signed(cmp_mode) && is_Const(right) && is_Const_null(right)))) {
-                               int      pnc      = get_Proj_proj(node);
-                               int      need_not = 0;
-                               ir_node *a        = NULL;
-                               ir_node *b        = NULL;
-                               int      bits;
-                               tarval  *tv;
-                               ir_node *shift_cnt;
-
-                               if (pnc == pn_Cmp_Lt) {
-                                       /* a < b  ->  (a - b) >> 31 */
-                                       a = left;
-                                       b = right;
-                               } else if (pnc == pn_Cmp_Le) {
-                                       /* a <= b  -> ~(a - b) >> 31 */
-                                       a        = right;
-                                       b        = left;
-                                       need_not = 1;
-                               } else if (pnc == pn_Cmp_Gt) {
-                                       /* a > b   -> (b - a) >> 31 */
-                                       a = right;
-                                       b = left;
-                               } else if (pnc == pn_Cmp_Ge) {
-                                       /* a >= b   -> ~(a - b) >> 31 */
-                                       a        = left;
-                                       b        = right;
-                                       need_not = 1;
-                               } else {
-                                       goto synth_zero_one;
-                               }
+       case iro_Cmp: {
+               ir_node    *left     = get_Cmp_left(node);
+               ir_node    *right    = get_Cmp_right(node);
+               ir_mode    *cmp_mode = get_irn_mode(left);
+               ir_relation relation = get_Cmp_relation(node);
+
+               if ((mode_is_int(cmp_mode) || mode_is_reference(cmp_mode)) &&
+                       (get_mode_size_bits(cmp_mode) < get_mode_size_bits(mode) ||
+                       (mode_is_signed(cmp_mode) && is_Const(right) && is_Const_null(right) && relation != ir_relation_greater))) {
+                       int         need_not = 0;
+                       ir_node    *a        = NULL;
+                       ir_node    *b        = NULL;
+                       int         bits;
+                       ir_tarval  *tv;
+                       ir_node    *shift_cnt;
+
+                       if (relation == ir_relation_less) {
+                               /* a < b  ->  (a - b) >> 31 */
+                               a = left;
+                               b = right;
+                       } else if (relation == ir_relation_less_equal) {
+                               /* a <= b  -> ~(a - b) >> 31 */
+                               a        = right;
+                               b        = left;
+                               need_not = 1;
+                       } else if (relation == ir_relation_greater) {
+                               /* a > b   -> (b - a) >> 31 */
+                               a = right;
+                               b = left;
+                       } else if (relation == ir_relation_greater_equal) {
+                               /* a >= b   -> ~(a - b) >> 31 */
+                               a        = left;
+                               b        = right;
+                               need_not = 1;
+                       } else {
+                               goto synth_zero_one;
+                       }
 
-                               bits      = get_mode_size_bits(mode);
-                               tv        = new_tarval_from_long(bits-1, mode_Iu);
-                               shift_cnt = new_rd_Const(dbgi, irg, tv);
+                       bits      = get_mode_size_bits(mode);
+                       tv        = new_tarval_from_long(bits-1, mode_Iu);
+                       shift_cnt = new_rd_Const(dbgi, irg, tv);
 
-                               if (cmp_mode != mode) {
-                                       a = new_rd_Conv(dbgi, block, a, mode);
-                                       b = new_rd_Conv(dbgi, block, b, mode);
-                               }
+                       if (cmp_mode != mode) {
+                               a = new_rd_Conv(dbgi, block, a, mode);
+                               b = new_rd_Conv(dbgi, block, b, mode);
+                       }
 
-                               res = new_rd_Sub(dbgi, block, a, b, mode);
-                               if (need_not) {
-                                       res = new_rd_Not(dbgi, block, res, mode);
-                               }
-                               res = new_rd_Shr(dbgi, block, res, shift_cnt, mode);
-                       } else {
-                               /* synthesize the 0/1 value */
-synth_zero_one:
-                               res = config->create_set(node);
+                       res = new_rd_Sub(dbgi, block, a, b, mode);
+                       if (need_not) {
+                               res = new_rd_Not(dbgi, block, res, mode);
                        }
-               } else if (is_Proj(pred) && is_Call(get_Proj_pred(pred))) {
+                       res = new_rd_Shr(dbgi, block, res, shift_cnt, mode);
+               } else {
+                       /* synthesize the 0/1 value */
+synth_zero_one:
+                       res = config->create_set(node);
+               }
+               break;
+       }
+
+       case iro_Proj: {
+               ir_node *pred = get_Proj_pred(node);
+
+               if (is_Proj(pred) && is_Call(get_Proj_pred(pred))) {
                        ir_type *type = get_Call_type(get_Proj_pred(pred));
                        adjust_method_type(type);
                        set_irn_mode(node, mode);
@@ -355,20 +343,18 @@ synth_zero_one:
                        set_irn_mode(node, mode);
                        res = node;
                        goto own_replacement;
-               } else {
-                       panic("unexpected projb: %+F (pred: %+F)", node, pred);
                }
-               break;
+               panic("unexpected projb: %+F (pred: %+F)", node, pred);
        }
 
        case iro_Const: {
-               tarval *tv = get_Const_tarval(node);
+               ir_tarval *tv = get_Const_tarval(node);
                if (tv == get_tarval_b_true()) {
-                       tarval *tv_one = get_mode_one(mode);
-                       res            = new_rd_Const(dbgi, irg, tv_one);
+                       ir_tarval *tv_one = get_mode_one(mode);
+                       res               = new_rd_Const(dbgi, irg, tv_one);
                } else if (tv == get_tarval_b_false()) {
-                       tarval *tv_zero = get_mode_null(mode);
-                       res             = new_rd_Const(dbgi, irg, tv_zero);
+                       ir_tarval *tv_zero = get_mode_null(mode);
+                       res                = new_rd_Const(dbgi, irg, tv_zero);
                } else {
                        panic("invalid boolean const %+F", node);
                }
@@ -402,15 +388,13 @@ static void lower_mode_b_walker(ir_node *node, void *env)
                        continue;
 
                if (! config->lower_direct_cmp) {
-                       /* Proj(Cmp) as input for Cond and Mux nodes needs no changes.
+                       /* Cmp as input for Cond and Mux nodes needs no changes.
                           (Mux with mode_b is an exception as it gets replaced by and/or
                            anyway so we still lower the inputs then) */
                        if (is_Cond(node) ||
                            (is_Mux(node) && get_irn_mode(node) != mode_b)) {
-                               if (is_Proj(in)) {
-                                       ir_node *pred = get_Proj_pred(in);
-                                       if (is_Cmp(pred))
-                                               continue;
+                               if (is_Cmp(in)) {
+                                       continue;
                                }
                        }
                }
@@ -427,7 +411,7 @@ static void lower_mode_b_walker(ir_node *node, void *env)
                changed = true;
        }
        if (changed) {
-               bool *global_changed = env;
+               bool *global_changed = (bool*)env;
                *global_changed = true;
                add_identities(node);
        }
@@ -438,8 +422,8 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig)
        ir_entity *entity  = get_irg_entity(irg);
        ir_type   *type    = get_entity_type(entity);
        bool       changed = false;
-       int        i;
-       int        n;
+       size_t     i;
+       size_t     n;
 
        config        = nconfig;
        lowered_nodes = NEW_ARR_F(ir_node*, 0);
@@ -458,13 +442,12 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig)
        irg_walk_graph(irg, firm_clear_link, NULL, NULL);
        irg_walk_graph(irg, lower_mode_b_walker, NULL, &changed);
 
-       for (i = 0; i < ARR_LEN(check_later); ++i) {
+       for (i = 0, n = ARR_LEN(check_later); i < n; ++i) {
                ir_node *node = check_later[i];
                irg_walk_core(node, lower_mode_b_walker, NULL, &changed);
        }
 
-       n = ARR_LEN(lowered_nodes);
-       for (i = 0; i < n; ++i) {
+       for (i = 0, n = ARR_LEN(lowered_nodes); i < n; ++i) {
                ir_node *node = lowered_nodes[i];
                maybe_kill_node(node);
        }
@@ -474,6 +457,9 @@ void ir_lower_mode_b(ir_graph *irg, const lower_mode_b_config_t *nconfig)
        ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
 
        if (changed) {
-               set_irg_outs_inconsistent(irg);
+               /* lowering might create new blocks, so be sure to handle this */
+               set_irg_extblk_inconsistent(irg);
+               set_irg_doms_inconsistent(irg);
+               edges_deactivate(irg);
        }
 }