never set the startblock to bad (even without the self-referencing loop)

[libfirm] / ir / ir / irgraph_t.h

diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h
index 14af2ff..1a5bbd0 100644 (file)
--- a/ir/ir/irgraph_t.h
+++ b/ir/ir/irgraph_t.h
@@ -76,6 +76,13 @@ enum irg_anchors {
   anchor_max
 };
 
+/** A callgraph entry for callees. */
+typedef struct cg_callee_entry {
+       ir_graph  *irg;        /**< The called irg. */
+       ir_node  **call_list;  /**< The list of all calls to the irg. */
+       int        max_depth;  /**< Maximum depth of all Call nodes to irg. */
+} cg_callee_entry;
+
 /**
  * An ir_graph holds all information for a procedure.
  */
@@ -112,7 +119,7 @@ struct ir_graph {
   irg_extblk_info_state extblk_state;      /**< State of extended basic block info. */
   exec_freq_state execfreq_state;          /**< Execution frequency state. */
   ir_address_taken_computed_state adr_taken_state;  /**< Address taken state. */
-  unsigned mem_disamgig_opt;               /**< Options for the memory disambiguator. */
+  unsigned mem_disambig_opt;               /**< Options for the memory disambiguator. */
   unsigned fp_model;                       /**< floating point model of the graph. */
 
   /* -- Fields for construction -- */
@@ -132,15 +139,15 @@ struct ir_graph {
   void *link;                        /**< A void* field to link any information to
                                           the node. */
 
-  ir_graph **callers;                /**< For callgraph analysis. */
+  ir_graph **callers;                /**< For callgraph analysis: list of caller graphs. */
   unsigned char *caller_isbe;        /**< For callgraph analysis: set if backedge. */
-  ir_graph **callees;                /**< For callgraph analysis. */
+  cg_callee_entry **callees;         /**< For callgraph analysis: list of callee calls */
   unsigned char *callee_isbe;        /**< For callgraph analysis: set if backedge. */
   int        callgraph_loop_depth;         /**< For callgraph analysis */
   int        callgraph_recursion_depth;    /**< For callgraph analysis */
   double     method_execution_frequency;   /**< For callgraph analysis */
 
-  ir_loop   *l;
+  ir_loop   *l;                            /**< For callgraph analysis. */
 
   /* -- Fields for Walking the graph -- */
   unsigned long visited;             /**< this flag is an identifier for
@@ -148,6 +155,8 @@ struct ir_graph {
                     every time someone walks through
                     the graph */
   unsigned long block_visited;       /**< same as visited, for a complete block */
+  unsigned inside_irg_walk   : 1;    /**< set to 1 if we are currently in an irg walk */
+  unsigned inside_block_walk : 1;    /**< set to 1 if we are currently in a block walk */
   unsigned estimated_node_count;     /**< estimated number of nodes in this graph,
                                           updated after every walk */
   irg_edges_info_t edge_info;        /**< edge info for automatic outs */
@@ -548,6 +557,36 @@ _dec_irg_block_visited(ir_graph *irg) {
   --irg->block_visited;
 }
 
+static INLINE void
+_set_inside_block_walk(ir_graph *irg) {
+  irg->inside_block_walk = 1;
+}
+
+static INLINE void
+_clear_inside_block_walk(ir_graph *irg) {
+  irg->inside_block_walk = 0;
+}
+
+static INLINE unsigned
+_inside_block_walk(const ir_graph *irg) {
+  return irg->inside_block_walk;
+}
+
+static INLINE void
+_set_inside_irg_walk(ir_graph *irg) {
+  irg->inside_irg_walk = 1;
+}
+
+static INLINE void
+_clear_inside_irg_walk(ir_graph *irg) {
+  irg->inside_irg_walk = 0;
+}
+
+static INLINE unsigned
+_inside_irg_walk(const ir_graph *irg) {
+  return irg->inside_irg_walk;
+}
+
 static INLINE unsigned
 _get_irg_estimated_node_cnt(const ir_graph *irg) {
   return irg->estimated_node_count;
@@ -665,6 +704,12 @@ get_idx_irn(ir_graph *irg, unsigned idx) {
 #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 set_inside_block_walk(irg)            _set_inside_block_walk(irg)
+#define clear_inside_block_walk(irg)          _clear_inside_block_walk(irg)
+#define inside_block_walk(irg)                _inside_block_walk(irg)
+#define set_inside_irg_walk(irg)              _set_inside_irg_walk(irg)
+#define clear_inside_irg_walk(irg)            _clear_inside_irg_walk(irg)
+#define inside_irg_walk(irg)                  _inside_irg_walk(irg)
 #define get_irg_estimated_node_cnt(irg)       _get_irg_estimated_node_cnt(irg)
 #define get_irg_fp_model(irg)                 _get_irg_fp_model(irg)