X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Ftr%2Ftrvrfy.c;h=21054ecd20beca642d20b9ecf1e46af478ba41d3;hb=217c4f3a0ffc115825dbebb2270ab1d20c246e97;hp=b84fc04eebcdccbd45887d3e6acc73cdf1c46c56;hpb=f6b661eaae85376166a897e8e7b3bf3a177f8524;p=libfirm

diff --git a/ir/tr/trvrfy.c b/ir/tr/trvrfy.c
index b84fc04ee..21054ecd2 100644
--- a/ir/tr/trvrfy.c
+++ b/ir/tr/trvrfy.c
@@ -15,7 +15,7 @@
 
 #include "trvrfy.h"
 #include "irgraph_t.h"  /* for checking whether constant code is allocated
-			   on proper obstack */
+               on proper obstack */
 
 /**
  * Check a class
@@ -41,18 +41,18 @@ static int check_class(type *tp) {
       entity *ovw = get_entity_overwrites(mem, j);
       /*printf(" overwrites: "); DDME(ovw);*/
       /* Check whether ovw is member of one of tp's supertypes. If so,
-	 the representation is correct. */
+     the representation is correct. */
       found = false;
       for (k = 0; k < get_class_n_supertypes(tp); k++) {
-	if (get_class_member_index(get_class_supertype(tp, k), ovw) >= 0) {
-	  found = true;
-	  break;
-	}
+    if (get_class_member_index(get_class_supertype(tp, k), ovw) >= 0) {
+      found = true;
+      break;
+    }
       }
       if (!found) {
-	DDMT(tp); DDME(mem);
-	assert(found && "overwrites an entity not contained in direct supertype");
-	return error_ent_not_cont;
+    DDMT(tp); DDME(mem);
+    assert(found && "overwrites an entity not contained in direct supertype");
+    return error_ent_not_cont;
       }
     }
 
@@ -71,6 +71,17 @@ static int check_array(type *tp) {
   return 0;
 }
 
+
+/**
+ * Check a primitive.
+ */
+static int check_primitive(type *tp) {
+  assert(is_mode(get_type_mode(tp)));
+
+  return 0;
+}
+
+
 /**
  * Checks a type.
  *
@@ -82,6 +93,8 @@ static int check_type(type *tp) {
     return check_class(tp);
   case tpo_array:
     return check_array(tp);
+  case tpo_primitive:
+    return check_primitive(tp);
   default: break;
   }
   return 0;
@@ -105,7 +118,7 @@ static void on_irg_storage(ir_node *n, void *env) {
 
   /* We also test whether the setting of the visited flag is legal. */
   assert(get_irn_visited(n) <= get_irg_visited(myenv->irg) &&
-	 "Visited flag of node is larger than that of corresponding irg.");
+     "Visited flag of node is larger than that of corresponding irg.");
 }
 
 /**
@@ -132,16 +145,16 @@ static int constants_on_wrong_irg(entity *ent) {
     int i;
     for (i = 0; i < get_compound_ent_n_values(ent); i++) {
       if (constant_on_wrong_irg(get_compound_ent_value(ent, i)))
-	return 1;
+    return 1;
     }
   } else {
-    /* Might not be set if entity belongs to a description. */
+    /* Might not be set if entity belongs to a description or is external allocated. */
     if (get_atomic_ent_value(ent))
       return constant_on_wrong_irg(get_atomic_ent_value(ent));
-    else
-      assert((is_class_type(get_entity_owner(ent)) &&
-	      get_class_peculiarity(get_entity_owner(ent)) == peculiarity_description) &&
-	     "Value in constant atomic entity not set.");
+    else if (get_entity_visibility(ent) != visibility_external_allocated)
+      assert((is_Class_type(get_entity_owner(ent)) &&
+          get_class_peculiarity(get_entity_owner(ent)) == peculiarity_description) &&
+         "Value in constant atomic entity not set.");
   }
   return 0;
 }
@@ -151,25 +164,58 @@ static int constants_on_wrong_irg(entity *ent) {
  * are build on the const irg graph.
  *
  * @return
- * 	0 	if no error encountered
- * 	!= 0	else
+ *  0   if no error encountered
+ *  != 0    else
  */
 static int check_entity(entity *ent) {
+  int rem_vpi;
+  type *tp = get_entity_type(ent);
+  type *owner = get_entity_owner(ent);
+
   current_ir_graph =  get_const_code_irg();
   if (constants_on_wrong_irg(ent)) {
     assert(0 && "Contants placed on wrong IRG");
     return error_const_on_wrong_irg;
   }
 
+  rem_vpi = get_visit_pseudo_irgs();
+  set_visit_pseudo_irgs(1);
   if ((get_entity_peculiarity(ent) == peculiarity_existent) &&
       (get_entity_visibility(ent) != visibility_external_allocated) &&
-      (is_method_type(get_entity_type(ent)))                &&
+      (is_Method_type(get_entity_type(ent)))                &&
       (!get_entity_irg(ent) || !(is_ir_graph(get_entity_irg(ent))))) {
     assert(0 && "Method ents with pec_exist must have an irg");
     return error_existent_entity_without_irg;
   }
+  set_visit_pseudo_irgs(rem_vpi);
+
+  /* Originally, this test assumed, that only method entities have
+     pec_inh.  As I changed this, I have to test for method type before
+     doing the test. */
+  if (get_entity_peculiarity(ent) == peculiarity_inherited) {
+    if (is_Method_type(get_entity_type(ent))) {
+      entity *impl = get_SymConst_entity(get_atomic_ent_value(ent));
+      assert(get_entity_peculiarity(impl) == peculiarity_existent &&
+	     "inherited method entities must have constant pointing to existent entity.");
+    }
+  }
 
-  return 0;
+  /* Entities in global type are not dynamic or automatic allocated. */
+  if (owner == get_glob_type()) {
+    assert(get_entity_allocation(ent) != allocation_dynamic &&
+	   get_entity_allocation(ent) != allocation_automatic);
+  }
+
+  if (get_entity_variability(ent) != variability_uninitialized) {
+    if (is_atomic_type(tp)) {
+      ir_node *val = get_atomic_ent_value(ent);
+      if (val)
+	assert(get_irn_mode(val) == get_type_mode(tp) &&
+	       "Mode of constant in entity must match type.");
+    }
+  }
+
+  return no_error;
 }
 
 /*