bepeephole: Inline be_peephole_new_node() into its only caller.
[libfirm] / ir / stat / distrib.c
index 3c2e1ac..8c69332 100644 (file)
@@ -1,30 +1,26 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/distrib.c
- * Purpose:     Statistics for Firm. Distribution tables.
- * Author:      Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 2004 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * This file is part of libFirm.
+ * Copyright (C) 2012 University of Karlsruhe.
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+
+/**
+ * @file
+ * @brief   Statistics for Firm. Distribution tables.
+ * @author  Michael Beck
+ */
+#include "config.h"
 
 #include "hashptr.h"
-#include "irtools.h"
+#include "util.h"
 #include "xmalloc.h"
 #include "firmstat_t.h"
 
-static const counter_t _cnt_0 = { { 0 } };
-
 /**
  * calculates a hash value for an address
  */
 static unsigned addr_hash(const void *object)
 {
-       return HASH_PTR(object);
+       return hash_ptr(object);
 }
 
 /**
@@ -40,10 +36,12 @@ static unsigned int_hash(const void *object)
  */
 static int int_cmp_fun(const void *elt, const void *key)
 {
-       const distrib_entry_t *p1 = elt;
-       const distrib_entry_t *p2 = key;
+       const distrib_entry_t *p1 = (const distrib_entry_t*)elt;
+       const distrib_entry_t *p2 = (const distrib_entry_t*)key;
 
-       return (char *)p1->object - (char *)p2->object;
+       if (p1->object == p2->object)
+               return 0;
+       return p1->object < p2->object ? -1 : 1;
 }
 
 /*
@@ -51,9 +49,7 @@ static int int_cmp_fun(const void *elt, const void *key)
  */
 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);
 
@@ -102,18 +98,18 @@ static distrib_entry_t *distrib_get_entry(distrib_tbl_t *tbl, const void *object
 
        key.object = object;
 
-       elem = pset_find(tbl->hash_map, &key, tbl->hash_func(object));
+       elem = (distrib_entry_t*)pset_find(tbl->hash_map, &key, tbl->hash_func(object));
        if (elem)
                return elem;
 
-       elem = obstack_alloc(&tbl->cnts, sizeof(*elem));
+       elem = OALLOC(&tbl->cnts, distrib_entry_t);
 
        /* clear counter */
        cnt_clr(&elem->cnt);
 
        elem->object = object;
 
-       return pset_insert(tbl->hash_map, elem, tbl->hash_func(object));
+       return (distrib_entry_t*)pset_insert(tbl->hash_map, elem, tbl->hash_func(object));
 }
 
 /*
@@ -131,7 +127,7 @@ void stat_add_distrib_tbl(distrib_tbl_t *tbl, const void *object, const counter_
  */
 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);
 }
 
 /*
@@ -149,19 +145,17 @@ void stat_inc_distrib_tbl(distrib_tbl_t *tbl, const void *object)
  */
 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));
 }
 
-
 /*
  * inserts a new object with count 0 into the distribution table
  * if object is already present, nothing happens
  */
 void stat_insert_distrib_tbl(distrib_tbl_t *tbl, const void *object)
 {
-       distrib_entry_t *elem = distrib_get_entry(tbl, object);
-
-       cnt_add(&elem->cnt, &_cnt_0);
+       /* executed for side effect */
+       (void)distrib_get_entry(tbl, object);
 }
 
 /*
@@ -170,7 +164,7 @@ void stat_insert_distrib_tbl(distrib_tbl_t *tbl, const void *object)
  */
 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));
 }
 
 /*
@@ -178,12 +172,11 @@ void stat_insert_int_distrib_tbl(distrib_tbl_t *tbl, int key)
  */
 int stat_get_count_distrib_tbl(distrib_tbl_t *tbl)
 {
-       distrib_entry_t *entry;
-       int sum = 0;
+       counter_t cnt = ZERO_CNT;
 
-       foreach_pset(tbl->hash_map, entry)
-               sum += cnt_to_uint(&entry->cnt);
-       return sum;
+       foreach_pset(tbl->hash_map, distrib_entry_t, entry)
+               cnt_add(&cnt, &entry->cnt);
+       return cnt_to_uint(&cnt);
 }
 
 /*
@@ -191,40 +184,33 @@ int stat_get_count_distrib_tbl(distrib_tbl_t *tbl)
  */
 double stat_calc_mean_distrib_tbl(distrib_tbl_t *tbl)
 {
-       distrib_entry_t *entry;
-       unsigned count;
+       size_t count;
        double sum;
 
        if (tbl->int_dist) {
                /* integer distribution, need min, max */
-               int min, max;
-
-               entry = pset_first(tbl->hash_map);
-
-               if (! entry)
+               if (pset_count(tbl->hash_map) == 0)
                        return 0.0;
 
-               min =
-               max = (int)entry->object;
-               sum = cnt_to_dbl(&entry->cnt);
-
+               int min = INT_MAX;
+               int max = INT_MIN;
+               sum = 0.0;
 
-               for (entry = pset_next(tbl->hash_map); entry; entry = pset_next(tbl->hash_map)) {
-                       int value = (int)entry->object;
+               foreach_pset(tbl->hash_map, distrib_entry_t, entry) {
+                       int value = PTR_TO_INT(entry->object);
 
                        if (value < min)
                                min = value;
-                       if (value > max);
+                       if (value > max)
                                max = value;
 
                        sum += cnt_to_dbl(&entry->cnt);
                }
                count = max - min + 1;
-       }
-       else {
+       } else {
                sum = 0.0;
                count = 0;
-               foreach_pset(tbl->hash_map, entry) {
+               foreach_pset(tbl->hash_map, distrib_entry_t, entry) {
                        sum += cnt_to_dbl(&entry->cnt);
                        ++count;
                }
@@ -238,21 +224,19 @@ double stat_calc_mean_distrib_tbl(distrib_tbl_t *tbl)
  */
 double stat_calc_avg_distrib_tbl(distrib_tbl_t *tbl)
 {
-       distrib_entry_t *entry;
-       unsigned        count = 0;
-       double          sum   = 0.0;
+       size_t count = 0;
+       double sum   = 0.0;
 
        if (tbl->int_dist) {
                if (pset_count(tbl->hash_map) <= 0)
                        return 0.0;
 
-               foreach_pset(tbl->hash_map, entry) {
-                       sum   += cnt_to_dbl(&entry->cnt) * (int)entry->object;
+               foreach_pset(tbl->hash_map, distrib_entry_t, entry) {
+                       sum   += cnt_to_dbl(&entry->cnt) * PTR_TO_INT(entry->object);
                        count += cnt_to_uint(&entry->cnt);
                }
-       }
-       else {
-               foreach_pset(tbl->hash_map, entry) {
+       } else {
+               foreach_pset(tbl->hash_map, distrib_entry_t, entry) {
                        sum += cnt_to_dbl(&entry->cnt);
                        ++count;
                }
@@ -264,10 +248,8 @@ double stat_calc_avg_distrib_tbl(distrib_tbl_t *tbl)
 /**
  * iterates over all entries in a distribution table
  */
-void stat_iterate_distrib_tbl(distrib_tbl_t *tbl, eval_distrib_entry_fun eval, void *env)
+void stat_iterate_distrib_tbl(const distrib_tbl_t *tbl, eval_distrib_entry_fun eval, void *env)
 {
-       distrib_entry_t *entry;
-
-       foreach_pset(tbl->hash_map, entry)
+       foreach_pset(tbl->hash_map, distrib_entry_t, entry)
                eval(entry, env);
 }