X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeifg_std.c;h=27b2d836b203536d387277b3779923c64b6dbdf4;hb=6d64da24e970f54e9c55b6df1e81c6925492c4ed;hp=8feeefada42225bb98dab1c96579bc6984ed6442;hpb=23b71abac8014aa6bfee3b47648fdb8fe8687b8f;p=libfirm diff --git a/ir/be/beifg_std.c b/ir/be/beifg_std.c index 8feeefada..27b2d836b 100644 --- a/ir/be/beifg_std.c +++ b/ir/be/beifg_std.c @@ -1,12 +1,29 @@ -/** - * @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. */ +/** + * @file + * @brief Default ifg implementation. + * @author Sebastian Hack + * @date 18.11.2005 + * @version $Id$ + */ #ifdef HAVE_CONFIG_H #include "config.h" #endif @@ -16,21 +33,24 @@ #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; }; @@ -41,26 +61,26 @@ static void ifg_std_free(void *self) 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++; } @@ -77,6 +97,7 @@ static void find_nodes(const void *self, void *iter) { 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); } @@ -109,19 +130,22 @@ static ir_node *ifg_std_nodes_begin(const void *self, void *iter) 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) @@ -132,7 +156,7 @@ 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) { @@ -146,11 +170,11 @@ static void find_neighbour_walker(ir_node *block, void *data) } 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); } } @@ -160,26 +184,28 @@ static void find_neighbours(const ifg_std_t *ifg, adj_iter_t *it, const ir_node { 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) { - 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; } @@ -187,16 +213,18 @@ static ir_node *ifg_std_neighbours_begin(const void *self, void *iter, const ir_ { 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); } @@ -235,7 +263,7 @@ static INLINE int get_next_clique(cliques_iter_t *it) { 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; @@ -284,7 +312,7 @@ static int ifg_std_cliques_begin(const void *self, void *iter, ir_node **buf) { 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); @@ -302,11 +330,13 @@ static int ifg_std_cliques_begin(const void *self, void *iter, ir_node **buf) 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); } @@ -316,7 +346,7 @@ static int ifg_std_degree(const void *self, const ir_node *irn) 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; } @@ -342,7 +372,7 @@ static const be_ifg_impl_t ifg_std_impl = { 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;