X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Fdistrib.c;h=0466b2f109ed4f63cf0c631472d3801683b76f4b;hb=4d7f507c357a0bdb1433ef3973645ece971e3824;hp=89eff58de446a179005c64f8e1b2e2953b942594;hpb=863d31d7a5c8210432fef88b30fc3e8353131538;p=libfirm diff --git a/ir/stat/distrib.c b/ir/stat/distrib.c index 89eff58de..0466b2f10 100644 --- a/ir/stat/distrib.c +++ b/ir/stat/distrib.c @@ -1,19 +1,32 @@ /* - * 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-2011 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" +#include "util.h" #include "xmalloc.h" #include "firmstat_t.h" @@ -38,10 +51,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; } /* @@ -49,9 +64,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); @@ -100,18 +113,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)); } /* @@ -129,7 +142,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 +160,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 +179,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)); } /* @@ -177,7 +190,7 @@ int stat_get_count_distrib_tbl(distrib_tbl_t *tbl) distrib_entry_t *entry; counter_t cnt = ZERO_CNT; - foreach_pset(tbl->hash_map, entry) + foreach_pset(tbl->hash_map, distrib_entry_t*, entry) cnt_add(&cnt, &entry->cnt); return cnt_to_uint(&cnt); } @@ -188,39 +201,39 @@ 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); + entry = (distrib_entry_t*)pset_first(tbl->hash_map); if (! entry) 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; + for (entry = (distrib_entry_t*)pset_next(tbl->hash_map); entry != NULL; + entry = (distrib_entry_t*)pset_next(tbl->hash_map)) { + 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; } @@ -235,20 +248,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; + 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,6 +276,6 @@ void stat_iterate_distrib_tbl(const distrib_tbl_t *tbl, eval_distrib_entry_fun e { distrib_entry_t *entry; - foreach_pset(tbl->hash_map, entry) + foreach_pset(tbl->hash_map, distrib_entry_t*, entry) eval(entry, env); }