}
}
-static tarval* conv_const_tv(const ir_node* cnst, ir_mode* dest_mode)
+static ir_tarval* conv_const_tv(const ir_node* cnst, ir_mode* dest_mode)
{
return tarval_convert_to(get_Const_tarval(cnst), dest_mode);
}
static ir_node *conv_transform(ir_node *node, ir_mode *dest_mode)
{
- ir_mode *mode = get_irn_mode(node);
- size_t arity;
- size_t i;
+ ir_mode *mode = get_irn_mode(node);
+ ir_graph *irg = get_irn_irg(node);
+ size_t arity;
+ size_t conv_arity;
+ size_t i;
+ ir_node *new_node;
+ ir_node **ins;
if (mode == dest_mode)
return node;
if (is_Const(node)) {
/* TODO tarval module is incomplete and can't convert floats to ints */
- tarval *tv = conv_const_tv(node, dest_mode);
+ ir_tarval *tv = conv_const_tv(node, dest_mode);
if (tv == tarval_bad) {
return place_conv(node, dest_mode);
} else {
- return new_Const(tv);
+ return new_r_Const(irg, tv);
}
}
return place_conv(node, dest_mode);
}
+ // We want to create a new node with the right mode
+ arity = get_irn_arity(node);
+ ins = ALLOCAN(ir_node *, arity);
+
// The shift count does not participate in the conv optimisation
- arity = is_Shl(node) ? 1 : get_irn_arity(node);
- for (i = 0; i < arity; i++) {
+ conv_arity = is_Shl(node) ? 1 : arity;
+ for (i = 0; i < conv_arity; i++) {
ir_node *pred = get_irn_n(node, i);
ir_node *transformed;
if (get_conv_costs(pred, dest_mode) > 0) {
} else {
transformed = conv_transform(pred, dest_mode);
}
- set_irn_n(node, i, transformed);
+ ins[i] = transformed;
}
- set_irn_mode(node, dest_mode);
- return node;
-}
-/* TODO, backends (at least ia32) can't handle it at the moment,
- and it's probably not more efficient on most archs */
-#if 0
-static void try_optimize_cmp(ir_node *node)
-{
- ir_node *left = get_Cmp_left(node);
- ir_node *right = get_Cmp_right(node);
- ir_node *conv = NULL;
+ for (i = conv_arity; i < arity; i++) {
+ ins[i] = get_irn_n(node, i);
+ }
+
+ new_node = new_ir_node(get_irn_dbg_info(node),
+ irg,
+ get_nodes_block(node),
+ get_irn_op(node),
+ dest_mode,
+ arity,
+ ins);
+ copy_node_attr(irg, node, new_node);
- if (is_downconv
+ return new_node;
}
-#endif
static void conv_opt_walker(ir_node *node, void *data)
{
ir_mode *pred_mode;
ir_mode *mode;
int costs;
- bool *changed = data;
-
-#if 0
- if (is_Cmp(node)) {
- try_optimize_cmp(node);
- return;
- }
-#endif
+ bool *changed = (bool*)data;
if (!is_Conv(node))
return;
transformed = conv_transform(pred, mode);
if (node != transformed) {
+ vrp_attr *vrp;
+
exchange(node, transformed);
- vrp_attr *vrp = vrp_get_info(transformed);
+ vrp = vrp_get_info(transformed);
if (vrp && vrp->valid) {
vrp->range_type = VRP_VARYING;
vrp->bits_set = tarval_convert_to(vrp->bits_set, mode);