projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve address mode tests
[libfirm]
/
ir
/
be
/
beirgmod.c
diff --git
a/ir/be/beirgmod.c
b/ir/be/beirgmod.c
index
301234e
..
843b670
100644
(file)
--- a/
ir/be/beirgmod.c
+++ b/
ir/be/beirgmod.c
@@
-88,30
+88,33
@@
ir_node *insert_Perm_after(be_irg_t *birg,
be_lv_t *lv = birg->lv;
ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos);
ir_graph *irg = get_irn_irg(bl);
be_lv_t *lv = birg->lv;
ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos);
ir_graph *irg = get_irn_irg(bl);
- pset *live = pset_new_ptr_default();
+ ir_nodeset_t live;
+ ir_nodeset_iterator_t iter;
ir_node *curr, *irn, *perm, **nodes;
ir_node *curr, *irn, *perm, **nodes;
-
in
t i, n;
+
size_
t i, n;
DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
DBG((dbg, LEVEL_1, "Insert Perm after: %+F\n", pos));
- be_liveness_nodes_live_at(lv, arch_env, cls, pos, live);
-
- n = pset_count(live);
+ ir_nodeset_init(&live);
+ be_liveness_nodes_live_at(lv, arch_env, cls, pos, &live);
+ n = ir_nodeset_size(&live);
if(n == 0) {
if(n == 0) {
-
del_pset(
live);
+
ir_nodeset_destroy(&
live);
return NULL;
}
nodes = xmalloc(n * sizeof(nodes[0]));
DBG((dbg, LEVEL_1, "live:\n"));
return NULL;
}
nodes = xmalloc(n * sizeof(nodes[0]));
DBG((dbg, LEVEL_1, "live:\n"));
- for(irn = pset_first(live), i = 0; irn; irn = pset_next(live), i++) {
+ i = 0;
+ foreach_ir_nodeset(&live, irn, iter) {
DBG((dbg, LEVEL_1, "\t%+F\n", irn));
nodes[i] = irn;
DBG((dbg, LEVEL_1, "\t%+F\n", irn));
nodes[i] = irn;
+ i++;
}
}
-
del_pset(
live);
+
ir_nodeset_destroy(&
live);
perm = be_new_Perm(cls, irg, bl, n, nodes);
sched_add_after(pos, perm);
perm = be_new_Perm(cls, irg, bl, n, nodes);
sched_add_after(pos, perm);
@@
-127,7
+130,6
@@
ir_node *insert_Perm_after(be_irg_t *birg,
ir_node *proj = new_r_Proj(irg, bl, perm, mode, i);
arch_set_irn_register(arch_env, proj, reg);
ir_node *proj = new_r_Proj(irg, bl, perm, mode, i);
arch_set_irn_register(arch_env, proj, reg);
- sched_add_after(curr, proj);
curr = proj;
be_ssa_construction_init(&senv, birg);
curr = proj;
be_ssa_construction_init(&senv, birg);