X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdumptxt.c;h=ee0ab725aea2a2260b4fc50f2f81e540e9b5e15b;hb=54d4a6e338344ee3ab159d493af3148bdab33c17;hp=5d793eeee5946a4726ad13dd37340fae5d56e9a2;hpb=5c49d04cab6ac76955eb0e417dd36ba29c112f58;p=libfirm

diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c
index 5d793eeee..ee0ab725a 100644
--- a/ir/ir/irdumptxt.c
+++ b/ir/ir/irdumptxt.c
@@ -6,7 +6,7 @@
  * Modified by: Goetz Lindenmaier, Hubert Schmidt
  * Created:
  * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2003 Universität Karlsruhe
+ * Copyright:   (c) 1998-2006 Universität Karlsruhe
  * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
  */
 #ifdef HAVE_CONFIG_H
@@ -223,7 +223,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
     fprintf(F, "  allocated on: the %s\n", (get_Free_where(n) == stack_alloc) ? "stack" : "heap");
   } break;
   case iro_Sel: {
-    entity *ent = get_Sel_entity(n);
+    ir_entity *ent = get_Sel_entity(n);
     if (ent) {
       fprintf(F, "  Selecting entity %s (%ld)\n", get_entity_name(ent), get_entity_nr(ent));
       fprintf(F, "    of type    %s\n",  get_type_name_ex(get_entity_type(ent),  &bad));
@@ -287,6 +287,11 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
       fprintf(F, "  entity: ");
       dump_entity_to_file(F, get_SymConst_entity(n), dump_verbosity_onlynames);
       break;
+    case symconst_ofs_ent:
+      fprintf(F, "  kind:   offset\n");
+      fprintf(F, "  entity: ");
+      dump_entity_to_file(F, get_SymConst_entity(n), dump_verbosity_onlynames);
+      break;
     case symconst_type_tag:
       fprintf(F, "  kind: type_tag\n");
       fprintf(F, "  type: ");
@@ -302,6 +307,10 @@ 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_enum_const:
+      fprintf(F, "  kind: enumeration\n");
+      fprintf(F, "  name: %s\n", get_enumeration_name(get_SymConst_enum(n)));
+      break;
     }
     fprintf(F, "  type of value: %s \n", get_type_name_ex(get_SymConst_value_type(n), &bad));
   } break;
@@ -365,7 +374,7 @@ void dump_graph_as_text(ir_graph *irg, const char *suffix) {
 
 int addr_is_alloc(ir_node *acc) {
   ir_node *addr = NULL;
-  opcode addr_op;
+  ir_opcode addr_op;
   if (is_memop(acc)) {
     addr = get_memop_ptr(acc);
   } else {
@@ -467,7 +476,7 @@ static void dump_type_list(FILE *F, ir_type *tp, char *prefix,
   fprintf(F, "\n");
 }
 
-void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned verbosity) {
+void    dump_entity_to_file_prefix (FILE *F, ir_entity *ent, char *prefix, unsigned verbosity) {
   int i, j;
   ir_type *owner, *type;
 
@@ -489,7 +498,7 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
       if (get_entity_n_overwrites(ent) > 0) {
         fprintf(F, "%s  overwrites:\n", prefix);
         for (i = 0; i < get_entity_n_overwrites(ent); ++i) {
-	        entity *ov = get_entity_overwrites(ent, i);
+	        ir_entity *ov = get_entity_overwrites(ent, i);
 	        fprintf(F, "%s    %d: %s of class %s\n", prefix, i, get_entity_name(ov),
 		        get_type_name(get_entity_owner(ov)));
         }
@@ -499,7 +508,7 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
       if (get_entity_n_overwrittenby(ent) > 0) {
         fprintf(F, "%s  overwritten by:\n", prefix);
         for (i = 0; i < get_entity_n_overwrittenby(ent); ++i) {
-	        entity *ov = get_entity_overwrittenby(ent, i);
+	        ir_entity *ov = get_entity_overwrittenby(ent, i);
 	        fprintf(F, "%s    %d: %s of class %s\n", prefix, i, get_entity_name(ov),
 		        get_type_name(get_entity_owner(ov)));
         }
@@ -508,7 +517,7 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
       }
 
       if (get_irp_inh_transitive_closure_state() != inh_transitive_closure_none) {
-        entity *ov;
+        ir_entity *ov;
         fprintf(F, "%s  transitive overwrites:\n", prefix);
         for (ov = get_entity_trans_overwrites_first(ent);
 	           ov;
@@ -560,12 +569,14 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
         fprintf(F, (cc & cc_last_on_top) ? "last param on top, " : "first param on top, ");
         fprintf(F, (cc & cc_callee_clear_stk) ? "callee clear stack" : "caller clear stack");
       }
+      fprintf(F, "\n%s  vtable number:        %u", prefix, get_entity_vtable_number(ent));
     }
 
     fprintf(F, "\n");
   } else {  /* no entattrs */
-    fprintf(F, "%s(%3d) %*s: %s", prefix,
-	    get_entity_offset_bits(ent), -40, get_type_name(get_entity_type(ent)), get_entity_name(ent));
+    fprintf(F, "%s(%3d:%d) %-40s: %s", prefix,
+        get_entity_offset(ent), get_entity_offset_bits_remainder(ent),
+        get_type_name(get_entity_type(ent)), get_entity_name(ent));
     if (is_Method_type(get_entity_type(ent))) fprintf(F, "(...)");
 
     if (verbosity & dump_verbosity_accessStats) {
@@ -585,13 +596,13 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
         fprintf(F, "%s  compound values:", prefix);
         for (i = 0; i < get_compound_ent_n_values(ent); ++i) {
           compound_graph_path *path = get_compound_ent_value_path(ent, i);
-          entity *ent0 = get_compound_graph_path_node(path, 0);
-          fprintf(F, "\n%s    %3d ", prefix, get_entity_offset_bits(ent0));
+          ir_entity *ent0 = get_compound_graph_path_node(path, 0);
+          fprintf(F, "\n%s    %3d:%d ", prefix, get_entity_offset(ent0), get_entity_offset_bits_remainder(ent0));
           if (get_type_state(type) == layout_fixed)
-            fprintf(F, "(%3d) ",   get_compound_ent_value_offset_bits(ent, i));
+            fprintf(F, "(%3d:%d) ",   get_compound_ent_value_offset_bytes(ent, i), get_compound_ent_value_offset_bit_remainder(ent, i));
           fprintf(F, "%s", get_entity_name(ent));
           for (j = 0; j < get_compound_graph_path_length(path); ++j) {
-            entity *node = get_compound_graph_path_node(path, j);
+            ir_entity *node = get_compound_graph_path_node(path, j);
             fprintf(F, ".%s", get_entity_name(node));
             if (is_Array_type(get_entity_owner(node)))
               fprintf(F, "[%d]", get_compound_graph_path_array_index(path, j));
@@ -608,7 +619,7 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
     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));
+    fprintf(F, "\n%s  offset:  %d bytes, %d rem bits", prefix, get_entity_offset(ent), get_entity_offset_bits_remainder(ent));
     if (is_Method_type(get_entity_type(ent))) {
       if (get_entity_irg(ent))   /* can be null */ {
         fprintf(F, "\n%s  irg = %ld", prefix, get_irg_graph_nr(get_entity_irg(ent)));
@@ -747,16 +758,16 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
 
 }
 
-void    dump_entity_to_file (FILE *F, entity *ent, unsigned verbosity) {
+void    dump_entity_to_file (FILE *F, ir_entity *ent, unsigned verbosity) {
   dump_entity_to_file_prefix (F, ent, "", verbosity);
   fprintf(F, "\n");
 }
 
-void dump_entity (entity *ent) {
+void dump_entity (ir_entity *ent) {
   dump_entity_to_file(stdout, ent, dump_verbosity_max);
 }
 
-void    dump_entitycsv_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned verbosity,
+void    dump_entitycsv_to_file_prefix (FILE *F, ir_entity *ent, char *prefix, unsigned verbosity,
 				       int *max_disp, int disp[], const char *comma) {
 
 #if 0   /* Outputs loop depth of all occurrences. */
@@ -901,7 +912,7 @@ void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const
     fprintf(F, "\n");
 
     for (i = 0; i < get_class_n_members(tp); ++i) {
-      entity *mem = get_class_member(tp, i);
+      ir_entity *mem = get_class_member(tp, i);
       if (((verbosity & dump_verbosity_methods) &&  is_Method_type(get_entity_type(mem))) ||
 	        ((verbosity & dump_verbosity_fields)  && !is_Method_type(get_entity_type(mem)))   ) {
         if (!((verbosity & dump_verbosity_nostatic) && (get_entity_allocation(mem) == allocation_static))) {
@@ -931,7 +942,7 @@ void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const
     }
 
     for (i = 0; i < get_class_n_members(tp); ++i) {
-      entity *mem = get_class_member(tp, i);
+      ir_entity *mem = get_class_member(tp, i);
       if (((verbosity & dump_verbosity_methods) &&  is_Method_type(get_entity_type(mem))) ||
 	        ((verbosity & dump_verbosity_fields)  && !is_Method_type(get_entity_type(mem)))   ) {
         if (!((verbosity & dump_verbosity_nostatic) && (get_entity_allocation(mem) == allocation_static))) {
@@ -964,7 +975,7 @@ void dump_type_to_file (FILE *F, ir_type *tp, dump_verbosity verbosity) {
       fprintf(F, "\n  members: \n");
     }
     for (i = 0; i < get_class_n_members(tp); ++i) {
-      entity *mem = get_class_member(tp, i);
+      ir_entity *mem = get_class_member(tp, i);
       if (((verbosity & dump_verbosity_methods) &&  is_Method_type(get_entity_type(mem))) ||
 	        ((verbosity & dump_verbosity_fields)  && !is_Method_type(get_entity_type(mem)))   ) {
         if (!((verbosity & dump_verbosity_nostatic) && (get_entity_allocation(mem) == allocation_static))) {
@@ -976,12 +987,12 @@ void dump_type_to_file (FILE *F, ir_type *tp, dump_verbosity verbosity) {
       fprintf(F, "  supertypes: ");
       for (i = 0; i < get_class_n_supertypes(tp); ++i) {
         ir_type *stp = get_class_supertype(tp, i);
-        fprintf(F, "\n    %s", get_type_name(stp));
+        fprintf(F, "\n    %d %s", i, get_type_name(stp));
       }
       fprintf(F, "\n  subtypes: ");
       for (i = 0; i < get_class_n_subtypes(tp); ++i) {
         ir_type *stp = get_class_subtype(tp, i);
-        fprintf(F, "\n    %s", get_type_name(stp));
+        fprintf(F, "\n    %d %s", i, get_type_name(stp));
       }
 
       if (get_irp_inh_transitive_closure_state() != inh_transitive_closure_none) {
@@ -1016,7 +1027,7 @@ void dump_type_to_file (FILE *F, ir_type *tp, dump_verbosity verbosity) {
   case tpo_struct:
     if (verbosity & dump_verbosity_fields) fprintf(F, "\n  members: ");
     for (i = 0; i < get_compound_n_members(tp); ++i) {
-      entity *mem = get_compound_member(tp, i);
+      ir_entity *mem = get_compound_member(tp, i);
       if (verbosity & dump_verbosity_fields) {
 	      dump_entity_to_file_prefix(F, mem, "    ", verbosity);
       }
@@ -1190,10 +1201,10 @@ void dump_types_as_text(unsigned verbosity, const char *suffix) {
   int i, n_types = get_irp_n_types();
 
   basename = irp_prog_name_is_set() ? get_irp_prog_name() : "TextTypes";
-  F = text_open (basename, suffix, "-types", ".txt");
+  F = text_open(basename, suffix, "-types", ".txt");
 
   if (verbosity & dump_verbosity_csv) {
-    CSV = text_open (basename, suffix, "-types", ".csv");
+    CSV = text_open(basename, suffix, "-types", ".csv");
     //fprintf(CSV, "Class, Field, Operation, L0, L1, L2, L3\n");
   }
 
@@ -1208,8 +1219,8 @@ void dump_types_as_text(unsigned verbosity, const char *suffix) {
     }
   }
 
-  fclose (F);
-  if (CSV) fclose (CSV);
+  fclose(F);
+  if (CSV) fclose(CSV);
 }
 
 
@@ -1228,7 +1239,7 @@ void dump_globals_as_text(unsigned verbosity, const char *suffix) {
   }
 
   for (i = 0; i < n_mems; ++i) {
-    entity *e = get_class_member(g, i);
+    ir_entity *e = get_class_member(g, i);
 
     dump_entity_to_file(F, e, verbosity);
     if (CSV) {