/*
- * 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.
*
*/
#include "config.h"
+#include <stdbool.h>
+
#include "firm_common.h"
#include "irnode_t.h"
#include "structure.h"
ir_reg_or_blk *parts; /**< The list of all region parts. */
ir_region **pred; /**< The predecessor (control flow) regions of this region. */
ir_region **succ; /**< The successor (control flow) regions of this region. */
- unsigned prenum; /**< DFS pre-oder number */
- unsigned postnum; /**< DFS post-oder number */
+ size_t prenum; /**< DFS pre-oder number */
+ size_t postnum; /**< DFS post-oder number */
void *link; /**< A link field. */
unsigned long nr; /**< for debugging */
unsigned visited:1; /**< The visited flag. */
/**
* Returns the link of a region.
*/
-void *get_region_link(const ir_region *reg) {
+void *get_region_link(const ir_region *reg)
+{
return reg->link;
}
/**
* Sets the link of a region.
*/
-void set_region_link(ir_region *reg, void *data) {
+void set_region_link(ir_region *reg, void *data)
+{
reg->link = data;
}
/**
* Get the immediate region of a block.
*/
-ir_region *get_block_region(const ir_node *block) {
+ir_region *get_block_region(const ir_node *block)
+{
assert(is_Block(block));
return block->attr.block.region;
}
/**
* Sets the immediate region of a block.
*/
-void set_block_region(ir_node *block, ir_region *reg) {
+void set_block_region(ir_node *block, ir_region *reg)
+{
assert(is_Block(block));
block->attr.block.region = reg;
}
/**
* Get the immediate region of a node.
*/
-ir_region *get_irn_region(ir_node *n) {
- if (is_no_Block(n))
+ir_region *get_irn_region(ir_node *n)
+{
+ if (!is_Block(n))
n = get_nodes_block(n);
return get_block_region(n);
}
/**
- * Return non-if a given firm thing is a region.
+ * Return non-zero if a given firm thing is a region.
*/
-int is_region(const void *thing) {
- const firm_kind *kind = thing;
+int is_region(const void *thing)
+{
+ const firm_kind *kind = (const firm_kind*) thing;
return *kind == k_ir_region;
}
/**
- * Return the number of predecessors in a region.
+ * Return the number of predecessors of a region.
*/
-int get_region_n_preds(const ir_region *reg) {
+size_t get_region_n_preds(const ir_region *reg)
+{
return ARR_LEN(reg->pred);
}
/**
* Return the predecessor region at position pos.
*/
-ir_region *get_region_pred(const ir_region *reg, int pos) {
- assert(0 <= pos && pos <= get_region_n_preds(reg));
+ir_region *get_region_pred(const ir_region *reg, size_t pos)
+{
+ assert(pos <= get_region_n_preds(reg));
return reg->pred[pos];
}
/**
* Set the predecessor region at position pos.
*/
-void set_region_pred(ir_region *reg, int pos, ir_region *n) {
- assert(0 <= pos && pos <= get_region_n_preds(reg));
+void set_region_pred(ir_region *reg, size_t pos, ir_region *n)
+{
+ assert(pos <= get_region_n_preds(reg));
reg->pred[pos] = n;
}
/**
* Return the number of successors in a region.
*/
-int get_region_n_succs(const ir_region *reg) {
+size_t get_region_n_succs(const ir_region *reg)
+{
return ARR_LEN(reg->succ);
}
/**
* Return the successor region at position pos.
*/
-ir_region *get_region_succ(const ir_region *reg, int pos) {
- assert(0 <= pos && pos <= get_region_n_succs(reg));
+ir_region *get_region_succ(const ir_region *reg, size_t pos)
+{
+ assert(pos <= get_region_n_succs(reg));
return reg->succ[pos];
}
/**
* Set the successor region at position pos.
*/
-void set_region_succ(ir_region *reg, int pos, ir_region *n) {
- assert(0 <= pos && pos <= get_region_n_succs(reg));
+void set_region_succ(ir_region *reg, size_t pos, ir_region *n)
+{
+ assert(pos <= get_region_n_succs(reg));
reg->succ[pos] = n;
}
/** Walker environment. */
typedef struct walk_env {
- struct obstack *obst; /**< an obstack to allocate from. */
+ struct obstack *obst; /**< An obstack to allocate from. */
ir_region **post; /**< The list of all currently existent top regions. */
- unsigned l_post; /**< length of the allocated regions array. */
- unsigned premax; /**< maximum pre counter */
- unsigned postmax; /**< maximum post counter */
- ir_node *start_block; /**< the start block of the graph. */
- ir_node *end_block; /**< the end block of the graph. */
+ size_t l_post; /**< The length of the allocated regions array. */
+ size_t premax; /**< maximum pre counter */
+ size_t postmax; /**< maximum post counter */
+ ir_node *start_block; /**< The start block of the graph. */
+ ir_node *end_block; /**< The end block of the graph. */
} walk_env;
/**
* Do a DFS search on the initial regions, assign a prenum and a postnum to every
* node and store the region nodes into the post array.
*/
-static void dfs_walk2(ir_region *reg, walk_env *env) {
- int i, n;
+static void dfs_walk2(ir_region *reg, walk_env *env)
+{
+ size_t i, n;
if (reg->visited == 0) {
reg->visited = 1;
* Do a DFS search on the initial regions, assign a prenum and a postnum to every
* node and store the region nodes into the post array.
*/
-static void dfs_walk(ir_graph *irg, walk_env *env) {
+static void dfs_walk(ir_graph *irg, walk_env *env)
+{
ir_graph *rem = current_ir_graph;
ir_region *reg;
current_ir_graph = irg;
- reg = get_irn_link(get_irg_start_block(irg));
+ reg = (ir_region*) get_irn_link(get_irg_start_block(irg));
env->premax = 0;
env->postmax = 0;
* Post-walker: wrap all blocks with a BasicBlock region
* and count them
*/
-static void wrap_BasicBlocks(ir_node *block, void *ctx) {
- walk_env *env = ctx;
+static void wrap_BasicBlocks(ir_node *block, void *ctx)
+{
+ walk_env *env = (walk_env*) ctx;
ir_region *reg;
/* Allocate a Block wrapper */
- reg = obstack_alloc(env->obst, sizeof(*reg));
+ reg = OALLOC(env->obst, ir_region);
reg->kind = k_ir_region;
reg->type = ir_rk_BasicBlock;
reg->parent = NULL;
} /* wrap_BasicBlocks */
/**
- * Create the pred and succ edges for Block wrapper.
+ * Post-walker: Create the pred and succ edges for Block wrapper.
* Kill edges to the Start and End blocks.
*/
-static void update_BasicBlock_regions(ir_node *blk, void *ctx) {
- walk_env *env = ctx;
- ir_region *reg = get_irn_link(blk);
- int i, j, len;
+static void update_BasicBlock_regions(ir_node *blk, void *ctx)
+{
+ walk_env *env = (walk_env*) ctx;
+ ir_region *reg = (ir_region*) get_irn_link(blk);
+ int i, len;
+ size_t j;
if (blk == env->start_block) {
- /* handle Firm's self loop */
+ /* handle Firm's self loop: Start block has no predecessors */
reg->pred = NEW_ARR_D(ir_region *, env->obst, 0);
} else {
len = get_Block_n_cfgpreds(blk);
reg->pred = NEW_ARR_D(ir_region *, env->obst, len);
- for (i = j = 0; i < len; ++i) {
+ for (j = i = 0; i < len; ++i) {
ir_node *pred = get_Block_cfgpred_block(blk, i);
- reg->pred[j++] = get_irn_link(pred);
+ reg->pred[j++] = (ir_region*) get_irn_link(pred);
}
ARR_SHRINKLEN(reg->pred, j);
}
len = get_Block_n_cfg_outs(blk);
reg->succ = NEW_ARR_D(ir_region *, env->obst, len);
- for (i = j = 0; i < len; ++i) {
+ for (j = i = 0; i < len; ++i) {
ir_node *succ = get_Block_cfg_out(blk, i);
- reg->succ[j++] = get_irn_link(succ);
+ reg->succ[j++] = (ir_region*) get_irn_link(succ);
}
ARR_SHRINKLEN(reg->succ, j);
} /* update_BasicBlock_regions */
-/** Allocate a new region of a obstack */
-#define ALLOC_REG(obst, reg, tp) \
- do { \
- (reg) = obstack_alloc((obst), sizeof(*(reg))); \
- (reg)->kind = k_ir_region; \
- (reg)->type = tp; \
- (reg)->parent = NULL; \
- (reg)->prenum = 0; \
- (reg)->postnum = 0; \
- (reg)->visited = 0; \
- (reg)->exit = 0; \
- (reg)->enter = 0; \
- (reg)->link = NULL; \
- } while (0)
+/** Allocate a new region on an obstack */
+static ir_region *alloc_region(struct obstack *obst, ir_region_kind type)
+{
+ ir_region *reg = OALLOC(obst, ir_region);
+ reg->kind = k_ir_region;
+ reg->type = type;
+ reg->parent = NULL;
+ reg->prenum = 0;
+ reg->postnum = 0;
+ reg->visited = 0;
+ reg->exit = 0;
+ reg->enter = 0;
+ reg->link = NULL;
+
+ return reg;
+} /* alloc_region */
/**
* Creates a new Sequence region.
*/
-static ir_region *new_Sequence(struct obstack *obst, ir_region *nset, int nset_len) {
- ir_region *reg, *next;
- int i;
-
- ALLOC_REG(obst, reg, ir_rk_Sequence);
+static ir_region *new_Sequence(struct obstack *obst, ir_region *nset, size_t nset_len)
+{
+ ir_region *reg = alloc_region(obst, ir_rk_Sequence);
+ ir_region *next;
+ size_t i;
reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, nset_len);
/* beware: list is in reverse order, reverse */
next = nset;
- for (i = nset_len - 1; i >= 0; --i) {
+ for (i = nset_len; i > 0;) {
+ --i;
nset = next;
reg->parts[i].region = nset;
nset->parent = reg;
- next = nset->link;
+ next = (ir_region*) nset->link;
nset->link = NULL;
}
DEBUG_ONLY(
DB((dbg, LEVEL_2, " Created Sequence "));
for (i = 0; i < nset_len; ++i) {
- DB((dbg, LEVEL_2, "(%u)", reg->parts[i].region->nr));
+ DB((dbg, LEVEL_2, "(%lu)", reg->parts[i].region->nr));
}
DB((dbg, LEVEL_2, "\n"));
)
/**
* Create a new IfThenElse region.
*/
-static ir_region *new_IfThenElse(struct obstack *obst, ir_region *if_b, ir_region *then_b, ir_region *else_b) {
- ir_region *reg;
-
- ALLOC_REG(obst, reg, ir_rk_IfThenElse);
+static ir_region *new_IfThenElse(struct obstack *obst, ir_region *if_b, ir_region *then_b, ir_region *else_b)
+{
+ ir_region *reg = alloc_region(obst, ir_rk_IfThenElse);
reg->nr = if_b->nr;
reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, 3);
reg->pred = DUP_ARR_D(ir_region *, obst, if_b->pred);
reg->succ = DUP_ARR_D(ir_region *, obst, then_b->succ);
- DB((dbg, LEVEL_2, " Created If(%u)Then(%u)Else(%u)\n", reg->nr, then_b->nr, else_b->nr));
+ DB((dbg, LEVEL_2, " Created If(%lu)Then(%lu)Else(%lu)\n", reg->nr, then_b->nr, else_b->nr));
return reg;
} /* new_IfThenElse */
/**
* Create a new IfThen region.
*/
-static ir_region *new_IfThen(struct obstack *obst, ir_region *if_b, ir_region *then_b) {
- ir_region *reg;
-
- ALLOC_REG(obst, reg, ir_rk_IfThen);
+static ir_region *new_IfThen(struct obstack *obst, ir_region *if_b, ir_region *then_b)
+{
+ ir_region *reg = alloc_region(obst, ir_rk_IfThen);
reg->nr = if_b->nr;
reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, 2);
reg->pred = DUP_ARR_D(ir_region *, obst, if_b->pred);
reg->succ = DUP_ARR_D(ir_region *, obst, then_b->succ);
- DB((dbg, LEVEL_2, " Created If(%u)Then(%u)\n", reg->nr, then_b->nr));
+ DB((dbg, LEVEL_2, " Created If(%lu)Then(%lu)\n", reg->nr, then_b->nr));
return reg;
} /* new_IfThenElse */
* Create a new Switch/case region.
*/
static ir_region *new_SwitchCase(struct obstack *obst, ir_region_kind type, ir_region *head, ir_region *exit,
- ir_region *cases, int cases_len) {
- ir_region *reg, *c, *n;
- int i;
- int add = 1;
+ ir_region *cases, size_t cases_len)
+{
+ ir_region *reg = alloc_region(obst, type);
+ ir_region *c, *n;
+ int add = 1;
+ size_t i;
/* check, if the exit block is in the list */
- for (c = cases; c != NULL; c = c->link) {
+ for (c = cases; c != NULL; c = (ir_region*) c->link) {
if (c == exit) {
add = 0;
break;
}
}
- ALLOC_REG(obst, reg, type);
-
reg->nr = head->nr;
reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, cases_len + add);
reg->parts[0].region = head; head->parent = reg;
i = 1;
for (c = cases; c != NULL; c = n) {
- n = c->link;
+ n = (ir_region*) c->link;
if (c != exit) {
reg->parts[i++].region = c;
c->parent = reg;
reg->succ = NEW_ARR_D(ir_region *, obst, 1);
reg->succ[0] = exit;
- DEBUG_ONLY(
+ DEBUG_ONLY({
DB((dbg, LEVEL_2, " Created %s(%u)\n", reg->type == ir_rk_Switch ? "Switch" : "Case", reg->nr));
for (i = 1; i < ARR_LEN(reg->parts); ++i) {
- DB((dbg, LEVEL_2, " Case(%u)\n", reg->parts[i].region->nr));
+ DB((dbg, LEVEL_2, " Case(%lu)\n", reg->parts[i].region->nr));
}
- DB((dbg, LEVEL_2, " Exit(%u)\n", exit->nr));
- )
+ DB((dbg, LEVEL_2, " Exit(%lu)\n", exit->nr));
+ })
return reg;
} /* new_SwitchCase */
/**
* Create a new SelfLoop region.
*/
-static ir_region *new_SelfLoop(struct obstack *obst, ir_region *head) {
- ir_region *reg, *succ;
- int i, j, len;
-
- ALLOC_REG(obst, reg, ir_rk_SelfLoop);
+static ir_region *new_SelfLoop(struct obstack *obst, ir_region *head)
+{
+ ir_region *reg = alloc_region(obst, ir_rk_SelfLoop);
+ ir_region *succ;
+ size_t i, j, len;
- reg->nr = head->nr;
- reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, 1);
+ reg->nr = head->nr;
+ reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, 1);
reg->parts[0].region = head; head->parent = reg;
else
reg->succ[0] = get_region_succ(head, 1);
- DB((dbg, LEVEL_2, " Created SelfLoop(%u)\n", reg->nr));
+ DB((dbg, LEVEL_2, " Created SelfLoop(%lu)\n", reg->nr));
return reg;
} /* new_SelfLoop */
/**
* Create a new RepeatLoop region.
*/
-static ir_region *new_RepeatLoop(struct obstack *obst, ir_region *head, ir_region *body) {
- ir_region *reg, *succ;
-
- ALLOC_REG(obst, reg, ir_rk_RepeatLoop);
+static ir_region *new_RepeatLoop(struct obstack *obst, ir_region *head, ir_region *body)
+{
+ ir_region *reg = alloc_region(obst, ir_rk_RepeatLoop);
+ ir_region *succ;
- reg->nr = head->nr;
- reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, 2);
+ reg->nr = head->nr;
+ reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, 2);
reg->parts[0].region = head; head->parent = reg;
reg->parts[1].region = body; body->parent = reg;
else
reg->succ[0] = get_region_succ(body, 1);
- DB((dbg, LEVEL_2, " Created RepeatLoop(%u)Body(%u)\n", reg->nr, body->nr));
+ DB((dbg, LEVEL_2, " Created RepeatLoop(%lu)Body(%lu)\n", reg->nr, body->nr));
return reg;
} /* new_RepeatLoop */
/**
* Create a new WhileLoop region.
*/
-static ir_region *new_WhileLoop(struct obstack *obst, ir_region *head) {
- ir_region *reg, *succ;
- ir_region *body = head->link;
- int i, j, len;
+static ir_region *new_WhileLoop(struct obstack *obst, ir_region *head)
+{
+ ir_region *reg = alloc_region(obst, ir_rk_WhileLoop);
+ ir_region *body = (ir_region*) head->link;
+ ir_region *succ;
+ size_t i, j, len;
head->link = NULL;
- ALLOC_REG(obst, reg, ir_rk_WhileLoop);
-
- reg->nr = head->nr;
- reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, 2);
+ reg->nr = head->nr;
+ reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, 2);
reg->parts[0].region = head; head->parent = reg;
reg->parts[1].region = body; body->parent = reg;
else
reg->succ[0] = get_region_succ(head, 1);
- DB((dbg, LEVEL_2, " Created WhileLoop(%u)Body(%u)\n", reg->nr, body->nr));
+ DB((dbg, LEVEL_2, " Created WhileLoop(%lu)Body(%lu)\n", reg->nr, body->nr));
return reg;
} /* new_WhileLoop */
/**
* Create a new new_NaturalLoop region.
*/
-static ir_region *new_NaturalLoop(struct obstack *obst, ir_region *head) {
- ir_region *reg, *c, *n;
- int i, j, k, len, n_pred, n_succ;
+static ir_region *new_NaturalLoop(struct obstack *obst, ir_region *head)
+{
+ ir_region *reg = alloc_region(obst, ir_rk_WhileLoop);
+ ir_region *c, *n;
+ size_t i, j, k, len, n_pred, n_succ;
/* count number of parts */
- for (len = 0, c = head; c != NULL; c = c->link)
+ for (len = 0, c = head; c != NULL; c = (ir_region*) c->link)
++len;
- ALLOC_REG(obst, reg, ir_rk_WhileLoop);
-
- reg->nr = head->nr;
- reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, len);
+ reg->nr = head->nr;
+ reg->parts = NEW_ARR_D(ir_reg_or_blk, obst, len);
/* enter all parts */
for (i = 0, c = head; c != NULL; c = n) {
reg->parts[i++].region = c;
c->parent = reg;
- n = c->link;
+ n = (ir_region*) c->link;
c->link = NULL;
}
/* count number of preds */
n_pred = 0;
- for (i = get_region_n_preds(head) - 1; i >= 0; --i) {
- ir_region *pred = get_region_pred(head, i);
+ for (i = get_region_n_preds(head); i > 0;) {
+ ir_region *pred = get_region_pred(head, --i);
if (pred->parent != reg)
++n_pred;
}
reg->pred = NEW_ARR_D(ir_region *, obst, n_pred);
- for (j = 0, i = get_region_n_preds(head) - 1; i >= 0; --i) {
- ir_region *pred = get_region_pred(head, i);
+ for (j = 0, i = get_region_n_preds(head); i > 0;) {
+ ir_region *pred = get_region_pred(head, --i);
if (pred->parent != reg)
reg->pred[j++] = pred;
}
/* count number of succs */
n_succ = 0;
for (j = 0; j < len; ++j) {
- ir_region *c = reg->parts[j].region;
- for (i = get_region_n_succs(c) - 1; i >= 0; --i) {
- ir_region *succ = get_region_succ(c, i);
+ ir_region *pc = reg->parts[j].region;
+ for (i = get_region_n_succs(pc); i > 0;) {
+ ir_region *succ = get_region_succ(pc, --i);
if (succ->parent != reg)
++n_succ;
}
reg->succ = NEW_ARR_D(ir_region *, obst, n_succ);
k = 0;
for (j = 0; j < len; ++j) {
- ir_region *c = reg->parts[j].region;
- for (i = get_region_n_succs(c) - 1; i >= 0; --i) {
- ir_region *succ = get_region_succ(c, i);
+ ir_region *pc = reg->parts[j].region;
+ for (i = get_region_n_succs(pc); i > 0;) {
+ ir_region *succ = get_region_succ(pc, --i);
if (succ->parent != reg)
reg->succ[k++] = succ;
}
} /* new_NaturalLoop */
/**
- * Return true if a is an ancestor of b in DFS search.
+ * Return true if region a is an ancestor of region b in DFS search.
*/
-static int is_ancestor(const ir_region *a, const ir_region *b) {
+static int is_ancestor(const ir_region *a, const ir_region *b)
+{
return (a->prenum <= b->prenum && a->postnum > b->postnum);
}
/**
- * Return true if region pred is a predecessor of region n.
+ * Return true if region pred is a predecessor of region n.
*/
-static int pred_of(const ir_region *pred, const ir_region *n) {
- int i;
- for (i = get_region_n_preds(n) - 1; i >= 0; --i) {
+static bool pred_of(const ir_region *pred, const ir_region *n)
+{
+ size_t i, n_preds;
+ for (i = 0, n_preds = get_region_n_preds(n); i < n_preds; ++i) {
if (get_region_pred(n, i) == pred)
- return 1;
+ return true;
}
- return 0;
+ return false;
}
/**
- * Return true if region succ is a successor of region n.
+ * Return true if region succ is a successor of region n.
*/
-static int succ_of(const ir_region *succ, const ir_region *n) {
- int i;
- for (i = get_region_n_succs(n) - 1; i >= 0; --i) {
+static bool succ_of(const ir_region *succ, const ir_region *n)
+{
+ size_t i, n_succs;
+ for (i = 0, n_succs = get_region_n_succs(n); i < n_succs; ++i) {
if (get_region_succ(n, i) == succ)
- return 1;
+ return true;
}
- return 0;
+ return false;
}
/**
- * Reverse linked list.
+ * Reverse a linked list of regions.
*/
-static struct ir_region *reverse_list(ir_region *n) {
+static struct ir_region *reverse_list(ir_region *n)
+{
ir_region *prev = NULL, *next;
for (; n; n = next) {
- next = n->link;
+ next = (ir_region*) n->link;
n->link = prev;
prev = n;
}
/**
* Find the cyclic region in the subgraph entered by node.
*/
-static ir_region *find_cyclic_region(ir_region *node) {
- int i;
+static ir_region *find_cyclic_region(ir_region *node)
+{
+ size_t i;
ir_region *last = node;
int improper = 0;
- for (i = get_region_n_preds(node) - 1; i >= 0; --i) {
- ir_region *pred = get_region_pred(node, i);
+ for (i = get_region_n_preds(node); i > 0;) {
+ ir_region *pred = get_region_pred(node, --i);
/* search backedges */
if (!pred->link && pred != last && is_ancestor(node, pred)) {
ir_region *rem = last;
- int j;
+ size_t j;
last->link = pred;
last = pred;
- for (j = get_region_n_preds(pred) - 1; j >= 0; --j) {
- ir_region *p = get_region_pred(pred, j);
+ for (j = get_region_n_preds(pred); j > 0;) {
+ ir_region *p = get_region_pred(pred, --j);
/* Search regions we didn't visited yet and
link them into the list. */
}
}
/* reverse the list. */
- last = rem->link;
- rem->link = reverse_list(rem->link);
+ last = (ir_region*) rem->link;
+ rem->link = reverse_list(last);
}
}
return node;
}
-#define LINK(list) ((ir_region *)list->link)
-
/**
* Detect a cyclic region.
*/
-static ir_region *cyclic_region_type(struct obstack *obst, ir_region *node) {
- ir_region *list;
+static ir_region *cyclic_region_type(struct obstack *obst, ir_region *node)
+{
+ ir_region *list, *next;
/* simple cases first */
if (succ_of(node, node)) {
}
list = find_cyclic_region(node);
- if (list->link) {
- if (!LINK(list)->link && get_region_n_succs(list->link) == 1) {
+ next = (ir_region*) list->link;
+ if (next) {
+ if (!next->link && get_region_n_succs(next) == 1) {
/* only one body block with only one successor (the head) */
return new_WhileLoop(obst, list);
}
}
/**
- * Clear all links on a list. Needed, because we expect cleared links-
+ * Clear all links on a list. Needed, because we expect cleared links.
*/
-static void clear_list(ir_region *list) {
+static void clear_list(ir_region *list)
+{
ir_region *next;
for (next = list; next; list = next) {
- next = list->link;
+ next = (ir_region*) list->link;
list->link = NULL;
}
}
-#define ADD_LIST(list, n) do { n->link = list; list = n; ++list##_len; } while(0)
+#define ADD_LIST(list, n) do { n->link = list; list = n; ++list##_len; } while (0)
/**
* Detect an acyclic region.
*/
-static ir_region *acyclic_region_type(struct obstack *obst, ir_region *node) {
+static ir_region *acyclic_region_type(struct obstack *obst, ir_region *node)
+{
ir_region *n, *m;
- int p, s, i, k;
+ bool p, s;
+ size_t k;
ir_region *nset = NULL;
- int nset_len = 0;
+ size_t nset_len = 0;
ir_region *res;
/* check for a block containing node */
n = node;
p = get_region_n_preds(n) == 1;
- s = 1;
+ s = true;
while (p & s) {
n = get_region_pred(n, 0);
p = get_region_n_preds(n) == 1;
s = get_region_n_succs(n) == 1;
}
- p = 1;
+ p = true;
s = get_region_n_succs(n) == 1;
while (p & s) {
ADD_LIST(nset, n);
/* check for IfThenElse */
k = get_region_n_succs(node);
if (k == 2) {
- int n_succs, m_succs, n_preds, m_preds;
+ size_t n_succs, m_succs, n_preds, m_preds;
n = get_region_succ(node, 0);
m = get_region_succ(node, 1);
}
/* check for Switch, case */
if (k > 0) {
- ir_region *exit = NULL;
+ ir_region *rexit = NULL;
+ size_t i, pos = 0;
nset = NULL; nset_len = 0;
- p = 0;
- for (i = k - 1; i >= 0; --i) {
- n = get_region_succ(node, i);
+ for (i = k; i > 0;) {
+ n = get_region_succ(node, i--);
ADD_LIST(nset, n);
if (get_region_n_succs(n) != 1) {
/* must be the exit */
- exit = n;
- ++p;
- if (p > 1)
+ rexit = n;
+ ++pos;
+ if (pos > 1)
break;
}
}
- if (p <= 1) {
+ if (pos <= 1) {
ir_region_kind kind = ir_rk_Case;
ir_region *pos_exit_1 = NULL;
ir_region *pos_exit_2 = NULL;
/* find the exit */
- for (m = nset; m != NULL; m = m->link) {
+ for (m = nset; m != NULL; m = (ir_region*) m->link) {
if (get_region_n_succs(m) != 1) {
/* must be the exit block */
- if (exit == NULL) {
- exit = m;
- } else if (exit != m) {
+ if (rexit == NULL) {
+ rexit = m;
+ } else if (rexit != m) {
/* two exits */
- exit = NULL;
+ rexit = NULL;
break;
}
} else {
ir_region *succ = get_region_succ(m, 0);
if (succ->link == NULL) {
- if (exit == NULL) {
+ if (rexit == NULL) {
if (succ == pos_exit_1)
- exit = succ;
+ rexit = succ;
else if (succ == pos_exit_2)
- exit = succ;
+ rexit = succ;
else if (pos_exit_1 == NULL)
pos_exit_1 = succ;
else if (pos_exit_2 == NULL)
/* more than two possible exits */
break;
}
- } else if (exit != succ) {
+ } else if (rexit != succ) {
/* two exits */
- exit = NULL;
+ rexit = NULL;
break;
}
}
}
}
- if (exit != NULL) {
+ if (rexit != NULL) {
/* do the checks */
- for (n = nset; n != NULL; n = n->link) {
+ for (n = nset; n != NULL; n = (ir_region*) n->link) {
ir_region *succ;
- if (n == exit) {
+ if (n == rexit) {
/* good, default fall through */
continue;
}
succ = get_region_succ(n, 0);
- if (succ == exit) {
+ if (succ == rexit) {
/* good, switch to exit */
continue;
}
if (n == NULL) {
/* detected */
- return new_SwitchCase(obst, kind, node, exit, nset, nset_len);
+ return new_SwitchCase(obst, kind, node, rexit, nset, nset_len);
}
}
}
* replace all pred edges from region pred that points to any of the set set
* to ONE edge to reg.
*/
-static void replace_pred(ir_region *succ, ir_region *reg) {
- int i, len = get_region_n_preds(succ);
- int have_one = 0;
+static void replace_pred(ir_region *succ, ir_region *reg)
+{
+ int have_one = 0;
+ size_t len = get_region_n_preds(succ);
+ size_t i;
for (i = 0; i < len; ++i) {
ir_region *pred = get_region_pred(succ, i);
* replace all succ edges from region pred that points to any of the set set
* to ONE edge to reg.
*/
-static void replace_succ(ir_region *pred, ir_region *reg) {
- int i, len = get_region_n_succs(pred);
- int have_one = 0;
+static void replace_succ(ir_region *pred, ir_region *reg)
+{
+ int have_one = 0;
+ size_t len = get_region_n_succs(pred);
+ size_t i;
for (i = 0; i < len; ++i) {
ir_region *succ = get_region_succ(pred, i);
/**
* Reduce the graph by the node reg.
*/
-static void reduce(walk_env *env, ir_region *reg) {
- int i;
+static void reduce(walk_env *env, ir_region *reg)
+{
+ size_t i;
ir_region *head = reg->parts[0].region;
- unsigned maxorder = head->postnum;
- unsigned minorder = head->prenum;
+ size_t maxorder = head->postnum;
+ size_t minorder = head->prenum;
/* second step: replace all preds in successors */
- for (i = get_region_n_succs(reg) - 1; i >= 0; --i) {
- ir_region *succ = get_region_succ(reg, i);
+ for (i = get_region_n_succs(reg); i > 0;) {
+ ir_region *succ = get_region_succ(reg, --i);
replace_pred(succ, reg);
}
- /* second third: replace all succs in predessors */
- for (i = get_region_n_preds(reg) - 1; i >= 0; --i) {
- ir_region *pred = get_region_pred(reg, i);
+ /* third step: replace all succs in predessors */
+ for (i = get_region_n_preds(reg); i > 0;) {
+ ir_region *pred = get_region_pred(reg, --i);
replace_succ(pred, reg);
}
*
* @param irg the graph
*/
-ir_reg_tree *construct_region_tree(ir_graph *irg) {
+ir_reg_tree *construct_region_tree(ir_graph *irg)
+{
walk_env env;
ir_graph *rem = current_ir_graph;
ir_reg_tree *res = XMALLOC(ir_reg_tree);
FIRM_DBG_REGISTER(dbg, "firm.ana.structure");
firm_dbg_set_mask(dbg, SET_LEVEL_5);
- DB((dbg, LEVEL_1, "Structural analysis on %+F starts...\n", irg));
-
- dump_ir_block_graph(irg, "-structure_start");
+ DB((dbg, LEVEL_1, "Structural analysis on %+F started ...\n", irg));
/* we need dominance info */
assure_doms(irg);
env.start_block = get_irg_start_block(irg);
env.end_block = get_irg_end_block(irg);
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_LINK);
+
/* create the Block wrapper and count them */
env.l_post = 0;
env.obst = &res->obst;
/* do the DFS walk */
dfs_walk(irg, &env);
- DB((dbg, LEVEL_1, "%d regions left\n", env.postmax));
+ DB((dbg, LEVEL_1, "%zu regions left\n", env.postmax));
if (env.postmax > 1) {
- unsigned postctr = 0;
+ size_t postctr = 0;
do {
ir_region *reg, *n = env.post[postctr];
do {
- if (n->parent) {
+ if (n->parent != NULL) {
/* already folded */
break;
}
}
DB((dbg, LEVEL_1, "Structural analysis finished.\n"));
+ ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
+
DEL_ARR_F(env.post);
current_ir_graph = rem;
* @param post walker function, executed after the children of a tree node are visited
* @param env environment, passed to pre and post
*/
-static void region_tree_walk2(ir_region *reg, irg_reg_walk_func *pre, irg_reg_walk_func *post, void *env) {
- int i, n;
+static void region_tree_walk2(ir_region *reg, irg_reg_walk_func *pre, irg_reg_walk_func *post, void *env)
+{
+ size_t i, n;
if (pre)
pre(reg, env);
* @param post walker function, executed after the children of a tree node are visited
* @param env environment, passed to pre and post
*/
-void region_tree_walk(ir_reg_tree *tree, irg_reg_walk_func *pre, irg_reg_walk_func *post, void *env) {
+void region_tree_walk(ir_reg_tree *tree, irg_reg_walk_func *pre, irg_reg_walk_func *post, void *env)
+{
region_tree_walk2(tree->top, pre, post, env);
}
projects / libfirm / blobdiff