removed pn_Bound_M_except, Bound now have only one memory output

[libfirm] / ir / ir / irgraph_t.h

diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h
index 2bfc530..034d1af 100644 (file)
--- a/ir/ir/irgraph_t.h
+++ b/ir/ir/irgraph_t.h
@@ -87,6 +87,8 @@ struct ir_graph {
   ir_node *current_block;        /**< block for newly gen_*()-erated ir_nodes */
   struct obstack *extbb_obst;    /**< obstack for extended basic block info */
 
+  unsigned last_node_idx;        /**< last IR node index for this graph */
+
   /* -- Fields for graph properties -- */
   irg_inline_property inline_property;     /**< How to handle inlineing. */
   unsigned additional_properties;          /**< additional graph properties. */
@@ -110,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. */
@@ -142,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
@@ -514,11 +514,59 @@ _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;
 }
 
+/**
+ * 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
+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;
+}
+
+/**
+ * Kill a node from the irg. BEWARE: this kills
+ * all later created nodes.
+ */
+static INLINE void
+irg_kill_node(ir_graph *irg, ir_node *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()
 #define is_ir_graph(thing)                    _is_ir_graph(thing)
 #define get_irg_start_block(irg)              _get_irg_start_block(irg)
@@ -577,6 +625,7 @@ _get_irg_estimated_node_cnt(const ir_graph *irg) {
 #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_ */