/*
- * 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.
*
/** A scc. */
typedef struct scc {
- ir_node *head; /**< the head of the list */
- tarval *init; /**< the init value iff only one exists. */
- tarval *incr; /**< the induction variable increment if only a single const exists. */
- unsigned code; /**< == iro_Add if +incr, iro_Sub if -incr, 0 if not analysed, iro_Bad else */
+ ir_node *head; /**< the head of the list */
+ ir_tarval *init; /**< the init value iff only one exists. */
+ ir_tarval *incr; /**< the induction variable increment if only a single const exists. */
+ unsigned code; /**< == iro_Add if +incr, iro_Sub if -incr, 0 if not analysed, iro_Bad else */
} scc;
/** A node entry */
typedef struct iv_env {
struct obstack obst; /**< an obstack for allocations */
ir_node **stack; /**< the node stack */
- int tos; /**< tos index */
+ size_t tos; /**< tos index */
unsigned nextDFSnum; /**< the current DFS number */
unsigned POnum; /**< current post order number */
set *quad_map; /**< a map from (op, iv, rc) to node */
* An entry in the (op, node, node) -> node map.
*/
typedef struct quadruple_t {
- ir_opcode code; /**< the opcode of the reduced operation */
+ unsigned code; /**< the opcode of the reduced operation */
ir_node *op1; /**< the first operand the reduced operation */
ir_node *op2; /**< the second operand of the reduced operation */
typedef struct LFTR_edge {
ir_node *src; /**< the source node */
ir_node *dst; /**< the destination node */
- ir_opcode code; /**< the opcode that must be applied */
+ unsigned code; /**< the opcode that must be applied */
ir_node *rc; /**< the region const that must be applied */
} LFTR_edge;
*/
static int LFTR_cmp(const void *e1, const void *e2, size_t size)
{
- const LFTR_edge *l1 = e1;
- const LFTR_edge *l2 = e2;
+ const LFTR_edge *l1 = (const LFTR_edge*)e1;
+ const LFTR_edge *l2 = (const LFTR_edge*)e2;
(void) size;
return l1->src != l2->src;
key.src = src;
- return set_find(env->lftr_edges, &key, sizeof(key), HASH_PTR(src));
+ return (LFTR_edge*)set_find(env->lftr_edges, &key, sizeof(key), HASH_PTR(src));
} /* LFTR_find */
/**
* @param rc the region const used in the transition
* @param env the environment
*/
-static void LFTR_add(ir_node *src, ir_node *dst, ir_opcode code, ir_node *rc, iv_env *env)
+static void LFTR_add(ir_node *src, ir_node *dst, unsigned code, ir_node *rc, iv_env *env)
{
LFTR_edge key;
*/
static node_entry *get_irn_ne(ir_node *irn, iv_env *env)
{
- node_entry *e = get_irn_link(irn);
+ node_entry *e = (node_entry*)get_irn_link(irn);
if (e == NULL) {
e = OALLOCZ(&env->obst, node_entry);
*/
static int quad_cmp(const void *e1, const void *e2, size_t size)
{
- const quadruple_t *c1 = e1;
- const quadruple_t *c2 = e2;
+ const quadruple_t *c1 = (const quadruple_t*)e1;
+ const quadruple_t *c2 = (const quadruple_t*)e2;
(void) size;
return c1->code != c2->code || c1->op1 != c2->op1 || c1->op2 != c2->op2;
*
* @return the already reduced node or NULL if this operation is not yet reduced
*/
-static ir_node *search(ir_opcode code, ir_node *op1, ir_node *op2, iv_env *env)
+static ir_node *search(unsigned code, ir_node *op1, ir_node *op2, iv_env *env)
{
quadruple_t key, *entry;
key.op1 = op1;
key.op2 = op2;
- entry = set_find(env->quad_map, &key, sizeof(key),
- (code * 9) ^ HASH_PTR(op1) ^HASH_PTR(op2));
+ entry = (quadruple_t*)set_find(env->quad_map, &key, sizeof(key),
+ (code * 9) ^ HASH_PTR(op1) ^HASH_PTR(op2));
if (entry)
return entry->res;
return NULL;
* @param result the result of the reduced operation
* @param env the environment
*/
-static void add(ir_opcode code, ir_node *op1, ir_node *op2, ir_node *result, iv_env *env)
+static void add(unsigned code, ir_node *op1, ir_node *op2, ir_node *result, iv_env *env)
{
quadruple_t key;
*
* @return the newly created node
*/
-static ir_node *do_apply(ir_opcode code, dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode)
+static ir_node *do_apply(unsigned code, dbg_info *db, ir_node *op1, ir_node *op2, ir_mode *mode)
{
ir_node *result;
ir_node *block = find_location(get_nodes_block(op1), get_nodes_block(op2));
*/
static ir_node *apply(ir_node *header, ir_node *orig, ir_node *op1, ir_node *op2, iv_env *env)
{
- ir_opcode code = get_irn_opcode(orig);
+ unsigned code = get_irn_opcode(orig);
ir_node *result = search(code, op1, op2, env);
if (result == NULL) {
*/
static ir_node *reduce(ir_node *orig, ir_node *iv, ir_node *rc, iv_env *env)
{
- ir_opcode code = get_irn_opcode(orig);
+ unsigned code = get_irn_opcode(orig);
ir_node *result = search(code, iv, rc, env);
/* check if we have already done this operation on the iv */
pscc->head = NULL;
waitq_put(wq, iv);
do {
- ir_node *irn = waitq_get(wq);
+ ir_node *irn = (ir_node*)waitq_get(wq);
node_entry *ne = get_irn_ne(irn, env);
int i;
if (result != irn) {
node_entry *e;
- hook_strength_red(current_ir_graph, irn);
+ hook_strength_red(get_irn_irg(irn), irn);
exchange(irn, result);
e = get_irn_ne(result, env);
if (e->pscc == NULL) {
/* normalization put constants on the right side */
rc = get_Mul_right(mul);
if (is_Const(rc)) {
- tarval *tv = get_Const_tarval(rc);
+ ir_tarval *tv = get_Const_tarval(rc);
if (tarval_is_long(tv)) {
long value = get_tarval_long(tv);
*/
static int check_users_for_reg_pressure(ir_node *iv, iv_env *env)
{
- ir_node *irn, *header;
+ ir_node *irn;
ir_node *have_user = NULL;
ir_node *have_cmp = NULL;
node_entry *e = get_irn_ne(iv, env);
scc *pscc = e->pscc;
- header = e->header;
for (irn = pscc->head; irn != NULL; irn = e->next) {
const ir_edge_t *edge;
{
ir_node *left, *right, *iv, *rc;
ir_op *op = get_irn_op(irn);
- ir_opcode code = get_op_code(op);
+ unsigned code = get_op_code(op);
ir_node *liv, *riv;
switch (code) {
/* find the header block for this scc */
for (irn = pscc->head; irn; irn = next) {
- node_entry *e = get_irn_link(irn);
+ node_entry *e = (node_entry*)get_irn_link(irn);
ir_node *block = get_nodes_block(irn);
next = e->next;
static void process_scc(scc *pscc, iv_env *env)
{
ir_node *head = pscc->head;
- node_entry *e = get_irn_link(head);
+ node_entry *e = (node_entry*)get_irn_link(head);
#ifdef DEBUG_libfirm
{
DB((dbg, LEVEL_4, " SCC at %p:\n ", pscc));
for (irn = pscc->head; irn != NULL; irn = next) {
- node_entry *e = get_irn_link(irn);
+ node_entry *e = (node_entry*)get_irn_link(irn);
next = e->next;
static void process_phi_only_scc(scc *pscc, iv_env *env)
{
ir_node *head = pscc->head;
- node_entry *e = get_irn_link(head);
+ node_entry *e = (node_entry*)get_irn_link(head);
#ifdef DEBUG_libfirm
{
DB((dbg, LEVEL_4, " SCC at %p:\n ", pscc));
for (irn = pscc->head; irn; irn = next) {
- node_entry *e = get_irn_link(irn);
+ node_entry *e = (node_entry*)get_irn_link(irn);
next = e->next;
node_entry *e;
if (env->tos == ARR_LEN(env->stack)) {
- int nlen = ARR_LEN(env->stack) * 2;
+ size_t nlen = ARR_LEN(env->stack) * 2;
ARR_RESIZE(ir_node *, env->stack, nlen);
}
env->stack[env->tos++] = n;
*/
static void do_dfs(ir_graph *irg, iv_env *env)
{
- ir_graph *rem = current_ir_graph;
ir_node *end = get_irg_end(irg);
int i;
ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
- current_ir_graph = irg;
inc_irg_visited(irg);
/* visit all visible nodes */
}
ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
-
- current_ir_graph = rem;
} /* do_dfs */
/**
*/
static void assign_po(ir_node *block, void *ctx)
{
- iv_env *env = ctx;
+ iv_env *env = (iv_env*)ctx;
node_entry *e = get_irn_ne(block, env);
e->POnum = env->POnum++;
static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env)
{
if (env->osr_flags & osr_flag_lftr_with_ov_check) {
- tarval *tv_l, *tv_r, *tv, *tv_init, *tv_incr, *tv_end;
+ ir_tarval *tv_l, *tv_r, *tv, *tv_init, *tv_incr, *tv_end;
tarval_int_overflow_mode_t ovmode;
scc *pscc;
+ ir_graph *irg;
if (! is_counter_iv(iv, env)) {
DB((dbg, LEVEL_4, " not counter IV"));
DB((dbg, LEVEL_4, " = OVERFLOW"));
return NULL;
}
- return new_Const(tv);
+ irg = get_irn_irg(iv);
+ return new_r_Const(irg, tv);
}
return do_apply(e->code, NULL, rc, e->rc, get_irn_mode(e->dst));
} /* applyOneEdge */
*/
static void do_lftr(ir_node *cmp, void *ctx)
{
- iv_env *env = ctx;
+ iv_env *env = (iv_env*)ctx;
ir_node *left, *right, *liv, *riv;
ir_node *iv, *rc;
ir_node *nleft = NULL, *nright = NULL;
*/
static void clear_and_fix(ir_node *irn, void *env)
{
- int *moved = env;
+ (void)env;
+
set_irn_link(irn, NULL);
if (is_Proj(irn)) {
if (get_nodes_block(irn) != pred_block) {
set_nodes_block(irn, pred_block);
- *moved = 1;
}
}
} /* clear_and_fix */
/* Remove any Phi cycles with only one real input. */
void remove_phi_cycles(ir_graph *irg)
{
- iv_env env;
- ir_graph *rem;
- int projs_moved;
-
- rem = current_ir_graph;
- current_ir_graph = irg;
+ iv_env env;
FIRM_DBG_REGISTER(dbg, "firm.opt.remove_phi");
* the same block as their predecessors.
* This can improve the placement of new nodes.
*/
- projs_moved = 0;
- irg_walk_graph(irg, NULL, clear_and_fix, &projs_moved);
- if (projs_moved)
- set_irg_outs_inconsistent(irg);
+ irg_walk_graph(irg, NULL, clear_and_fix, NULL);
/* we need outs for calculating the post order */
assure_irg_outs(irg);
ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
if (env.replaced) {
- set_irg_outs_inconsistent(irg);
DB((dbg, LEVEL_1, "remove_phi_cycles: %u Cycles removed\n\n", env.replaced));
}
DEL_ARR_F(env.stack);
obstack_free(&env.obst, NULL);
-
- current_ir_graph = rem;
} /* remove_phi_cycles */
ir_graph_pass_t *remove_phi_cycles_pass(const char *name)
set_Sub_right(irn, right);
}
}
+ } else if (mode_is_reference(mode)) {
+ ir_node *left = get_Sub_left(irn);
+ ir_node *right = get_Sub_right(irn);
+ ir_mode *l_mode = get_irn_mode(left);
+ ir_mode *r_mode = get_irn_mode(right);
+ if (mode_is_int(l_mode)) {
+ /* Usually, Sub(I*,P) is an error, hence the verifier rejects it.
+ * However, it is correct in this case, so add Conv to make verifier happy. */
+ ir_node *block = get_nodes_block(right);
+ ir_node *lconv = new_r_Conv(block, left, r_mode);
+ assert(mode_is_reference(r_mode));
+ set_Sub_left(irn, lconv);
+ }
}
}
} /* fix_adds_and_subs */
void opt_osr(ir_graph *irg, unsigned flags)
{
iv_env env;
- ir_graph *rem;
int edges;
- int projs_moved;
-
- rem = current_ir_graph;
- current_ir_graph = irg;
FIRM_DBG_REGISTER(dbg, "firm.opt.osr");
env.process_scc = process_scc;
/* Clear all links and move Proj nodes into the
- the same block as it's predecessors.
- This can improve the placement of new nodes.
+ * the same block as its predecessors.
+ * This can improve the placement of new nodes.
*/
- projs_moved = 0;
- irg_walk_graph(irg, NULL, clear_and_fix, &projs_moved);
- if (projs_moved)
- set_irg_outs_inconsistent(irg);
+ irg_walk_graph(irg, NULL, clear_and_fix, NULL);
/* we need dominance */
assure_doms(irg);
lftr(irg, &env);
(void)lftr;
- set_irg_outs_inconsistent(irg);
DB((dbg, LEVEL_1, "Replacements: %u + %u (lftr)\n\n", env.replaced, env.lftr_replaced));
}
ir_free_resources(irg, IR_RESOURCE_IRN_LINK);
if (! edges)
edges_deactivate(irg);
-
- current_ir_graph = rem;
} /* opt_osr */
-struct pass_t {
+typedef struct pass_t {
ir_graph_pass_t pass;
unsigned flags;
-};
+} pass_t;
/**
* Wrapper for running opt_osr() as an ir_graph pass.
*/
static int pass_wrapper(ir_graph *irg, void *context)
{
- struct pass_t *pass = context;
+ pass_t *pass = (pass_t*)context;
opt_osr(irg, pass->flags);
return 0;
} /* pass_wrapper */
ir_graph_pass_t *opt_osr_pass(const char *name, unsigned flags)
{
- struct pass_t *pass = XMALLOCZ(struct pass_t);
+ pass_t *pass = XMALLOCZ(pass_t);
pass->flags = flags;
return def_graph_pass_constructor(
projects / libfirm / blobdiff