debug output

[r2788]

diff --git a/ir/tr/entity.c b/ir/tr/entity.c
index 426feff..cb73eed 100644 (file)
--- a/ir/tr/entity.c
+++ b/ir/tr/entity.c
@@ -917,6 +917,15 @@ static INLINE entity *resolve_ent_polymorphy2 (type *dynamic_class, entity* stat
  *  Search downwards in overwritten tree. */
 entity *resolve_ent_polymorphy(type *dynamic_class, entity* static_ent) {
   entity *res = resolve_ent_polymorphy2(dynamic_class, static_ent);
+  if (!res) {
+    printf(" Could not find entity "); DDME(static_ent);
+    printf("  in class"); DDMT(dynamic_class);
+    printf("\n");
+    dump_entity(static_ent);
+    dump_type(get_entity_owner(static_ent));
+    dump_type(dynamic_class);
+
+  }
   assert(res);
   return res;
 }
@@ -996,6 +1005,7 @@ void dump_entity (entity *ent) {
     else
       { printf ("\n  irg = NULL"); }
   }
+  printf("\n\n");
 }
 #undef X
 #else  /* DEBUG_libfirm */

diff --git a/ir/tr/type.c b/ir/tr/type.c
index aeb6586..1402ec9 100644 (file)
--- a/ir/tr/type.c
+++ b/ir/tr/type.c
@@ -1544,17 +1544,29 @@ INLINE int dump_node_opcode(FILE *F, ir_node *n); /* from irdump.c */
 void dump_type (type *tp) {
   int i;
 
-  printf("%s type %s (%ld)\n", get_tpop_name(get_type_tpop(tp)), get_type_name(tp), get_type_nr(tp));
+  printf("%s type %s (%ld)", get_tpop_name(get_type_tpop(tp)), get_type_name(tp), get_type_nr(tp));
 
   switch (get_type_tpop_code(tp)) {
 
   case tpo_class: {
-    printf("  members: ");
+    printf("\n  members: ");
     for (i = 0; i < get_class_n_members(tp); ++i) {
       entity *mem = get_class_member(tp, i);
       printf("\n    (%2d) %s:\t %s",
             get_entity_offset(mem), get_type_name(get_entity_type(mem)), get_entity_name(mem));
     }
+    printf("\n  suptertypes: ");
+    for (i = 0; i < get_class_n_supertypes(tp); ++i) {
+      type *stp = get_class_supertype(tp, i);
+      printf("\n    %s", get_type_name(stp));
+    }
+    printf("\n  subtypes: ");
+    for (i = 0; i < get_class_n_subtypes(tp); ++i) {
+      type *stp = get_class_subtype(tp, i);
+      printf("\n    %s", get_type_name(stp));
+    }
+
+    printf("\n  peculiarity: %s", get_peculiarity_string(get_class_peculiarity(tp)));
 
   } break;
   default:

diff --git a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
index 674f23c..d83c174 100644 (file)
--- a/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/ARRAY-STACK_EXAMPLE_main-wtypes.vcg
@@ -165,7 +165,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    ARRAY-STACK_EXAMPLE_main
+name:    main
 ld_name: ARRAY-STACK_EXAMPLE_main
 offset:  -1
 irg = g33"

diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg
index 75c2d6a..7ab26c7 100644 (file)
--- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg
+++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-pure-wtypes-ip.vcg
@@ -397,7 +397,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -434,7 +434,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"
@@ -463,7 +463,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    GlobalType_OO_PROGRAM_EXAMPLE_main
+name:    OO_PROGRAM_EXAMPLE_main
 ld_name: GlobalType_OO_PROGRAM_EXAMPLE_main
 offset:  -1
 irg = g35"

diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg
index c303701..0f05fa7 100644 (file)
--- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg
+++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-type.vcg
@@ -69,7 +69,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -97,7 +97,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"
@@ -116,7 +116,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    GlobalType_OO_PROGRAM_EXAMPLE_main
+name:    OO_PROGRAM_EXAMPLE_main
 ld_name: GlobalType_OO_PROGRAM_EXAMPLE_main
 offset:  -1
 irg = g35"

diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
index e0f15d6..2b16fd0 100644 (file)
--- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
+++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes-ip.vcg
@@ -356,7 +356,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -393,7 +393,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"
@@ -422,7 +422,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    GlobalType_OO_PROGRAM_EXAMPLE_main
+name:    OO_PROGRAM_EXAMPLE_main
 ld_name: GlobalType_OO_PROGRAM_EXAMPLE_main
 offset:  -1
 irg = g35"

diff --git a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg
index cb1cac6..8283787 100644 (file)
--- a/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/GlobalType_OO_PROGRAM_EXAMPLE_main-wtypes.vcg
@@ -201,7 +201,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -229,7 +229,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"
@@ -248,7 +248,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    GlobalType_OO_PROGRAM_EXAMPLE_main
+name:    OO_PROGRAM_EXAMPLE_main
 ld_name: GlobalType_OO_PROGRAM_EXAMPLE_main
 offset:  -1
 irg = g35"

diff --git a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
index a5f7b3f..b2b1dfc 100644 (file)
--- a/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
+++ b/testprograms/ref-results/OO_INLINE_EXAMPLE_main-wtypes.vcg
@@ -185,7 +185,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_INLINE_set_a
+name:    set_a
 ld_name: PRIMA_INLINE_set_a
 offset:  -1
 irg = g68"
@@ -222,7 +222,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_INLINE_c
+name:    c
 ld_name: PRIMA_INLINE_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
index 6eff40e..3eebc02 100644 (file)
--- a/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
+++ b/testprograms/ref-results/OO_PROGRAM_EXAMPLE_main-pure-wtypes.vcg
@@ -217,7 +217,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -245,7 +245,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
index ad33b2e..df24ba3 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_c-wtypes.vcg
@@ -151,7 +151,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_INLINE_set_a
+name:    set_a
 ld_name: PRIMA_INLINE_set_a
 offset:  -1
 irg = g68"
@@ -188,7 +188,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_INLINE_c
+name:    c
 ld_name: PRIMA_INLINE_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
index 4057a6c..6b16e17 100644 (file)
--- a/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_INLINE_set_a-wtypes.vcg
@@ -127,7 +127,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_INLINE_set_a
+name:    set_a
 ld_name: PRIMA_INLINE_set_a
 offset:  -1
 irg = g68"
@@ -164,7 +164,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_INLINE_c
+name:    c
 ld_name: PRIMA_INLINE_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
index d6209de..3b7f216 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_c-pure-wtypes.vcg
@@ -152,7 +152,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -189,7 +189,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/PRIMA_c-type.vcg b/testprograms/ref-results/PRIMA_c-type.vcg
index 7d85240..8f09f55 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-type.vcg
+++ b/testprograms/ref-results/PRIMA_c-type.vcg
@@ -50,7 +50,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -87,7 +87,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/PRIMA_c-wtypes.vcg b/testprograms/ref-results/PRIMA_c-wtypes.vcg
index 5ae68d5..b6131f6 100644 (file)
--- a/testprograms/ref-results/PRIMA_c-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_c-wtypes.vcg
@@ -139,7 +139,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -176,7 +176,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
index 29bb9a3..4d4eade 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-pure-wtypes.vcg
@@ -138,7 +138,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -175,7 +175,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/PRIMA_set_a-type.vcg b/testprograms/ref-results/PRIMA_set_a-type.vcg
index dcbb835..7bd2dfe 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-type.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-type.vcg
@@ -50,7 +50,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -87,7 +87,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
index 757ab1e..3645799 100644 (file)
--- a/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
+++ b/testprograms/ref-results/PRIMA_set_a-wtypes.vcg
@@ -127,7 +127,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -164,7 +164,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"

diff --git a/testprograms/ref-results/class_hierarchy.vcg b/testprograms/ref-results/class_hierarchy.vcg
index 97b75b6..f24525f 100644 (file)
--- a/testprograms/ref-results/class_hierarchy.vcg
+++ b/testprograms/ref-results/class_hierarchy.vcg
@@ -47,7 +47,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_set_a
+name:    set_a
 ld_name: PRIMA_set_a
 offset:  -1
 irg = g68"
@@ -61,7 +61,7 @@ visibility:  visibility_local
 variability: variability_constant
 volatility:  volatility_non_volatile
 peculiarity: peculiarity_existent
-name:    PRIMA_c
+name:    c
 ld_name: PRIMA_c
 offset:  -1
 irg = g90"