renamed SubSP to SubSPandCopy, add some constants

[libfirm] / ir / be / beverify.c

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index 4e21118..ec2af73 100644 (file)
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -127,7 +127,7 @@ int be_verify_register_pressure(const be_irg_t *birg,
 
        env.lv                  = be_liveness(birg);
        env.irg                 = irg;
-       env.arch_env            = &birg->main_env->arch_env;
+       env.arch_env            = birg->main_env->arch_env;
        env.cls                 = cls;
        env.registers_available = env.cls->n_regs - be_put_ignore_regs(birg, env.cls, NULL);
        env.problem_found       = 0;
@@ -262,6 +262,9 @@ static void verify_schedule_walker(ir_node *block, void *data) {
                        int      arity   = get_irn_arity(node);
                        int      problem = 1;
                        ir_node *prev    = sched_prev(node);
+                       while(be_is_Keep(prev))
+                               prev = sched_prev(prev);
+
                        for(i = 0; i < arity; ++i) {
                                ir_node *in = get_irn_n(node, i);
                                in = skip_Proj(in);
@@ -351,7 +354,7 @@ int be_verify_schedule(const be_irg_t *birg)
        env.problem_found = 0;
        env.irg           = be_get_birg_irg(birg);
        env.scheduled     = bitset_alloca(get_irg_last_idx(env.irg));
-       env.arch_env      = &birg->main_env->arch_env;
+       env.arch_env      = birg->main_env->arch_env;
 
        irg_block_walk_graph(env.irg, verify_schedule_walker, NULL, &env);
        /* check if all nodes are scheduled */
@@ -806,12 +809,11 @@ static void check_register_allocation(be_verify_register_allocation_env_t *env,
 static void verify_block_register_allocation(ir_node *block, void *data) {
        be_verify_register_allocation_env_t *env = data;
        const arch_env_t *arch_env = env->arch_env;
-       const arch_isa_t *isa = arch_env->isa;
        int i, nregclasses;
 
-       nregclasses = arch_isa_get_n_reg_class(isa);
+       nregclasses = arch_env_get_n_reg_class(arch_env);
        for (i = 0; i < nregclasses; ++i) {
-               const arch_register_class_t *regclass = arch_isa_get_reg_class(isa, i);
+               const arch_register_class_t *regclass = arch_env_get_reg_class(arch_env, i);
                ir_node *node;
                ir_nodeset_t live_nodes;