X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firedges.c;h=cb163b144a5807d71ea0db817a1dd644413366a2;hb=c89e74c65341bb0e168fcabe76fcc33a1be452e4;hp=ae086ecf08ebebccd2c92a71028ed8c7d5d993e3;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm diff --git a/ir/ir/iredges.c b/ir/ir/iredges.c index ae086ecf0..cb163b144 100644 --- a/ir/ir/iredges.c +++ b/ir/ir/iredges.c @@ -51,7 +51,7 @@ #define ValueType ir_edge_t* #define NullValue NULL #define DeletedValue ((ir_edge_t*)-1) -#define Hash(this,key) (HASH_PTR(key->src) ^ (key->pos * 40013)) +#define Hash(this,key) (hash_ptr(key->src) ^ (key->pos * 40013)) #define KeysEqual(this,key1,key2) ((key1->src) == (key2->src) && (key1->pos == key2->pos)) #define SetRangeEmpty(ptr,size) memset(ptr, 0, (size) * sizeof((ptr)[0])) @@ -156,17 +156,6 @@ static inline long edge_get_id(const ir_edge_t *e) return (long)e; } -/** - * Announce to reserve extra space for each edge to be allocated. - * - * @param n: Size of the space to reserve - * - * @return Offset at which the private data will begin - * - * Several users can reserve extra space for private usage. - * Each user has to remember his given offset and the size of his private data. - * To be called before FIRM is initialized. - */ size_t edges_register_private_data(size_t n) { size_t res = edges_private_size; @@ -177,11 +166,6 @@ size_t edges_register_private_data(size_t n) return res; } -/* - * Reset the user's private data at offset 'offset' - * The user has to remember his offset and the size of his data! - * Caution: Using wrong values here can destroy other users private data! - */ void edges_reset_private_data(ir_graph *irg, int offset, unsigned size) { irg_edge_info_t *info = get_irg_edge_info(irg, EDGE_KIND_NORMAL); @@ -197,12 +181,8 @@ void edges_reset_private_data(ir_graph *irg, int offset, unsigned size) #define get_irn_out_list_head(irn) (&get_irn_out_info(irn)->outs) -#define edge_hash(edge) (TIMES37((edge)->pos) + HASH_PTR((edge)->src)) +#define edge_hash(edge) (TIMES37((edge)->pos) + hash_ptr((edge)->src)) -/** - * Initialize the out information for a graph. - * @note Dead node elimination can call this on an already initialized graph. - */ void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind) { if (edges_activated_kind(irg, kind)) { @@ -222,15 +202,6 @@ void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind) } } -/** - * Get the edge object of an outgoing edge at a node. - * @param irg The graph, the node is in. - * @param src The node at which the edge originates. - * @param pos The position of the edge. - * @param kind The kind of the edge. - * @return The corresponding edge object or NULL, - * if no such edge exists. - */ 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); @@ -310,7 +281,6 @@ void edges_dump_kind(ir_graph *irg, ir_edge_kind_t kind) } } -/* The edge from (src, pos) -> old_tgt is redirected to tgt */ void edges_notify_edge_kind(ir_node *src, int pos, ir_node *tgt, ir_node *old_tgt, ir_edge_kind_t kind, ir_graph *irg) @@ -602,30 +572,30 @@ static void visitor(ir_node *irn, void *data) } } -/* - * Build the initial edge set. - * Beware, this is not a simple task because it suffers from two - * difficulties: - * - the anchor set allows access to Nodes that may not be reachable from - * the End node - * - the identities add nodes to the "root set" that are not yet reachable - * from End. However, after some transformations, the CSE may revival these - * nodes - * - * These problems can be fixed using different strategies: - * - Add an age flag to every node. Whenever the edge of a node is older - * then the current edge, invalidate the edges of this node. - * While this would help for revivaled nodes, it increases memory and runtime. - * - Delete the identities set. - * Solves the revival problem, but may increase the memory consumption, as - * nodes cannot be revivaled at all. - * - Manually iterate over the identities root set. This did not consume more memory - * but increase the computation time because the |identities| >= |V| - * - * Currently, we use the last option. - */ void edges_activate_kind(ir_graph *irg, ir_edge_kind_t kind) { + /* + * Build the initial edge set. + * Beware, this is not a simple task because it suffers from two + * difficulties: + * - the anchor set allows access to Nodes that may not be reachable from + * the End node + * - the identities add nodes to the "root set" that are not yet reachable + * from End. However, after some transformations, the CSE may revival these + * nodes + * + * These problems can be fixed using different strategies: + * - Add an age flag to every node. Whenever the edge of a node is older + * then the current edge, invalidate the edges of this node. + * While this would help for revivaled nodes, it increases memory and runtime. + * - Delete the identities set. + * Solves the revival problem, but may increase the memory consumption, as + * nodes cannot be revivaled at all. + * - Manually iterate over the identities root set. This did not consume more memory + * but increase the computation time because the |identities| >= |V| + * + * Currently, we use the last option. + */ struct build_walker w; irg_edge_info_t *info = get_irg_edge_info(irg, kind); visitor_info_t visit; @@ -645,9 +615,9 @@ void edges_activate_kind(ir_graph *irg, ir_edge_kind_t kind) visit_all_identities(irg, visitor, &visit); irg_walk_anchors(irg, NULL, build_edges_walker, &w); } else { - irg_walk_anchors(irg, init_lh_walker, build_edges_walker, &w); visit.visit = init_lh_walker; visit_all_identities(irg, visitor, &visit); + irg_walk_anchors(irg, init_lh_walker, build_edges_walker, &w); } } @@ -661,6 +631,7 @@ void edges_deactivate_kind(ir_graph *irg, ir_edge_kind_t kind) ir_edgeset_destroy(&info->edges); info->allocated = 0; } + clear_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES); } int (edges_activated_kind)(const ir_graph *irg, ir_edge_kind_t kind) @@ -668,14 +639,6 @@ int (edges_activated_kind)(const ir_graph *irg, ir_edge_kind_t kind) return edges_activated_kind_(irg, kind); } - -/** - * Reroute all use-edges from a node to another. - * @param from The node whose use-edges shall be withdrawn. - * @param to The node to which all the use-edges of @p from shall be - * sent to. - * @param irg The graph. - */ void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind) { ir_graph *irg = get_irn_irg(from); @@ -694,6 +657,18 @@ void edges_reroute_kind(ir_node *from, ir_node *to, ir_edge_kind_t kind) } } +void edges_reroute_except(ir_node *from, ir_node *to, ir_node *exception) +{ + const ir_edge_t *edge; + const ir_edge_t *next; + foreach_out_edge_safe(from, edge, next) { + ir_node *src = get_edge_src_irn(edge); + if (src == exception) + continue; + set_irn_n(src, edge->pos, to); + } +} + static void verify_set_presence(ir_node *irn, void *data) { build_walker *w = (build_walker*)data; @@ -875,9 +850,6 @@ static void verify_edge_counter(ir_node *irn, void *env) bitset_free(bs); } -/** - * Verifies the out edges of an irg. - */ int edges_verify(ir_graph *irg) { struct build_walker w; @@ -913,7 +885,6 @@ static int edges_verify_wrapper(ir_graph *irg, void *context) return 0; } -/* Creates an ir_graph pass for edges_verify(). */ ir_graph_pass_t *irg_verify_edges_pass(const char *name, unsigned assert_on_problem) { pass_t *pass = XMALLOCZ(pass_t); @@ -955,32 +926,17 @@ void edges_deactivate(ir_graph *irg) edges_deactivate_kind(irg, EDGE_KIND_NORMAL); } -int edges_assure(ir_graph *irg) +void assure_edges(ir_graph *irg) { - int activated = 0; - - if (edges_activated_kind(irg, EDGE_KIND_BLOCK)) { - activated = 1; - } else { - edges_activate_kind(irg, EDGE_KIND_BLOCK); - } - if (edges_activated_kind(irg, EDGE_KIND_NORMAL)) { - activated = 1; - } else { - edges_activate_kind(irg, EDGE_KIND_NORMAL); - } - - return activated; + assure_edges_kind(irg, EDGE_KIND_BLOCK); + assure_edges_kind(irg, EDGE_KIND_NORMAL); + add_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES); } -int edges_assure_kind(ir_graph *irg, ir_edge_kind_t kind) +void assure_edges_kind(ir_graph *irg, ir_edge_kind_t kind) { - int activated = edges_activated_kind(irg, kind); - - if (!activated) + if (!edges_activated_kind(irg, kind)) edges_activate_kind(irg, kind); - - return activated; } void edges_node_deleted(ir_node *irn)