-/**
- * @file beifg_std.c
- * @date 18.11.2005
- * @author Sebastian Hack
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
*
- * Copyright (C) 2005 Universitaet Karlsruhe
- * Released under the GPL
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
*/
-#ifdef HAVE_CONFIG_H
+/**
+ * @file
+ * @brief Default ifg implementation.
+ * @author Sebastian Hack
+ * @date 18.11.2005
+ * @version $Id$
+ */
#include "config.h"
-#endif
#include <stdlib.h>
#include "list.h"
#include "irnode_t.h"
+#include "irnodeset.h"
#include "irgraph_t.h"
#include "irgwalk.h"
+#include "irtools.h"
+#include "bearch_t.h"
#include "be_t.h"
#include "belive_t.h"
#include "bera.h"
#include "beifg_t.h"
#include "bechordal_t.h"
-
-#define MAX(x, y) ((x) > (y) ? (x) : (y))
+#include "beirg_t.h"
+#include "beintlive_t.h"
typedef struct _ifg_std_t ifg_std_t;
struct _ifg_std_t {
- const be_ifg_impl_t *impl;
+ const be_ifg_impl_t *impl;
const be_chordal_env_t *env;
};
static int ifg_std_connected(const void *self, const ir_node *a, const ir_node *b)
{
- return values_interfere(a, b);
+ const ifg_std_t *ifg = self;
+ return values_interfere(ifg->env->birg, a, b);
}
typedef struct _nodes_iter_t {
const be_chordal_env_t *env;
- struct obstack obst;
- int n;
- int curr;
- ir_node **nodes;
+ struct obstack obst;
+ int n;
+ int curr;
+ ir_node **nodes;
} nodes_iter_t;
static void nodes_walker(ir_node *bl, void *data)
{
- nodes_iter_t *it = data;
+ nodes_iter_t *it = data;
struct list_head *head = get_block_border_head(it->env, bl);
-
- border_t *b;
+ border_t *b;
foreach_border_head(head, b) {
- if(b->is_def && b->is_real) {
+ if (b->is_def && b->is_real) {
obstack_ptr_grow(&it->obst, b->irn);
it->n++;
}
it->env = ifg->env;
irg_block_walk_graph(ifg->env->irg, nodes_walker, NULL, iter);
+ obstack_ptr_grow(&it->obst, NULL);
it->nodes = obstack_finish(&it->obst);
}
-static INLINE void node_break(nodes_iter_t *it, int force)
+static inline void node_break(nodes_iter_t *it, int force)
{
if((it->curr >= it->n || force) && it->nodes) {
obstack_free(&it->obst, NULL);
static ir_node *ifg_std_nodes_next(const void *self, void *iter)
{
+ (void) self;
return get_next_node(iter);
}
static void ifg_std_nodes_break(const void *self, void *iter)
{
+ (void) self;
node_break(iter, 1);
}
typedef struct _adj_iter_t {
const be_chordal_env_t *env;
- const ir_node *irn;
- int reached_end;
- pset *neighbours;
+ const ir_node *irn;
+ int valid;
+ ir_nodeset_t neighbours;
+ ir_nodeset_iterator_t iter;
} adj_iter_t;
static void find_neighbour_walker(ir_node *block, void *data)
border_t *b;
int has_started = 0;
- if(!is_live_in(block, it->irn) && block != get_nodes_block(it->irn))
+ if(!be_is_live_in(it->env->birg->lv, block, it->irn) && block != get_nodes_block(it->irn))
return;
foreach_border_head(head, b) {
}
else if(b->is_def) {
/* if any other node than the one in question starts living, add it to the set */
- pset_insert_ptr(it->neighbours, irn);
+ ir_nodeset_insert(&it->neighbours, irn);
}
else if(!has_started) {
/* we only delete, if the live range in question has not yet started */
- pset_remove_ptr(it->neighbours, irn);
+ ir_nodeset_remove(&it->neighbours, irn);
}
}
{
it->env = ifg->env;
it->irn = irn;
- it->neighbours = pset_new_ptr(16);
- it->reached_end = 0;
+ it->valid = 1;
+ ir_nodeset_init(&it->neighbours);
dom_tree_walk(get_nodes_block(irn), find_neighbour_walker, NULL, it);
+
+ ir_nodeset_iterator_init(&it->iter, &it->neighbours);
}
-static INLINE void neighbours_break(adj_iter_t *it, int force)
+static inline void neighbours_break(adj_iter_t *it, int force)
{
- if((it->reached_end || force) && it->neighbours) {
- del_pset(it->neighbours);
- it->neighbours = NULL;
- }
+ (void) force;
+ assert(it->valid == 1);
+ ir_nodeset_destroy(&it->neighbours);
+ it->valid = 0;
}
static ir_node *get_next_neighbour(adj_iter_t *it) {
- ir_node *res = pset_next(it->neighbours);
-
- it->reached_end = res == NULL;
- neighbours_break(it, 0);
+ ir_node *res = ir_nodeset_iterator_next(&it->iter);
+ if (res == NULL) {
+ ir_nodeset_destroy(&it->neighbours);
+ }
return res;
}
{
adj_iter_t *it = iter;
find_neighbours(self, iter, irn);
- return pset_first(it->neighbours);
+ return ir_nodeset_iterator_next(&it->iter);
}
static ir_node *ifg_std_neighbours_next(const void *self, void *iter)
{
+ (void) self;
return get_next_neighbour(iter);
}
static void ifg_std_neighbours_break(const void *self, void *iter)
{
+ (void) self;
neighbours_break(iter, 1);
}
pset *living;
} cliques_iter_t;
-static INLINE void free_clique_iter(cliques_iter_t *it) {
+static inline void free_clique_iter(cliques_iter_t *it) {
it->n_blocks = -1;
obstack_free(&it->ob, NULL);
del_pset(it->living);
* NOTE: Be careful when changing this function!
* First understand the control flow of consecutive calls.
*/
-static INLINE int get_next_clique(cliques_iter_t *it) {
+static inline int get_next_clique(cliques_iter_t *it) {
/* continue in the block we left the last time */
for (; it->blk < it->n_blocks; it->blk++) {
int output_on_shrink = 0;
struct list_head *head = get_block_border_head(it->cenv, it->blocks[it->blk]);
- /* on entry to a new block set the first border ...
+ /* on entry to a new block set the first border ... */
if (!it->bor)
it->bor = head->prev;
{
const ifg_std_t *ifg = self;
cliques_iter_t *it = iter;
- ir_node *start_bl = get_irg_start_block(it->cenv->irg);
+ ir_node *start_bl = get_irg_start_block(ifg->env->irg);
obstack_init(&it->ob);
dom_tree_walk(start_bl, get_blocks_dom_order, NULL, it);
static int ifg_std_cliques_next(const void *self, void *iter)
{
+ (void) self;
return get_next_clique(iter);
}
static void ifg_std_cliques_break(const void *self, void *iter)
{
+ (void) self;
free_clique_iter(iter);
}
adj_iter_t it;
int degree;
find_neighbours(self, &it, irn);
- degree = pset_count(it.neighbours);
+ degree = ir_nodeset_size(&it.neighbours);
neighbours_break(&it, 1);
return degree;
}
be_ifg_t *be_ifg_std_new(const be_chordal_env_t *env)
{
- ifg_std_t *ifg = malloc(sizeof(*ifg));
+ ifg_std_t *ifg = XMALLOC(ifg_std_t);
ifg->impl = &ifg_std_impl;
ifg->env = env;
projects / libfirm / blobdiff