some bugifxes for alloca handling

[libfirm] / ir / be / beverify.c

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index 6d45d74..0e836e4 100644 (file)
--- a/ir/be/beverify.c
+++ b/ir/be/beverify.c
@@ -23,7 +23,6 @@
 #include "array.h"
 #include "benode_t.h"
 
-static int my_value_dominates(const ir_node *a, const ir_node *b);
 static int my_values_interfere(const ir_node *a, const ir_node *b);
 
 typedef struct be_verify_register_pressure_env_t_ {
@@ -185,12 +184,54 @@ static void verify_schedule_walker(ir_node *block, void *data)
 
        /* check that all delay branches are filled (at least with NOPs) */
        if (cfchange_found && delay_branches != 0) {
-               ir_fprintf(stderr, "Not all delay slots filled after jump (%d/%d) in block %+F (%s)\n",
+               ir_fprintf(stderr, "Verify warning: Not all delay slots filled after jump (%d/%d) in block %+F (%s)\n",
                        block, get_irg_dump_name(env->irg));
                env->problem_found = 1;
        }
 }
 
+static int should_be_scheduled(ir_node *node) {
+       if(is_Block(node))
+               return -1;
+
+       if(get_irn_mode(node) == mode_M) {
+               if(is_Proj(node))
+                       return -1;
+               if(is_Phi(node) || is_Sync(node) || get_irn_opcode(node) == iro_Pin)
+                       return 0;
+       }
+       if(is_Proj(node) && get_irn_mode(node) == mode_X)
+               return 0;
+       if(be_is_Keep(node) && get_irn_opcode(get_nodes_block(node)) == iro_Bad)
+               return 0;
+
+       switch(get_irn_opcode(node)) {
+       case iro_End:
+       case iro_NoMem:
+       case iro_Bad:
+               return 0;
+       default:
+               break;
+       }
+
+       return 1;
+}
+
+static void check_schedule(ir_node *node, void *data) {
+       be_verify_schedule_env_t *env = data;
+       int should_be;
+
+       should_be = should_be_scheduled(node);
+       if(should_be == -1)
+               return;
+
+       if(should_be ? !sched_is_scheduled(node) : sched_is_scheduled(node)) {
+               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;
+       }
+}
+
 /**
  * Start a walk over the irg and check schedule.
  */
@@ -202,6 +243,8 @@ int be_verify_schedule(ir_graph *irg)
        env.irg           = irg;
 
        irg_block_walk_graph(irg, verify_schedule_walker, NULL, &env);
+       // check if all nodes are scheduled
+       irg_walk_graph(irg, check_schedule, NULL, &env);
 
        return ! env.problem_found;
 }
@@ -231,6 +274,13 @@ 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) {
+       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, entity *ent) {
        spill_t spill, *res;
        int hash = HASH_PTR(node);
@@ -248,8 +298,16 @@ static spill_t *get_spill(be_verify_spillslots_env_t *env, ir_node *node, entity
 
 static void collect(be_verify_spillslots_env_t *env, ir_node *node, ir_node *reload, entity* ent);
 
+static void check_entity(be_verify_spillslots_env_t *env, ir_node *node, 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, entity* ent) {
        entity *spillent = be_get_frame_entity(node);
+       check_entity(env, node, spillent);
        get_spill(env, node, ent);
 
        if(spillent != ent) {
@@ -273,6 +331,7 @@ static void collect_memperm(be_verify_spillslots_env_t *env, ir_node *node, ir_n
        out = get_Proj_proj(node);
 
        spillent = be_get_MemPerm_out_entity(memperm, out);
+       check_entity(env, memperm, spillent);
        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));
@@ -343,6 +402,7 @@ static void collect_spills_walker(ir_node *node, void *data) {
        if(be_is_Reload(node)) {
                ir_node *spill = get_irn_n(node, be_pos_Reload_mem);
                entity* ent = be_get_frame_entity(node);
+               check_entity(env, node, ent);
 
                collect(env, spill, node, ent);
                ARR_APP1(ir_node*, env->reloads, node);
@@ -381,6 +441,23 @@ static void check_spillslot_interference(be_verify_spillslots_env_t *env) {
        }
 }
 
+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)))) {
+               spill_t *spill = find_spill(env, node);
+               if(be_is_Spill(node)) {
+                       entity *ent = be_get_frame_entity(node);
+                       check_entity(env, node, ent);
+               }
+
+               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(ir_graph *irg)
 {
        be_verify_spillslots_env_t env;
@@ -392,6 +469,7 @@ int be_verify_spillslots(ir_graph *irg)
        env.lv = be_liveness(irg);
 
        irg_walk_graph(irg, collect_spills_walker, NULL, &env);
+       irg_walk_graph(irg, check_lonely_spills, NULL, &env);
 
        check_spillslot_interference(&env);