/** Describes a pair of relative conditions lo < hi, lo pnc_lo x, hi pnc_hi x */
typedef struct cond_pair {
- ir_node *cmp_lo; /**< The lo compare node. */
- ir_node *cmp_hi; /**< The hi compare node. */
- pn_Cmp pnc_lo; /**< The lo relation node. */
- pn_Cmp pnc_hi; /**< The hi relation node. */
- ir_node *proj_lo; /**< The mode_b result proj of cmp_lo. */
- ir_node *proj_hi; /**< The mode_b result proj of cmp_hi. */
- tarval *tv_lo; /**< The tarval of cmp_lo node. */
- tarval *tv_hi; /**< The tarval of cmp_hi node. */
- ir_mode *lo_mode; /**< The mode of the cmp_lo operands. */
+ ir_node *cmp_lo; /**< The lo compare node. */
+ ir_node *cmp_hi; /**< The hi compare node. */
+ pn_Cmp pnc_lo; /**< The lo relation node. */
+ pn_Cmp pnc_hi; /**< The hi relation node. */
+ ir_node *proj_lo; /**< The mode_b result proj of cmp_lo. */
+ ir_node *proj_hi; /**< The mode_b result proj of cmp_hi. */
+ ir_tarval *tv_lo; /**< The tarval of cmp_lo node. */
+ ir_tarval *tv_hi; /**< The tarval of cmp_hi node. */
+ ir_mode *lo_mode; /**< The mode of the cmp_lo operands. */
} cond_pair;
/** Environment for all walker in boolopt. */
ir_node *const lor = get_Cmp_right(lo);
ir_node *const rol = get_Cmp_left(ro);
ir_node *const ror = get_Cmp_right(ro);
- pn_Cmp const pnc_l = get_Proj_proj(l);
- pn_Cmp const pnc_r = get_Proj_proj(r);
+ pn_Cmp const pnc_l = get_Proj_pn_cmp(l);
+ pn_Cmp const pnc_r = get_Proj_pn_cmp(r);
if (is_Const(lor) && is_Const_null(lor) &&
is_Const(ror) && is_Const_null(ror) &&
if (lol == rol && lor != ror && is_Const(lor) && is_Const(ror)) {
/* lo == (x CMP c_l), ro == (x cmp c_r) */
- tarval *const tv_l = get_Const_tarval(lor);
- tarval *const tv_r = get_Const_tarval(ror);
- pn_Cmp const rel = tarval_cmp(tv_l, tv_r);
+ ir_tarval *const tv_l = get_Const_tarval(lor);
+ ir_tarval *const tv_r = get_Const_tarval(ror);
+ pn_Cmp const rel = tarval_cmp(tv_l, tv_r);
res->lo_mode = get_irn_mode(lol);
*/
static ir_node *bool_and(cond_pair* const cpair, ir_node *dst_block)
{
- ir_node *const cmp_lo = cpair->cmp_lo;
- ir_node *const cmp_hi = cpair->cmp_hi;
- pn_Cmp pnc_lo = cpair->pnc_lo;
- pn_Cmp const pnc_hi = cpair->pnc_hi;
- ir_node *const proj_lo = cpair->proj_lo;
- ir_node *const proj_hi = cpair->proj_hi;
- tarval * tv_lo = cpair->tv_lo;
- tarval * tv_hi = cpair->tv_hi;
- ir_mode * mode = cpair->lo_mode;
+ ir_node *const cmp_lo = cpair->cmp_lo;
+ ir_node *const cmp_hi = cpair->cmp_hi;
+ pn_Cmp pnc_lo = cpair->pnc_lo;
+ pn_Cmp const pnc_hi = cpair->pnc_hi;
+ ir_node *const proj_lo = cpair->proj_lo;
+ ir_node *const proj_hi = cpair->proj_hi;
+ ir_tarval * tv_lo = cpair->tv_lo;
+ ir_tarval * tv_hi = cpair->tv_hi;
+ ir_mode * mode = cpair->lo_mode;
+ ir_graph * irg = get_irn_irg(cmp_lo);
if (pnc_lo == pn_Cmp_Eq && pnc_hi == pn_Cmp_Eq &&
tarval_is_null(tv_lo) && tarval_is_null(tv_hi) &&
hil = get_Cmp_left(cmp_hi);
hil = new_r_Conv(dst_block, hil, mode);
p = new_r_And(dst_block, lol, hil, mode);
- c = new_Const(tv_lo);
+ c = new_r_Const(irg, tv_lo);
cmp = new_r_Cmp(dst_block, p, c);
- p = new_r_Proj(dst_block, cmp, mode_b, pn_Cmp_Eq);
+ p = new_r_Proj(cmp, mode_b, pn_Cmp_Eq);
return p;
}
}
if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
(pnc_hi == pn_Cmp_Eq || pnc_hi == pn_Cmp_Ge || pnc_hi == pn_Cmp_Gt)) {
/* x <|<=|== lo && x ==|>=|> hi ==> false */
- ir_node *const t = new_Const(tarval_b_false);
+ ir_node *const t = new_r_Const(irg, tarval_b_false);
return t;
} else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
(pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Lg)) {
} else if (tarval_is_one(tarval_sub(tv_hi, tv_lo, NULL))) { /* lo + 1 == hi */
if (pnc_lo == pn_Cmp_Ge && pnc_hi == pn_Cmp_Lt) {
/* x >= c && x < c + 1 ==> x == c */
- ir_node *const block = get_nodes_block(cmp_lo);
- ir_node *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Eq);
+ ir_node *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Eq);
return p;
} else if (pnc_lo == pn_Cmp_Gt) {
if (pnc_hi == pn_Cmp_Lg) {
/* x > c && x != c + 1 ==> x > c + 1 */
- ir_node *const block = get_nodes_block(cmp_hi);
- ir_node *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Gt);
+ ir_node *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Gt);
return p;
} else if (pnc_hi == pn_Cmp_Lt) {
/* x > c && x < c + 1 ==> false */
- ir_node *const t = new_Const(tarval_b_false);
+ ir_node *const t = new_r_Const(irg, tarval_b_false);
return t;
} else if (pnc_hi == pn_Cmp_Le) {
/* x > c && x <= c + 1 ==> x != c + 1 */
- ir_node *const block = get_nodes_block(cmp_hi);
- ir_node *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Eq);
+ ir_node *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Eq);
return p;
}
} else if (pnc_lo == pn_Cmp_Lg && pnc_hi == pn_Cmp_Lt) {
/* x != c && c < c + 1 ==> x < c */
- ir_node *const block = get_nodes_block(cmp_lo);
- ir_node *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Lt);
+ ir_node *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Lt);
return p;
}
} else if ((pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Ge) &&
/* x >|\= lo && x <|<= hi ==> (x - lo) <u|<=u (hi-lo) */
if (pnc_lo == pn_Cmp_Gt) {
/* must convert to >= */
- ir_mode *mode = get_tarval_mode(tv_lo);
- tarval *n = tarval_add(tv_lo, get_mode_one(mode));
+ ir_mode *mode = get_tarval_mode(tv_lo);
+ ir_tarval *n = tarval_add(tv_lo, get_mode_one(mode));
if (n != tarval_bad && tarval_cmp(n, tv_lo) == pn_Cmp_Gt) {
/* no overflow */
tv_lo = n;
if (tv_lo == tarval_bad || tv_hi == tarval_bad)
return NULL;
}
- c = new_Const(tv_lo);
+ c = new_r_Const(irg, tv_lo);
sub = new_r_Sub(block, x, c, mode);
- subc = new_r_Sub(block, new_Const(tv_hi), c, mode);
+ subc = new_r_Sub(block, new_r_Const(irg, tv_hi), c, mode);
cmp = new_r_Cmp(block, sub, subc);
- p = new_r_Proj(block, cmp, mode_b, pnc_hi);
+ p = new_r_Proj(cmp, mode_b, pnc_hi);
return p;
}
}
*/
static ir_node *bool_or(cond_pair *const cpair, ir_node *dst_block)
{
- ir_node *const cmp_lo = cpair->cmp_lo;
- ir_node *const cmp_hi = cpair->cmp_hi;
- pn_Cmp pnc_lo = cpair->pnc_lo;
- pn_Cmp const pnc_hi = cpair->pnc_hi;
- ir_node *const proj_lo = cpair->proj_lo;
- ir_node *const proj_hi = cpair->proj_hi;
- tarval * tv_lo = cpair->tv_lo;
- tarval * tv_hi = cpair->tv_hi;
- ir_mode * mode = cpair->lo_mode;
+ ir_node *const cmp_lo = cpair->cmp_lo;
+ ir_node *const cmp_hi = cpair->cmp_hi;
+ pn_Cmp pnc_lo = cpair->pnc_lo;
+ pn_Cmp const pnc_hi = cpair->pnc_hi;
+ ir_node *const proj_lo = cpair->proj_lo;
+ ir_node *const proj_hi = cpair->proj_hi;
+ ir_tarval * tv_lo = cpair->tv_lo;
+ ir_tarval * tv_hi = cpair->tv_hi;
+ ir_mode * mode = cpair->lo_mode;
+ ir_graph * irg = get_irn_irg(cmp_lo);
if (pnc_lo == pn_Cmp_Lg && pnc_hi == pn_Cmp_Lg &&
tarval_is_null(tv_lo) && tarval_is_null(tv_hi) &&
hil = get_Cmp_left(cmp_hi);
hil = new_r_Conv(dst_block, hil, mode);
p = new_r_Or(dst_block, lol, hil, mode);
- c = new_Const(tv_lo);
+ c = new_r_Const(irg, tv_lo);
cmp = new_r_Cmp(dst_block, p, c);
- p = new_r_Proj(dst_block, cmp, mode_b, pn_Cmp_Lg);
+ p = new_r_Proj(cmp, mode_b, pn_Cmp_Lg);
return p;
}
}
if ((pnc_lo == pn_Cmp_Ge || pnc_lo == pn_Cmp_Gt || pnc_lo == pn_Cmp_Lg) &&
(pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Lg)) {
/* x >=|>|!= lo | x <|<=|!= hi ==> true */
- ir_node *const t = new_Const(tarval_b_true);
+ ir_node *const t = new_r_Const(irg, tarval_b_true);
return t;
} else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le || pnc_lo == pn_Cmp_Eq) &&
(pnc_hi == pn_Cmp_Lt || pnc_hi == pn_Cmp_Le || pnc_hi == pn_Cmp_Lg)) {
} else if (tarval_is_one(tarval_sub(tv_hi, tv_lo, NULL))) { /* lo + 1 == hi */
if (pnc_lo == pn_Cmp_Lt && pnc_hi == pn_Cmp_Ge) {
/* x < c || x >= c + 1 ==> x != c */
- ir_node *const block = get_nodes_block(cmp_lo);
- ir_node *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Lg);
+ ir_node *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Lg);
return p;
} else if (pnc_lo == pn_Cmp_Le) {
if (pnc_hi == pn_Cmp_Eq) {
/* x <= c || x == c + 1 ==> x <= c + 1 */
- ir_node *const block = get_nodes_block(cmp_hi);
- ir_node *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Le);
+ ir_node *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Le);
return p;
} else if (pnc_hi == pn_Cmp_Ge) {
/* x <= c || x >= c + 1 ==> true */
- ir_node *const t = new_Const(tarval_b_true);
+ ir_node *const t = new_r_Const(irg, tarval_b_true);
return t;
} else if (pnc_hi == pn_Cmp_Gt) {
/* x <= c || x > c + 1 ==> x != c + 1 */
- ir_node *const block = get_nodes_block(cmp_hi);
- ir_node *const p = new_r_Proj(block, cmp_hi, mode_b, pn_Cmp_Lg);
+ ir_node *const p = new_r_Proj(cmp_hi, mode_b, pn_Cmp_Lg);
return p;
}
} else if (pnc_lo == pn_Cmp_Eq && pnc_hi == pn_Cmp_Ge) {
/* x == c || x >= c + 1 ==> x >= c */
- ir_node *const block = get_nodes_block(cmp_lo);
- ir_node *const p = new_r_Proj(block, cmp_lo, mode_b, pn_Cmp_Ge);
+ ir_node *const p = new_r_Proj(cmp_lo, mode_b, pn_Cmp_Ge);
return p;
}
} else if ((pnc_lo == pn_Cmp_Lt || pnc_lo == pn_Cmp_Le) &&
/* x <|<= lo || x >|>= hi ==> (x - lo) >u|>=u (hi-lo) */
if (pnc_lo == pn_Cmp_Le) {
/* must convert to < */
- ir_mode *mode = get_tarval_mode(tv_lo);
- tarval *n = tarval_add(tv_lo, get_mode_one(mode));
+ ir_mode *mode = get_tarval_mode(tv_lo);
+ ir_tarval *n = tarval_add(tv_lo, get_mode_one(mode));
if (n != tarval_bad && tarval_cmp(n, tv_lo) == pn_Cmp_Gt) {
/* no overflow */
tv_lo = n;
if (tv_lo == tarval_bad || tv_hi == tarval_bad)
return NULL;
}
- c = new_Const(tv_lo);
+ c = new_r_Const(irg, tv_lo);
sub = new_r_Sub(block, x, c, mode);
- subc = new_r_Sub(block, new_Const(tv_hi), c, mode);
+ subc = new_r_Sub(block, new_r_Const(irg, tv_hi), c, mode);
cmp = new_r_Cmp(block, sub, subc);
- p = new_r_Proj(block, cmp, mode_b, pnc_hi);
+ p = new_r_Proj(cmp, mode_b, pnc_hi);
return p;
}
}
*/
static void bool_walk(ir_node *n, void *ctx)
{
- bool_opt_env_t *env = ctx;
+ bool_opt_env_t *env = (bool_opt_env_t*)ctx;
if (get_irn_mode(n) != mode_b)
return;
*/
static void find_cf_and_or_walker(ir_node *block, void *ctx)
{
+ bool_opt_env_t *env = (bool_opt_env_t*)ctx;
int low_idx, up_idx;
- int n_cfgpreds = get_Block_n_cfgpreds(block);
- bool_opt_env_t *env = ctx;
+ int n_cfgpreds;
+ /* because we modify the graph in regions we might not visited yet,
+ * Id nodes might arise here. Ignore them.
+ */
+ if (is_Id(block))
+ return;
+
+ n_cfgpreds = get_Block_n_cfgpreds(block);
restart:
if (n_cfgpreds < 2)
return;
if (cpair.proj_lo == cond_selector) {
ir_mode *mode = get_tarval_mode(cpair.tv_lo);
ir_node *cmp = get_Proj_pred(cpair.proj_lo);
- ir_node *block = get_nodes_block(cmp);
cpair.pnc_lo = get_negated_pnc(cpair.pnc_lo, mode);
- cpair.proj_lo = new_r_Proj(block, cmp, mode_b, cpair.pnc_lo);
+ cpair.proj_lo = new_r_Proj(cmp, mode_b, cpair.pnc_lo);
} else {
ir_mode *mode = get_tarval_mode(cpair.tv_hi);
ir_node *cmp = get_Proj_pred(cpair.proj_hi);
- ir_node *block = get_nodes_block(cmp);
assert(cpair.proj_hi == cond_selector);
cpair.pnc_hi = get_negated_pnc(cpair.pnc_hi, mode);
- cpair.proj_hi = new_r_Proj(block, cmp, mode_b, cpair.pnc_hi);
+ cpair.proj_hi = new_r_Proj(cmp, mode_b, cpair.pnc_hi);
}
}
if (get_Proj_proj(upper_cf) == pn_Cond_false) {
if (cpair.proj_lo == upper_cond_selector) {
ir_mode *mode = get_tarval_mode(cpair.tv_lo);
ir_node *cmp = get_Proj_pred(cpair.proj_lo);
- ir_node *block = get_nodes_block(cmp);
cpair.pnc_lo = get_negated_pnc(cpair.pnc_lo, mode);
- cpair.proj_lo = new_r_Proj(block, cmp, mode_b, cpair.pnc_lo);
+ cpair.proj_lo = new_r_Proj(cmp, mode_b, cpair.pnc_lo);
} else {
ir_mode *mode = get_tarval_mode(cpair.tv_hi);
ir_node *cmp = get_Proj_pred(cpair.proj_hi);
- ir_node *block = get_nodes_block(cmp);
assert(cpair.proj_hi == upper_cond_selector);
cpair.pnc_hi = get_negated_pnc(cpair.pnc_hi, mode);
- cpair.proj_hi = new_r_Proj(block, cmp, mode_b, cpair.pnc_hi);
+ cpair.proj_hi = new_r_Proj(cmp, mode_b, cpair.pnc_hi);
}
}
env->changed = 1;
DB((dbg, LEVEL_1, "boolopt: %+F: fusing (ub %+F lb %+F)\n",
- current_ir_graph, upper_block, lower_block));
+ get_irn_irg(upper_block), upper_block, lower_block));
/* move all expressions on the path to lower/upper block */
move_nodes_to_block(get_Block_cfgpred(block, up_idx), upper_block);
projects / libfirm / blobdiff