if (get_Block_dom_depth(bl) == -1) {
/* This block is not reachable from Start */
ir_graph *irg = get_irn_irg(bl);
- return new_r_Bad(irg);
+ return new_r_Bad(irg, mode_BB);
}
return get_dom_info(bl)->idom;
}
if (get_Block_postdom_depth(bl) == -1) {
/* This block is not reachable from Start */
ir_graph *irg = get_irn_irg(bl);
- return new_r_Bad(irg);
+ return new_r_Bad(irg, mode_BB);
}
return get_pdom_info(bl)->idom;
}
/* The root of the dominator tree should be the Start block. */
ir_node *root = get_irg_start_block(irg);
- assert(irg->dom_state == dom_consistent
+ assert(is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE)
&& "The dominators of the irg must be consistent");
assert(root && "The start block of the graph is NULL?");
assert(get_dom_info(root)->idom == NULL
void postdom_tree_walk_irg(ir_graph *irg, irg_walk_func *pre,
irg_walk_func *post, void *env)
{
- /* The root of the dominator tree should be the End block. */
+ /* The root of the post dominator tree should be the End block. */
ir_node *root = get_irg_end_block(irg);
- assert(irg->pdom_state == dom_consistent
+ assert(is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE)
&& "The dominators of the irg must be consistent");
assert(root && "The end block of the graph is NULL?");
assert(get_pdom_info(root)->idom == NULL
{
int *n_blocks = (int *) env;
- if (is_Block_dead(bl))
- return;
-
(*n_blocks) ++;
memset(get_pdom_info(bl), 0, sizeof(ir_dom_info));
tmp_dom_info *tdi;
int i;
- if (is_Block_dead(bl))
- return;
-
assert(is_Block(bl));
if (Block_block_visited(bl))
return;
tmp_dom_info *tdi;
int i;
- if (is_Block_dead(bl))
- return;
-
assert(is_Block(bl));
if (get_irg_block_visited(current_ir_graph) == get_Block_block_visited(bl))
return;
static void count_and_init_blocks_dom(ir_node *bl, void *env)
{
int *n_blocks = (int *) env;
- if (is_Block_dead(bl))
- return;
(*n_blocks) ++;
set_Block_dom_depth(bl, -1);
}
-/* Computes the dominator trees. Sets a flag in irg to "dom_consistent".
- If the control flow of the graph is changed this flag must be set to
- "dom_inconsistent". */
+/* Computes the dominator trees. */
void compute_doms(ir_graph *irg)
{
ir_graph *rem = current_ir_graph;
/* Update graph state */
assert(get_irg_phase_state(irg) != phase_building);
- irg->dom_state = dom_consistent;
/* Count the number of blocks in the graph. */
n_blocks = 0;
for (i = n_blocks-1; i > 0; i--) { /* Don't iterate the root, it's done. */
- int irn_arity;
- tmp_dom_info *w = &tdi_list[i];
+ tmp_dom_info *w = &tdi_list[i];
+ ir_node *block = w->block;
tmp_dom_info *v;
+ int irn_arity;
/* Step 2 */
- irn_arity = get_irn_arity(w->block);
+ irn_arity = get_irn_arity(block);
for (j = 0; j < irn_arity; j++) {
- ir_node *pred = get_Block_cfgpred_block(w->block, j);
+ ir_node *pred = get_Block_cfgpred(block, j);
+ ir_node *pred_block = get_nodes_block(pred);
tmp_dom_info *u;
- if (is_Bad(pred) || (get_Block_dom_pre_num (pred) == -1))
- continue; /* control-dead */
+ if (is_Bad(pred) || (get_Block_dom_pre_num (pred_block) == -1))
+ continue; /* unreachable */
- u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
- if (u->semi < w->semi) w->semi = u->semi;
+ u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred_block)]);
+ if (u->semi < w->semi)
+ w->semi = u->semi;
}
/* handle keep-alives if we are at the end block */
- if (w->block == get_irg_end_block(irg)) {
+ if (block == get_irg_end_block(irg)) {
ir_node *end = get_irg_end(irg);
irn_arity = get_irn_arity(end);
tmp_dom_info *u;
if (!is_Block(pred) || get_Block_dom_pre_num(pred) == -1)
- continue; /* control-dead */
+ continue; /* unreachable */
u = dom_eval (&tdi_list[get_Block_dom_pre_num(pred)]);
- if (u->semi < w->semi) w->semi = u->semi;
+ if (u->semi < w->semi)
+ w->semi = u->semi;
}
}
if (! w->dom)
continue; /* control dead */
- if (w->dom != w->semi) w->dom = w->dom->dom;
+ if (w->dom != w->semi)
+ w->dom = w->dom->dom;
set_Block_idom(w->block, w->dom->block);
/* blocks dominated by dead one's are still dead */
/* Do a walk over the tree and assign the tree pre orders. */
{
unsigned tree_pre_order = 0;
- dom_tree_walk_irg(irg, assign_tree_dom_pre_order,
- assign_tree_dom_pre_order_max, &tree_pre_order);
+ dom_tree_walk(get_irg_start_block(irg), assign_tree_dom_pre_order,
+ assign_tree_dom_pre_order_max, &tree_pre_order);
}
current_ir_graph = rem;
+ set_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
}
void assure_doms(ir_graph *irg)
{
- if (get_irg_dom_state(irg) != dom_consistent)
+ if (! is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE))
compute_doms(irg);
}
{
/* Update graph state */
assert(get_irg_phase_state(irg) != phase_building);
- irg->dom_state = dom_none;
+ clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_DOMINANCE);
/* With the implementation right now there is nothing to free,
but better call it anyways... */
}
-/* Computes the post dominator trees. Sets a flag in irg to "dom_consistent".
- If the control flow of the graph is changed this flag must be set to
- "dom_inconsistent". */
+/* Computes the post dominator trees. */
void compute_postdoms(ir_graph *irg)
{
ir_graph *rem = current_ir_graph;
/* Update graph state */
assert(get_irg_phase_state(irg) != phase_building);
- irg->pdom_state = dom_consistent;
/* Count the number of blocks in the graph. */
n_blocks = 0;
/* Do a walk over the tree and assign the tree pre orders. */
{
unsigned tree_pre_order = 0;
- postdom_tree_walk_irg(irg, assign_tree_postdom_pre_order,
+ postdom_tree_walk(get_irg_end_block(irg), assign_tree_postdom_pre_order,
assign_tree_postdom_pre_order_max, &tree_pre_order);
}
current_ir_graph = rem;
+ set_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE);
}
void assure_postdoms(ir_graph *irg)
{
- if (get_irg_postdom_state(irg) != dom_consistent)
+ if (! is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE))
compute_postdoms(irg);
}
{
/* Update graph state */
assert(get_irg_phase_state(irg) != phase_building);
- irg->pdom_state = dom_none;
+ clear_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE);
/* With the implementation right now there is nothing to free,
but better call it anyways... */
projects / libfirm / blobdiff