X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firedges_t.h;h=db8eedeb08004722a85e2126d2b340c848e33665;hb=eb47aca33f2f8c414409f3695e73277b47442334;hp=ced4650377237250cce68910efa11e662c409440;hpb=bb9f2e36362333c6635b89f5258171b06c786608;p=libfirm

diff --git a/ir/ir/iredges_t.h b/ir/ir/iredges_t.h
index ced465037..db8eedeb0 100644
--- a/ir/ir/iredges_t.h
+++ b/ir/ir/iredges_t.h
@@ -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.
  *
@@ -43,17 +43,13 @@
 /**
  * An edge.
  */
-struct _ir_edge_t {
-  ir_node  *src;          /**< The source node of the edge. */
-  int      pos;           /**< The position of the edge at @p src. */
-  unsigned invalid : 1;   /**< edges that are removed are marked invalid. */
-  unsigned present : 1;   /**< Used by the verifier. Don't rely on its content. */
-  unsigned kind    : 4;   /**< The kind of the edge. */
-  struct list_head list;  /**< The list head to queue all out edges at a node. */
-#ifdef DEBUG_libfirm
-  long src_nr;            /**< The node number of the source node. */
-  long edge_nr;           /**< A unique number identifying the edge. */
-#endif
+struct ir_edge_t {
+	ir_node  *src;          /**< The source node of the edge. */
+	int      pos;           /**< The position of the edge at @p src. */
+	unsigned invalid : 1;   /**< edges that are removed are marked invalid. */
+	unsigned present : 1;   /**< Used by the verifier. Don't rely on its content. */
+	unsigned kind    : 4;   /**< The kind of the edge. */
+	struct list_head list;  /**< The list head to queue all out edges at a node. */
 };
 
 
@@ -78,7 +74,9 @@ struct _ir_edge_t {
 */
 static inline const ir_edge_t *_get_irn_out_edge_first_kind(const ir_node *irn, ir_edge_kind_t kind)
 {
-	const struct list_head *head = _get_irn_outs_head(irn, kind);
+	const struct list_head *head;
+	assert(edges_activated_kind(get_irn_irg(irn), kind));
+	head = _get_irn_outs_head(irn, kind);
 	return list_empty(head) ? NULL : list_entry(head->next, ir_edge_t, list);
 }
 
@@ -101,16 +99,7 @@ static inline const ir_edge_t *_get_irn_out_edge_next(const ir_node *irn, const
 */
 static inline int _get_irn_n_edges_kind(const ir_node *irn, int kind)
 {
-	/* Perhaps out_count was buggy. This code does it more safely. */
-#if 0
-	int res = 0;
-	const struct list_head *pos, *head = _get_irn_outs_head(irn, kind);
-	list_for_each(pos, head)
-		res++;
-	return res;
-#else
 	return _get_irn_edge_info(irn, kind)->out_count;
-#endif
 }
 
 static inline int _edges_activated_kind(const ir_graph *irg, ir_edge_kind_t kind)
@@ -122,7 +111,7 @@ static inline int _edges_activated_kind(const ir_graph *irg, ir_edge_kind_t kind
 * Assure, that the edges information is present for a certain graph.
 * @param irg The graph.
 */
-static inline void _edges_assure_kind(ir_graph *irg, int kind)
+static inline void _edges_assure_kind(ir_graph *irg, ir_edge_kind_t kind)
 {
 	if(!_edges_activated_kind(irg, kind))
 		edges_activate_kind(irg, kind);
@@ -131,17 +120,11 @@ static inline void _edges_assure_kind(ir_graph *irg, int kind)
 void edges_init_graph_kind(ir_graph *irg, ir_edge_kind_t kind);
 
 /**
-* Notify of a edge change.
-* 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);
-
-/**
-* A node is deleted.
-*/
-void edges_node_deleted(ir_node *old, ir_graph *irg);
+ * A node might be revivaled by CSE.
+ */
+void edges_node_revival(ir_node *node);
 
-void edges_invalidate_kind(ir_node *irn, ir_edge_kind_t kind, ir_graph *irg);
+void edges_invalidate_kind(ir_node *irn, ir_edge_kind_t kind);
 
 /**
 * Register additional memory in an edge.
@@ -151,7 +134,7 @@ void edges_invalidate_kind(ir_node *irn, ir_edge_kind_t kind, ir_graph *irg);
 *         edges_get_private_data()
 *         to get a pointer to your data.
 */
-int edges_register_private_data(size_t n);
+size_t edges_register_private_data(size_t n);
 
 /**
 * Get a pointer to the private data you registered.
@@ -181,12 +164,19 @@ static inline int _get_edge_src_pos(const ir_edge_t *edge)
 */
 extern void init_edges(void);
 
+void edges_invalidate_all(ir_node *irn);
+
 /**
- * Set dbg information for edges.
+ * Helper function to dump the edge set of a graph,
+ * unused in normal code.
  */
-void edges_init_dbg(int do_dbg);
+void edges_dump_kind(ir_graph *irg, ir_edge_kind_t kind);
 
-void edges_invalidate_all(ir_node *irn, ir_graph *irg);
+/**
+ * Notify normal and block edges.
+ */
+void edges_notify_edge(ir_node *src, int pos, ir_node *tgt,
+                       ir_node *old_tgt, ir_graph *irg);
 
 #define get_irn_n_edges_kind(irn, kind)   _get_irn_n_edges_kind(irn, kind)
 #define get_edge_src_irn(edge)            _get_edge_src_irn(edge)