X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdumptxt.c;h=24b91cd6c6d8834a70d4f503771962df07f7e700;hb=b78bdd4d94de46de4156272e6dbfe44e97933a5b;hp=319747b717097d8b4688117af125d55c7d6447cd;hpb=131359c3d638ce750f3241cb76c9280b2b3c9d1d;p=libfirm

diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c
index 319747b71..24b91cd6c 100644
--- a/ir/ir/irdumptxt.c
+++ b/ir/ir/irdumptxt.c
@@ -57,7 +57,7 @@ static FILE *text_open (const char *basename, const char * suffix1, const char *
   if (!suffix3) suffix3 = ".txt";
 
   /* open file for vcg graph */
-  fname = malloc (strlen(basename)*2 + strlen(suffix1) + strlen(suffix2) + 5); /* *2: space for excapes. */
+  fname = xmalloc (strlen(basename)*2 + strlen(suffix1) + strlen(suffix2) + 5); /* *2: space for excapes. */
 
   j = 0;
   for (i = 0; i < len; ++i) {  /* replace '/' in the name: escape by @. */
@@ -92,6 +92,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
   dump_node_opcode(F, n);
   fprintf(F, " %ld\n", get_irn_node_nr(n));
 
+  fprintf(F, "  index: %u\n", get_irn_idx(n));
   if (opt_dump_pointer_values_to_info)
     fprintf (F, "  addr:    %p \n", (void *)n);
   fprintf (F, "  mode:    %s\n", get_mode_name(get_irn_mode(n)));
@@ -288,11 +289,16 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
       fprintf(F, "  type: ");
       dump_type_to_file(F, get_SymConst_type(n), dump_verbosity_onlynames);
       break;
-    case symconst_size:
+    case symconst_type_size:
       fprintf(F, "  kind: size\n");
       fprintf(F, "  type: ");
       dump_type_to_file(F, get_SymConst_type(n), dump_verbosity_onlynames);
       break;
+    case symconst_type_align:
+      fprintf(F, "  kind: alignment\n");
+      fprintf(F, "  type: ");
+      dump_type_to_file(F, get_SymConst_type(n), dump_verbosity_onlynames);
+      break;
     }
     fprintf(F, "  type of value: %s \n", get_type_name_ex(get_SymConst_value_type(n), &bad));
   } break;
@@ -458,7 +464,6 @@ static void dump_type_list(FILE *F, ir_type *tp, char *prefix,
   fprintf(F, "\n");
 }
 
-#define X(a)    case a: fprintf(F, #a); break
 void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned verbosity) {
   int i, j;
   ir_type *owner, *type;
@@ -518,32 +523,19 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
       }
     }
 
-    fprintf(F, "%s  allocation:  ", prefix);
-    switch (get_entity_allocation(ent)) {
-      X(allocation_dynamic);
-      X(allocation_automatic);
-      X(allocation_static);
-      X(allocation_parameter);
-    }
-
-    fprintf(F, "\n%s  visibility:  ", prefix);
-    switch (get_entity_visibility(ent)) {
-      X(visibility_local);
-      X(visibility_external_visible);
-      X(visibility_external_allocated);
-    }
-
-    fprintf(F, "\n%s  variability: ", prefix);
-    switch (get_entity_variability(ent)) {
-      X(variability_uninitialized);
-      X(variability_initialized);
-      X(variability_part_constant);
-      X(variability_constant);
-    }
+    fprintf(F, "%s  allocation:  %s", prefix, get_allocation_name(get_entity_allocation(ent)));
+    fprintf(F, "\n%s  visibility:  %s", prefix, get_visibility_name(get_entity_visibility(ent)));
+    fprintf(F, "\n%s  variability: %s", prefix, get_variability_name(get_entity_variability(ent)));
 
     if (is_Method_type(get_entity_type(ent))) {
       unsigned mask = get_entity_additional_properties(ent);
       unsigned cc   = get_method_calling_convention(get_entity_type(ent));
+      ir_graph *irg = get_entity_irg(ent);
+
+      if (irg) {
+        fprintf(F, "\n%s  estimated node count: %u", prefix, get_irg_estimated_node_cnt(irg));
+        fprintf(F, "\n%s  maximum node index:   %u", prefix, get_irg_last_idx(irg));
+      }
 
       if (mask) {
         fprintf(F, "\n%s  additional prop: ", prefix);
@@ -610,13 +602,8 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
   }
 
   if (verbosity & dump_verbosity_entattrs) {
-    fprintf(F, "%s  volatility:  ", prefix);
-    switch (get_entity_volatility(ent)) {
-      X(volatility_non_volatile);
-      X(volatility_is_volatile);
-    }
-
-    fprintf(F, "\n%s  peculiarity: %s", prefix, get_peculiarity_string(get_entity_peculiarity(ent)));
+    fprintf(F, "%s  volatility:  %s", prefix, get_volatility_name(get_entity_volatility(ent)));
+    fprintf(F, "\n%s  peculiarity: %s", prefix, get_peculiarity_name(get_entity_peculiarity(ent)));
     fprintf(F, "\n%s  ld_name: %s", prefix, ent->ld_name ? get_entity_ld_name(ent) : "no yet set");
     fprintf(F, "\n%s  offset:  %d bits, %d bytes", prefix, get_entity_offset_bits(ent), get_entity_offset_bytes(ent));
     if (is_Method_type(get_entity_type(ent))) {
@@ -756,7 +743,6 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
   }
 
 }
-#undef X
 
 void    dump_entity_to_file (FILE *F, entity *ent, unsigned verbosity) {
   dump_entity_to_file_prefix (F, ent, "", verbosity);
@@ -1011,8 +997,15 @@ void dump_type_to_file (FILE *F, ir_type *tp, dump_verbosity verbosity) {
         }
       }
 
-      fprintf(F, "\n  peculiarity: %s\n", get_peculiarity_string(get_class_peculiarity(tp)));
-
+      fprintf(F, "\n  peculiarity: %s\n", get_peculiarity_name(get_class_peculiarity(tp)));
+      fprintf(F, "\n  flags:       ");
+      if (is_class_final(tp))
+        fprintf(F, "final, ");
+      if (is_class_interface(tp))
+        fprintf(F, "interface, ");
+      if (is_class_abstract(tp))
+        fprintf(F, "abstract, ");
+      fprintf(F, "\n");
     }
     break;