lowering: fix i_mapper for new exception attributes

[libfirm] / ir / be / beloopana.c

diff --git a/ir/be/beloopana.c b/ir/be/beloopana.c
index afa4307..b79c537 100644 (file)
--- a/ir/be/beloopana.c
+++ b/ir/be/beloopana.c
@@ -1,5 +1,5 @@
 /*
- * 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.
  *
@@ -57,8 +57,8 @@ struct be_loopana_t {
 
 static int cmp_loop_info(const void *a, const void *b, size_t size)
 {
-       const be_loop_info_t *i1 = a;
-       const be_loop_info_t *i2 = b;
+       const be_loop_info_t *i1 = (const be_loop_info_t*)a;
+       const be_loop_info_t *i2 = (const be_loop_info_t*)b;
        (void) size;
 
        return ! (i1->loop == i2->loop && i1->cls == i2->cls);
@@ -78,7 +78,7 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
        be_lv_t      *lv = be_get_irg_liveness(irg);
        ir_nodeset_t  live_nodes;
        ir_node      *irn;
-       int          max_live;
+       size_t        max_live;
 
        DBG((dbg, LEVEL_1, "Processing Block %+F\n", block));
 
@@ -88,7 +88,7 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
        max_live   = ir_nodeset_size(&live_nodes);
 
        sched_foreach_reverse(block, irn) {
-               int cnt;
+               size_t cnt;
 
                if (is_Phi(irn))
                        break;
@@ -98,14 +98,14 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
                max_live = MAX(cnt, max_live);
        }
 
-       DBG((dbg, LEVEL_1, "Finished with Block %+F (%s %u)\n", block, cls->name, max_live));
+       DBG((dbg, LEVEL_1, "Finished with Block %+F (%s %zu)\n", block, cls->name, max_live));
 
        ir_nodeset_destroy(&live_nodes);
        return max_live;
 }
 
 /**
- * Compute the highest register pressure in a loop and it's sub-loops.
+ * Compute the highest register pressure in a loop and its sub-loops.
  * @param loop_ana  The loop ana object.
  * @param loop      The loop to compute pressure for.
  * @param cls       The register class to compute pressure for.
@@ -114,11 +114,11 @@ static unsigned be_compute_block_pressure(const ir_graph *irg,
 static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
                                          const arch_register_class_t *cls)
 {
-       int            i, max;
+       size_t         i, max;
        unsigned       pressure;
        be_loop_info_t *entry, key;
 
-       DBG((dbg, LEVEL_1, "\nProcessing Loop %d\n", loop->loop_nr));
+       DBG((dbg, LEVEL_1, "\nProcessing Loop %ld\n", loop->loop_nr));
        assert(get_loop_n_elements(loop) > 0);
        pressure = 0;
 
@@ -136,13 +136,13 @@ static unsigned be_compute_loop_pressure(be_loopana_t *loop_ana, ir_loop *loop,
 
                pressure = MAX(pressure, son_pressure);
        }
-       DBG((dbg, LEVEL_1, "Done with loop %d, pressure %u for class %s\n", loop->loop_nr, pressure, cls->name));
+       DBG((dbg, LEVEL_1, "Done with loop %ld, pressure %u for class %s\n", loop->loop_nr, pressure, cls->name));
 
        /* update info in set */
        key.loop            = loop;
        key.cls             = cls;
        key.max_pressure    = 0;
-       entry               = set_insert(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
+       entry               = (be_loop_info_t*)set_insert(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
        entry->max_pressure = MAX(entry->max_pressure, pressure);
 
        return pressure;
@@ -225,7 +225,7 @@ unsigned be_get_loop_pressure(be_loopana_t *loop_ana, const arch_register_class_
 
        key.loop = loop;
        key.cls  = cls;
-       entry    = set_find(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
+       entry    = (be_loop_info_t*)set_find(loop_ana->data, &key, sizeof(key), HASH_LOOP_INFO(&key));
 
        if (entry)
                pressure = entry->max_pressure;
@@ -244,7 +244,7 @@ void be_free_loop_pressure(be_loopana_t *loop_ana)
        xfree(loop_ana);
 }
 
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_loopana);
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_loopana)
 void be_init_loopana(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.loopana");