added flag to turn off vrfy

[libfirm] / ir / ir / irvrfy.c

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index 5312ea4..435b277 100644 (file)
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -38,6 +38,12 @@
 /* @@@ replace use of array "in" by access functions. */
 ir_node **get_irn_in(ir_node *node);
 
+bool opt_do_node_verification = 1;
+void do_node_verification(bool b) {
+  opt_do_node_verification = b;
+}
+
+
 INLINE static int
 vrfy_Proj_proj(ir_node *p, ir_graph *irg) {
   ir_node *pred;
@@ -120,11 +126,26 @@ vrfy_Proj_proj(ir_node *p, ir_graph *irg) {
       break;
 
     case iro_Load:
-      ASSERT_AND_RET(
-          ((proj == 0 && mode == mode_M) ||
-           (proj == 1 && mode == mode_X) ||
-           (proj == 2 && mode_is_data(mode))),
-          "wrong Proj from Load", 0);
+      if (proj == pn_Load_res) {
+       ir_node *ptr = get_Load_ptr(pred);
+       entity *ent = NULL;
+       if (get_irn_op(ptr) == op_Sel) {
+         ent = get_Sel_entity(ptr);
+       } else if ((get_irn_op(ptr) == op_Const) &&
+                  tarval_is_entity(get_Const_tarval(ptr))) {
+         ent = get_tarval_entity(get_Const_tarval(ptr));
+       }
+       if (ent)
+         ASSERT_AND_RET((mode == get_type_mode(get_entity_type(ent))),
+                        "wrong data Proj from Load", 0);
+       else
+         ASSERT_AND_RET(mode_is_data(mode),
+                        "wrong data Proj from Load", 0);
+      } else {
+       ASSERT_AND_RET(((proj == pn_Load_M        && mode == mode_M) ||
+                       (proj == pn_Load_X_except && mode == mode_X)),
+                      "wrong Proj from Load", 0);
+      }
       break;
 
     case iro_Store:
@@ -230,6 +251,8 @@ int irn_vrfy_irg(ir_node *n, ir_graph *irg)
 
   ir_node **in;
 
+  if (!opt_do_node_verification) return 1;
+
   if (! interprocedural_view) {
     /*
      * do NOT check placement in interprocedural view, as we don't always know
@@ -258,29 +281,28 @@ int irn_vrfy_irg(ir_node *n, ir_graph *irg)
     case iro_Block:
       for (i = 0; i < get_Block_n_cfgpreds(n); ++i) {
        ir_node *pred =  get_Block_cfgpred(n, i);
-       ASSERT_AND_RET((is_Bad(pred) || (get_irn_mode(pred) == mode_X)), "Block node", 0);
+       ASSERT_AND_RET((is_Bad(pred)                     ||
+                       (get_irn_op(pred) == op_Unknown) ||
+                       (get_irn_mode(pred) == mode_X)     ),
+                      "Block node", 0);
       }
       // End block may only have Return, Raise or fragile ops as preds.
       if (n == get_irg_end_block(irg))
        for (i = 0; i < get_Block_n_cfgpreds(n); ++i) {
-#if 0  // Some optimization seems to add a Jmp to the End Block??
          ir_node *pred =  skip_Proj(get_Block_cfgpred(n, i));
-         if ((get_irn_op(pred) == op_Return) ||
-             is_Bad(pred)                    ||
-             (get_irn_op(pred) == op_Raise)  ||
-             is_fragile_op(pred)               )
-           {  }
-         else {
-           DDMG(irg); printf(" pred %d, ", i); DDMN(n); DDMN(pred);
-         }
-
+         if (is_Proj(pred) || get_irn_op(pred) == op_Tuple)
+           break;   // We can not test properly.  How many tuples are there?
          ASSERT_AND_RET(((get_irn_op(pred) == op_Return) ||
                          is_Bad(pred)                    ||
                          (get_irn_op(pred) == op_Raise)  ||
                          is_fragile_op(pred)               ),
                         "End Block node", 0);
-#endif
        }
+      // irg attr must == graph we are in.
+      if (! interprocedural_view) {
+       ASSERT_AND_RET(((get_irn_irg(n) && get_irn_irg(n) == irg)), "", 0);
+      }
+
       break;
 
     case iro_Start:
@@ -688,7 +710,7 @@ int irn_vrfy_irg(ir_node *n, ir_graph *irg)
           /* Free: BB x M x ref --> M */
           op1mode == mode_M && mode_is_reference(op2mode) &&
           mymode == mode_M,
-          "Free node",0
+          "Free node", 0
           );
       break;
 
@@ -704,6 +726,18 @@ int irn_vrfy_irg(ir_node *n, ir_graph *irg)
       return vrfy_Proj_proj(n, irg);
       break;
 
+    case iro_Confirm:
+      op1mode = get_irn_mode(in[1]);
+      op2mode = get_irn_mode(in[2]);
+      ASSERT_AND_RET(
+          /* Confirm: BB x T x T --> T */
+          op1mode == mymode &&
+         op2mode == mymode,
+          "Confirm node", 0
+          );
+
+      break;
+
     default:
       break;
   }