X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdumptxt.c;h=6d2bceae440fe63ea6257af98c8dc46b16cb52b9;hb=94ad692c1439dc0b3f48e1d2de3bf662916d7343;hp=353fc3d8efc15db57b4b6bf0984468895d77645c;hpb=288021c12e15f12ef9543587a04a27d60454a910;p=libfirm

diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c
index 353fc3d8e..6d2bceae4 100644
--- a/ir/ir/irdumptxt.c
+++ b/ir/ir/irdumptxt.c
@@ -1,13 +1,27 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/irdumptxt.c
- * Purpose:     Write vcg representation of firm to file.
- * Author:      Martin Trapp, Christian Schaefer
- * Modified by: Goetz Lindenmaier, Hubert Schmidt
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 1998-2006 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   Write vcg representation of firm to file.
+ * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt
+ * @version $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -223,7 +237,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));
@@ -324,6 +338,9 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
   case iro_Confirm:
     fprintf(F, "  compare operation: %s\n", get_pnc_string(get_Confirm_cmp(n)));
     break;
+  case iro_ASM:
+    fprintf(F, "  assembler text: %s\n", get_ASM_text(n));
+    break;
 
   default: ;
   }
@@ -374,7 +391,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 {
@@ -476,7 +493,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;
 
@@ -498,7 +515,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)));
         }
@@ -508,7 +525,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)));
         }
@@ -517,7 +534,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;
@@ -574,8 +591,9 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
 
     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) {
@@ -593,16 +611,15 @@ void    dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned
         dump_node_opcode(F, get_atomic_ent_value(ent));
       } else {
         fprintf(F, "%s  compound values:", prefix);
-		compute_compound_ent_array_indices(ent);
         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:%d) ",   get_compound_ent_value_offset_bytes(ent, i), get_compound_ent_value_offset_bit_part(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));
@@ -619,7 +636,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)));
@@ -758,16 +775,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. */
@@ -912,7 +929,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))) {
@@ -942,7 +959,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))) {
@@ -975,7 +992,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))) {
@@ -1027,7 +1044,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);
       }
@@ -1239,7 +1256,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) {