recursively optimize phi to get real minimal SSA-form for reducible CFGs
[libfirm] / ir / ir / irdumptxt.c
index ef99028..093daea 100644 (file)
@@ -19,8 +19,9 @@
 
 /**
  * @file
- * @brief   Write vcg representation of firm to file.
- * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt
+ * @brief   Write text representation of firm to file.
+ * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt,
+ *          Matthias Braun
  * @version $Id$
  */
 #include "config.h"
@@ -28,6 +29,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <stdbool.h>
 
 #include "irdump_t.h"
 #include "irgraph_t.h"
 #include "trouts.h"
 #include "irgwalk.h"
 #include "tv_t.h"
+#include "vrp.h"
 #include "irprintf.h"
 #include "error.h"
 
 #include "irdom.h"
 #include "field_temperature.h"
 
-#define MY_SIZE 1024     /* Size of an array that actually should be computed. */
+static ir_dump_verbosity_t  verbosity = dump_verbosity_max;
 
-/**
- * Just opens a file, mangling a file name.
- *
- * The file name results from the concatenation of the following parts:
- *
- * @param basename  The basis of the name telling about the content.
- * @param suffix1   The first suffix.
- * @param suffix2   The second suffix.
- * @param suffix3   The third suffix.
- */
-static FILE *text_open(const char *basename, const char * suffix1, const char *suffix2, const char *suffix3)
+void ir_set_dump_verbosity(ir_dump_verbosity_t new_verbosity)
 {
-       FILE *F;
-       int len = strlen(basename), i, j;
-       char *fname;  /* filename to put the vcg information in */
-
-       if (!basename) assert(basename);
-       if (!suffix1) suffix1 = "";
-       if (!suffix2) suffix2 = "";
-       if (!suffix3) suffix3 = ".txt";
-
-       /* open file for vcg graph */
-       fname = XMALLOCN(char, strlen(basename)*2 + strlen(suffix1) + strlen(suffix2) + 5); /* *2: space for escapes. */
-
-       j = 0;
-       for (i = 0; i < len; ++i) {  /* replace '/' in the name: escape by @. */
-               if (basename[i] == '/') {
-                       fname[j] = '@'; j++; fname[j] = '1'; j++;
-               } else if (basename[i] == '@') {
-                       fname[j] = '@'; j++; fname[j] = '2'; j++;
-               } else {
-                       fname[j] = basename[i]; j++;
-               }
-       }
-       fname[j] = '\0';
-       strcat(fname, suffix1);  /* append file suffix */
-       strcat(fname, suffix2);  /* append file suffix */
-       strcat(fname, suffix3);  /* append the .txt suffix */
-
-       F = fopen(fname, "w");   /* open file for writing */
-       if (!F) {
-               perror(fname);
-               abort();
-       }
-       free(fname);
+       verbosity = new_verbosity;
+}
 
-       return F;
+ir_dump_verbosity_t ir_get_dump_verbosity(void)
+{
+       return verbosity;
 }
 
 /* Write the irnode and all its attributes to the file passed. */
-int dump_irnode_to_file(FILE *F, ir_node *n)
+void dump_irnode_to_file(FILE *F, ir_node *n)
 {
-       int i, bad = 0;
-       char comma;
+       int      i;
+       char     comma;
        ir_graph *irg;
+       vrp_attr *vrp_info;
 
        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)
+       if (ir_get_dump_flags() & ir_dump_flag_analysed_types)
                fprintf (F, "  addr:    %p\n", (void *)n);
        fprintf (F, "  mode:    %s\n", get_mode_name(get_irn_mode(n)));
        fprintf (F, "  visited: %ld\n", get_irn_visited(n));
@@ -120,21 +85,6 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
                fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, -1)));
        }
 
-#ifdef INTERPROCEDURAL_VIEW
-       fprintf(F, "  arity:   %d\n", get_irn_intra_arity(n));
-       /* show all predecessor nodes */
-       fprintf(F, "  pred nodes:\n");
-       if (!is_Block(n)) {
-               fprintf(F, "    -1:    ");
-               dump_node_opcode(F, get_irn_n(n, -1));
-               fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, -1)));
-       }
-       for ( i = 0; i < get_irn_intra_arity(n); ++i) {
-               fprintf(F, "     %d: %s ", i, is_intra_backedge(n, i) ? "be" : "  ");
-               dump_node_opcode(F, get_irn_intra_n(n, i));
-               fprintf(F, " %ld\n", get_irn_node_nr(get_irn_intra_n(n, i)));
-       }
-#else
        fprintf(F, "  arity:   %d\n", get_irn_arity(n));
        /* show all predecessor nodes */
        fprintf(F, "  pred nodes:\n");
@@ -148,25 +98,12 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
                dump_node_opcode(F, get_irn_n(n, i));
                fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, i)));
        }
-#endif
 
        fprintf(F, "  Private Attributes:\n");
 
        if (is_Proj(n))
                fprintf(F, "  proj nr: %ld\n", get_Proj_proj(n));
 
-#ifdef INTERPROCEDURAL_VIEW
-       if ((get_irp_ip_view_state() != ip_view_no) && (is_Filter(n) || is_Block(n))) {
-               fprintf(F, "  inter arity: %d\n", get_irn_inter_arity(n));
-               fprintf(F, "  inter pred nodes:\n");
-               for (i = 0; i < get_irn_inter_arity(n); ++i) {
-                       fprintf(F, "     %d: %s ", i, is_intra_backedge(n, i) ? "be" : "  ");
-                       dump_node_opcode(F, get_irn_inter_n(n, i));
-                       fprintf(F, " %ld\n", get_irn_node_nr(get_irn_inter_n(n, i)));
-               }
-       }
-#endif
-
        if (is_fragile_op(n)) {
                fprintf(F, "  pinned state: %s\n", get_op_pin_state_name(get_irn_pinned(n)));
                /* not dumped: frag array */
@@ -174,8 +111,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
 
        /* This is not nice, output it as a marker in the predecessor list. */
        if (is_Block(n)             ||
-           get_irn_op(n) == op_Phi ||
-           (is_Filter(n) && get_interprocedural_view())) {
+           get_irn_op(n) == op_Phi) {
                fprintf(F, "  backedges:");
                comma = ' ';
                for (i = 0; i < get_irn_arity(n); i++)
@@ -187,8 +123,8 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
        if (get_irg_loopinfo_state(irg) & loopinfo_valid) {
                ir_loop *loop = get_irn_loop(n);
                if (loop != NULL) {
-                       fprintf(F, "  in loop %d with depth %d\n",
-                               get_loop_loop_nr(loop), get_loop_depth(loop));
+                       fprintf(F, "  in loop %ld with depth %u\n",
+                               get_loop_loop_nr(loop), get_loop_depth(loop));
                }
        }
 
@@ -197,7 +133,6 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
        case iro_Block: {
                if (has_Block_entity(n))
                        fprintf(F, "  Label: %lu\n", get_entity_label(get_Block_entity(n)));
-               ir_fprintf(F, "  macro Block: %+F\n", get_Block_MacroBlock(n));
                fprintf(F, "  block visited: %ld\n", get_Block_block_visited(n));
                fprintf(F, "  block marked: %u\n", get_Block_mark(n));
                if (get_irg_dom_state(get_irn_irg(n)) != dom_none) {
@@ -209,39 +144,16 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
                fprintf(F, "  Execution frequency statistics:\n");
                if (get_irg_exec_freq_state(get_irn_irg(n)) != exec_freq_none)
                        fprintf(F, "    procedure local evaluation:   %8.2lf\n", get_irn_exec_freq(n));
-#ifdef INTERPROCEDURAL_VIEW
-               if (get_irp_loop_nesting_depth_state() != loop_nesting_depth_none)
-                       fprintf(F, "    call frequency of procedure:   %8.2lf\n",
-                       get_irg_method_execution_frequency(get_irn_irg(n)));
-               if (get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent)
-                       fprintf(F, "    recursion depth of procedure: %8.2lf\n", (double)get_irn_recursion_depth(n));
-               if ((get_irg_exec_freq_state(get_irn_irg(n)) != exec_freq_none) &&
-                       (get_irp_loop_nesting_depth_state() != loop_nesting_depth_none) &&
-                       (get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent))
-                       fprintf(F, "    final evaluation:           **%8.2lf**\n", get_irn_final_cost(n));
-#endif
 
                /* not dumped: graph_arr */
                /* not dumped: mature    */
        }  break;
        case iro_Start: {
+               size_t   i;
                ir_type *tp = get_entity_type(get_irg_entity(get_irn_irg(n)));
                ir_fprintf(F, "  start of method of type %+F\n", tp);
                for (i = 0; i < get_method_n_params(tp); ++i)
                        ir_fprintf(F, "    param %d type: %+F\n", i, get_method_param_type(tp, i));
-#ifdef INTERPROCEDURAL_VIEW
-               if ((get_irp_ip_view_state() == ip_view_valid) && !get_interprocedural_view()) {
-                       ir_node *sbl = get_nodes_block(n);
-                       int i, n_cfgpreds = get_Block_cg_n_cfgpreds(sbl);
-                       fprintf(F, "  graph has %d interprocedural predecessors:\n", n_cfgpreds);
-                       for (i = 0; i < n_cfgpreds; ++i) {
-                               ir_node *cfgpred = get_Block_cg_cfgpred(sbl, i);
-                               fprintf(F, "    %d: Call %ld in graph %s\n", i,
-                                       get_irn_node_nr(cfgpred),
-                                       get_irg_dump_name(get_irn_irg(cfgpred)));
-                       }
-               }
-#endif
        } break;
        case iro_Cond: {
                fprintf(F, "  default ProjNr: %ld\n", get_Cond_default_proj(n));
@@ -264,10 +176,8 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
                        fprintf(F, "  Selecting entity %s (%ld)\n", get_entity_name(ent), get_entity_nr(ent));
                        ir_fprintf(F, "    of type    %+F\n",  get_entity_type(ent));
                        ir_fprintf(F, "    with owner %+F.\n", get_entity_owner(ent));
-               }
-               else {
+               } else {
                        fprintf(F, "  <NULL entity>\n");
-                       bad = 1;
                }
        } break;
        case iro_Call: {
@@ -275,7 +185,8 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
                if (get_Call_tail_call(n))
                        fprintf(F, "  tail call\n");
                ir_fprintf(F, "  calling method of type %+F\n", tp);
-               if(get_unknown_type() != tp) {
+               if (get_unknown_type() != tp) {
+                       size_t i;
                        for (i = 0; i < get_method_n_params(tp); ++i)
                                ir_fprintf(F, "    param %d type: %+F\n", i, get_method_param_type(tp, i));
                        for (i = 0; i < get_method_n_ress(tp); ++i)
@@ -288,73 +199,53 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
                        }
                }
        } break;
-       case iro_CallBegin: {
-               ir_node *call = get_CallBegin_call(n);
-               fprintf(F, "  Call: %ld\n", get_irn_node_nr(call));
-               if (Call_has_callees(call)) {
-                       fprintf(F, "  possible callees:\n");
-                       for (i = 0; i < get_Call_n_callees(call); i++) {
-                               fprintf(F, "    %d: %s\n", i, get_ent_dump_name(get_Call_callee(call, i)));
-                       }
-               }
-       } break;
        case iro_Cast: {
                ir_fprintf(F, "  cast to type: %+F\n", get_Cast_type(n));
        } break;
        case iro_Return: {
-               if (!get_interprocedural_view()) {
-                       ir_type *tp = get_entity_type(get_irg_entity(get_irn_irg(n)));
-                       ir_fprintf(F, "  return in method of type %+F\n", tp);
-                       for (i = 0; i < get_method_n_ress(tp); ++i) {
-                               ir_fprintf(F, "    result %d type: %+F\n", i,
-                                          get_method_res_type(tp, i));
-                       }
+               size_t   i;
+               ir_type *tp = get_entity_type(get_irg_entity(get_irn_irg(n)));
+               ir_fprintf(F, "  return in method of type %+F\n", tp);
+               for (i = 0; i < get_method_n_ress(tp); ++i) {
+                       ir_fprintf(F, "    result %d type: %+F\n", i,
+                                          get_method_res_type(tp, i));
                }
        } break;
-       case iro_Const: {
-               assert(get_Const_type(n) != firm_none_type);
-               ir_fprintf(F, "  Const of type %+F\n", get_Const_type(n));
-       } break;
        case iro_SymConst: {
-               switch(get_SymConst_kind(n)) {
-               case symconst_addr_name:
-                       fprintf(F, "  kind: addr_name\n");
-                       fprintf(F, "  name: %s\n", get_id_str(get_SymConst_name(n)));
-                       break;
+               switch (get_SymConst_kind(n)) {
                case symconst_addr_ent:
                        fprintf(F, "  kind:   addr_ent\n");
                        fprintf(F, "  entity: ");
-                       dump_entity_to_file(F, get_SymConst_entity(n), dump_verbosity_onlynames);
+                       dump_entity_to_file(F, get_SymConst_entity(n));
                        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);
+                       dump_entity_to_file(F, get_SymConst_entity(n));
                        break;
                case symconst_type_tag:
                        fprintf(F, "  kind: type_tag\n");
                        fprintf(F, "  type: ");
-                       dump_type_to_file(F, get_SymConst_type(n), dump_verbosity_onlynames);
+                       dump_type_to_file(F, get_SymConst_type(n));
                        break;
                case symconst_type_size:
                        fprintf(F, "  kind: size\n");
                        fprintf(F, "  type: ");
-                       dump_type_to_file(F, get_SymConst_type(n), dump_verbosity_onlynames);
+                       dump_type_to_file(F, get_SymConst_type(n));
                        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);
+                       dump_type_to_file(F, get_SymConst_type(n));
                        break;
                case symconst_enum_const:
                        fprintf(F, "  kind: enumeration\n");
                        fprintf(F, "  name: %s\n", get_enumeration_const_name(get_SymConst_enum(n)));
                        break;
                }
-               ir_fprintf(F, "  type of value: %+F\n", get_SymConst_value_type(n));
        } break;
        case iro_Load:
-               fprintf(F, "  mode of loaded value: %s\n", get_mode_name_ex(get_Load_mode(n), &bad));
+               fprintf(F, "  mode of loaded value: %s\n", get_mode_name_ex(get_Load_mode(n), NULL));
                fprintf(F, "  volatility: %s\n", get_volatility_name(get_Load_volatility(n)));
                fprintf(F, "  align: %s\n", get_align_name(get_Load_align(n)));
                break;
@@ -396,10 +287,13 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
                        fprintf(F, "\n  volatile");
                fprintf(F, "\n");
        } break;
-       default: ;
+
+       default:
+               break;
        }
 
-       if (n->vrp.valid) {
+       vrp_info = vrp_get_info(n);
+       if (vrp_info) {
                dump_vrp_info(F, n);
        }
 
@@ -407,98 +301,12 @@ int dump_irnode_to_file(FILE *F, ir_node *n)
                get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_inconsistent  )
                if (get_irn_typeinfo_type(n) != firm_none_type)
                        ir_fprintf (F, "  Analysed type: %s\n", get_irn_typeinfo_type(n));
-
-       return bad;
-}
-
-
-
-void dump_irnode(ir_node *n)
-{
-       dump_irnode_to_file(stdout, n);
-}
-
-
-void dump_graph_to_file(FILE *F, ir_graph *irg)
-{
-       fprintf(F, "graph %s\n", get_irg_dump_name(irg));
-}
-
-void dump_graph(ir_graph *g)
-{
-       dump_graph_to_file(stdout, g);
-}
-
-static void dump_node_to_graph_file(ir_node *n, void *env)
-{
-       FILE *F = (FILE *)env;
-
-       dump_irnode_to_file(F, n);
-       fprintf(F, "\n");
 }
 
-void dump_graph_as_text(ir_graph *irg, const char *suffix)
+void dump_graph_as_text(FILE *out, ir_graph *irg)
 {
-       const char *basename = get_irg_dump_name(irg);
-       FILE *F;
-
-       F = text_open(basename, suffix, "", ".txt");
-
-       dump_graph_to_file(F, irg);
-       fprintf(F, "\n\n");
-       irg_walk_graph(irg, NULL, dump_node_to_graph_file, F);
-
-       fclose (F);
-}
-
-#ifdef EXTENDED_ACCESS_STATS
-static int addr_is_alloc(ir_node *acc)
-{
-       ir_node *addr = NULL;
-       ir_opcode addr_op;
-       if (is_memop(acc)) {
-               addr = get_memop_ptr(acc);
-       } else {
-               assert(is_Call(acc));
-               addr = get_Call_ptr(acc);
-       }
-
-       addr_op = get_irn_opcode(addr);
-
-       while (addr_op != iro_Alloc) {
-               switch (addr_op) {
-               case iro_Sel:
-                       addr = get_Sel_ptr(addr);
-                       break;
-               case iro_Cast:
-                       addr = get_Cast_op(addr);
-                       break;
-               case iro_Proj:
-                       addr = get_Proj_pred(addr);
-                       break;
-               case iro_SymConst:
-               case iro_Const:
-                       return 0;
-                       break;
-               case iro_Phi:
-               case iro_Load:
-               case iro_Call:
-               case iro_Start:
-                       return 0;
-                       break;
-
-               default:
-                       //DDMN(addr);
-                       //assert(0 && "unexpected address node");
-                       ;
-               }
-               addr_op = get_irn_opcode(addr);
-       }
-
-       /* In addition, the alloc must be in the same loop. */
-       return 1;
+       fprintf(out, "graph %s\n", get_irg_dump_name(irg));
 }
-#endif
 
 /** dumps something like:
  *
@@ -506,25 +314,22 @@ static int addr_is_alloc(ir_node *acc)
  *  "prefix"    node8, ... node15,\n
  *  "prefix"    node16, node17\n
  */
-static void dump_node_list(FILE *F, firm_kind *k, char *prefix,
+static void dump_node_list(FILE *F, firm_kind *k, const char *prefix,
                            int (*get_entity_n_nodes)(firm_kind *ent),
                            ir_node *(*get_entity_node)(firm_kind *ent, int pos),
-                           char *name) {
+                           const char *name)
+{
        int i, n_nodes = get_entity_n_nodes(k);
-       char *comma = "";
+       const char *comma = "";
 
        fprintf(F, "%s  %s (%d):", prefix, name, n_nodes);
        for (i = 0; i < n_nodes; ++i) {
-               int rem;
                if (i > 7 && !(i & 7)) { /* line break every eight node. */
                        fprintf(F, ",\n%s   ", prefix);
                        comma = "";
                }
                fprintf(F, "%s ", comma);
-               rem = opt_dump_analysed_type_info;
-               opt_dump_analysed_type_info = 0;
                dump_node_label(F, get_entity_node(k, i));
-               opt_dump_analysed_type_info = rem;
                comma = ",";
        }
        fprintf(F, "\n");
@@ -536,12 +341,13 @@ static void dump_node_list(FILE *F, firm_kind *k, char *prefix,
  *  "prefix"    node8, ... node15,\n
  *  "prefix"    node16, node17\n
  */
-static void dump_type_list(FILE *F, ir_type *tp, char *prefix,
+static void dump_type_list(FILE *F, ir_type *tp, const char *prefix,
                            int (*get_n_types)(const ir_type *tp),
                            ir_type *(*get_type)(const ir_type *tp, int pos),
-                           const char *name) {
+                           const char *name)
+{
        int i, n_nodes = get_n_types(tp);
-       char *comma = "";
+       const char *comma = "";
 
        fprintf(F, "%s  %s (%d):", prefix, name, n_nodes);
        for (i = 0; i < n_nodes; ++i) {
@@ -561,9 +367,11 @@ static int need_nl = 1;
  * Dump initializers.
  */
 static void dump_ir_initializers_to_file(FILE *F, const char *prefix,
-                                                                                const ir_initializer_t *initializer, ir_type *type) {
-       tarval  *tv;
-       ir_node *value;
+                                         const ir_initializer_t *initializer,
+                                         ir_type *type)
+{
+       ir_tarval *tv;
+       ir_node   *value;
 
        if (need_nl) {
                fprintf(F, "\n%s    ", prefix);
@@ -641,9 +449,8 @@ static void dump_entity_linkage(FILE *F, const ir_entity *entity)
                fprintf(F, " hidden_user");
 }
 
-void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned verbosity)
+static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *prefix)
 {
-       int i, j;
        ir_type *owner, *type;
 
        assert(is_entity(ent));
@@ -662,6 +469,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
 
                if (is_Class_type(get_entity_owner(ent))) {
                        if (get_entity_n_overwrites(ent) > 0) {
+                               size_t i;
                                fprintf(F, "%s  overwrites:\n", prefix);
                                for (i = 0; i < get_entity_n_overwrites(ent); ++i) {
                                        ir_entity *ov = get_entity_overwrites(ent, i);
@@ -672,6 +480,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                fprintf(F, "%s  Does not overwrite other entities.\n", prefix);
                        }
                        if (get_entity_n_overwrittenby(ent) > 0) {
+                               size_t i;
                                fprintf(F, "%s  overwritten by:\n", prefix);
                                for (i = 0; i < get_entity_n_overwrittenby(ent); ++i) {
                                        ir_entity *ov = get_entity_overwrittenby(ent, i);
@@ -767,8 +576,10 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                        need_nl = 1;
                        dump_ir_initializers_to_file(F, prefix, initializer, get_entity_type(ent));
                } else if (entity_has_compound_ent_values(ent)) {
+                       size_t i;
                        fprintf(F, "%s  compound values:", prefix);
                        for (i = 0; i < get_compound_ent_n_values(ent); ++i) {
+                               size_t j;
                                compound_graph_path *path = get_compound_ent_value_path(ent, i);
                                ir_entity *ent0 = get_compound_graph_path_node(path, 0);
                                fprintf(F, "\n%s    %3d:%u ", prefix, get_entity_offset(ent0), get_entity_offset_bits_remainder(ent0));
@@ -779,7 +590,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                        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));
+                                               fprintf(F, "[%ld]", get_compound_graph_path_array_index(path, j));
                                }
                                fprintf(F, "\t = ");
                                dump_node_opcode(F, get_compound_ent_value(ent, i));
@@ -799,12 +610,6 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                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)));
-#ifdef INTERPROCEDURAL_VIEW
-                               if (get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent) {
-                                       fprintf(F, "\n%s    recursion depth %d", prefix, get_irg_recursion_depth(get_entity_irg(ent)));
-                                       fprintf(F, "\n%s    loop depth      %d", prefix, get_irg_loop_depth(get_entity_irg(ent)));
-                               }
-#endif
                        } else {
                                fprintf(F, "\n%s  irg = NULL", prefix);
                        }
@@ -819,138 +624,17 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                dump_node_list(F, (firm_kind *)ent, prefix, (int(*)(firm_kind *))get_entity_n_references,
                        (ir_node *(*)(firm_kind *, int))get_entity_reference, "References");
        }
-
-       if (verbosity & dump_verbosity_accessStats) {
-#ifdef EXTENDED_ACCESS_STATS
-               int n_acc = get_entity_n_accesses(ent);
-               int max_depth = 0;
-               int max_L_freq = -1;
-               int max_S_freq = -1;
-               int max_LA_freq = -1;
-               int max_SA_freq = -1;
-               int *L_freq;
-               int *S_freq;
-               int *LA_freq;
-               int *SA_freq;
-
-               /* Find maximal depth */
-               for (i = 0; i < n_acc; ++i) {
-                       ir_node *acc = get_entity_access(ent, i);
-                       int depth = get_weighted_loop_depth(acc);
-                       max_depth = (depth > max_depth) ? depth : max_depth ;
-               }
-
-               L_freq = XMALLOCNZ(int, 4 * max_depth);
-
-               S_freq  = L_freq + 1*max_depth;
-               LA_freq = L_freq + 2*max_depth;
-               SA_freq = L_freq + 3*max_depth;
-
-               for (i = 0; i < n_acc; ++i) {
-                       ir_node *acc = get_entity_access(ent, i);
-                       int depth = get_weighted_loop_depth(acc);
-                       assert(depth < max_depth);
-                       if (is_Load(acc) || is_Call(acc)) {
-                               L_freq[depth]++;
-                               max_L_freq = (depth > max_L_freq) ? depth : max_L_freq;
-                               if (addr_is_alloc(acc)) {
-                                       LA_freq[depth]++;
-                                       max_LA_freq = (depth > max_LA_freq) ? depth : max_LA_freq;
-                               }
-                       } else if (is_Store(acc)) {
-                               S_freq[depth]++;
-                               max_S_freq = (depth > max_S_freq) ? depth : max_S_freq;
-                               if (addr_is_alloc(acc)) {
-                                       SA_freq[depth]++;
-                                       max_SA_freq = (depth > max_SA_freq) ? depth : max_SA_freq;
-                               }
-                       } else {
-                               assert(0);
-                       }
-               }
-
-               if (max_L_freq >= 0) {
-                       char comma = ':';
-
-                       fprintf(F, "%s  Load  Stats", prefix);
-                       for (i = 0; i <= max_L_freq; ++i) {
-                               if (L_freq[i])
-                                       fprintf(F, "%c %d x  L%d", comma, L_freq[i], i);
-                               else
-                                       fprintf(F, "         ");
-                               comma = ',';
-                       }
-                       fprintf(F, "\n");
-               }
-               if (max_LA_freq >= 0) {
-                       //fprintf(F, "%s  LoadA Stats", prefix);
-                       char comma = ':';
-                       for (i = 0; i <= max_LA_freq; ++i) {
-                               //if (LA_freq[i])
-                               //fprintf(F, "%c %d x LA%d", comma, LA_freq[i], i);
-                               //else
-                               //fprintf(F, "         ");
-                               comma = ',';
-                       }
-                       fprintf(F, "\n");
-               }
-               if (max_S_freq >= 0) {
-                       char comma = ':';
-
-                       fprintf(F, "%s  Store Stats", prefix);
-                       for (i = 0; i <= max_S_freq; ++i) {
-                               if (S_freq[i])
-                                       fprintf(F, "%c %d x  S%d", comma, S_freq[i], i);
-                               else
-                                       fprintf(F, "         ");
-                               comma = ',';
-                       }
-                       fprintf(F, "\n");
-               }
-               if (max_SA_freq >= 0) {
-                       //fprintf(F, "%s  StoreAStats", prefix);
-                       char comma = ':';
-                       for (i = 0; i <= max_SA_freq; ++i) {
-                               //if (SA_freq[i])
-                               //fprintf(F, "%c %d x SA%d", comma, SA_freq[i], i);
-                               //else
-                               //fprintf(F, "         ");
-                               comma = ',';
-                       }
-                       fprintf(F, "\n");
-               }
-
-               /* free allocated space */
-               free(L_freq);
-#endif
-               if (get_trouts_state() != outs_none) {
-#ifdef INTERPROCEDURAL_VIEW
-                       if (is_Method_type(get_entity_type(ent))) {
-                               fprintf(F, "%s  Estimated #Calls:    %lf\n", prefix, get_entity_estimated_n_calls(ent));
-                               fprintf(F, "%s  Estimated #dynCalls: %lf\n", prefix, get_entity_estimated_n_calls(ent));
-                       } else {
-                               fprintf(F, "%s  Estimated #Loads:  %lf\n", prefix, get_entity_estimated_n_loads(ent));
-                               fprintf(F, "%s  Estimated #Stores: %lf\n", prefix, get_entity_estimated_n_stores(ent));
-                       }
-#endif
-               }
-       }
 }
 
-void    dump_entity_to_file (FILE *F, ir_entity *ent, unsigned verbosity)
+void dump_entity_to_file(FILE *out, ir_entity *ent)
 {
-       dump_entity_to_file_prefix (F, ent, "", verbosity);
-       fprintf(F, "\n");
+       dump_entity_to_file_prefix(out, ent, "");
+       fprintf(out, "\n");
 }
 
-void dump_entity(ir_entity *ent)
+void dump_type_to_file(FILE *F, ir_type *tp)
 {
-  dump_entity_to_file(stdout, ent, dump_verbosity_max);
-}
-
-void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity)
-{
-       int i;
+       size_t i;
 
        if ((is_Class_type(tp))       && (verbosity & dump_verbosity_noClassTypes)) return;
        if ((is_Struct_type(tp))      && (verbosity & dump_verbosity_noStructTypes)) return;
@@ -975,7 +659,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity)
                        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)) {
-                                       dump_entity_to_file_prefix(F, mem, "    ", verbosity);
+                                       dump_entity_to_file_prefix(F, mem, "    ");
                                }
                        }
                }
@@ -1024,7 +708,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity)
                for (i = 0; i < get_compound_n_members(tp); ++i) {
                        ir_entity *mem = get_compound_member(tp, i);
                        if (verbosity & dump_verbosity_fields) {
-                               dump_entity_to_file_prefix(F, mem, "    ", verbosity);
+                               dump_entity_to_file_prefix(F, mem, "    ");
                        }
                }
                break;
@@ -1069,7 +753,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity)
 
                        if (verbosity & dump_verbosity_fields) {
                                dump_entity_to_file_prefix(F, get_array_element_entity(tp),
-                                       "    ", verbosity);
+                                                          "    ");
                        }
                }
                break;
@@ -1084,13 +768,15 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity)
        case tpo_method:
                if (verbosity & dump_verbosity_typeattrs) {
                        fprintf(F, "\n  variadicity: %s", get_variadicity_name(get_method_variadicity(tp)));
-                       fprintf(F, "\n  return types: %d", get_method_n_ress(tp));
+                       fprintf(F, "\n  return types: %lu",
+                               (unsigned long) get_method_n_ress(tp));
                        for (i = 0; i < get_method_n_ress(tp); ++i) {
                                ir_type *rtp = get_method_res_type(tp, i);
                                ir_fprintf(F, "\n    %+F", rtp);
                        }
 
-                       fprintf(F, "\n  parameter types: %d", get_method_n_params(tp));
+                       fprintf(F, "\n  parameter types: %lu",
+                               (unsigned long) get_method_n_params(tp));
                        for (i = 0; i < get_method_n_params(tp); ++i) {
                                ir_type *ptp = get_method_param_type(tp, i);
                                ir_fprintf(F, "\n    %+F", ptp);
@@ -1137,102 +823,28 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity)
                dump_type_list(F, tp, "  ", get_type_n_pointertypes_to, get_type_pointertype_to, "PointerTpsTo");
        }
 
-
-       if (verbosity & dump_verbosity_accessStats) {
-#if 0
-               int n_all = get_type_n_allocs(tp);
-               int max_depth = 0;
-               int max_freq = -1;
-               int *freq;
-
-               /* Find maximal depth */
-               for (i = 0; i < n_all; ++i) {
-                       ir_node *all = get_type_alloc(tp, i);
-                       int depth = get_weighted_loop_depth(all);
-                       max_depth = (depth > max_depth) ? depth : max_depth ;
-               }
-
-               freq = XMALLOCNZ(int, max_depth + 1);
-
-               for (i = 0; i < n_all; ++i) {
-                       ir_node *all = get_type_alloc(tp, i);
-                       int depth = get_weighted_loop_depth(all);
-                       assert(depth <= max_depth);
-                       freq[depth]++;
-                       max_freq = (depth > max_freq) ? depth : max_freq;
-                       assert(is_Alloc(all));
-               }
-
-               if (max_freq >= 0) {
-                       char comma = ':';
-
-                       fprintf(F, "  Alloc Stats");
-                       for (i = 0; i <= max_freq; ++i) {
-                               fprintf(F, "%c %d x A%d", comma, freq[i], i);
-                               comma = ',';
-                       }
-                       fprintf(F, "\n");
-               }
-
-               free(freq);
-#endif
-#ifdef INTERPROCEDURAL_VIEW
-               if (get_trouts_state() != outs_none) {
-                       fprintf(F, "  Estimated #Instances: %lf\n", get_type_estimated_n_instances(tp));
-                       if (is_Class_type(tp) && (get_irp_typeinfo_state() != ir_typeinfo_none)) {
-                               fprintf(F, "  Estimated #dyn Calls: %lf\n", get_class_estimated_n_dyncalls(tp));
-                               fprintf(F, "  Estimated #Upcasts:   %lf (#CastOps: %d)\n", get_class_estimated_n_upcasts(tp), get_class_n_upcasts(tp));
-                               fprintf(F, "  Estimated #Downcasts: %lf (#CastOps: %d)\n", get_class_estimated_n_downcasts(tp), get_class_n_downcasts(tp));
-                               assert(get_class_n_upcasts(tp) + get_class_n_downcasts(tp) == get_type_n_casts(tp));
-                       }
-               }
-#endif
-
-       }
-
        fprintf(F, "\n\n");
 }
 
-void dump_type(ir_type *tp)
-{
-       dump_type_to_file (stdout, tp, dump_verbosity_max);
-}
-
-void dump_types_as_text(unsigned verbosity, const char *suffix)
+void dump_types_as_text(FILE *out)
 {
-       const char *basename;
-       FILE *F;
-       int i, n_types = get_irp_n_types();
-
-       basename = irp_prog_name_is_set() ? get_irp_name() : "TextTypes";
-       F = text_open(basename, suffix, "-types", ".txt");
+       int i;
+       int n_types = get_irp_n_types();
 
        for (i = 0; i < n_types; ++i) {
-               ir_type *t = get_irp_type(i);
-
-               //if (is_jack_rts_class(t)) continue;
-
-               dump_type_to_file(F, t, verbosity);
+               ir_type *type = get_irp_type(i);
+               dump_type_to_file(out, type);
        }
-
-       fclose(F);
 }
 
-void dump_globals_as_text(unsigned verbosity, const char *suffix)
+void dump_globals_as_text(FILE *out)
 {
-       const char *basename;
-       FILE *F;
-       ir_type *g = get_glob_type();
-       int i, n_mems = get_class_n_members(g);
-
-       basename = irp_prog_name_is_set() ? get_irp_name() : "TextGlobals";
-       F = text_open (basename, suffix, "-globals", ".txt");
+       ir_type *global_type = get_glob_type();
+       int      n_members   = get_class_n_members(global_type);
+       int      i;
 
-       for (i = 0; i < n_mems; ++i) {
-               ir_entity *e = get_class_member(g, i);
-
-               dump_entity_to_file(F, e, verbosity);
+       for (i = 0; i < n_members; ++i) {
+               ir_entity *entity = get_class_member(global_type, i);
+               dump_entity_to_file(out, entity);
        }
-
-       fclose (F);
 }