Put opening curly brace of functions on a separate line. Last time I missed some.
[libfirm] / ir / be / beverify.c
index eb37d27..1163528 100644 (file)
@@ -24,9 +24,7 @@
  * @date        05.05.2006
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <limits.h>
 
@@ -43,9 +41,9 @@
 
 #include "beverify.h"
 #include "belive.h"
-#include "besched_t.h"
-#include "benode_t.h"
-#include "beirg_t.h"
+#include "besched.h"
+#include "benode.h"
+#include "beirg.h"
 #include "beintlive_t.h"
 
 static int my_values_interfere(const ir_node *a, const ir_node *b);
@@ -53,7 +51,6 @@ static int my_values_interfere(const ir_node *a, const ir_node *b);
 typedef struct be_verify_register_pressure_env_t_ {
        ir_graph                    *irg;                 /**< the irg to verify */
         be_lv_t                    *lv;                  /**< Liveness information. */
-       const arch_env_t            *arch_env;            /**< an architecture environment */
        const arch_register_class_t *cls;                 /**< the register class to check for */
        int                         registers_available;  /**< number of available registers */
        int                         problem_found;        /**< flag indicating if a problem was found */
@@ -62,7 +59,8 @@ typedef struct be_verify_register_pressure_env_t_ {
 /**
  * Print all nodes of a pset into a file.
  */
-static void print_living_values(FILE *F, const ir_nodeset_t *live_nodes) {
+static void print_living_values(FILE *F, const ir_nodeset_t *live_nodes)
+{
        ir_nodeset_iterator_t iter;
        ir_node *node;
 
@@ -76,7 +74,8 @@ static void print_living_values(FILE *F, const ir_nodeset_t *live_nodes) {
 /**
  * Check if number of live nodes never exceeds the number of available registers.
  */
-static void verify_liveness_walker(ir_node *block, void *data) {
+static void verify_liveness_walker(ir_node *block, void *data)
+{
        be_verify_register_pressure_env_t *env = (be_verify_register_pressure_env_t *)data;
        ir_nodeset_t live_nodes;
        ir_node *irn;
@@ -85,12 +84,12 @@ static void verify_liveness_walker(ir_node *block, void *data) {
        /* collect register pressure info, start with end of a block */
        // ir_fprintf(stderr, "liveness check %+F\n", block);
        ir_nodeset_init(&live_nodes);
-       be_liveness_end_of_block(env->lv, env->arch_env, env->cls, block,
+       be_liveness_end_of_block(env->lv, env->cls, block,
                                 &live_nodes);
 
        // print_living_values(stderr, &live_nodes);
        pressure = ir_nodeset_size(&live_nodes);
-       if(pressure > env->registers_available) {
+       if (pressure > env->registers_available) {
                ir_fprintf(stderr, "Verify Warning: Register pressure too high at end of block %+F(%s) (%d/%d):\n",
                        block, get_irg_dump_name(env->irg), pressure, env->registers_available);
                print_living_values(stderr, &live_nodes);
@@ -102,11 +101,11 @@ static void verify_liveness_walker(ir_node *block, void *data) {
                        break;
 
                // print_living_values(stderr, &live_nodes);
-               be_liveness_transfer(env->arch_env, env->cls, irn, &live_nodes);
+               be_liveness_transfer(env->cls, irn, &live_nodes);
 
                pressure = ir_nodeset_size(&live_nodes);
 
-               if(pressure > env->registers_available) {
+               if (pressure > env->registers_available) {
                        ir_fprintf(stderr, "Verify Warning: Register pressure too high before node %+F in %+F(%s) (%d/%d):\n",
                                irn, block, get_irg_dump_name(env->irg), pressure, env->registers_available);
                        print_living_values(stderr, &live_nodes);
@@ -121,13 +120,12 @@ static void verify_liveness_walker(ir_node *block, void *data) {
  * Start a walk over the irg and check the register pressure.
  */
 int be_verify_register_pressure(const be_irg_t *birg,
-                                const arch_register_class_t *cls,
-                                ir_graph *irg) {
+                                const arch_register_class_t *cls, ir_graph *irg)
+{
        be_verify_register_pressure_env_t env;
 
-       env.lv                  = be_liveness(birg);
+       env.lv                  = be_liveness(irg);
        env.irg                 = irg;
-       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;
@@ -149,13 +147,13 @@ typedef struct be_verify_schedule_env_t_ {
        int      problem_found;     /**< flags indicating if there was a problem */
        bitset_t *scheduled;        /**< bitset of scheduled nodes */
        ir_graph *irg;              /**< the irg to check */
-       const arch_env_t *arch_env; /**< the arch_env */
 } be_verify_schedule_env_t;
 
 /**
  * Simple schedule checker.
  */
-static void verify_schedule_walker(ir_node *block, void *data) {
+static void verify_schedule_walker(ir_node *block, void *data)
+{
        be_verify_schedule_env_t *env = (be_verify_schedule_env_t*) data;
        ir_node *node;
        ir_node *non_phi_found = NULL;
@@ -177,21 +175,21 @@ static void verify_schedule_walker(ir_node *block, void *data) {
                int timestep;
 
                /* this node is scheduled */
-               if(bitset_is_set(env->scheduled, get_irn_idx(node))) {
+               if (bitset_is_set(env->scheduled, get_irn_idx(node))) {
                        ir_fprintf(stderr, "Verify warning: %+F appears to be schedule twice\n");
                        env->problem_found = 1;
                }
                bitset_set(env->scheduled, get_irn_idx(node));
 
                /* Check that scheduled nodes are in the correct block */
-               if(get_nodes_block(node) != block) {
+               if (get_nodes_block(node) != block) {
                        ir_fprintf(stderr, "Verify warning: %+F is in block %+F but scheduled in %+F\n", node, get_nodes_block(node), block);
                        env->problem_found = 1;
                }
 
                /* Check that timesteps are increasing */
                timestep = sched_get_time_step(node);
-               if(timestep <= last_timestep) {
+               if (timestep <= last_timestep) {
                        ir_fprintf(stderr, "Verify warning: Schedule timestep did not increase at node %+F\n",
                                   node);
                        env->problem_found = 1;
@@ -220,7 +218,7 @@ static void verify_schedule_walker(ir_node *block, void *data) {
                        cfchange_found = 1;
                } else if (cfchange_found) {
                        /* proj and keepany aren't real instructions... */
-                       if(!is_Proj(node) && !be_is_Keep(node)) {
+                       if (!is_Proj(node) && !be_is_Keep(node)) {
                                /* check for delay branches */
                                if (delay_branches == 0) {
                                        ir_fprintf(stderr, "Verify Warning: Node %+F scheduled after control flow changing node (+delay branches) in block %+F (%s)\n",
@@ -233,15 +231,15 @@ static void verify_schedule_walker(ir_node *block, void *data) {
                }
 
                /* Check that all uses come before their definitions */
-               if(!is_Phi(node)) {
+               if (!is_Phi(node)) {
                        int nodetime = sched_get_time_step(node);
-                       for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
+                       for (i = 0, arity = get_irn_arity(node); i < arity; ++i) {
                                ir_node *arg = get_irn_n(node, i);
-                               if(get_nodes_block(arg) != block
+                               if (get_nodes_block(arg) != block
                                   || !sched_is_scheduled(arg))
                                        continue;
 
-                               if(sched_get_time_step(arg) >= nodetime) {
+                               if (sched_get_time_step(arg) >= nodetime) {
                                        ir_fprintf(stderr, "Verify Warning: Value %+F used by %+F before it was defined in block %+F (%s)\n",
                                                   arg, node, block, get_irg_dump_name(env->irg));
                                        env->problem_found = 1;
@@ -250,28 +248,28 @@ static void verify_schedule_walker(ir_node *block, void *data) {
                }
 
                /* Check that no dead nodes are scheduled */
-               if(get_irn_n_edges(node) == 0) {
+               if (get_irn_n_edges(node) == 0) {
                        ir_fprintf(stderr, "Verify warning: Node %+F is dead but scheduled in block %+F (%s)\n",
                                   node, block, get_irg_dump_name(env->irg));
                        env->problem_found = 1;
                }
 
-               if(be_is_Keep(node)) {
+               if (be_is_Keep(node) || be_is_CopyKeep(node)) {
                        /* at least 1 of the keep arguments has to be it schedule
                         * predecessor */
                        int      arity   = get_irn_arity(node);
                        int      problem = 1;
                        ir_node *prev    = sched_prev(node);
-                       while(be_is_Keep(prev))
+                       while (be_is_Keep(prev) || be_is_CopyKeep(prev))
                                prev = sched_prev(prev);
 
-                       for(i = 0; i < arity; ++i) {
+                       for (i = 0; i < arity; ++i) {
                                ir_node *in = get_irn_n(node, i);
                                in = skip_Proj(in);
-                               if(in == prev)
+                               if (in == prev)
                                        problem = 0;
                        }
-                       if(problem) {
+                       if (problem) {
                                ir_fprintf(stderr, "%+F not scheduled after its pred node in block %+F (%s)\n",
                                           node, block, get_irg_dump_name(env->irg));
                                env->problem_found = 1;
@@ -287,57 +285,51 @@ static void verify_schedule_walker(ir_node *block, void *data) {
        }
 }
 
-static int should_be_scheduled(be_verify_schedule_env_t *env, ir_node *node) {
-       if(is_Block(node))
-               return -1;
-
-       if(get_irn_mode(node) == mode_M) {
-               if(is_Proj(node))
-                       return 0;
-               if(is_Phi(node) || is_Sync(node) || is_Pin(node))
-                       return 0;
-       }
-#ifdef SCHEDULE_PROJS
-       if(is_Proj(node)) {
-               if(get_irn_mode(node) == mode_X)
-                       return 0;
-               return should_be_scheduled(env, get_Proj_pred(node));
-       }
-#else
-       if(is_Proj(node))
-               return 0;
-#endif
-       if(be_is_Keep(node) && get_irn_opcode(get_nodes_block(node)) == iro_Bad)
-               return 0;
-
-       switch(get_irn_opcode(node)) {
+static int should_be_scheduled(ir_node *node)
+{
+       switch (get_irn_opcode(node)) {
+       case iro_Bad:
+       case iro_Block:
        case iro_End:
        case iro_NoMem:
-       case iro_Bad:
+       case iro_Pin:
+       case iro_Proj:
+       case iro_Sync:
        case iro_Unknown:
                return 0;
+       case iro_Phi:
+               if (get_irn_mode(node) == mode_M)
+                       return 0;
+               break;
+       case iro_Start:
+       case iro_Jmp:
+       case beo_Return:
+               return 1;
        default:
                break;
        }
 
-       if(arch_irn_get_flags(env->arch_env, node) & arch_irn_flags_ignore)
-               return -1;
+       if (get_irn_mode(node) != mode_T) {
+               if (arch_irn_is_ignore(node))
+                       return -1;
+       }
 
        return 1;
 }
 
-static void check_schedule(ir_node *node, void *data) {
+static void check_schedule(ir_node *node, void *data)
+{
        be_verify_schedule_env_t *env = data;
        int should_be;
        int scheduled;
 
-       should_be = should_be_scheduled(env, node);
-       if(should_be == -1)
+       should_be = should_be_scheduled(node);
+       if (should_be == -1)
                return;
 
        scheduled = bitset_is_set(env->scheduled, get_irn_idx(node)) ? 1 : 0;
        should_be = should_be ? 1 : 0;
-       if(should_be != scheduled) {
+       if (should_be != scheduled) {
                ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should%s be scheduled\n",
                        node, get_nodes_block(node), get_irg_dump_name(env->irg), should_be ? "" : " not");
                env->problem_found = 1;
@@ -354,7 +346,6 @@ 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;
 
        irg_block_walk_graph(env.irg, verify_schedule_walker, NULL, &env);
        /* check if all nodes are scheduled */
@@ -375,14 +366,14 @@ 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) {
+static int cmp_spill(const void* d1, const void* d2, size_t size)
+{
        const spill_t* s1 = d1;
        const spill_t* s2 = d2;
        (void) size;
@@ -390,21 +381,23 @@ static int cmp_spill(const void* d1, const void* d2, size_t size) {
        return s1->spill != s2->spill;
 }
 
-static spill_t *find_spill(be_verify_spillslots_env_t *env, ir_node *node) {
+static spill_t *find_spill(be_verify_spillslots_env_t *env, ir_node *node)
+{
        spill_t spill;
 
        spill.spill = node;
        return set_find(env->spills, &spill, sizeof(spill), HASH_PTR(node));
 }
 
-static spill_t *get_spill(be_verify_spillslots_env_t *env, ir_node *node, ir_entity *ent) {
+static spill_t *get_spill(be_verify_spillslots_env_t *env, ir_node *node, ir_entity *ent)
+{
        spill_t spill, *res;
        int hash = HASH_PTR(node);
 
        spill.spill = node;
        res = set_find(env->spills, &spill, sizeof(spill), hash);
 
-       if(res == NULL) {
+       if (res == NULL) {
                spill.ent = ent;
                res = set_insert(env->spills, &spill, sizeof(spill), hash);
        }
@@ -412,14 +405,15 @@ static spill_t *get_spill(be_verify_spillslots_env_t *env, ir_node *node, ir_ent
        return res;
 }
 
-static ir_node *get_memory_edge(const ir_node *node) {
+static ir_node *get_memory_edge(const ir_node *node)
+{
        int i, arity;
        ir_node *result = NULL;
 
        arity = get_irn_arity(node);
-       for(i = arity - 1; i >= 0; --i) {
+       for (i = arity - 1; i >= 0; --i) {
                ir_node *arg = get_irn_n(node, i);
-               if(get_irn_mode(arg) == mode_M) {
+               if (get_irn_mode(arg) == mode_M) {
                        assert(result == NULL);
                        result = arg;
                }
@@ -428,31 +422,31 @@ static ir_node *get_memory_edge(const ir_node *node) {
        return result;
 }
 
-static
-void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity* ent);
+static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity* ent);
 
-static
-void be_check_entity(be_verify_spillslots_env_t *env, ir_node *node, ir_entity *ent) {
-       if(ent == NULL) {
+static void be_check_entity(be_verify_spillslots_env_t *env, ir_node *node, ir_entity *ent)
+{
+       if (ent == NULL) {
                ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have an entity assigned\n",
                           node, get_nodes_block(node), get_irg_dump_name(env->irg));
        }
 }
 
-static
-void collect_spill(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity* ent) {
-       ir_entity *spillent = arch_get_frame_entity(env->arch_env, node);
+static void collect_spill(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity* ent)
+{
+       ir_entity *spillent = arch_get_frame_entity(node);
        be_check_entity(env, node, spillent);
        get_spill(env, node, ent);
 
-       if(spillent != ent) {
+       if (spillent != ent) {
                ir_fprintf(stderr, "Verify warning: Spill %+F has different entity than reload %+F in block %+F(%s)\n",
                        node, reload, get_nodes_block(node), get_irg_dump_name(env->irg));
                env->problem_found = 1;
        }
 }
 
-static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity* ent) {
+static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity* ent)
+{
        int i, arity;
        spill_t spill, *res;
        int hash = HASH_PTR(node);
@@ -467,7 +461,7 @@ static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_n
 
        spillent = be_get_MemPerm_out_entity(memperm, out);
        be_check_entity(env, memperm, spillent);
-       if(spillent != ent) {
+       if (spillent != ent) {
                ir_fprintf(stderr, "Verify warning: MemPerm %+F has different entity than reload %+F in block %+F(%s)\n",
                        node, reload, get_nodes_block(node), get_irg_dump_name(env->irg));
                env->problem_found = 1;
@@ -475,14 +469,14 @@ static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_n
 
        spill.spill = node;
        res = set_find(env->spills, &spill, sizeof(spill), hash);
-       if(res != NULL) {
+       if (res != NULL) {
                return;
        }
 
        spill.ent = spillent;
        res = set_insert(env->spills, &spill, sizeof(spill), hash);
 
-       for(i = 0, arity = be_get_MemPerm_entity_arity(memperm); i < arity; ++i) {
+       for (i = 0, arity = be_get_MemPerm_entity_arity(memperm); i < arity; ++i) {
                ir_node* arg = get_irn_n(memperm, i + 1);
                ir_entity* argent = be_get_MemPerm_in_entity(memperm, i);
 
@@ -490,7 +484,8 @@ static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_n
        }
 }
 
-static void collect_memphi(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity *ent) {
+static void collect_memphi(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity *ent)
+{
        int i, arity;
        spill_t spill, *res;
        int hash = HASH_PTR(node);
@@ -499,7 +494,7 @@ static void collect_memphi(be_verify_spillslots_env_t *env, ir_node *node, ir_no
 
        spill.spill = node;
        res = set_find(env->spills, &spill, sizeof(spill), hash);
-       if(res != NULL) {
+       if (res != NULL) {
                return;
        }
 
@@ -507,18 +502,19 @@ static void collect_memphi(be_verify_spillslots_env_t *env, ir_node *node, ir_no
        res = set_insert(env->spills, &spill, sizeof(spill), hash);
 
        /* is 1 of the arguments a spill? */
-       for(i = 0, arity = get_irn_arity(node); i < arity; ++i) {
+       for (i = 0, arity = get_irn_arity(node); i < arity; ++i) {
                ir_node* arg = get_irn_n(node, i);
                collect(env, arg, reload, ent);
        }
 }
 
-static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity* ent) {
-       if(be_is_Spill(node)) {
+static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, ir_entity* ent)
+{
+       if (be_is_Spill(node)) {
                collect_spill(env, node, reload, ent);
-       } else if(is_Proj(node)) {
+       } else if (is_Proj(node)) {
                collect_memperm(env, node, reload, ent);
-       } else if(is_Phi(node) && get_irn_mode(node) == mode_M) {
+       } else if (is_Phi(node) && get_irn_mode(node) == mode_M) {
                collect_memphi(env, node, reload, ent);
        } else {
                /* Disabled for now, spills might get transformed by the backend */
@@ -534,25 +530,25 @@ static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *rel
  * This walker function searches for reloads and collects all the spills
  * and memphis attached to them.
  */
-static void collect_spills_walker(ir_node *node, void *data) {
+static void collect_spills_walker(ir_node *node, void *data)
+{
        be_verify_spillslots_env_t *env = data;
-       const arch_env_t *arch_env = env->arch_env;
 
        /* @@@ ia32_classify returns classification of Proj_pred :-/ */
-       if(is_Proj(node))
+       if (is_Proj(node))
                return;
 
-       if(arch_irn_class_is(arch_env, node, reload)) {
+       if (arch_irn_class_is(node, reload)) {
                ir_node *spill = get_memory_edge(node);
                ir_entity *ent;
 
-               if(spill == NULL) {
+               if (spill == NULL) {
                        ir_fprintf(stderr, "Verify warning: No spill attached to reload %+F in block %+F(%s)\n",
                                   node, get_nodes_block(node), get_irg_dump_name(env->irg));
                        env->problem_found = 1;
                        return;
                }
-               ent = arch_get_frame_entity(env->arch_env, node);
+               ent = arch_get_frame_entity(node);
                be_check_entity(env, node, ent);
 
                collect(env, spill, node, ent);
@@ -560,27 +556,28 @@ static void collect_spills_walker(ir_node *node, void *data) {
        }
 }
 
-static void check_spillslot_interference(be_verify_spillslots_env_t *env) {
-       int spillcount = set_count(env->spills);
-       spill_t **spills = alloca(spillcount * sizeof(spills[0]));
-       spill_t *spill;
-       int i;
+static void check_spillslot_interference(be_verify_spillslots_env_t *env)
+{
+       int       spillcount = set_count(env->spills);
+       spill_t **spills     = ALLOCAN(spill_t*, spillcount);
+       spill_t  *spill;
+       int       i;
 
-       for(spill = set_first(env->spills), i = 0; spill != NULL; spill = set_next(env->spills), ++i) {
+       for (spill = set_first(env->spills), i = 0; spill != NULL; spill = set_next(env->spills), ++i) {
                spills[i] = spill;
        }
 
-       for(i = 0; i < spillcount; ++i) {
+       for (i = 0; i < spillcount; ++i) {
                spill_t *sp1 = spills[i];
                int i2;
 
-               for(i2 = i+1; i2 < spillcount; ++i2) {
+               for (i2 = i+1; i2 < spillcount; ++i2) {
                        spill_t *sp2 = spills[i2];
 
-                       if(sp1->ent != sp2->ent)
+                       if (sp1->ent != sp2->ent)
                                continue;
 
-                       if(my_values_interfere(sp1->spill, sp2->spill)) {
+                       if (my_values_interfere(sp1->spill, sp2->spill)) {
                                ir_fprintf(stderr, "Verify warning: Spillslots for %+F in block %+F(%s) and %+F in block %+F(%s) interfere\n",
                                        sp1->spill, get_nodes_block(sp1->spill), get_irg_dump_name(env->irg),
                                        sp2->spill, get_nodes_block(sp2->spill), get_irg_dump_name(env->irg));
@@ -591,28 +588,28 @@ static void check_spillslot_interference(be_verify_spillslots_env_t *env) {
        }
 }
 
-static void check_lonely_spills(ir_node *node, void *data) {
+static void check_lonely_spills(ir_node *node, void *data)
+{
        be_verify_spillslots_env_t *env = data;
 
-       if(be_is_Spill(node) || (is_Proj(node) && be_is_MemPerm(get_Proj_pred(node)))) {
+       if (be_is_Spill(node) || (is_Proj(node) && be_is_MemPerm(get_Proj_pred(node)))) {
                spill_t *spill = find_spill(env, node);
-               if(be_is_Spill(node)) {
-                       ir_entity *ent = arch_get_frame_entity(env->arch_env, node);
+               if (be_is_Spill(node)) {
+                       ir_entity *ent = arch_get_frame_entity(node);
                        be_check_entity(env, node, ent);
                }
 
-               if(spill == NULL) {
+               if (spill == NULL) {
                        ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) not connected to a reaload\n",
                                   node, get_nodes_block(node), get_irg_dump_name(env->irg));
                }
        }
 }
 
-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);
@@ -641,21 +638,22 @@ int be_verify_spillslots(const arch_env_t *arch_env, ir_graph *irg)
  * @param b The second value.
  * @return 1, if a and b interfere, 0 if not.
  */
-static int my_values_interfere(const ir_node *a, const ir_node *b) {
+static int my_values_interfere(const ir_node *a, const ir_node *b)
+{
        const ir_edge_t *edge;
        ir_node *bb;
        int a2b = value_dominates(a, b);
        int b2a = value_dominates(b, a);
 
        /* If there is no dominance relation, they do not interfere. */
-       if(!a2b && !b2a)
+       if (!a2b && !b2a)
                return 0;
 
        /*
         * Adjust a and b so, that a dominates b if
         * a dominates b or vice versa.
         */
-       if(b2a) {
+       if (b2a) {
                const ir_node *t = a;
                a = b;
                b = t;
@@ -676,21 +674,21 @@ static int my_values_interfere(const ir_node *a, const ir_node *b) {
         */
        foreach_out_edge(a, edge) {
                const ir_node *user = get_edge_src_irn(edge);
-               if(b == user)
+               if (b == user)
                        continue;
 
-               if(get_irn_opcode(user) == iro_End)
+               if (get_irn_opcode(user) == iro_End)
                        continue;
 
                /* in case of phi arguments we compare with the block the value comes from */
-               if(is_Phi(user)) {
+               if (is_Phi(user)) {
                        ir_node *phiblock = get_nodes_block(user);
-                       if(phiblock == bb)
+                       if (phiblock == bb)
                                continue;
                        user = get_irn_n(phiblock, get_edge_src_pos(edge));
                }
 
-               if(value_dominates(b, user))
+               if (value_dominates(b, user))
                        return 1;
        }
 
@@ -701,36 +699,34 @@ static int my_values_interfere(const ir_node *a, const ir_node *b) {
 
 /*--------------------------------------------------------------------------- */
 
+static const arch_env_t            *arch_env;
+static ir_graph                    *irg;
+static be_lv_t                     *lv;
+static int                          problem_found;
+static const arch_register_class_t *regclass;
+static ir_node                    **registers;
 
-
-typedef struct _be_verify_register_allocation_env_t {
-       const arch_env_t *arch_env;
-       ir_graph *irg;
-       be_lv_t *lv;
-       int problem_found;
-} be_verify_register_allocation_env_t;
-
-static void check_register_constraints(ir_node *node,
-                                       be_verify_register_allocation_env_t *env)
+static void check_output_constraints(ir_node *node)
 {
-       const arch_env_t      *arch_env = env->arch_env;
-       const arch_register_t *reg;
-       int                   i, arity;
-
        /* verify output register */
-       if (arch_get_irn_reg_class(arch_env, node, -1) != NULL) {
-               reg = arch_get_irn_register(arch_env, node);
+       if (arch_get_irn_reg_class_out(node) == regclass) {
+               const arch_register_t *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(env->irg));
-                       env->problem_found = 1;
-               }
-               else if (! arch_register_type_is(reg, joker) && !arch_reg_is_allocatable(arch_env, node, -1, reg)) {
+                                       node, get_nodes_block(node), get_irg_dump_name(irg));
+                       problem_found = 1;
+               } 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(env->irg));
-                       env->problem_found = 1;
+                                       reg->name, node, get_nodes_block(node), get_irg_dump_name(irg));
+                       problem_found = 1;
                }
        }
+}
+
+static void check_input_constraints(ir_node *node)
+{
+       const arch_register_t *reg;
+       int                    i, arity;
 
        /* verify input register */
        arity = get_irn_arity(node);
@@ -742,114 +738,175 @@ static void check_register_constraints(ir_node *node,
 
                if (is_Bad(pred)) {
                        ir_fprintf(stderr, "Verify warning: %+F in block %+F(%s) has Bad as input %d\n",
-                               node, get_nodes_block(node), get_irg_dump_name(env->irg), i);
-                       env->problem_found = 1;
+                               node, get_nodes_block(node), get_irg_dump_name(irg), i);
+                       problem_found = 1;
                        continue;
                }
 
-               if (arch_get_irn_reg_class(arch_env, node, i) == NULL)
+               if (arch_get_irn_reg_class(node, i) == NULL)
                        continue;
 
-               reg = arch_get_irn_register(arch_env, pred);
+               reg = arch_get_irn_register(pred);
                if (reg == NULL) {
                        ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) should have a register assigned (%+F input constraint)\n",
-                                  pred, get_nodes_block(pred), get_irg_dump_name(env->irg), node);
-                       env->problem_found = 1;
+                                  pred, get_nodes_block(pred), get_irg_dump_name(irg), node);
+                       problem_found = 1;
                        continue;
-               }
-               else if (! arch_register_type_is(reg, joker) && ! arch_reg_is_allocatable(arch_env, node, i, reg)) {
+               } else if (!arch_register_type_is(reg, joker) && ! arch_reg_is_allocatable(node, i, reg)) {
                        ir_fprintf(stderr, "Verify warning: Register %s as input %d of %+F not allowed (register constraint) in block %+F(%s)\n",
-                                  reg->name, i, node, get_nodes_block(node), get_irg_dump_name(env->irg));
-                       env->problem_found = 1;
+                                  reg->name, i, node, get_nodes_block(node), get_irg_dump_name(irg));
+                       problem_found = 1;
+               }
+       }
+
+       /* phis should be NOPs at this point, which means all input regs
+        * must be the same as the output reg */
+       if (is_Phi(node)) {
+               int i, arity;
+
+               reg = arch_get_irn_register(node);
+
+               arity = get_irn_arity(node);
+               for (i = 0; i < arity; ++i) {
+                       ir_node               *pred     = get_Phi_pred(node, i);
+                       const arch_register_t *pred_reg = arch_get_irn_register(pred);
+
+                       if (reg != pred_reg && !arch_register_type_is(pred_reg, joker)) {
+                               const char *pred_name = pred_reg != NULL ? pred_reg->name : "(null)";
+                               const char *reg_name  = reg != NULL ? reg->name : "(null)";
+                               ir_fprintf(stderr, "Verify warning: Input %d of %+F in block %+F(%s) uses register %s instead of %s\n",
+                                          i, node, get_nodes_block(node),
+                                          get_irg_dump_name(irg), pred_name, reg_name);
+                               problem_found = 1;
+                       }
                }
        }
 }
 
-static void check_register_allocation(be_verify_register_allocation_env_t *env,
-                                      const arch_register_class_t *regclass,
-                                      ir_nodeset_t *nodes)
+static void value_used(ir_node *block, ir_node *node)
 {
-       const arch_env_t      *arch_env  = env->arch_env;
-       const arch_register_t *reg       = NULL;
-       int                   fail       = 0;
-       bitset_t              *registers = bitset_alloca(arch_register_class_n_regs(regclass));
-       ir_node               *node;
-       ir_nodeset_iterator_t  iter;
-
-       foreach_ir_nodeset(nodes, node, iter) {
-               if (arch_get_irn_reg_class(arch_env, node, -1) != regclass)
-                       continue;
+       const arch_register_t *reg;
+       ir_node               *reg_node;
 
-               reg = arch_get_irn_register(arch_env, node);
+       if (arch_get_irn_reg_class_out(node) != regclass)
+               return;
 
-               /* this problem is already reported in 'check_register_constraints' */
-               if (! reg)
-                       continue;
+       reg = arch_get_irn_register(node);
+       if (reg == NULL || reg->type & arch_register_type_virtual)
+               return;
 
-               if (bitset_is_set(registers, reg->index)) {
-                       fail = 1;
-                       break;
-               }
-               bitset_set(registers, reg->index);
+       reg_node = registers[reg->index];
+       if (reg_node != NULL && reg_node != node) {
+               ir_fprintf(stderr, "Verify warning: Register %s assigned more than once in block %+F(%s) (nodes %+F %+F)\n",
+                              reg->name, block, get_irg_dump_name(irg),
+                              node, reg_node);
+               problem_found = 1;
        }
 
-       if (fail) {
-               ir_fprintf(stderr, "Verify warning: Register %s assigned more than once in block %+F(%s)\n",
-                              reg->name, get_nodes_block(node), get_irg_dump_name(env->irg));
-               env->problem_found = 1;
+       registers[reg->index] = node;
+}
 
-               foreach_ir_nodeset(nodes, node, iter) {
-                       if (arch_get_irn_register(arch_env, node) == reg) {
-                               ir_fprintf(stderr, "  at node %+F\n", node);
-                       }
-               }
+static void value_def(ir_node *node)
+{
+       const arch_register_t *reg;
+       ir_node               *reg_node;
+
+       if (arch_get_irn_reg_class_out(node) != regclass)
+               return;
+
+       reg = arch_get_irn_register(node);
+       if (reg == NULL || reg->type & arch_register_type_virtual)
+               return;
+
+       reg_node = registers[reg->index];
+
+       if (reg_node != node) {
+               ir_fprintf(stderr, "Verify warning: Node %+F not registered as value for Register %s (but %+F) in block %+F(%s)\n",
+                              node, reg->name, reg_node, get_nodes_block(node), get_irg_dump_name(irg));
+               problem_found = 1;
        }
+       registers[reg->index] = NULL;
 }
 
-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;
+static void verify_block_register_allocation(ir_node *block, void *data)
+{
        int i, nregclasses;
+       (void) data;
 
        nregclasses = arch_env_get_n_reg_class(arch_env);
        for (i = 0; i < nregclasses; ++i) {
-               const arch_register_class_t *regclass = arch_env_get_reg_class(arch_env, i);
                ir_node *node;
-               ir_nodeset_t live_nodes;
+               int      idx, i2, n_regs;
+
+               regclass = arch_env_get_reg_class(arch_env, i);
 
-               ir_nodeset_init(&live_nodes);
+               assert(lv->nodes && "live sets must be computed");
 
-               be_liveness_end_of_block(env->lv, env->arch_env, regclass, block,
-                                        &live_nodes);
-               check_register_allocation(env, regclass, &live_nodes);
+               n_regs    = arch_register_class_n_regs(regclass);
+               registers = ALLOCANZ(ir_node*, n_regs);
+
+               be_lv_foreach(lv, block, be_lv_state_end, idx) {
+                       ir_node *node = be_lv_get_irn(lv, block, idx);
+                       value_used(block, node);
+               }
 
                sched_foreach_reverse(block, node) {
-                       if (is_Phi(node))
-                               break;
+                       int arity;
+
+                       if (get_irn_mode(node) == mode_T) {
+                               const ir_edge_t *edge;
+                               foreach_out_edge(node, edge) {
+                                       ir_node *def = get_edge_src_irn(edge);
+                                       value_def(def);
+                                       check_output_constraints(def);
+                               }
+                       } else {
+                               value_def(node);
+                               check_output_constraints(node);
+                       }
 
-                       be_liveness_transfer(env->arch_env, regclass, node, &live_nodes);
-                       check_register_allocation(env, regclass, &live_nodes);
-                       check_register_constraints(node, env);
+                       check_input_constraints(node);
+
+                       /* process uses. (Phi inputs are no real uses) */
+                       if (!is_Phi(node)) {
+                               arity = get_irn_arity(node);
+                               for (i2 = 0; i2 < arity; ++i2) {
+                                       ir_node *use = get_irn_n(node, i2);
+                                       value_used(block, use);
+                               }
+                       }
                }
 
-               ir_nodeset_destroy(&live_nodes);
+               be_lv_foreach(lv, block, be_lv_state_in, idx) {
+                       ir_node *node = be_lv_get_irn(lv, block, idx);
+                       value_def(node);
+               }
+
+               /* set must be empty now */
+               for (i2 = 0; i2 < n_regs; ++i2) {
+                       if (registers[i2] == NULL)
+                               continue;
+
+                       ir_fprintf(stderr, "Verify warning: Node %+F not live-in and no def found in block %+F(%s)\n",
+                                       registers[i2], block, get_irg_dump_name(irg));
+                       problem_found = 1;
+               }
        }
 }
 
-int be_verify_register_allocation(const be_irg_t *birg) {
-       be_verify_register_allocation_env_t env;
-
-       env.arch_env = be_get_birg_arch_env(birg);
-       env.irg      = be_get_birg_irg(birg);
-       env.lv       = be_liveness(birg);
-       env.problem_found = 0;
+int be_verify_register_allocation(const be_irg_t *birg)
+{
+       arch_env      = be_get_birg_arch_env(birg);
+       irg           = be_get_birg_irg(birg);
+       lv            = be_liveness(irg);
+       problem_found = 0;
 
-       be_liveness_assure_sets(env.lv);
-       irg_block_walk_graph(env.irg, verify_block_register_allocation, NULL, &env);
+       be_liveness_assure_sets(lv);
+       irg_block_walk_graph(irg, verify_block_register_allocation, NULL, NULL);
 
-       be_liveness_free(env.lv);
+       be_liveness_free(lv);
 
-       return !env.problem_found;
+       return !problem_found;
 }
 
 
@@ -864,22 +921,22 @@ typedef struct _verify_out_dead_nodes_env {
        int problem_found;
 } verify_out_dead_nodes_env;
 
-static void check_out_edges(ir_node *node, verify_out_dead_nodes_env *env) {
+static void check_out_edges(ir_node *node, verify_out_dead_nodes_env *env)
+{
        ir_graph *irg = env->irg;
        const ir_edge_t* edge;
 
-       if(irn_visited(node))
+       if (irn_visited_else_mark(node))
                return;
-       mark_irn_visited(node);
 
        /* we find too many (uncritical) dead nodes in block out edges */
-       if(is_Block(node))
+       if (is_Block(node))
                return;
 
        foreach_out_edge(node, edge) {
                ir_node* src = get_edge_src_irn(edge);
 
-               if(!bitset_is_set(env->reachable, get_irn_idx(src)) && !is_Block(src)) {
+               if (!bitset_is_set(env->reachable, get_irn_idx(src)) && !is_Block(src)) {
                        ir_fprintf(stderr, "Verify warning: Node %+F in block %+F(%s) only reachable through out edges from %+F\n",
                                   src, get_nodes_block(src), get_irg_dump_name(irg), node);
                        env->problem_found = 1;
@@ -896,9 +953,11 @@ static void set_reachable(ir_node *node, void* data)
        bitset_set(reachable, get_irn_idx(node));
 }
 
-int be_verify_out_edges(ir_graph *irg) {
+int be_verify_out_edges(ir_graph *irg)
+{
        verify_out_dead_nodes_env env;
 
+return 1;
        env.irg           = irg;
        env.reachable     = bitset_alloca(get_irg_last_idx(irg));
        env.problem_found = edges_verify(irg);