/*
- * 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.
*
* @file
* @brief boolean condition/control flow optimizations
* @author Matthias Braun, Christoph Mallon, Michael Beck
- * @version $Id: cfopt.c 22579 2008-10-07 14:54:04Z beck $
*/
#include "config.h"
int changed; /**< Set if the graph was changed. */
} bool_opt_env_t;
-DEBUG_ONLY(static firm_dbg_module_t *dbg);
+DEBUG_ONLY(static firm_dbg_module_t *dbg;)
/**
* Check if tho given nodes, l and r, represent two compares with
*/
static bool find_cond_pair(ir_node *const l, ir_node *const r, cond_pair *const res)
{
- if (!is_Cmp(l) || !is_Cmp(r))
- return false;
-
- ir_node *const lol = get_Cmp_left(l);
- ir_node *const lor = get_Cmp_right(l);
- ir_node *const rol = get_Cmp_left(r);
- ir_node *const ror = get_Cmp_right(r);
- ir_relation const pnc_l = get_Cmp_relation(l);
- ir_relation const pnc_r = get_Cmp_relation(r);
-
- if (is_Const(lor) && is_Const_null(lor) &&
- is_Const(ror) && is_Const_null(ror) &&
- pnc_l == pnc_r &&
- (pnc_l == ir_relation_less_greater || pnc_l == ir_relation_equal)) {
- /* l == (lol !=|== NULL) && r == (rol !=|== NULL) */
- res->cmp_lo = l;
- res->cmp_hi = r;
- res->rel_lo = pnc_l;
- res->rel_hi = pnc_l;
- res->tv_lo = get_Const_tarval(lor);
- res->tv_hi = get_Const_tarval(ror);
- res->lo_mode = get_irn_mode(lor);
-
- return true;
- }
-
- if (lol == rol && lor != ror && is_Const(lor) && is_Const(ror)) {
- /* l == (x CMP c_l), r == (x cmp c_r) */
- ir_tarval *const tv_l = get_Const_tarval(lor);
- ir_tarval *const tv_r = get_Const_tarval(ror);
- ir_relation const rel = tarval_cmp(tv_l, tv_r);
-
- res->lo_mode = get_irn_mode(lol);
-
- if (rel == ir_relation_less) {
- /* c_l < c_r */
+ if (is_Cmp(l) && is_Cmp(r)) {
+ ir_node *const lol = get_Cmp_left(l);
+ ir_node *const lor = get_Cmp_right(l);
+ ir_node *const rol = get_Cmp_left(r);
+ ir_node *const ror = get_Cmp_right(r);
+ ir_relation const pnc_l = get_Cmp_relation(l);
+ ir_relation const pnc_r = get_Cmp_relation(r);
+
+ if (is_Const(lor) && is_Const_null(lor) &&
+ is_Const(ror) && is_Const_null(ror) &&
+ pnc_l == pnc_r &&
+ (pnc_l == ir_relation_less_greater || pnc_l == ir_relation_equal)) {
+ /* l == (lol !=|== NULL) && r == (rol !=|== NULL) */
res->cmp_lo = l;
res->cmp_hi = r;
res->rel_lo = pnc_l;
- res->rel_hi = pnc_r;
- res->tv_lo = tv_l;
- res->tv_hi = tv_r;
- } else if (rel == ir_relation_greater) {
- /* c_l > c_r */
- res->cmp_lo = r;
- res->cmp_hi = l;
- res->rel_lo = pnc_r;
res->rel_hi = pnc_l;
- res->tv_lo = tv_r;
- res->tv_hi = tv_l;
- } else {
- /* The constants shall be unequal but comparable.
- * Local optimizations handle the equal case. */
- return false;
+ res->tv_lo = get_Const_tarval(lor);
+ res->tv_hi = get_Const_tarval(ror);
+ res->lo_mode = get_irn_mode(lor);
+
+ return true;
+ }
+
+ if (lol == rol && lor != ror && is_Const(lor) && is_Const(ror)) {
+ /* l == (x CMP c_l), r == (x cmp c_r) */
+ ir_tarval *const tv_l = get_Const_tarval(lor);
+ ir_tarval *const tv_r = get_Const_tarval(ror);
+ ir_relation const rel = tarval_cmp(tv_l, tv_r);
+
+ res->lo_mode = get_irn_mode(lol);
+
+ if (rel == ir_relation_less) {
+ /* c_l < c_r */
+ res->cmp_lo = l;
+ res->cmp_hi = r;
+ res->rel_lo = pnc_l;
+ res->rel_hi = pnc_r;
+ res->tv_lo = tv_l;
+ res->tv_hi = tv_r;
+ } else if (rel == ir_relation_greater) {
+ /* c_l > c_r */
+ res->cmp_lo = r;
+ res->cmp_hi = l;
+ res->rel_lo = pnc_r;
+ res->rel_hi = pnc_l;
+ res->tv_lo = tv_r;
+ res->tv_hi = tv_l;
+ } else {
+ /* The constants shall be unequal but comparable.
+ * Local optimizations handle the equal case. */
+ return false;
+ }
+ return true;
}
- return true;
}
return false;
}
/* register a debug mask */
FIRM_DBG_REGISTER(dbg, "firm.opt.bool");
- /* works better with one return block only */
- normalize_one_return(irg);
-
env.changed = 0;
/* optimize simple Andb and Orb cases */
irg_walk_graph(irg, NULL, bool_walk, &env);
- ir_reserve_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
-
/* now more complicated cases: find control flow And/Or and optimize. */
+ ir_reserve_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
irg_walk_graph(irg, clear_block_infos, collect_phis, NULL);
irg_block_walk_graph(irg, NULL, find_cf_and_or_walker, &env);
-
- if (env.changed) {
- set_irg_outs_inconsistent(irg);
- set_irg_doms_inconsistent(irg);
- set_irg_extblk_inconsistent(irg);
- set_irg_loopinfo_inconsistent(irg);
- }
-
ir_free_resources(irg, IR_RESOURCE_BLOCK_MARK | IR_RESOURCE_PHI_LIST);
+
+ confirm_irg_properties(irg,
+ env.changed ? IR_GRAPH_PROPERTIES_NONE : IR_GRAPH_PROPERTIES_ALL);
}
/* Creates an ir_graph pass for opt_bool. */