/*
- * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved.
*
* This file is part of libFirm.
*
* @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"
*/
static unsigned addr_hash(const void *object)
{
- return HASH_PTR(object);
+ return hash_ptr(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;
}
/*
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->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));
}
/*
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);
}
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;
sum = cnt_to_dbl(&entry->cnt);
- for (entry = pset_next(tbl->hash_map); entry; entry = pset_next(tbl->hash_map)) {
+ 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)
} 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;
}
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) {
+ 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) {
+ foreach_pset(tbl->hash_map, distrib_entry_t*, entry) {
sum += cnt_to_dbl(&entry->cnt);
++count;
}
{
distrib_entry_t *entry;
- foreach_pset(tbl->hash_map, entry)
+ foreach_pset(tbl->hash_map, distrib_entry_t*, entry)
eval(entry, env);
}