projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- BugFix: removed missing debugging artefact, causing partitions with
[libfirm]
/
ir
/
opt
/
opt_osr.c
diff --git
a/ir/opt/opt_osr.c
b/ir/opt/opt_osr.c
index
706cd45
..
3253615
100644
(file)
--- a/
ir/opt/opt_osr.c
+++ b/
ir/opt/opt_osr.c
@@
-53,6
+53,7
@@
#include "array.h"
#include "firmstat.h"
#include "xmalloc.h"
#include "array.h"
#include "firmstat.h"
#include "xmalloc.h"
+#include "error.h"
/** The debug handle. */
DEBUG_ONLY(static firm_dbg_module_t *dbg;)
/** The debug handle. */
DEBUG_ONLY(static firm_dbg_module_t *dbg;)
@@
-305,7
+306,7
@@
static ir_node *do_apply(ir_opcode code, dbg_info *db, ir_node *op1, ir_node *op
result = new_rd_Sub(db, irg, block, op1, op2, mode);
break;
default:
result = new_rd_Sub(db, irg, block, op1, op2, mode);
break;
default:
-
assert(0
);
+
panic("Unsupported opcode"
);
result = NULL;
}
return result;
result = NULL;
}
return result;
@@
-469,6
+470,7
@@
static int replace(ir_node *irn, ir_node *iv, ir_node *rc, iv_env *env) {
return 0;
}
return 0;
}
+#if 0
/**
* check if a given node is a mul with 2, 4, 8
*/
/**
* check if a given node is a mul with 2, 4, 8
*/
@@
-494,6
+496,7
@@
static int is_x86_shift_const(ir_node *mul) {
}
return 0;
}
}
return 0;
}
+#endif
/**
* Check if an IV represents a counter with constant limits.
/**
* Check if an IV represents a counter with constant limits.
@@
-662,11
+665,6
@@
static int check_replace(ir_node *irn, iv_env *env) {
if (! check_users_for_reg_pressure(iv, env))
return 0;
}
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;
return replace(irn, iv, rc, env);
}
break;
@@
-1000,7
+998,7
@@
static void do_dfs(ir_graph *irg, iv_env *env) {
ir_node *end = get_irg_end(irg);
int i, n;
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);
current_ir_graph = irg;
inc_irg_visited(irg);
@@
-1017,7
+1015,7
@@
static void do_dfs(ir_graph *irg, iv_env *env) {
dfs(ka, env);
}
dfs(ka, env);
}
-
clear_using_irn_visited(irg
);
+
ir_free_resources(irg, IR_RESOURCE_IRN_VISITED
);
current_ir_graph = rem;
}
current_ir_graph = rem;
}
@@
-1115,12
+1113,12
@@
static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
DB((dbg, LEVEL_4, " + %+F", tv_r));
break;
case iro_Sub:
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:
DB((dbg, LEVEL_4, " - %+F", tv_r));
break;
default:
-
assert(0
);
+
panic("Unsupported opcode"
);
tv = tarval_bad;
}
tv = tarval_bad;
}
@@
-1128,7
+1126,7
@@
static ir_node *applyOneEdge(ir_node *iv, ir_node *rc, LFTR_edge *e, iv_env *env
tv = tarval_add(tv, tv_incr);
} else {
assert(pscc->code == iro_Sub);
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);
}
tarval_set_integer_overflow_mode(ovmode);
@@
-1192,7
+1190,7
@@
static void do_lftr(ir_node *cmp, void *ctx) {
ir_node *iv, *rc;
ir_node *nleft = NULL, *nright = NULL;
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);
return;
left = get_Cmp_left(cmp);
@@
-1300,7
+1298,8
@@
void opt_osr(ir_graph *irg, unsigned flags) {
if (env.replaced) {
/* try linear function test replacements */
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));
set_irg_outs_inconsistent(irg);
DB((dbg, LEVEL_1, "Replacements: %u + %u (lftr)\n\n", env.replaced, env.lftr_replaced));