- when a graph is lowered because of struct return changes, transform

[libfirm] / ir / stat / distrib.c

diff --git a/ir/stat/distrib.c b/ir/stat/distrib.c
index 4a74b04..ea9bd25 100644 (file)
--- a/ir/stat/distrib.c
+++ b/ir/stat/distrib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -23,9 +23,7 @@
  * @author  Michael Beck
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "hashptr.h"
 #include "irtools.h"
@@ -60,9 +58,7 @@ static int int_cmp_fun(const void *elt, const void *key) {
  * create a new distribution table
  */
 distrib_tbl_t *stat_new_distrib_tbl(pset_cmp_fun cmp_func, distrib_hash_fun hash_func) {
-       distrib_tbl_t *res;
-
-       res = xmalloc(sizeof(*res));
+       distrib_tbl_t *res = XMALLOC(distrib_tbl_t);
 
        obstack_init(&res->cnts);
 
@@ -135,7 +131,7 @@ void stat_add_distrib_tbl(distrib_tbl_t *tbl, const void *object, const counter_
  * adds a new key count into the integer distribution table
  */
 void stat_add_int_distrib_tbl(distrib_tbl_t *tbl, int key, const counter_t *cnt) {
-       stat_add_distrib_tbl(tbl, (const void *)key, cnt);
+       stat_add_distrib_tbl(tbl, INT_TO_PTR(key), cnt);
 }
 
 /*
@@ -151,7 +147,7 @@ void stat_inc_distrib_tbl(distrib_tbl_t *tbl, const void *object) {
  * increases key count by one
  */
 void stat_inc_int_distrib_tbl(distrib_tbl_t *tbl, int key) {
-       stat_inc_distrib_tbl(tbl, (const void *)key);
+       stat_inc_distrib_tbl(tbl, INT_TO_PTR(key));
 }
 
 /*
@@ -168,7 +164,7 @@ void stat_insert_distrib_tbl(distrib_tbl_t *tbl, const void *object) {
  * if key is already present, nothing happens
  */
 void stat_insert_int_distrib_tbl(distrib_tbl_t *tbl, int key) {
-       stat_insert_distrib_tbl(tbl, (const void *)key);
+       stat_insert_distrib_tbl(tbl, INT_TO_PTR(key));
 }
 
 /*
@@ -201,12 +197,12 @@ double stat_calc_mean_distrib_tbl(distrib_tbl_t *tbl) {
                        return 0.0;
 
                min =
-               max = (int)entry->object;
+               max = PTR_TO_INT(entry->object);
                sum = cnt_to_dbl(&entry->cnt);
 
 
                for (entry = pset_next(tbl->hash_map); entry; entry = pset_next(tbl->hash_map)) {
-                       int value = (int)entry->object;
+                       int value = PTR_TO_INT(entry->object);
 
                        if (value < min)
                                min = value;
@@ -241,7 +237,7 @@ double stat_calc_avg_distrib_tbl(distrib_tbl_t *tbl) {
                        return 0.0;
 
                foreach_pset(tbl->hash_map, entry) {
-                       sum   += cnt_to_dbl(&entry->cnt) * (int)entry->object;
+                       sum   += cnt_to_dbl(&entry->cnt) * PTR_TO_INT(entry->object);
                        count += cnt_to_uint(&entry->cnt);
                }
        } else {