Do not warn about wrong register for a Phi input if that register is a joker (i.e...

[libfirm] / ir / be / beschedrss.c

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index 6dfdfa1..65498d2 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.
  *
@@ -59,8 +59,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 +300,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);
-       const ir_node **arr = (const 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 +308,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;
 }
@@ -2063,8 +2064,8 @@ 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)));