fix 64bit warnings
authorMichael Beck <beck@ipd.info.uni-karlsruhe.de>
Tue, 29 Apr 2008 16:12:15 +0000 (16:12 +0000)
committerMichael Beck <beck@ipd.info.uni-karlsruhe.de>
Tue, 29 Apr 2008 16:12:15 +0000 (16:12 +0000)
[r19451]

ir/stat/distrib.c
ir/stat/stat_dmp.c

index 04b6a5b..2f8e6da 100644 (file)
@@ -135,7 +135,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 +151,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 +168,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 +201,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 +241,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 {
index 8fab83f..16f7b6c 100644 (file)
@@ -298,7 +298,7 @@ static void simple_dump_be_block_sched_ready(dumper_t *dmp, graph_entry_t *entry
 static void add_distrib_entry(const distrib_entry_t *entry, void *env) {
        distrib_tbl_t *sum_tbl = env;
 
-       stat_add_int_distrib_tbl(sum_tbl, (int)(entry->object), &entry->cnt);
+       stat_add_int_distrib_tbl(sum_tbl, PTR_TO_INT(entry->object), &entry->cnt);
 }  /* add_distrib_entry */
 
 /**