projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
beifg: Let be_ifg_foreach_neighbour() declare the node variable.
[libfirm]
/
ir
/
be
/
beifg.c
diff --git
a/ir/be/beifg.c
b/ir/be/beifg.c
index
e7a7c7a
..
609bcea
100644
(file)
--- a/
ir/be/beifg.c
+++ b/
ir/be/beifg.c
@@
-61,7
+61,6
@@
static void nodes_walker(ir_node *bl, void *data)
{
nodes_iter_t *it = (nodes_iter_t*)data;
struct list_head *head = get_block_border_head(it->env, bl);
{
nodes_iter_t *it = (nodes_iter_t*)data;
struct list_head *head = get_block_border_head(it->env, bl);
- border_t *b;
foreach_border_head(head, b) {
if (b->is_def && b->is_real) {
foreach_border_head(head, b) {
if (b->is_def && b->is_real) {
@@
-125,7
+124,6
@@
static void find_neighbour_walker(ir_node *block, void *data)
struct list_head *head = get_block_border_head(it->env, block);
be_lv_t *lv = be_get_irg_liveness(it->env->irg);
struct list_head *head = get_block_border_head(it->env, block);
be_lv_t *lv = be_get_irg_liveness(it->env->irg);
- border_t *b;
int has_started = 0;
if (!be_is_live_in(lv, block, it->irn) && block != get_nodes_block(it->irn))
int has_started = 0;
if (!be_is_live_in(lv, block, it->irn) && block != get_nodes_block(it->irn))
@@
-186,7
+184,7
@@
ir_node *be_ifg_neighbours_begin(const be_ifg_t *ifg, neighbours_iter_t *iter,
const ir_node *irn)
{
find_neighbours(ifg, iter, irn);
const ir_node *irn)
{
find_neighbours(ifg, iter, irn);
- return
ir_nodeset_iterator_next(&iter->
iter);
+ return
get_next_neighbour(
iter);
}
ir_node *be_ifg_neighbours_next(neighbours_iter_t *iter)
}
ir_node *be_ifg_neighbours_next(neighbours_iter_t *iter)
@@
-244,11
+242,9
@@
static inline int get_next_clique(cliques_iter_t *it)
/* before shrinking the set, return the current maximal clique */
if (output_on_shrink) {
int count = 0;
/* before shrinking the set, return the current maximal clique */
if (output_on_shrink) {
int count = 0;
- ir_node *irn;
/* fill the output buffer */
/* fill the output buffer */
- for (irn = (ir_node*)pset_first(it->living); irn != NULL;
- irn = (ir_node*)pset_next(it->living)) {
+ foreach_pset(it->living, ir_node, irn) {
it->buf[count++] = irn;
}
it->buf[count++] = irn;
}
@@
-274,10
+270,8
@@
static inline int get_next_clique(cliques_iter_t *it)
int be_ifg_cliques_begin(const be_ifg_t *ifg, cliques_iter_t *it,
ir_node **buf)
{
int be_ifg_cliques_begin(const be_ifg_t *ifg, cliques_iter_t *it,
ir_node **buf)
{
- ir_node *start_bl = get_irg_start_block(ifg->env->irg);
-
obstack_init(&it->ob);
obstack_init(&it->ob);
- dom_tree_walk
(start_bl
, get_blocks_dom_order, NULL, it);
+ dom_tree_walk
_irg(ifg->env->irg
, get_blocks_dom_order, NULL, it);
it->cenv = ifg->env;
it->buf = buf;
it->cenv = ifg->env;
it->buf = buf;
@@
-321,13
+315,13
@@
be_ifg_t *be_create_ifg(const be_chordal_env_t *env)
static void int_comp_rec(be_ifg_t *ifg, ir_node *n, bitset_t *seen)
{
neighbours_iter_t neigh_it;
static void int_comp_rec(be_ifg_t *ifg, ir_node *n, bitset_t *seen)
{
neighbours_iter_t neigh_it;
- ir_node *m;
be_ifg_foreach_neighbour(ifg, &neigh_it, n, m) {
if (bitset_is_set(seen, get_irn_idx(m)))
continue;
be_ifg_foreach_neighbour(ifg, &neigh_it, n, m) {
if (bitset_is_set(seen, get_irn_idx(m)))
continue;
- if (arch_get_irn_register_req(m)->type & arch_register_req_type_ignore)
+ arch_register_req_t const *const req = arch_get_irn_register_req(m);
+ if (arch_register_req_is(req, ignore))
continue;
bitset_set(seen, get_irn_idx(m));
continue;
bitset_set(seen, get_irn_idx(m));
@@
-348,7
+342,8
@@
static int int_component_stat(ir_graph *irg, be_ifg_t *ifg)
if (bitset_is_set(seen, get_irn_idx(n)))
continue;
if (bitset_is_set(seen, get_irn_idx(n)))
continue;
- if (arch_get_irn_register_req(n)->type & arch_register_req_type_ignore)
+ arch_register_req_t const *const req = arch_get_irn_register_req(n);
+ if (arch_register_req_is(req, ignore))
continue;
++n_comp;
continue;
++n_comp;
@@
-365,7
+360,7
@@
void be_ifg_stat(ir_graph *irg, be_ifg_t *ifg, be_ifg_stat_t *stat)
nodes_iter_t nodes_it;
neighbours_iter_t neigh_it;
bitset_t *nodes = bitset_malloc(get_irg_last_idx(irg));
nodes_iter_t nodes_it;
neighbours_iter_t neigh_it;
bitset_t *nodes = bitset_malloc(get_irg_last_idx(irg));
- ir_node *n
, *m
;
+ ir_node *n;
memset(stat, 0, sizeof(stat[0]));
memset(stat, 0, sizeof(stat[0]));