estimated node count added

[libfirm] / ir / ir / irgraph_t.h

diff --git a/ir/ir/irgraph_t.h b/ir/ir/irgraph_t.h
index b701517..3f7aa49 100644 (file)
--- a/ir/ir/irgraph_t.h
+++ b/ir/ir/irgraph_t.h
@@ -29,6 +29,7 @@
 #include "irprog.h"
 #include "pseudo_irg.h"
 #include "type_t.h"
+#include "entity_t.h"
 #include "typegmod.h"
 #include "tr_inheritance.h"
 
@@ -97,7 +98,6 @@ struct ir_graph {
   exec_freq_state   execfreq_state;        /**< state of execution frequency information */
   ir_class_cast_state class_cast_state;    /**< kind of cast operations in code. */
   irg_extblk_info_state extblk_state;      /**< state of extended basic block info */
-  unsigned calling_conv;                   /**< calling convention */
 
   /* -- Fields for construction -- */
 #if USE_EXPLICIT_PHI_IN_STACK
@@ -135,22 +135,22 @@ struct ir_graph {
                     every time someone walks through
                     the 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
 #ifdef DEBUG_libfirm
   int graph_nr;             /**< a unique graph number for each graph to make output
                    readable. */
 #endif
 
-#if FIRM_EDGES_INPLACE
-  irg_edge_info_t edge_info;  /**< edge info for automatic outs */
-#endif
 };
 
 /**
  * Initializes the graph construction module
- *
- * @param default_cc_mask  The default calling convention.
  */
-void firm_init_irgraph(unsigned default_cc_mask);
+void firm_init_irgraph(void);
 
 /* Internal constructor that does not add to irp_irgs or the like. */
 ir_graph *new_r_ir_graph (entity *ent, int n_loc);
@@ -449,27 +449,25 @@ _set_irg_inline_property(ir_graph *irg, irg_inline_property s) {
 
 static INLINE unsigned
 _get_irg_additional_properties(const ir_graph *irg) {
+  if (irg->additional_properties & mtp_property_inherited)
+    return get_method_additional_properties(get_entity_type(irg->ent));
   return irg->additional_properties;
 }
 
 static INLINE void
 _set_irg_additional_properties(ir_graph *irg, unsigned mask) {
-  irg->additional_properties = mask;
+  /* do not allow to set the mtp_property_inherited flag or
+   * the automatic inheritance of flags will not work */
+  irg->additional_properties = mask & ~mtp_property_inherited;
 }
 
 static INLINE void
-_set_irg_additional_property(ir_graph *irg, irg_additional_property flag) {
-  irg->additional_properties |= flag;
-}
+_set_irg_additional_property(ir_graph *irg, mtp_additional_property flag) {
+  unsigned prop = irg->additional_properties;
 
-static INLINE unsigned
-_get_irg_calling_convention(const ir_graph *irg) {
-  return irg->calling_conv;
-}
-
-static INLINE void
-_set_irg_calling_convention(ir_graph *irg, unsigned cc_mask) {
-  irg->calling_conv = cc_mask;
+  if (prop & mtp_property_inherited)
+    prop = get_method_additional_properties(get_entity_type(irg->ent));
+  irg->additional_properties = prop | flag;
 }
 
 static INLINE void
@@ -502,6 +500,11 @@ _inc_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;
+}
+
 #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)
@@ -553,13 +556,12 @@ _inc_irg_block_visited(ir_graph *irg) {
 #define get_irg_additional_properties(irg)    _get_irg_additional_properties(irg)
 #define set_irg_additional_properties(irg, m) _set_irg_additional_properties(irg, m)
 #define set_irg_additional_property(irg, f)   _set_irg_additional_property(irg, f)
-#define get_irg_calling_convention(irg)       _get_irg_calling_convention(irg)
-#define set_irg_calling_convention(irg, cc)   _set_irg_calling_convention(irg, cc)
 #define set_irg_link(irg, thing)              _set_irg_link(irg, thing)
 #define get_irg_link(irg)                     _get_irg_link(irg)
 #define get_irg_visited(irg)                  _get_irg_visited(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 get_irg_estimated_node_cnt(irg)       _get_irg_estimated_node_cnt(irg)
 
 # endif /* _IRGRAPH_T_H_ */