X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firedges.c;h=799dadaf106500fecb1b3a82dfe7f7c7140a0924;hb=af82344c3d1ede9a28e652302a8c2bac7bb1c743;hp=fdb8b7c45cbca5b0839a30cfc8635b1c32e2604c;hpb=753399e387c8fa3b26116f6693a74cf9a824b177;p=libfirm diff --git a/ir/ir/iredges.c b/ir/ir/iredges.c index fdb8b7c45..799dadaf1 100644 --- a/ir/ir/iredges.c +++ b/ir/ir/iredges.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -134,7 +134,7 @@ static int edges_used = 0; * Summed size of all users private data */ -static int edges_private_size = 0; +static size_t edges_private_size = 0; #define EDGE_SIZE (sizeof(ir_edge_t) + edges_private_size) /** @@ -142,21 +142,12 @@ static int edges_private_size = 0; */ static int edges_dbg = 0; -#ifdef DEBUG_libfirm -/* a static variable holding the last number assigned to a new edge */ -static long last_edge_num = -1; -#endif - /** * Returns an ID for the given edge. */ static inline long edge_get_id(const ir_edge_t *e) { -#ifdef DEBUG_libfirm - return e->edge_nr; -#else /* DEBUG_libfirm */ return (long)e; -#endif /* DEBUG_libfirm */ } /** @@ -170,9 +161,9 @@ static inline long edge_get_id(const ir_edge_t *e) * Each user has to remember his given offset and the size of his private data. * To be called before FIRM is initialized. */ -int edges_register_private_data(size_t n) +size_t edges_register_private_data(size_t n) { - int res = edges_private_size; + size_t res = edges_private_size; assert(!edges_used && "you cannot register private edge data, if edges have been initialized"); @@ -234,8 +225,9 @@ void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind) * @return The corresponding edge object or NULL, * if no such edge exists. */ -const ir_edge_t *get_irn_edge_kind(ir_graph *irg, const ir_node *src, int pos, ir_edge_kind_t kind) +const ir_edge_t *get_irn_edge_kind(const ir_node *src, int pos, ir_edge_kind_t kind) { + ir_graph *irg = get_irn_irg(src); if (edges_activated_kind(irg, kind)) { irg_edge_info_t *info = _get_irg_edge_info(irg, kind); ir_edge_t key; @@ -249,18 +241,6 @@ const ir_edge_t *get_irn_edge_kind(ir_graph *irg, const ir_node *src, int pos, i return NULL; } -/** - * Get the edge object of an outgoing edge at a node. - * Looks for an edge for all kinds. - */ -const ir_edge_t *get_irn_edge(ir_graph *irg, const ir_node *src, int pos) -{ - const ir_edge_t *edge; - if ((edge = get_irn_edge_kind(irg, src, pos, EDGE_KIND_NORMAL)) == NULL) - edge = get_irn_edge_kind(irg, src, pos, EDGE_KIND_BLOCK); - return(edge); -} - /** * Change the out count * @@ -271,27 +251,6 @@ static inline void edge_change_cnt(ir_node *tgt, ir_edge_kind_t kind, int ofs) { irn_edge_info_t *info = _get_irn_edge_info(tgt, kind); info->out_count += ofs; - -#if 0 - ir_graph *irg = get_irn_irg(tgt); - assert(info->out_count >= 0); - if (info->out_count == 0 && kind == EDGE_KIND_NORMAL) { - /* tgt lost it's last user */ - int i; - - for (i = get_irn_arity(tgt) - 1; i >= -1; --i) { - ir_node *prev = get_irn_n(tgt, i); - - edges_notify_edge(tgt, i, NULL, prev, irg); - } - for (i = get_irn_deps(tgt) - 1; i >= 0; --i) { - ir_node *prev = get_irn_dep(tgt, i); - - edges_notify_edge_kind(tgt, i, NULL, prev, EDGE_KIND_DEP, irg); - - } - } -#endif } /** @@ -354,7 +313,6 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, irg_edge_info_t *info; ir_edgeset_t *edges; ir_edge_t templ; - ir_edge_t *edge; assert(edges_activated_kind(irg, kind)); @@ -376,7 +334,7 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, */ if (tgt == NULL) { /* search the edge in the set. */ - edge = ir_edgeset_find(edges, &templ); + ir_edge_t *edge = ir_edgeset_find(edges, &templ); /* mark the edge invalid if it was found */ if (edge) { @@ -387,9 +345,6 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, edge->invalid = 1; edge->pos = -2; edge->src = NULL; -#ifdef DEBUG_libfirm - edge->edge_nr = -1; -#endif /* DEBUG_libfirm */ edge_change_cnt(old_tgt, kind, -1); } else { /* If the edge was not found issue a warning on the debug stream */ @@ -409,7 +364,7 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, /* If the old target is not null, the edge is moved. */ if (old_tgt) { - edge = ir_edgeset_find(edges, &templ); + ir_edge_t *edge = ir_edgeset_find(edges, &templ); assert(edge && "edge to redirect not found!"); assert(! edge->invalid && "Invalid edge encountered"); @@ -423,7 +378,7 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, ir_edge_t *edge; if (list_empty(&info->free_edges)) { - edge = obstack_alloc(&info->edges_obst, EDGE_SIZE); + edge = (ir_edge_t*)obstack_alloc(&info->edges_obst, EDGE_SIZE); } else { edge = list_entry(info->free_edges.next, ir_edge_t, list); list_del(&edge->list); @@ -437,7 +392,6 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, edge->list.next = NULL; edge->list.prev = NULL; memset(edge + 1, 0, edges_private_size); - DEBUG_ONLY(edge->src_nr = get_irn_node_nr(src)); new_edge = ir_edgeset_insert(edges, edge); if (new_edge != edge) { @@ -446,7 +400,6 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, msg = "adding"; list_add(&edge->list, head); - DEBUG_ONLY(edge->edge_nr = ++last_edge_num); } edge_change_cnt(tgt, kind, +1); @@ -465,20 +418,36 @@ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, DBG((dbg, LEVEL_5, "announce out edge: %+F %d-> %+F(%+F): %s\n", src, pos, tgt, old_tgt, msg)); } -void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, ir_graph *irg) +void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, + ir_graph *irg) { if (edges_activated_kind(irg, EDGE_KIND_NORMAL)) { edges_notify_edge_kind(src, pos, tgt, old_tgt, EDGE_KIND_NORMAL, irg); } - if (edges_activated_kind(irg, EDGE_KIND_BLOCK) && is_Block(src)) { - ir_node *bl_old = old_tgt ? get_nodes_block(skip_Proj(old_tgt)) : NULL; - ir_node *bl_tgt = NULL; - - if (tgt) - bl_tgt = is_Bad(tgt) ? tgt : get_nodes_block(skip_Proj(tgt)); - - edges_notify_edge_kind(src, pos, bl_tgt, bl_old, EDGE_KIND_BLOCK, irg); + if (edges_activated_kind(irg, EDGE_KIND_BLOCK)) { + if (is_Block(src)) { + ir_node *bl_old = old_tgt ? get_nodes_block(old_tgt) : NULL; + ir_node *bl_tgt = NULL; + + if (tgt) + bl_tgt = is_Bad(tgt) ? tgt : get_nodes_block(tgt); + + edges_notify_edge_kind(src, pos, bl_tgt, bl_old, EDGE_KIND_BLOCK, irg); + } else if (get_irn_mode(src) == mode_X && old_tgt != NULL && is_Block(old_tgt)) { + /* moving a jump node from one block to another */ + const ir_edge_t *edge; + const ir_edge_t *next; + foreach_out_edge_kind_safe(old_tgt, edge, next, EDGE_KIND_BLOCK) { + ir_node *succ = get_edge_src_irn(edge); + int succ_pos = get_edge_src_pos(edge); + ir_node *block_pred = get_Block_cfgpred(succ, succ_pos); + if (block_pred != src) + continue; + edges_notify_edge_kind(succ, succ_pos, tgt, old_tgt, + EDGE_KIND_BLOCK, irg); + } + } } } @@ -489,9 +458,10 @@ void edges_notify_edge(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, ir * @param kind the kind of edges to remove * @param irg the irg of the old node */ -static void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind, ir_graph *irg) +static void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind) { int i, n; + ir_graph *irg = get_irn_irg(old); if (!edges_activated_kind(irg, kind)) return; @@ -511,10 +481,11 @@ static void edges_node_deleted_kind(ir_node *old, ir_edge_kind_t kind, ir_graph * @param kind the kind of edges to remove * @param irg the irg of the old node */ -static void edges_node_revival_kind(ir_node *irn, ir_edge_kind_t kind, ir_graph *irg) +static void edges_node_revival_kind(ir_node *irn, ir_edge_kind_t kind) { irn_edge_info_t *info; int i, n; + ir_graph *irg = get_irn_irg(irn); if (!edges_activated_kind(irg, kind)) return; @@ -532,25 +503,22 @@ static void edges_node_revival_kind(ir_node *irn, ir_edge_kind_t kind, ir_graph info->edges_built = 1; } -struct build_walker { - ir_graph *irg; +typedef struct build_walker { ir_edge_kind_t kind; bitset_t *reachable; unsigned problem_found; -}; +} build_walker; /** * Post-Walker: notify all edges */ static void build_edges_walker(ir_node *irn, void *data) { - struct build_walker *w = data; + build_walker *w = (build_walker*)data; int i, n; ir_edge_kind_t kind = w->kind; - ir_graph *irg = w->irg; - get_edge_src_n_func_t *get_n; + ir_graph *irg = get_irn_irg(irn); - get_n = edge_kind_info[kind].get_n; foreach_tgt(irn, i, n, kind) { ir_node *pred = get_n(irn, i, kind); edges_notify_edge_kind(irn, i, pred, NULL, kind, irg); @@ -564,9 +532,9 @@ static void build_edges_walker(ir_node *irn, void *data) */ static void init_lh_walker(ir_node *irn, void *data) { - struct build_walker *w = data; - ir_edge_kind_t kind = w->kind; - list_head *head = _get_irn_outs_head(irn, kind); + build_walker *w = (build_walker*)data; + ir_edge_kind_t kind = w->kind; + list_head *head = _get_irn_outs_head(irn, kind); INIT_LIST_HEAD(head); _get_irn_edge_info(irn, kind)->edges_built = 0; _get_irn_edge_info(irn, kind)->out_count = 0; @@ -585,10 +553,10 @@ static void init_lh_walker(ir_node *irn, void *data) */ static void init_lh_walker_dep(ir_node *irn, void *data) { - struct build_walker *w = data; - ir_edge_kind_t kind = w->kind; - list_head *head = _get_irn_outs_head(irn, kind); - int i; + build_walker *w = (build_walker*)data; + ir_edge_kind_t kind = w->kind; + list_head *head = _get_irn_outs_head(irn, kind); + int i; INIT_LIST_HEAD(head); _get_irn_edge_info(irn, kind)->edges_built = 0; @@ -616,10 +584,12 @@ typedef struct visitor_info_t { */ static void visitor(ir_node *irn, void *data) { - visitor_info_t *info = data; + visitor_info_t *info = (visitor_info_t*)data; if (is_Deleted(irn)) return; + if (!is_Block(irn) && is_Deleted(get_nodes_block(irn))) + return; if (!irn_visited_else_mark(irn)) { info->visit(irn, info->data); @@ -654,7 +624,6 @@ void edges_activate_kind(ir_graph *irg, ir_edge_kind_t kind) irg_edge_info_t *info = _get_irg_edge_info(irg, kind); visitor_info_t visit; - w.irg = irg; w.kind = kind; visit.data = &w; @@ -701,8 +670,9 @@ int (edges_activated_kind)(const ir_graph *irg, ir_edge_kind_t kind) * sent to. * @param irg The graph. */ -void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind, ir_graph *irg) +void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind) { + ir_graph *irg = get_irn_irg(from); set_edge_func_t *set_edge = edge_kind_info[kind].set_edge; if (set_edge && edges_activated_kind(irg, kind)) { @@ -720,8 +690,9 @@ void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind, ir_grap static void verify_set_presence(ir_node *irn, void *data) { - struct build_walker *w = data; - ir_edgeset_t *edges = &_get_irg_edge_info(w->irg, w->kind)->edges; + build_walker *w = (build_walker*)data; + ir_graph *irg = get_irn_irg(irn); + ir_edgeset_t *edges = &_get_irg_edge_info(irg, w->kind)->edges; int i, n; foreach_tgt(irn, i, n, w->kind) { @@ -735,18 +706,14 @@ static void verify_set_presence(ir_node *irn, void *data) e->present = 1; } else { w->problem_found = 1; -#if 0 - ir_fprintf(stderr, "Edge Verifier: edge %+F,%d -> %+F (kind: \"%s\") is missing\n", - irn, i, get_n(irn, i, w->kind), get_kind_str(w->kind)); -#endif } } } static void verify_list_presence(ir_node *irn, void *data) { - struct build_walker *w = data; - const ir_edge_t *e; + build_walker *w = (build_walker*)data; + const ir_edge_t *e; bitset_set(w->reachable, get_irn_idx(irn)); @@ -758,10 +725,6 @@ static void verify_list_presence(ir_node *irn, void *data) if (w->kind == EDGE_KIND_NORMAL && get_irn_arity(e->src) <= e->pos) { w->problem_found = 1; -#if 0 - ir_fprintf(stderr, "Edge Verifier: edge(%ld) %+F -> %+F recorded at src position %d, but src has arity %d\n", - edge_get_id(e), e->src, irn, e->pos, get_irn_arity(e->src)); -#endif continue; } @@ -769,10 +732,6 @@ static void verify_list_presence(ir_node *irn, void *data) if (irn != tgt) { w->problem_found = 1; -#if 0 - ir_fprintf(stderr, "Edge Verifier: edge(%ld) %+F,%d (kind \"%s\") is no out edge of %+F but of %+F\n", - edge_get_id(e), e->src, e->pos, get_kind_str(w->kind), irn, tgt); -#endif } } } @@ -784,7 +743,6 @@ int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind) ir_edge_t *e; ir_edgeset_iterator_t iter; - w.irg = irg; w.kind = kind; w.reachable = bitset_alloca(get_irg_last_idx(irg)); w.problem_found = 0; @@ -818,15 +776,17 @@ int edges_verify_kind(ir_graph *irg, ir_edge_kind_t kind) */ static void clear_links(ir_node *irn, void *env) { - struct build_walker *w = env; - bitset_t *bs; + bitset_t *bs; + ir_graph *irg; + (void) env; if (IGNORE_NODE(irn)) { set_irn_link(irn, NULL); return; } - bs = bitset_malloc(get_irg_last_idx(w->irg)); + irg = get_irn_irg(irn); + bs = bitset_malloc(get_irg_last_idx(irg)); set_irn_link(irn, bs); } @@ -839,10 +799,10 @@ static void count_user(ir_node *irn, void *env) int first; (void) env; - first = -1; + first = is_Block(irn) ? 0 : -1; for (i = get_irn_arity(irn) - 1; i >= first; --i) { ir_node *op = get_irn_n(irn, i); - bitset_t *bs = get_irn_link(op); + bitset_t *bs = (bitset_t*)get_irn_link(op); if (bs) bitset_set(bs, get_irn_idx(irn)); @@ -854,19 +814,20 @@ static void count_user(ir_node *irn, void *env) */ static void verify_edge_counter(ir_node *irn, void *env) { - struct build_walker *w = env; + build_walker *w = (build_walker*)env; bitset_t *bs; int list_cnt; int ref_cnt; int edge_cnt; - unsigned long idx; + size_t idx; const struct list_head *head; const struct list_head *pos; + ir_graph *irg; if (IGNORE_NODE(irn)) return; - bs = get_irn_link(irn); + bs = (bitset_t*)get_irn_link(irn); list_cnt = 0; ref_cnt = 0; edge_cnt = _get_irn_edge_info(irn, EDGE_KIND_NORMAL)->out_count; @@ -879,10 +840,11 @@ static void verify_edge_counter(ir_node *irn, void *env) /* check all nodes that reference us and count edges that point number * of ins that actually point to us */ + irg = get_irn_irg(irn); ref_cnt = 0; bitset_foreach(bs, idx) { int i, arity; - ir_node *src = get_idx_irn(w->irg, idx); + ir_node *src = get_idx_irn(irg, idx); arity = get_irn_arity(src); for (i = 0; i < arity; ++i) { @@ -902,26 +864,6 @@ static void verify_edge_counter(ir_node *irn, void *env) w->problem_found = 1; ir_fprintf(stderr, "Edge Verifier: %+F reachable by %d node(s), but the list contains %d edge(s)\n", irn, ref_cnt, list_cnt); - - /* Matze: buggy if a node has multiple ins pointing at irn */ -#if 0 - list_for_each(pos, head) { - ir_edge_t *edge = list_entry(pos, ir_edge_t, list); - bitset_flip(bs, get_irn_idx(edge->src)); - } - - if (ref_cnt < list_cnt) - fprintf(stderr," following nodes are recorded in list, but not as user:\n"); - else - fprintf(stderr," following nodes are user, but not recorded in list:\n"); - - fprintf(stderr," "); - bitset_foreach(bs, idx) { - ir_node *src = get_idx_irn(w->irg, idx); - ir_fprintf(stderr, " %+F", src); - } - fprintf(stderr, "\n"); -#endif } bitset_free(bs); @@ -938,7 +880,6 @@ int edges_verify(ir_graph *irg) /* verify normal edges only */ problem_found = edges_verify_kind(irg, EDGE_KIND_NORMAL); - w.irg = irg; w.kind = EDGE_KIND_NORMAL; w.problem_found = 0; @@ -949,18 +890,18 @@ int edges_verify(ir_graph *irg) return problem_found ? 1 : w.problem_found; } -struct pass_t { +typedef struct pass_t { ir_graph_pass_t pass; unsigned assert_on_problem; -}; +} pass_t; /** * Wrapper to edges_verify to be run as an ir_graph pass. */ static int edges_verify_wrapper(ir_graph *irg, void *context) { - struct pass_t *pass = context; - int problems_found = edges_verify(irg); + pass_t *pass = (pass_t*)context; + int problems_found = edges_verify(irg); /* do NOT rerun the pass if verify is ok :-) */ assert(problems_found && pass->assert_on_problem); return 0; @@ -969,7 +910,7 @@ static int edges_verify_wrapper(ir_graph *irg, void *context) /* Creates an ir_graph pass for edges_verify(). */ ir_graph_pass_t *irg_verify_edges_pass(const char *name, unsigned assert_on_problem) { - struct pass_t *pass = XMALLOCZ(struct pass_t); + pass_t *pass = XMALLOCZ(pass_t); def_graph_pass_constructor( &pass->pass, name ? name : "edges_verify", edges_verify_wrapper); @@ -1036,16 +977,16 @@ int edges_assure_kind(ir_graph *irg, ir_edge_kind_t kind) return activated; } -void edges_node_deleted(ir_node *irn, ir_graph *irg) +void edges_node_deleted(ir_node *irn) { - edges_node_deleted_kind(irn, EDGE_KIND_NORMAL, irg); - edges_node_deleted_kind(irn, EDGE_KIND_BLOCK, irg); + edges_node_deleted_kind(irn, EDGE_KIND_NORMAL); + edges_node_deleted_kind(irn, EDGE_KIND_BLOCK); } -void edges_node_revival(ir_node *irn, ir_graph *irg) +void edges_node_revival(ir_node *irn) { - edges_node_revival_kind(irn, EDGE_KIND_NORMAL, irg); - edges_node_revival_kind(irn, EDGE_KIND_BLOCK, irg); + edges_node_revival_kind(irn, EDGE_KIND_NORMAL); + edges_node_revival_kind(irn, EDGE_KIND_BLOCK); } const ir_edge_t *(get_irn_out_edge_first_kind)(const ir_node *irn, ir_edge_kind_t kind) @@ -1078,9 +1019,8 @@ static void irg_walk_edges2(ir_node *node, irg_walk_func *pre, { const ir_edge_t *edge, *next; - if (irn_visited(node)) + if (irn_visited_else_mark(node)) return; - mark_irn_visited(node); if (pre != NULL) pre(node, env);