X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Ffirmstat_t.h;h=0ab8fde61098911778fc72a07e373caa3c6bd125;hb=3c3425a50a1d721b74a015c6812257e32feeac85;hp=8df6306cced7a6a68f83354c270db6d998aa738f;hpb=1a3b7d363474ab544c13093a2f0b578718d37c7a;p=libfirm

diff --git a/ir/stat/firmstat_t.h b/ir/stat/firmstat_t.h
index 8df6306cc..0ab8fde61 100644
--- a/ir/stat/firmstat_t.h
+++ b/ir/stat/firmstat_t.h
@@ -21,7 +21,6 @@
  * @file
  * @brief   Statistics for Firm. Internal data structures.
  * @author  Michael Beck
- * @version $Id$
  */
 #ifndef FIRM_STAT_FIRMSTAT_T_H
 #define FIRM_STAT_FIRMSTAT_T_H
@@ -152,7 +151,6 @@ typedef struct graph_entry_t {
 	struct obstack             recalc_cnts;                  /**< obstack containing the counters that are recalculated */
 	HASH_MAP(node_entry_t)     *opcode_hash;                 /**< hash map containing the opcode counter */
 	HASH_MAP(block_entry_t)    *block_hash;                  /**< hash map containing the block counter */
-	HASH_MAP(block_entry_t)    *extbb_hash;                  /**< hash map containing the extended block counter */
 	HASH_MAP(be_block_entry_t) *be_block_hash;               /**< hash map containing backend block information */
 	counter_t                  cnt[_gcnt_last];               /**< counter */
 	unsigned                   num_tail_recursion;           /**< number of tail recursion optimizations */
@@ -243,9 +241,6 @@ typedef struct block_entry_t {
 	unsigned        is_end:1;         /**< set, if it's the End block. */
 } block_entry_t;
 
-/** An entry for an extended block in a ir-graph */
-typedef block_entry_t extbb_entry_t;
-
 /**
  * Some potential interesting float values
  */
@@ -277,24 +272,24 @@ typedef struct dumper_t dumper_t;
  * @param dmp   the dumper
  * @param entry the IR-graph hash map entry
  */
-typedef void (*dump_graph_FUNC)(dumper_t *dmp, graph_entry_t *entry);
+typedef void dump_graph_FUNC(dumper_t *dmp, graph_entry_t *entry);
 
 /**
  * handler for dumper a constant info table
  *
  * @param dmp   the dumper
  */
-typedef void (*dump_const_table_FUNC)(dumper_t *dmp, const constant_info_t *tbl);
+typedef void dump_const_table_FUNC(dumper_t *dmp, const constant_info_t *tbl);
 
 /**
  * dumps the parameter distribution table
  */
-typedef void (*dump_param_tbl_FUNC)(dumper_t *dmp, const distrib_tbl_t *tbl, graph_entry_t *global);
+typedef void dump_param_tbl_FUNC(dumper_t *dmp, const distrib_tbl_t *tbl, graph_entry_t *global);
 
 /**
  * dumps the optimizations counter
  */
-typedef void (*dump_opt_cnt_FUNC)(dumper_t *dumper, const counter_t *tbl, unsigned len);
+typedef void dump_opt_cnt_FUNC(dumper_t *dumper, const counter_t *tbl, unsigned len);
 
 /**
  * handler for dumper init
@@ -302,14 +297,14 @@ typedef void (*dump_opt_cnt_FUNC)(dumper_t *dumper, const counter_t *tbl, unsign
  * @param dmp   the dumper
  * @param name  name of the file to dump to
  */
-typedef void (*dump_init_FUNC)(dumper_t *dmp, const char *name);
+typedef void dump_init_FUNC(dumper_t *dmp, const char *name);
 
 /**
  * handler for dumper finish
  *
  * @param dmp   the dumper
  */
-typedef void (*dump_finish_FUNC)(dumper_t *dmp);
+typedef void dump_finish_FUNC(dumper_t *dmp);
 
 /**
  * statistics info
@@ -343,17 +338,17 @@ typedef struct statistic_info_t {
  * a dumper description
  */
 struct dumper_t {
-	dump_graph_FUNC         dump_graph;     /**< handler for dumping an irg */
-	dump_const_table_FUNC   dump_const_tbl; /**< handler for dumping a const table */
-	dump_param_tbl_FUNC     dump_param_tbl; /**< handler for dumping the Call parameter table */
-	dump_opt_cnt_FUNC       dump_opt_cnt;   /**< handler for dumping the optimization table. */
-	dump_init_FUNC          init;           /**< handler for init */
-	dump_finish_FUNC        finish;         /**< handler for finish */
-	FILE                    *f;             /**< the file to dump to */
-	stat_info_t             *status;        /**< access to the global status */
-	dumper_t                *next;          /**< link to the next dumper */
-	pset                    *func_map;      /**< pset containing all registered functions */
-	unsigned                tag;            /**< the id tag of the dumper */
+	dump_graph_FUNC       *dump_graph;     /**< handler for dumping an irg */
+	dump_const_table_FUNC *dump_const_tbl; /**< handler for dumping a const table */
+	dump_param_tbl_FUNC   *dump_param_tbl; /**< handler for dumping the Call parameter table */
+	dump_opt_cnt_FUNC     *dump_opt_cnt;   /**< handler for dumping the optimization table. */
+	dump_init_FUNC        *init;           /**< handler for init */
+	dump_finish_FUNC      *finish;         /**< handler for finish */
+	FILE                  *f;             /**< the file to dump to */
+	stat_info_t           *status;        /**< access to the global status */
+	dumper_t              *next;          /**< link to the next dumper */
+	pset                  *func_map;      /**< pset containing all registered functions */
+	unsigned               tag;            /**< the id tag of the dumper */
 };
 
 /**
@@ -509,6 +504,6 @@ void stat_be_block_stat_permcycle(const char *class_name, ir_node *perm, ir_node
  *
  * @param func  the dump function to register
  */
-void stat_register_dumper_func(dump_graph_FUNC func);
+void stat_register_dumper_func(dump_graph_FUNC *func);
 
 #endif /* FIRM_STAT_FIRMSTAT_T_H */