- fixed r22803

[libfirm] / ir / be / beschedrss.c

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index 4657f9a..d8f83f9 100644 (file)
--- a/ir/be/beschedrss.c
+++ b/ir/be/beschedrss.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -28,9 +28,7 @@
  * as described in: Sid-Ahmed-Ali Touati
  * Register Saturation in Superscalar and VLIW Codes
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -50,6 +48,7 @@
 #include "bipartite.h"
 #include "hungarian.h"
 #include "plist.h"
+#include "array_t.h"
 
 #include "height.h"
 
@@ -59,8 +58,8 @@
 #include "besched_t.h"
 #include "beirg_t.h"
 
-#include <libcore/lc_opts.h>
-#include <libcore/lc_opts_enum.h>
+#include "lc_opts.h"
+#include "lc_opts_enum.h"
 
 
 #define ARR_LEN_SAFE(arr) ((arr) != NULL ? ARR_LEN((arr)) : 0)
@@ -300,7 +299,7 @@ static const ir_node **build_sorted_array_from_list(plist_t *irn_list, struct ob
        plist_element_t *el;
        int             i   = 0;
        int             len = plist_count(irn_list);
-       ir_node         **arr = (ir_node **) NEW_ARR_D(ir_node *, obst, len);
+       const ir_node   **arr = (const ir_node**)NEW_ARR_D(ir_node*, obst, len);
 
        /* copy the list into the array */
        foreach_plist(irn_list, el) {
@@ -308,7 +307,8 @@ static const ir_node **build_sorted_array_from_list(plist_t *irn_list, struct ob
        }
 
        /* sort the array by node index */
-       qsort(arr, len, sizeof(arr[0]), cmp_irn_idx);
+       /* HACK cast for MSVC */
+       qsort((void*)arr, len, sizeof(arr[0]), cmp_irn_idx);
 
        return arr;
 }
@@ -631,7 +631,7 @@ static void collect_descendants(rss_t *rss, rss_irn_t *rirn, ir_node *irn, int *
                        ir_node *user = get_edge_src_irn(edge);
 
                        /* skip ignore nodes as they do not really contribute to register pressure */
-                       if (arch_irn_is(rss->arch_env, user, ignore))
+                       if (arch_irn_is(user, ignore))
                                continue;
 
                        /*
@@ -646,8 +646,7 @@ static void collect_descendants(rss_t *rss, rss_irn_t *rirn, ir_node *irn, int *
                        }
 
                        if (is_Proj(user)) {
-
-                               //if (arch_get_irn_reg_class(rss->arch_env, user, -1) == rss->cls)
+                               //if (arch_get_irn_reg_class(user, -1) == rss->cls)
                                        collect_descendants(rss, rirn, user, got_sink, cur_desc_walk);
                        }
                        else {
@@ -680,7 +679,8 @@ static void collect_single_consumer(rss_t *rss, rss_irn_t *rss_irn, ir_node *con
        assert(! is_Proj(consumer) && "Cannot handle Projs");
 
        if (! is_Phi(consumer) && ! is_Block(consumer) && get_nodes_block(consumer) == block) {
-               if (! arch_irn_is(rss->arch_env, consumer, ignore) && ! plist_has_value(rss_irn->consumer_list, consumer)) {
+               if (!arch_irn_is(consumer, ignore) &&
+                               !plist_has_value(rss_irn->consumer_list, consumer)) {
                        plist_insert_back(rss_irn->consumer_list, consumer);
                        DBG((rss->dbg, LEVEL_2, "\t\tconsumer %+F\n", consumer));
                }
@@ -715,7 +715,7 @@ static void collect_consumer(rss_t *rss, rss_irn_t *rss_irn, ir_node *irn, int *
                        ir_node *consumer = get_edge_src_irn(edge);
 
                        if (is_Proj(consumer)) {
-                               //if (arch_get_irn_reg_class(rss->arch_env, consumer, -1) == rss->cls)
+                               //if (arch_get_irn_reg_class(consumer, -1) == rss->cls)
                                        collect_consumer(rss, rss_irn, consumer, got_sink);
                        }
                        else
@@ -1566,7 +1566,7 @@ static ir_nodeset_t *compute_maximal_antichain(rss_t *rss, dvg_t *dvg, int itera
                DBG((rss->dbg, LEVEL_3, "\t\t\t%3d -> %3d         %3d -> %3d\n", i, assignment[i], i, assignment_rev[i]));
        }
 
-       values    = xmalloc(sizeof(values[0]));
+       values    = XMALLOC(ir_nodeset_t);
        ir_nodeset_init_size(values, 10);
        cur_chain = 0;
        /* Construction of the minimal chain partition */
@@ -1644,7 +1644,7 @@ static ir_nodeset_t *compute_maximal_antichain(rss_t *rss, dvg_t *dvg, int itera
                        free(temp);
                }
 
-               temp = xmalloc(sizeof(temp[0]));
+               temp = XMALLOC(ir_nodeset_t);
                ir_nodeset_init_size(temp, 10);
 
                /* Select all nodes from current value set, having another node in the set as descendant. */
@@ -1960,7 +1960,7 @@ static void perform_value_serialization_heuristic(rss_t *rss) {
        pset *ser_set = new_pset(cmp_rss_edges, 20);
 
        /* available_regs = R = |arch_non_ignore_regs cut ~abi_ignore_regs| */
-       arch_put_non_ignore_regs(rss->arch_env, rss->cls, arch_nonign_bs);
+       arch_put_non_ignore_regs(rss->cls, arch_nonign_bs);
        be_abi_put_ignore_regs(rss->abi, rss->cls, abi_ign_bs);
        bitset_andnot(arch_nonign_bs, abi_ign_bs);
        available_regs  = bitset_popcnt(arch_nonign_bs);
@@ -2063,15 +2063,15 @@ static void process_block(ir_node *block, void *env) {
        rss->max_height = heights_recompute_block(rss->h, block);
 
        /* loop over all register classes */
-       for (i = arch_isa_get_n_reg_class(rss->arch_env->isa) - 1; i >= 0; --i) {
-               const arch_register_class_t *cls = arch_isa_get_reg_class(rss->arch_env->isa, i);
+       for (i = arch_env_get_n_reg_class(rss->arch_env) - 1; i >= 0; --i) {
+               const arch_register_class_t *cls = arch_env_get_reg_class(rss->arch_env, i);
 
                rss->cls = cls;
                DBG((rss->dbg, LEVEL_1, "register class %s\n", arch_register_class_name(cls)));
 
                /* Get all live value at end of Block having current register class */
                ir_nodeset_init(&rss->live_block);
-               be_liveness_end_of_block(rss->liveness, rss->arch_env, rss->cls, rss->block, &rss->live_block);
+               be_liveness_end_of_block(rss->liveness, rss->cls, rss->block, &rss->live_block);
 
                /* reset the list of interesting nodes */
                plist_clear(rss->nodes);
@@ -2110,7 +2110,8 @@ static void process_block(ir_node *block, void *env) {
                        if (be_is_Keep(irn))
                                continue;
 
-                       if (! arch_irn_is(rss->arch_env, irn, ignore) && arch_get_irn_reg_class(rss->arch_env, irn, -1) == cls) {
+                       if (!arch_irn_is(irn, ignore) &&
+                                       arch_get_irn_reg_class(irn, -1) == cls) {
                                plist_insert_back(rss->nodes, skip_Proj(irn));
                        }
                        //}