* This are out-edges (also called def-use edges) that are dynamically
* updated as the graph changes.
*/
-#ifdef HAVE_CONFIG_H
#include "config.h"
-#endif
#include "irnode_t.h"
#include "iropt_t.h"
#include "irgwalk.h"
#include "irdump_t.h"
#include "irprintf.h"
-#include "irhooks.h"
#include "debug.h"
#include "set.h"
#include "bitset.h"
-#include "xmalloc.h"
+#include "error.h"
#include "iredgeset.h"
#include "hashptr.h"
static long last_edge_num = -1;
#endif
-static INLINE long edge_get_id(const ir_edge_t *e) {
+static inline long edge_get_id(const ir_edge_t *e) {
#ifdef DEBUG_libfirm
return e->edge_nr;
#else /* DEBUG_libfirm */
obstack_free(&info->edges_obst, NULL);
}
obstack_init(&info->edges_obst);
+ INIT_LIST_HEAD(&info->free_edges);
ir_edgeset_init_size(&info->edges, amount);
info->allocated = 1;
}
* @param tgt the edge target
* @param kind the kind of the edge
*/
-static INLINE void edge_change_cnt(ir_node *tgt, ir_edge_kind_t kind, int ofs) {
+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;
* Verify the edge list of a node, ie. ensure it's a loop:
* head -> e_1 -> ... -> e_n -> head
*/
-static INLINE void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind) {
+static inline void vrfy_list_head(ir_node *irn, ir_edge_kind_t kind) {
int err = 0;
int num = 0;
pset *lh_set = pset_new_ptr(16);
if (edge) {
msg = "deleting";
list_del(&edge->list);
+ ir_edgeset_remove(edges, edge);
+ list_add(&edge->list, &info->free_edges);
edge->invalid = 1;
edge->pos = -2;
edge->src = NULL;
edge->edge_nr = -1;
#endif /* DEBUG_libfirm */
edge_change_cnt(old_tgt, kind, -1);
- }
-
- /* If the edge was not found issue a warning on the debug stream */
- else {
+ } else {
+ /* If the edge was not found issue a warning on the debug stream */
msg = "edge to delete not found!\n";
}
- } /* if */
-
- /*
- * The target is not NULL and the old target differs
- * from the new target, the edge shall be moved (if the
- * old target was != NULL) or added (if the old target was
- * NULL).
- */
- else {
+ } else {
+ /*
+ * The target is not NULL and the old target differs
+ * from the new target, the edge shall be moved (if the
+ * old target was != NULL) or added (if the old target was
+ * NULL).
+ */
struct list_head *head = _get_irn_outs_head(tgt, kind);
assert(head->next && head->prev &&
list_move(&edge->list, head);
edge_change_cnt(old_tgt, kind, -1);
- }
-
- /* The old target was null, thus, the edge is newly created. */
- else {
+ } else {
+ /* The old target was NULL, thus, the edge is newly created. */
ir_edge_t *new_edge;
- ir_edge_t *edge
- = obstack_alloc(&info->edges_obst, EDGE_SIZE);
- memset(edge, 0, EDGE_SIZE);
- edge->src = src;
- edge->pos = pos;
- edge->kind = kind;
+ ir_edge_t *edge;
+
+ if (list_empty(&info->free_edges)) {
+ edge = obstack_alloc(&info->edges_obst, EDGE_SIZE);
+ } else {
+ edge = list_entry(info->free_edges.next, ir_edge_t, list);
+ list_del(&edge->list);
+ }
+
+ edge->src = src;
+ edge->pos = pos;
+ edge->invalid = 0;
+ edge->present = 0;
+ edge->kind = kind;
+ edge->list.next = NULL;
+ edge->list.prev = NULL;
DEBUG_ONLY(edge->src_nr = get_irn_node_nr(src));
new_edge = ir_edgeset_insert(edges, edge);
- if(new_edge != edge) {
- obstack_free(&info->edges_obst, edge);
+ if (new_edge != edge) {
+ panic("new edge exists already");
}
- assert(! edge->invalid && "Freshly inserted edge is invalid?!?");
- assert(edge->list.next == NULL && edge->list.prev == NULL &&
- "New edge must not have list head initialized");
-
msg = "adding";
list_add(&edge->list, head);
-#ifdef DEBUG_libfirm
- edge->edge_nr = ++last_edge_num;
-#endif /* DEBUG_libfirm */
+ DEBUG_ONLY(edge->edge_nr = ++last_edge_num);
}
edge_change_cnt(tgt, kind, +1);
ir_graph *irg = w->irg;
get_edge_src_n_func_t *get_n;
- if (! edges_activated_kind(irg, kind))
- return;
-
get_n = edge_kind_info[kind].get_n;
foreach_tgt(irn, i, n, kind) {
ir_node *pred = get_n(irn, i, kind);
static void init_lh_walker(ir_node *irn, void *data) {
struct build_walker *w = data;
ir_edge_kind_t kind = w->kind;
- INIT_LIST_HEAD(_get_irn_outs_head(irn, kind));
+ list_head *head = _get_irn_outs_head(irn, kind);
+ INIT_LIST_HEAD(head);
_get_irn_edge_info(irn, kind)->out_count = 0;
}
+/**
+ * Pre-Walker: initializes the list-heads and set the out-count
+ * of all nodes to 0.
+ *
+ * Additionally touches DEP nodes, as they might be DEAD.
+ * THIS IS UGLY, but I don't find a better way until we
+ *
+ * a) ensure that dead nodes are not used as input
+ * b) it might be sufficient to add those stupid NO_REG nodes
+ * to the anchor
+ */
+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;
+
+ INIT_LIST_HEAD(head);
+ _get_irn_edge_info(irn, kind)->out_count = 0;
+
+ for (i = get_irn_deps(irn) - 1; i >= 0; --i) {
+ ir_node *dep = get_irn_dep(irn, i);
+
+ head = _get_irn_outs_head(dep, kind);
+
+ INIT_LIST_HEAD(head);
+ _get_irn_edge_info(dep, kind)->out_count = 0;
+ }
+}
+
+typedef struct visitor_info_t {
+ irg_walk_func *visit;
+ void *data;
+} visitor_info_t;
+
/**
* Visitor: initializes the list-heads and set the out-count
* of all nodes to 0 of nodes that are not seen so far.
*/
static void visitor(ir_node *irn, void *data) {
- if (irn_not_visited(irn)) {
+ visitor_info_t *info = data;
+
+ if (!irn_visited(irn)) {
mark_irn_visited(irn);
- init_lh_walker(irn, data);
+ info->visit(irn, info->data);
}
}
void edges_activate_kind(ir_graph *irg, ir_edge_kind_t kind)
{
struct build_walker w;
- irg_edge_info_t *info = _get_irg_edge_info(irg, 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;
+
info->activated = 1;
edges_init_graph_kind(irg, kind);
if (kind == EDGE_KIND_DEP) {
- irg_walk_anchors(irg, init_lh_walker, NULL, &w);
+ irg_walk_anchors(irg, init_lh_walker_dep, NULL, &w);
+ /* Argh: Dep nodes might be dead, so we MUST visit identities first */
+ visit.visit = init_lh_walker_dep;
+ 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);
}
- visit_all_identities(irg, visitor, &w);
}
void edges_deactivate_kind(ir_graph *irg, ir_edge_kind_t kind)
void edges_activate(ir_graph *irg) {
edges_activate_kind(irg, EDGE_KIND_NORMAL);
edges_activate_kind(irg, EDGE_KIND_BLOCK);
- edges_activate_kind(irg, EDGE_KIND_DEP);
+ if (get_irg_phase_state(irg) == phase_backend)
+ edges_activate_kind(irg, EDGE_KIND_DEP);
}
void edges_deactivate(ir_graph *irg) {
- edges_deactivate_kind(irg, EDGE_KIND_DEP);
+ if (get_irg_phase_state(irg) == phase_backend)
+ edges_deactivate_kind(irg, EDGE_KIND_DEP);
edges_deactivate_kind(irg, EDGE_KIND_BLOCK);
edges_deactivate_kind(irg, EDGE_KIND_NORMAL);
}
void *env) {
const ir_edge_t *edge, *next;
- if (Block_not_block_visited(bl)) {
+ if (!Block_block_visited(bl)) {
mark_Block_block_visited(bl);
if (pre)
assert(edges_activated(current_ir_graph));
assert(is_Block(node));
- set_using_block_visited(current_ir_graph);
+ ir_reserve_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED);
inc_irg_block_visited(current_ir_graph);
irg_block_edges_walk2(node, pre, post, env);
- clear_using_block_visited(current_ir_graph);
+ ir_free_resources(current_ir_graph, IR_RESOURCE_BLOCK_VISITED);
}
projects / libfirm / blobdiff