Fixed warnings.

[libfirm] / ir / opt / proc_cloning.c

diff --git a/ir/opt/proc_cloning.c b/ir/opt/proc_cloning.c
index 0e4141d..c4da9ad 100644 (file)
--- a/ir/opt/proc_cloning.c
+++ b/ir/opt/proc_cloning.c
@@ -21,7 +21,6 @@
  * @file
  * @brief   Procedure cloning.
  * @author  Beyhan Veliev, Michael Beck
- * @version $Id$
  * @brief
  *
  * The purpose is first to find and analyze functions, that are called
@@ -97,7 +96,7 @@ static int entry_cmp(const void *elt, const void *key)
  */
 static unsigned hash_entry(const entry_t *entry)
 {
-       return HASH_PTR(entry->q.ent) ^ HASH_PTR(entry->q.tv) ^ (unsigned)(entry->q.pos * 9);
+       return hash_ptr(entry->q.ent) ^ hash_ptr(entry->q.tv) ^ (unsigned)(entry->q.pos * 9);
 }
 
 /**
@@ -126,7 +125,8 @@ static void process_call(ir_node *call, ir_entity *callee, q_set *hmap)
 
        n_params = get_Call_n_params(call);
 
-       /* Beware: we cannot clone variadic parameters as well as the
+       /* TODO
+        * Beware: we cannot clone variadic parameters as well as the
         * last non-variadic one, which might be needed for the va_start()
         * magic
         */
@@ -182,10 +182,10 @@ static void collect_irg_calls(ir_node *call, void *env)
        if (is_Call(call)) {
                call_ptr = get_Call_ptr(call);
 
-               if (! is_Global(call_ptr))
+               if (! is_SymConst_addr_ent(call_ptr))
                        return;
 
-               callee = get_Global_entity(call_ptr);
+               callee = get_SymConst_entity(call_ptr);
 
                /* we don't know which function gets finally bound to a weak symbol */
                if (get_entity_linkage(callee) & IR_LINKAGE_WEAK)
@@ -585,7 +585,7 @@ restart:
  */
 void proc_cloning(float threshold)
 {
-       entry_t *entry = NULL, *p;
+       entry_t *p;
        size_t i, n;
        q_set hmap;
 
@@ -612,7 +612,7 @@ void proc_cloning(float threshold)
                /* We iterate the set and arrange the element of the set in a list.
                   The elements are arranged dependent of their value descending.*/
                if (hmap.map) {
-                       foreach_pset(hmap.map, entry_t*, entry) {
+                       foreach_pset(hmap.map, entry_t, entry) {
                                entry->weight = calculate_weight(entry);
 
                                /*
@@ -651,14 +651,14 @@ void proc_cloning(float threshold)
 #ifdef DEBUG_libfirm
                /* Print some information about the list. */
                DB((dbg, LEVEL_2, "-----------------\n"));
-               for (entry = hmap.heavy_uses; entry; entry = entry->next) {
+               for (entry_t *entry = hmap.heavy_uses; entry; entry = entry->next) {
                        DB((dbg, LEVEL_2, "\nweight: is %f\n", entry->weight));
                        DB((dbg, LEVEL_2, "Call for Method %E\n", entry->q.ent));
                        DB((dbg, LEVEL_2, "Position %zu\n", entry->q.pos));
                        DB((dbg, LEVEL_2, "Value %T\n", entry->q.tv));
                }
 #endif
-               entry = hmap.heavy_uses;
+               entry_t *const entry = hmap.heavy_uses;
                if (entry) {
                        quadruple_t *qp = &entry->q;