Checks now the Load_mode

[libfirm] / ir / ir / irvrfy.c

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index 5d40c32..722a7f3 100644 (file)
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -61,12 +61,21 @@ do { \
 
 #endif
 
+/** if this flag is set, verify entity types in Load & Store nodes */
+static int vrfy_entities = 0;
+
 /* @@@ replace use of array "in" by access functions. */
 ir_node **get_irn_in(ir_node *node);
 
 static node_verification_t opt_do_node_verification = NODE_VERIFICATION_ON;
 static const char *bad_msg;
 
+/* enable verification of Load/Store entities */
+void vrfy_enable_entity_tests(int enable)
+{
+  vrfy_entities = enable;
+}
+
 /**
  * little helper for NULL modes
  */
@@ -382,7 +391,9 @@ vrfy_Proj_proj(ir_node *p, ir_graph *irg) {
       if (proj == pn_Load_res) {
        ir_node *ptr = get_Load_ptr(pred);
        entity *ent = get_ptr_entity(ptr);
-       if (ent) {
+
+       if (vrfy_entities && ent && get_irg_phase_state(current_ir_graph) == phase_high) {
+         /* do NOT check this for lowered phases, see comment on Store */
          ASSERT_AND_RET_DBG(
                             (mode == get_type_mode(get_entity_type(ent))),
                             "wrong data Proj from Load, entity type_mode failed", 0,
@@ -391,7 +402,7 @@ vrfy_Proj_proj(ir_node *p, ir_graph *irg) {
        }
        else {
          ASSERT_AND_RET_DBG(
-                            mode_is_data(mode),
+                            mode_is_data(mode) && mode == get_Load_mode(pred),
                             "wrong data Proj from Load", 0,
                             show_proj_failure(p);
                             );
@@ -411,7 +422,7 @@ vrfy_Proj_proj(ir_node *p, ir_graph *irg) {
         ((proj == pn_Store_M        && mode == mode_M) ||
          (proj == pn_Store_X_except && mode == mode_X)),
         "wrong Proj from Store", 0,
-    show_proj_failure(p);
+        show_proj_failure(p);
       );
       break;
 
@@ -1067,8 +1078,14 @@ int irn_vrfy_irg(ir_node *n, ir_graph *irg)
       ASSERT_AND_RET(mymode == mode_T, "Store node", 0);
 
       entity *target = get_ptr_entity(in[2]);
-      if (target) {
-       ASSERT_AND_RET(op3mode == get_type_mode(get_entity_type(target)), "Store node", 0);
+      if (vrfy_entities && target && get_irg_phase_state(current_ir_graph) == phase_high) {
+       /*
+        * If lowered code, any Sels that add 0 may be removed, causing
+        * an direct access to entities of array or compound type.
+        * Prevent this by checking the phase.
+        */
+       ASSERT_AND_RET( op3mode == get_type_mode(get_entity_type(target)),
+                       "Store node", 0);
       }
 
       break;
@@ -1163,7 +1180,7 @@ int irg_vrfy(ir_graph *irg)
 
   assert(get_irg_pinned(irg) == op_pin_state_pinned);
 
-  irg_walk(irg->end, vrfy_wrap, NULL, &res);
+  irg_walk_graph(irg, vrfy_wrap, NULL, &res);
 
   current_ir_graph = rem;
 
@@ -1193,3 +1210,114 @@ int irn_vrfy_irg_dump(ir_node *n, ir_graph *irg, const char **bad_string)
 
   return res;
 }
+
+
+typedef struct _vrfy_bad_env_t {
+  int flags;
+  int res;
+} vrfy_bad_env_t;
+
+static void check_bads(ir_node *node, void *env)
+{
+  vrfy_bad_env_t *venv = env;
+  int i, arity = get_irn_arity(node);
+
+  if (is_Block(node)) {
+    if ((venv->flags & BAD_CF) == 0) {
+
+      /* check for Bad Block predecessor */
+      for (i = 0; i < arity; ++i) {
+        ir_node *pred = get_irn_n(node, i);
+
+       if (is_Bad(pred)) {
+         venv->res |= BAD_CF;
+
+         if (opt_do_node_verification == NODE_VERIFICATION_REPORT) {
+           fprintf(stderr, "irg_vrfy_bads: Block %ld has Bad predecessor\n", get_irn_node_nr(node));
+         }
+         if (opt_do_node_verification == NODE_VERIFICATION_ON) {
+           assert(0 && "Bad CF detected");
+         }
+       }
+      }
+    }
+  }
+  else {
+    if ((venv->flags & BAD_BLOCK) == 0) {
+
+      /* check for Bad Block */
+      if (is_Bad(get_nodes_block(node))) {
+       venv->res |= BAD_BLOCK;
+
+       if (opt_do_node_verification == NODE_VERIFICATION_REPORT) {
+         fprintf(stderr, "irg_vrfy_bads: node %ld has Bad Block\n", get_irn_node_nr(node));
+       }
+       if (opt_do_node_verification == NODE_VERIFICATION_ON) {
+         assert(0 && "Bad CF detected");
+       }
+      }
+    }
+
+    if ((venv->flags & TUPLE) == 0) {
+      if (get_irn_op(node) == op_Tuple) {
+       venv->res |= TUPLE;
+
+       if (opt_do_node_verification == NODE_VERIFICATION_REPORT) {
+         fprintf(stderr, "irg_vrfy_bads: node %ld is a Tuple\n", get_irn_node_nr(node));
+       }
+       if (opt_do_node_verification == NODE_VERIFICATION_ON) {
+         assert(0 && "Tuple detected");
+       }
+      }
+    }
+
+    for (i = 0; i < arity; ++i) {
+      ir_node *pred = get_irn_n(node, i);
+
+      if (is_Bad(pred)) {
+       /* check for Phi with Bad inputs */
+       if (is_Phi(node) && !is_Bad(get_nodes_block(node)) && is_Bad(get_irn_n(get_nodes_block(node), i))) {
+         if (venv->flags & BAD_CF)
+           continue;
+         else {
+           venv->res |= BAD_CF;
+
+           if (opt_do_node_verification == NODE_VERIFICATION_REPORT) {
+             fprintf(stderr, "irg_vrfy_bads: Phi %ld has Bad Input\n", get_irn_node_nr(node));
+           }
+           if (opt_do_node_verification == NODE_VERIFICATION_ON) {
+             assert(0 && "Bad CF detected");
+           }
+         }
+       }
+
+       /* Bad node input */
+       if ((venv->flags & BAD_DF) == 0) {
+         venv->res |= BAD_DF;
+
+         if (opt_do_node_verification == NODE_VERIFICATION_REPORT) {
+           fprintf(stderr, "irg_vrfy_bads: node %ld has Bad Input\n", get_irn_node_nr(node));
+         }
+         if (opt_do_node_verification == NODE_VERIFICATION_ON) {
+           assert(0 && "Bad NON-CF detected");
+         }
+       }
+      }
+    }
+  }
+}
+
+/*
+ * verify occurance of bad nodes
+ */
+int irg_vrfy_bads(ir_graph *irg, int flags)
+{
+  vrfy_bad_env_t env;
+
+  env.flags = flags;
+  env.res   = 0;
+
+  irg_walk_graph(irg, check_bads, NULL, &env);
+
+  return env.res;
+}