Add arch_reg_out_is_allocatable().

[libfirm] / ir / be / beverify.c

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index 810e4d5..de4cf4a 100644 (file)
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -24,9 +24,7 @@
  * @date        05.05.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -363,11 +361,10 @@ typedef struct _spill_t {
 } spill_t;
 
 typedef struct {
-       const arch_env_t *arch_env;
-       ir_graph *irg;
-       set *spills;
-       ir_node **reloads;
-       int problem_found;
+       ir_graph  *irg;
+       set       *spills;
+       ir_node  **reloads;
+       int        problem_found;
 } be_verify_spillslots_env_t;
 
 static int cmp_spill(const void* d1, const void* d2, size_t size) {
@@ -595,11 +592,10 @@ static void check_lonely_spills(ir_node *node, void *data) {
        }
 }
 
-int be_verify_spillslots(const arch_env_t *arch_env, ir_graph *irg)
+int be_verify_spillslots(ir_graph *irg)
 {
        be_verify_spillslots_env_t env;
 
-       env.arch_env = arch_env;
        env.irg = irg;
        env.spills = new_set(cmp_spill, 10);
        env.reloads = NEW_ARR_F(ir_node*, 0);
@@ -701,13 +697,13 @@ static void check_register_constraints(ir_node *node)
        int                   i, arity;
 
        /* verify output register */
-       if (arch_get_irn_reg_class(node, -1) != NULL) {
+       if (arch_get_irn_reg_class_out(node) != NULL) {
                reg = arch_get_irn_register(node);
                if (reg == NULL) {
                        ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have a register assigned\n",
                                        node, get_nodes_block(node), get_irg_dump_name(irg));
                        problem_found = 1;
-               } else if (!arch_register_type_is(reg, joker) && !arch_reg_is_allocatable(node, -1, reg)) {
+               } else if (!arch_register_type_is(reg, joker) && !arch_reg_out_is_allocatable(node, reg)) {
                        ir_fprintf(stderr, "Verify warning: Register %s assigned as output of %+F not allowed (register constraint) in block %+F(%s)\n",
                                        reg->name, node, get_nodes_block(node), get_irg_dump_name(irg));
                        problem_found = 1;
@@ -770,7 +766,7 @@ static void value_used(ir_node *node) {
        const arch_register_t *reg;
        ir_node               *reg_node;
 
-       if (arch_get_irn_reg_class(node, -1) != regclass)
+       if (arch_get_irn_reg_class_out(node) != regclass)
                return;
 
        reg = arch_get_irn_register(node);
@@ -793,7 +789,7 @@ static void value_def(ir_node *node)
        const arch_register_t *reg;
        ir_node               *reg_node;
 
-       if (arch_get_irn_reg_class(node, -1) != regclass)
+       if (arch_get_irn_reg_class_out(node) != regclass)
                return;
 
        reg = arch_get_irn_register(node);