* by Keith D. Cooper, L. Taylor Simpson, Christopher A. Vick.
* Extended version.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "adt/pdeq.h"
#include "iroptimize.h"
#include "irloop_t.h"
#include "array.h"
#include "firmstat.h"
-#include "xmalloc.h"
+#include "error.h"
/** The debug handle. */
DEBUG_ONLY(static firm_dbg_module_t *dbg;)
result = new_rd_Sub(db, irg, block, op1, op2, mode);
break;
default:
- assert(0);
+ panic("Unsupported opcode");
result = NULL;
}
return result;
*
* @return the newly created node
*/
-static ir_node *apply(ir_node *orig, ir_node *op1, ir_node *op2, iv_env *env) {
+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);
ir_node *result = search(code, op1, op2, env);
- if (! result) {
+ if (result == NULL) {
dbg_info *db = get_irn_dbg_info(orig);
ir_node *op1_header = get_irn_ne(op1, env)->header;
ir_node *op2_header = get_irn_ne(op2, env)->header;
- if (op1_header != NULL && is_rc(op2, op1_header)) {
+ if (op1_header == header && is_rc(op2, op1_header)) {
result = reduce(orig, op1, op2, env);
}
- else if (op2_header != NULL && is_rc(op1, op2_header)) {
+ else if (op2_header == header && is_rc(op1, op2_header)) {
result = reduce(orig, op2, op1, env);
}
else {
result = do_apply(code, db, op1, op2, get_irn_mode(orig));
- get_irn_ne(result, env)->header = NULL; }
+ get_irn_ne(result, env)->header = NULL;
+ }
}
return result;
}
ir_opcode code = get_irn_opcode(orig);
ir_node *result = search(code, iv, rc, env);
- if (! result) {
+ if (result == NULL) {
node_entry *e, *iv_e;
int i, n;
ir_mode *mode = get_irn_mode(orig);
if (e->header == iv_e->header)
o = reduce(orig, o, rc, env);
else if (is_Phi(result) || code == iro_Mul)
- o = apply(orig, o, rc, env);
+ o = apply(iv_e->header, orig, o, rc, env);
set_irn_n(result, i, o);
}
}
ir_node *header = e->header;
waitq *wq = new_waitq();
+ DB((dbg, LEVEL_2, " Creating SCC for new an induction variable:\n "));
pscc->head = NULL;
waitq_put(wq, iv);
do {
ne->pscc = pscc;
ne->next = pscc->head;
pscc->head = irn;
+ DB((dbg, LEVEL_2, " %+F,", irn));
for (i = get_irn_arity(irn) - 1; i >= 0; --i) {
ir_node *pred = get_irn_n(irn, i);
node_entry *pe = get_irn_ne(pred, env);
- if (pe->header == header && pe->pscc == NULL)
+ if (pe->header == header && pe->pscc == NULL) {
+ /* set the pscc here to ensure that the node is NOT enqueued another time */
+ pe->pscc = pscc;
waitq_put(wq, pred);
+ }
}
} while (! waitq_empty(wq));
del_waitq(wq);
+ DB((dbg, LEVEL_2, "\n"));
}
/**
return 0;
}
+#if 0
/**
* check if a given node is a mul with 2, 4, 8
*/
}
return 0;
}
+#endif
/**
* Check if an IV represents a counter with constant limits.
if (! check_users_for_reg_pressure(iv, env))
return 0;
}
- /* check for x86 constants */
- if (env->flags & osr_flag_ignore_x86_shift)
- if (is_x86_shift_const(irn))
- return 0;
-
return replace(irn, iv, rc, env);
}
break;
for (i = 0; i < n; ++i) {
ir_node *pred = get_irn_n(irn, i);
- if (irn_not_visited(pred))
+ if (!irn_visited(pred))
dfs(pred, env);
}
}
push(env, irn);
/* handle the block */
- if (irn_not_visited(block))
+ if (!irn_visited(block))
dfs(block, env);
n = get_irn_arity(irn);
ir_node *pred = get_irn_n(irn, i);
node_entry *o = get_irn_ne(pred, env);
- if (irn_not_visited(pred)) {
+ if (!irn_visited(pred)) {
dfs(pred, env);
node->low = MIN(node->low, o->low);
}
ir_node *end = get_irg_end(irg);
int i, n;
- set_using_irn_visited(irg);
+ ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
current_ir_graph = irg;
inc_irg_visited(irg);
for (i = 0; i < n; ++i) {
ir_node *ka = get_End_keepalive(end, i);
- if (irn_not_visited(ka))
+ if (!irn_visited(ka))
dfs(ka, env);
}
- clear_using_irn_visited(irg);
+ ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
current_ir_graph = rem;
}
DB((dbg, LEVEL_4, " + %+F", tv_r));
break;
case iro_Sub:
- tv = tarval_sub(tv_l, tv_r);
- tv_init = tarval_sub(tv_init, tv_r);
+ tv = tarval_sub(tv_l, tv_r, NULL);
+ tv_init = tarval_sub(tv_init, tv_r, NULL);
DB((dbg, LEVEL_4, " - %+F", tv_r));
break;
default:
- assert(0);
+ panic("Unsupported opcode");
tv = tarval_bad;
}
tv = tarval_add(tv, tv_incr);
} else {
assert(pscc->code == iro_Sub);
- tv = tarval_sub(tv, tv_incr);
+ tv = tarval_sub(tv, tv_incr, NULL);
}
tarval_set_integer_overflow_mode(ovmode);
ir_node *iv, *rc;
ir_node *nleft = NULL, *nright = NULL;
- if (get_irn_op(cmp) != op_Cmp)
+ if (!is_Cmp(cmp))
return;
left = get_Cmp_left(cmp);
if (env.replaced) {
/* try linear function test replacements */
- lftr(irg, &env);
+ //lftr(irg, &env); // currently buggy :-(
+ (void) lftr;
set_irg_outs_inconsistent(irg);
DB((dbg, LEVEL_1, "Replacements: %u + %u (lftr)\n\n", env.replaced, env.lftr_replaced));