fixed output of arm_emit_shift()

[libfirm] / ir / be / beverify.c

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index bc281ae..9bb6c88 100644 (file)
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -62,11 +62,12 @@ typedef struct be_verify_register_pressure_env_t_ {
 /**
  * Print all nodes of a pset into a file.
  */
-static void print_living_values(FILE *F, pset *live_nodes) {
+static void print_living_values(FILE *F, const ir_nodeset_t *live_nodes) {
+       ir_nodeset_iterator_t iter;
        ir_node *node;
 
        ir_fprintf(F, "\t");
-       foreach_pset(live_nodes, node) {
+       foreach_ir_nodeset(live_nodes, node, iter) {
                ir_fprintf(F, "%+F ", node);
        }
        ir_fprintf(F, "\n");
@@ -77,18 +78,20 @@ static void print_living_values(FILE *F, pset *live_nodes) {
  */
 static void verify_liveness_walker(ir_node *block, void *data) {
        be_verify_register_pressure_env_t *env = (be_verify_register_pressure_env_t *)data;
-       pset    *live_nodes = pset_new_ptr_default();
+       ir_nodeset_t live_nodes;
        ir_node *irn;
        int pressure;
 
        /* collect register pressure info, start with end of a block */
-       be_liveness_end_of_block(env->lv, env->arch_env, env->cls, block, live_nodes);
+       ir_nodeset_init(&live_nodes);
+       be_liveness_end_of_block(env->lv, env->arch_env, env->cls, block,
+                                &live_nodes);
 
-       pressure = pset_count(live_nodes);
+       pressure = ir_nodeset_size(&live_nodes);
        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);
+               print_living_values(stderr, &live_nodes);
                env->problem_found = 1;
        }
 
@@ -96,18 +99,18 @@ static void verify_liveness_walker(ir_node *block, void *data) {
                if (is_Phi(irn))
                        break;
 
-               be_liveness_transfer(env->arch_env, env->cls, irn, live_nodes);
+               be_liveness_transfer(env->arch_env, env->cls, irn, &live_nodes);
 
-               pressure = pset_count(live_nodes);
+               pressure = ir_nodeset_size(&live_nodes);
 
                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);
+                       print_living_values(stderr, &live_nodes);
                        env->problem_found = 1;
                }
        }
-       del_pset(live_nodes);
+       ir_nodeset_destroy(&live_nodes);
 }
 
 /**
@@ -263,34 +266,16 @@ static void verify_schedule_walker(ir_node *block, void *data) {
                }
 #endif
                if(be_is_Keep(node)) {
-                       int arity   = get_irn_arity(node);
-                       int problem = 0;
+                       /* 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);
                        for(i = 0; i < arity; ++i) {
                                ir_node *in = get_irn_n(node, i);
-                               ir_node *succ = sched_next(in);
-                               while(succ != node && !sched_is_end(succ)) {
-                                       /* the node in between has to be another input of the
-                                        * keep or a Proj */
-                                       int i2;
-                                       int found = 0;
-
-                                       if(is_Proj(succ)) {
-                                               succ = sched_next(succ);
-                                               continue;
-                                       }
-
-                                       for(i2 = 0; i2 < arity; ++i2) {
-                                               ir_node *in2 = get_irn_n(node, i2);
-                                               if(in2 == succ) {
-                                                       found = 1;
-                                                       break;
-                                               }
-                                       }
-                                       if(!found)
-                                               problem = 1;
-
-                                       succ = sched_next(succ);
-                               }
+                               in = skip_Proj(in);
+                               if(in == prev)
+                                       problem = 0;
                        }
                        if(problem) {
                                ir_fprintf(stderr, "%+F not scheduled after its pred node in block %+F (%s)\n",
@@ -731,7 +716,9 @@ typedef struct _be_verify_register_allocation_env_t {
        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_register_constraints(ir_node *node,
+                                       be_verify_register_allocation_env_t *env)
+{
        const arch_env_t      *arch_env = env->arch_env;
        const arch_register_t *reg;
        int                   i, arity;
@@ -785,14 +772,17 @@ static void check_register_constraints(ir_node *node, be_verify_register_allocat
 }
 
 static void check_register_allocation(be_verify_register_allocation_env_t *env,
-                                      const arch_register_class_t *regclass, pset *nodes) {
+                                      const arch_register_class_t *regclass,
+                                      ir_nodeset_t *nodes)
+{
        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_pset(nodes, node) {
+       foreach_ir_nodeset(nodes, node, iter) {
                if (arch_get_irn_reg_class(arch_env, node, -1) != regclass)
                        continue;
 
@@ -803,7 +793,6 @@ static void check_register_allocation(be_verify_register_allocation_env_t *env,
                        continue;
 
                if (bitset_is_set(registers, reg->index)) {
-                       pset_break(nodes);
                        fail = 1;
                        break;
                }
@@ -815,7 +804,7 @@ static void check_register_allocation(be_verify_register_allocation_env_t *env,
                               reg->name, get_nodes_block(node), get_irg_dump_name(env->irg));
                env->problem_found = 1;
 
-               foreach_pset(nodes, node) {
+               foreach_ir_nodeset(nodes, node, iter) {
                        if (arch_get_irn_register(arch_env, node) == reg) {
                                ir_fprintf(stderr, "  at node %+F\n", node);
                        }
@@ -833,21 +822,24 @@ static void verify_block_register_allocation(ir_node *block, void *data) {
        for (i = 0; i < nregclasses; ++i) {
                const arch_register_class_t *regclass = arch_isa_get_reg_class(isa, i);
                ir_node *node;
-               pset *live_nodes = pset_new_ptr_default();
+               ir_nodeset_t live_nodes;
+
+               ir_nodeset_init(&live_nodes);
 
-               be_liveness_end_of_block(env->lv, env->arch_env, regclass, block, live_nodes);
-               check_register_allocation(env, regclass, live_nodes);
+               be_liveness_end_of_block(env->lv, env->arch_env, regclass, block,
+                                        &live_nodes);
+               check_register_allocation(env, regclass, &live_nodes);
 
                sched_foreach_reverse(block, node) {
                        if (is_Phi(node))
                                break;
 
-                       be_liveness_transfer(env->arch_env, regclass, node, live_nodes);
-                       check_register_allocation(env, regclass, live_nodes);
+                       be_liveness_transfer(env->arch_env, regclass, node, &live_nodes);
+                       check_register_allocation(env, regclass, &live_nodes);
                        check_register_constraints(node, env);
                }
 
-               del_pset(live_nodes);
+               ir_nodeset_destroy(&live_nodes);
        }
 }