static const lower_mode_b_config_t *config;
static ir_type *lowered_type;
static ir_node **lowered_nodes;
+static ir_node **check_later;
/**
* Removes a node if its out-edge count has reached 0.
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);
+ return new_rd_Eor(dbgi, block, node, one, mode);
}
static ir_node *create_convb(ir_node *node)
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;
}
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);
return phi;
}
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;
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
return new_phi;
}
- case iro_And:
- case iro_Or:
+ case iro_And: {
+ ir_node *lowered_left = lower_node(get_And_left(node));
+ ir_node *lowered_right = lower_node(get_And_right(node));
+ res = new_rd_And(dbgi, block, lowered_left, lowered_right, mode);
+ break;
+ }
+ case iro_Or: {
+ ir_node *lowered_left = lower_node(get_Or_left(node));
+ ir_node *lowered_right = lower_node(get_Or_right(node));
+ res = new_rd_Or(dbgi, block, lowered_left, lowered_right, mode);
+ break;
+ }
case iro_Eor: {
- int i, arity;
-
- res = exact_copy(node);
- arity = get_irn_arity(node);
- for (i = 0; i < arity; ++i) {
- ir_node *in = get_irn_n(node, i);
- ir_node *low_in = lower_node(in);
-
- set_irn_n(res, i, low_in);
- }
- set_irn_mode(res, mode);
+ ir_node *lowered_left = lower_node(get_Eor_left(node));
+ ir_node *lowered_right = lower_node(get_Eor_right(node));
+ res = new_rd_Eor(dbgi, block, lowered_left, lowered_right, mode);
break;
}
}
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 *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_node *proj = new_rd_Proj(dbgi, cmp, mode_b, pn_Cmp_Lg);
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;
+ int pnc = get_Proj_proj(node);
+ int need_not = 0;
+ ir_node *a = NULL;
+ ir_node *b = NULL;
+ int bits;
+ ir_tarval *tv;
+ ir_node *shift_cnt;
if (pnc == pn_Cmp_Lt) {
/* a < b -> (a - b) >> 31 */
}
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);
}
changed = true;
}
if (changed) {
- bool *global_changed = env;
+ bool *global_changed = (bool*)env;
*global_changed = true;
add_identities(node);
}
config = nconfig;
lowered_nodes = NEW_ARR_F(ir_node*, 0);
+ check_later = NEW_ARR_F(ir_node*, 0);
lowered_type = NULL;
edges_assure(irg);
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) {
+ 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) {
ir_node *node = lowered_nodes[i];
maybe_kill_node(node);
}
+ DEL_ARR_F(check_later);
DEL_ARR_F(lowered_nodes);
ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
projects / libfirm / blobdiff