projects
/
libfirm
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement/fix assembler clobbers
[libfirm]
/
ir
/
be
/
beifg_list.c
diff --git
a/ir/be/beifg_list.c
b/ir/be/beifg_list.c
index
7624d65
..
5c03a85
100644
(file)
--- a/
ir/be/beifg_list.c
+++ b/
ir/be/beifg_list.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 1995-200
7
University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-200
8
University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
*
* This file is part of libFirm.
*
@@
-30,7
+30,6
@@
#include <stdlib.h>
#include <stdlib.h>
-#include "benodesets.h"
#include "list.h"
#include "irnode_t.h"
#include "list.h"
#include "irnode_t.h"
@@
-171,10
+170,12
@@
static void find_neighbour_walker(ir_node *bl, void *data)
{
ifg_list_t *ifg = data;
struct list_head *head = get_block_border_head(ifg->env, bl);
{
ifg_list_t *ifg = data;
struct list_head *head = get_block_border_head(ifg->env, bl);
-
nodeset *live = new_nodeset(ifg->env->cls->n_regs)
;
+
ir_nodeset_t live
;
ir_node *live_irn = NULL;
border_t *b = NULL;
ir_node *live_irn = NULL;
border_t *b = NULL;
+ ir_nodeset_init(&live);
+
assert(is_Block(bl) && "There is no block to work on");
foreach_border_head(head, b) /* follow the borders of each block */
assert(is_Block(bl) && "There is no block to work on");
foreach_border_head(head, b) /* follow the borders of each block */
@@
-182,10
+183,12
@@
static void find_neighbour_walker(ir_node *bl, void *data)
if (b->is_def)
{
create_node(ifg, b->irn); /* add the node to the array of all nodes of this ifg implementation */
if (b->is_def)
{
create_node(ifg, b->irn); /* add the node to the array of all nodes of this ifg implementation */
-
nodeset_insert(
live, b->irn);
+
ir_nodeset_insert(&
live, b->irn);
if (b->is_real) /* this is a new node */
{
if (b->is_real) /* this is a new node */
{
- foreach_nodeset(live, live_irn)
+ ir_nodeset_iterator_t iter;
+
+ foreach_ir_nodeset(&live, live_irn, iter)
{
if (b->irn != live_irn) /* add a as a neighbour to b and vice versa */
add_edge(ifg, b->irn, live_irn);
{
if (b->irn != live_irn) /* add a as a neighbour to b and vice versa */
add_edge(ifg, b->irn, live_irn);
@@
-194,13
+197,11
@@
static void find_neighbour_walker(ir_node *bl, void *data)
}
else /* b->irn is now dead */
{
}
else /* b->irn is now dead */
{
- if (nodeset_find(live, b->irn))
- nodeset_remove(live, b->irn);
+ ir_nodeset_remove(&live, b->irn);
}
}
}
}
- if (live)
- del_nodeset(live);
+ ir_nodeset_destroy(&live);
}
static ir_node *get_first_node(const ifg_list_t *ifg, nodes_iter_t *it)
}
static ir_node *get_first_node(const ifg_list_t *ifg, nodes_iter_t *it)
@@
-362,12
+363,14
@@
static ir_node *ifg_list_nodes_begin(const void *self, void *iter)
static ir_node *ifg_list_nodes_next(const void *self, void *iter)
{
static ir_node *ifg_list_nodes_next(const void *self, void *iter)
{
+ (void) self;
return get_next_node(iter);
}
static void ifg_list_nodes_break(const void *self, void *iter)
{
nodes_iter_t *it = iter;
return get_next_node(iter);
}
static void ifg_list_nodes_break(const void *self, void *iter)
{
nodes_iter_t *it = iter;
+ (void) self;
it->curr_node_idx = 0;
it->ifg = NULL;
}
it->curr_node_idx = 0;
it->ifg = NULL;
}
@@
-380,12
+383,14
@@
static ir_node *ifg_list_neighbours_begin(const void *self, void *iter,const ir_
static ir_node *ifg_list_neighbours_next(const void *self, void *iter)
{
static ir_node *ifg_list_neighbours_next(const void *self, void *iter)
{
+ (void) self;
return get_next_neighbour(iter);
}
static void ifg_list_neighbours_break(const void *self, void *iter)
{
adj_iter_t *it= iter;
return get_next_neighbour(iter);
}
static void ifg_list_neighbours_break(const void *self, void *iter)
{
adj_iter_t *it= iter;
+ (void) self;
it->curr_adj_element = NULL;
it->ifg = NULL;
}
it->curr_adj_element = NULL;
it->ifg = NULL;
}