X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firvrfy.c;h=dd356533f9c098ec90dedd715aed097c4fa7c9ab;hb=eda9d668d0e8c8246015b4c5e743316a6a835a23;hp=30ffea46fa944b9100a01f02e7e154af2d2f9a1d;hpb=f667113899d26608e395458858dd22ad780d8beb;p=libfirm

diff --git a/ir/ir/irvrfy.c b/ir/ir/irvrfy.c
index 30ffea46f..dd356533f 100644
--- a/ir/ir/irvrfy.c
+++ b/ir/ir/irvrfy.c
@@ -1,15 +1,28 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/irvrfy.c
- * Purpose:     Check irnodes for correctness.
- * Author:      Christian Schaefer
- * Modified by: Goetz Lindenmaier. Till Riedel. Michael Beck.
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2003 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
+/**
+ * @file
+ * @brief    Check irnodes for correctness.
+ * @author   Christian Schaefer, Goetz Lindenmaier, Till Riedel, Michael Beck
+ * @version  $Id$
+ */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -776,7 +789,7 @@ static int verify_node_Block(ir_node *n, ir_graph *irg) {
   }
 
   /*  End block may only have Return, Raise or fragile ops as preds. */
-  if (n == get_irg_end_block(irg))
+  if (n == get_irg_end_block(irg) && get_irg_phase_state(irg) != phase_backend)
     for (i = get_Block_n_cfgpreds(n) - 1; i >= 0; --i) {
       ir_node *pred =  skip_Proj(get_Block_cfgpred(n, i));
       if (is_Proj(pred) || get_irn_op(pred) == op_Tuple)
@@ -1477,11 +1490,13 @@ static int verify_node_Load(ir_node *n, ir_graph *irg) {
   ir_mode *op1mode = get_irn_mode(get_Load_mem(n));
   ir_mode *op2mode = get_irn_mode(get_Load_ptr(n));
 
-  ASSERT_AND_RET(
-    /* Load: BB x M x ref --> M x X x data */
-    op1mode == mode_M && mode_is_reference(op2mode),
-    "Load node", 0
-  );
+  ASSERT_AND_RET(op1mode == mode_M, "Load node", 0);
+  if(get_irg_phase_state(irg) != phase_backend) {
+    ASSERT_AND_RET(mode_is_reference(op2mode), "Load node", 0 );
+  } else {
+	ASSERT_AND_RET(mode_is_reference(op2mode) ||
+	               (mode_is_int(op2mode) && get_mode_size_bits(op2mode) == get_mode_size_bits(mode_P)), "Load node", 0 );
+  }
   ASSERT_AND_RET( mymode == mode_T, "Load node", 0 );
 
   /*
@@ -1513,11 +1528,13 @@ static int verify_node_Store(ir_node *n, ir_graph *irg) {
   ir_mode *op2mode = get_irn_mode(get_Store_ptr(n));
   ir_mode *op3mode = get_irn_mode(get_Store_value(n));
 
-  ASSERT_AND_RET(
-    /* Store: BB x M x ref x data --> M x X */
-    op1mode == mode_M && mode_is_reference(op2mode) && mode_is_data(op3mode),
-    "Store node", 0
-  );
+  ASSERT_AND_RET(op1mode == mode_M && mode_is_data(op3mode), "Store node", 0 );
+  if(get_irg_phase_state(irg) != phase_backend) {
+    ASSERT_AND_RET(mode_is_reference(op2mode), "Store node", 0 );
+  } else {
+	ASSERT_AND_RET(mode_is_reference(op2mode) ||
+	               (mode_is_int(op2mode) && get_mode_size_bits(op2mode) == get_mode_size_bits(mode_P)), "Store node", 0 );
+  }
   ASSERT_AND_RET(mymode == mode_T, "Store node", 0);
 
   target = get_ptr_entity(get_Store_ptr(n));
@@ -1639,12 +1656,16 @@ static int verify_node_CopyB(ir_node *n, ir_graph *irg) {
   ir_type *t = get_CopyB_type(n);
 
   /* CopyB: BB x M x ref x ref --> M x X */
-  ASSERT_AND_RET(
-    mymode == mode_T &&
-    op1mode == mode_M &&
-    mode_is_reference(op2mode) &&
-    mode_is_reference(op3mode),
-    "CopyB node", 0 );  /* operand M x ref x ref */
+  ASSERT_AND_RET(mymode == mode_T && op1mode == mode_M, "CopyB node", 0);
+  if(get_irg_phase_state(irg) != phase_backend) {
+	  ASSERT_AND_RET(mode_is_reference(op2mode) && mode_is_reference(op3mode),
+                     "CopyB node", 0 );
+  } else {
+      ASSERT_AND_RET(mode_is_reference(op2mode) ||
+			  (mode_is_int(op2mode) && get_mode_size_bits(op2mode) == get_mode_size_bits(mode_P)), "Load node", 0 );
+      ASSERT_AND_RET(mode_is_reference(op3mode) ||
+			  (mode_is_int(op3mode) && get_mode_size_bits(op3mode) == get_mode_size_bits(mode_P)), "Load node", 0 );
+  }
 
   ASSERT_AND_RET(
     is_compound_type(t),
@@ -1900,6 +1921,7 @@ static void check_bads(ir_node *node, void *env)
             fprintf(stderr, "irg_vrfy_bads: Block %ld has Bad predecessor\n", get_irn_node_nr(node));
           }
           if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
+            dump_ir_block_graph(current_ir_graph, "-assert");
             assert(0 && "Bad CF detected");
           }
         }
@@ -1917,6 +1939,7 @@ static void check_bads(ir_node *node, void *env)
           fprintf(stderr, "irg_vrfy_bads: node %ld has Bad Block\n", get_irn_node_nr(node));
         }
         if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
+          dump_ir_block_graph(current_ir_graph, "-assert");
           assert(0 && "Bad CF detected");
         }
       }
@@ -1930,6 +1953,7 @@ static void check_bads(ir_node *node, void *env)
           fprintf(stderr, "irg_vrfy_bads: node %ld is a Tuple\n", get_irn_node_nr(node));
         }
         if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
+          dump_ir_block_graph(current_ir_graph, "-assert");
           assert(0 && "Tuple detected");
         }
       }
@@ -1950,6 +1974,7 @@ static void check_bads(ir_node *node, void *env)
               fprintf(stderr, "irg_vrfy_bads: Phi %ld has Bad Input\n", get_irn_node_nr(node));
             }
             if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
+              dump_ir_block_graph(current_ir_graph, "-assert");
               assert(0 && "Bad CF detected");
             }
           }
@@ -1963,6 +1988,7 @@ static void check_bads(ir_node *node, void *env)
             fprintf(stderr, "irg_vrfy_bads: node %ld has Bad Input\n", get_irn_node_nr(node));
           }
           if (get_node_verification_mode() == FIRM_VERIFICATION_ON) {
+            dump_ir_block_graph(current_ir_graph, "-assert");
             assert(0 && "Bad NON-CF detected");
           }
         }