X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firgraph_t.h;h=034d1afe6adbeb5393d1047ff4924401e5fc3cc9;hb=e1c33a238578342a072e1c95ff12eefe6d0acd37;hp=8d0d410571dcdfbc0f5a3aba13fa39deca61a79a;hpb=2080968df998886ef494ff80bac44cac5773eb14;p=libfirm

diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h
index 8d0d41057..034d1afe6 100644
--- a/ir/ir/irgraph_t.h
+++ b/ir/ir/irgraph_t.h
@@ -112,16 +112,13 @@ struct ir_graph {
 #endif
   int n_loc;                         /**< number of local variable in this
                                           procedure including procedure parameters. */
-  void **loc_descriptions;           /**< storage for local variable desriptions */
+  void **loc_descriptions;           /**< storage for local variable descriptions */
 
   /* -- Fields for optimizations / analysis information -- */
   pset *value_table;                 /**< hash table for global value numbering (cse)
                     for optimizing use in iropt.c */
   ir_node **outs;                    /**< Space for the out arrays. */
 
-#ifdef DEBUG_libfirm
-  int             n_outs;            /**< Size wasted for outs */
-#endif /* defined DEBUG_libfirm */
   ir_loop *loop;                     /**< The outermost loop */
   void *link;                        /**< A void* field to link any information to
                     the node. */
@@ -144,10 +141,11 @@ struct ir_graph {
   unsigned long block_visited;       /**< same as visited, for a complete block */
   unsigned estimated_node_count;     /**< estimated number of nodes in this graph,
                                           updated after every walk */
-#if FIRM_EDGES_INPLACE
-  irg_edge_info_t edge_info;  /**< edge info for automatic outs */
-#endif
+  irg_edge_info_t edge_info;         /**< edge info for automatic outs */
+  ir_node **idx_irn_map;             /**< Array mapping node indexes to nodes. */
+
 #ifdef DEBUG_libfirm
+  int             n_outs;            /**< Size wasted for outs */
   long graph_nr;              /**< a unique graph number for each graph to make output
                    readable. */
 #endif
@@ -516,17 +514,31 @@ _inc_irg_block_visited(ir_graph *irg) {
   ++irg->block_visited;
 }
 
+static INLINE void
+_dec_irg_block_visited(ir_graph *irg) {
+  --irg->block_visited;
+}
+
 static INLINE unsigned
 _get_irg_estimated_node_cnt(const ir_graph *irg) {
   return irg->estimated_node_count;
 }
 
 /**
- * Returns the next IR node index for the given graph.
+ * Allocates a new idx in the irg for the node and adds the irn to the idx -> irn map.
+ * @param irg The graph.
+ * @param irn The node.
+ * @return    The index allocated for the node.
  */
 static INLINE unsigned
-get_irg_next_node_idx(ir_graph *irg) {
-  return irg->last_node_idx++;
+irg_register_node_idx(ir_graph *irg, ir_node *irn)
+{
+	unsigned idx = irg->last_node_idx++;
+	if(idx >= (unsigned) ARR_LEN(irg->idx_irn_map))
+		ARR_RESIZE(ir_node *, irg->idx_irn_map, idx + 1);
+
+	irg->idx_irn_map[idx] = irn;
+	return idx;
 }
 
 /**
@@ -535,9 +547,24 @@ get_irg_next_node_idx(ir_graph *irg) {
  */
 static INLINE void
 irg_kill_node(ir_graph *irg, ir_node *n) {
-  if (get_irn_idx(n) + 1 == irg->last_node_idx)
-    --irg->last_node_idx;
-  obstack_free(irg->obst, n);
+	unsigned idx = get_irn_idx(n);
+	if (idx + 1 == irg->last_node_idx)
+		--irg->last_node_idx;
+	irg->idx_irn_map[idx] = NULL;
+	obstack_free(irg->obst, n);
+}
+
+/**
+ * Get the node for an index.
+ * @param irg The graph.
+ * @param idx The index you want the node for.
+ * @return    The node with that index or NULL, if there is no node with that index.
+ * @note      The node you got might be dead.
+ */
+static INLINE ir_node *
+get_idx_irn(ir_graph *irg, unsigned idx) {
+	assert(idx < (unsigned) ARR_LEN(irg->idx_irn_map));
+	return irg->idx_irn_map[idx];
 }
 
 #define get_interprocedural_view()            _get_interprocedural_view()
@@ -598,6 +625,7 @@ irg_kill_node(ir_graph *irg, ir_node *n) {
 #define get_irg_block_visited(irg)            _get_irg_block_visited(irg)
 #define set_irg_block_visited(irg, v)         _set_irg_block_visited(irg, v)
 #define inc_irg_block_visited(irg)            _inc_irg_block_visited(irg)
+#define dec_irg_block_visited(irg)            _dec_irg_block_visited(irg)
 #define get_irg_estimated_node_cnt(irg)       _get_irg_estimated_node_cnt(irg)
 
 # endif /* _IRGRAPH_T_H_ */