fixed be_Return gen

[libfirm] / ir / be / beverify.c

diff --git a/ir/be/beverify.c b/ir/be/beverify.c
index 6d45d74..63bd7e7 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;
 }