we can do without the odd align.h

[libfirm] / ir / stat / distrib.c

diff --git a/ir/stat/distrib.c b/ir/stat/distrib.c
index 89eff58..1002faa 100644 (file)
--- a/ir/stat/distrib.c
+++ b/ir/stat/distrib.c
@@ -1,16 +1,29 @@
 /*
- * 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.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+
+/**
+ * @file
+ * @brief   Statistics for Firm. Distribution tables.
+ * @author  Michael Beck
+ * @version $Id$
+ */
+#include "config.h"
 
 #include "hashptr.h"
 #include "irtools.h"
@@ -49,9 +62,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);
 
@@ -104,7 +115,7 @@ static distrib_entry_t *distrib_get_entry(distrib_tbl_t *tbl, const void *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);
@@ -129,7 +140,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);
 }
 
 /*
@@ -147,7 +158,7 @@ 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));
 }
 
 /*
@@ -166,7 +177,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));
 }
 
 /*
@@ -201,23 +212,22 @@ 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;
-                       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) {
@@ -243,11 +253,10 @@ 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 {
+       } else {
                foreach_pset(tbl->hash_map, entry) {
                        sum += cnt_to_dbl(&entry->cnt);
                        ++count;