fix fehler175.c
[libfirm] / ir / ir / irdumptxt.c
index c4af212..7d90a66 100644 (file)
@@ -32,8 +32,6 @@
 #include "irdump_t.h"
 #include "irgraph_t.h"
 
-#include "firm_common_t.h"
-
 #include "irprog_t.h"
 #include "entity_t.h"
 #include "trouts.h"
@@ -106,9 +104,9 @@ int dump_irnode_to_file(FILE *F, ir_node *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, "  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));
+       fprintf (F, "  visited: %ld\n", get_irn_visited(n));
        irg = get_irn_irg(n);
        if (irg != get_const_code_irg())
                fprintf (F, "  irg:     %s\n", get_ent_dump_name(get_irg_entity(irg)));
@@ -123,7 +121,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
 #ifdef INTERPROCEDURAL_VIEW
        fprintf(F, "  arity:   %d\n", get_irn_intra_arity(n));
        /* show all predecessor nodes */
-       fprintf(F, "  pred nodes: \n");
+       fprintf(F, "  pred nodes:\n");
        if (!is_Block(n)) {
                fprintf(F, "    -1:    ");
                dump_node_opcode(F, get_irn_n(n, -1));
@@ -137,7 +135,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
 #else
        fprintf(F, "  arity:   %d\n", get_irn_arity(n));
        /* show all predecessor nodes */
-       fprintf(F, "  pred nodes: \n");
+       fprintf(F, "  pred nodes:\n");
        if (!is_Block(n)) {
                fprintf(F, "    -1:    ");
                dump_node_opcode(F, get_irn_n(n, -1));
@@ -158,7 +156,7 @@ int dump_irnode_to_file(FILE *F, ir_node *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");
+               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));
@@ -184,18 +182,19 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
        }
 
        /* Loop node.   Someone else please tell me what's wrong ... */
-       if (get_irn_loop(n)) {
+       if (get_irg_loopinfo_state(irg) & loopinfo_valid) {
                ir_loop *loop = get_irn_loop(n);
-               assert(loop);
-               fprintf(F, "  in loop %d with depth %d\n",
-                       get_loop_loop_nr(loop), get_loop_depth(loop));
+               if (loop != NULL) {
+                       fprintf(F, "  in loop %d with depth %d\n",
+                               get_loop_loop_nr(loop), get_loop_depth(loop));
+               }
        }
 
        /* Source types */
        switch (get_irn_opcode(n)) {
        case iro_Block: {
-               if (has_Block_label(n))
-                       fprintf(F, "  Label: %lu\n", get_Block_label(n));
+               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));
@@ -225,9 +224,9 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
        }  break;
        case iro_Start: {
                ir_type *tp = get_entity_type(get_irg_entity(get_irn_irg(n)));
-               fprintf(F, "  start of method of type %s \n", get_type_name_ex(tp, &bad));
+               ir_fprintf(F, "  start of method of type %+F\n", tp);
                for (i = 0; i < get_method_n_params(tp); ++i)
-                       fprintf(F, "    param %d type: %s \n", i, get_type_name_ex(get_method_param_type(tp, i), &bad));
+                       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);
@@ -235,32 +234,34 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                        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)));
+                               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, "  condition kind: %s\n",  get_Cond_kind(n) == dense ? "dense" : "fragmentary");
-               fprintf(F, "  default ProjNr: %ld\n", get_Cond_defaultProj(n));
-               if (get_Cond_jmp_pred(n) != COND_JMP_PRED_NONE)
-                       fprintf(F, "  jump prediction: %s\n", get_cond_jmp_predicate_name(get_Cond_jmp_pred(n)));
+               fprintf(F, "  default ProjNr: %ld\n", get_Cond_default_proj(n));
+               if (get_Cond_jmp_pred(n) != COND_JMP_PRED_NONE) {
+                       fprintf(F, "  jump prediction: %s\n",
+                               get_cond_jmp_predicate_name(get_Cond_jmp_pred(n)));
+               }
        } break;
        case iro_Alloc: {
-               fprintf(F, "  allocating entity of type: %s \n", get_type_name_ex(get_Alloc_type(n), &bad));
+               ir_fprintf(F, "  allocating entity of type: %+F\n", get_Alloc_type(n));
                fprintf(F, "  allocating on: the %s\n", (get_Alloc_where(n) == stack_alloc) ? "stack" : "heap");
        } break;
        case iro_Free: {
-               fprintf(F, "  freeing entity of type %s \n", get_type_name_ex(get_Free_type(n), &bad));
+               ir_fprintf(F, "  freeing entity of type %+F\n", get_Free_type(n));
                fprintf(F, "  allocated on: the %s\n", (get_Free_where(n) == stack_alloc) ? "stack" : "heap");
        } break;
        case iro_Sel: {
                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));
-                       fprintf(F, "    with owner %s.\n", get_type_name_ex(get_entity_owner(ent), &bad));
+                       ir_fprintf(F, "    of type    %+F\n",  get_entity_type(ent));
+                       ir_fprintf(F, "    with owner %+F.\n", get_entity_owner(ent));
                }
                else {
                        fprintf(F, "  <NULL entity>\n");
@@ -269,15 +270,17 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
        } break;
        case iro_Call: {
                ir_type *tp = get_Call_type(n);
-               fprintf(F, "  calling method of type %s \n", get_type_name_ex(tp, &bad));
+               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) {
                        for (i = 0; i < get_method_n_params(tp); ++i)
-                               fprintf(F, "    param %d type: %s \n", i, get_type_name_ex(get_method_param_type(tp, i), &bad));
+                               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)
-                               fprintf(F, "    resul %d type: %s \n", i, get_type_name_ex(get_method_res_type(tp, i), &bad));
+                               ir_fprintf(F, "    result %d type: %+F\n", i, get_method_res_type(tp, i));
                }
                if (Call_has_callees(n)) {
-                       fprintf(F, "  possible callees: \n");
+                       fprintf(F, "  possible callees:\n");
                        for (i = 0; i < get_Call_n_callees(n); i++) {
                                fprintf(F, "    %d: %s\n", i, get_ent_dump_name(get_Call_callee(n, i)));
                        }
@@ -287,26 +290,28 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                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");
+                       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: {
-               fprintf(F, "  cast to type: %s\n", get_type_name_ex(get_Cast_type(n), &bad));
+               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)));
-                       fprintf(F, "  return in method of type %s \n", get_type_name_ex(tp, &bad));
-                       for (i = 0; i < get_method_n_ress(tp); ++i)
-                               fprintf(F, "    res %d type: %s \n", i, get_type_name_ex(get_method_res_type(tp, i), &bad));
+                       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);
-               fprintf(F, "  Const of type %s \n", get_type_name_ex(get_Const_type(n), &bad));
+               ir_fprintf(F, "  Const of type %+F\n", get_Const_type(n));
        } break;
        case iro_SymConst: {
                switch(get_SymConst_kind(n)) {
@@ -341,14 +346,10 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                        break;
                case symconst_enum_const:
                        fprintf(F, "  kind: enumeration\n");
-                       fprintf(F, "  name: %s\n", get_enumeration_name(get_SymConst_enum(n)));
-                       break;
-               case symconst_label:
-                       fprintf(F, "  kind: label\n");
-                       fprintf(F, "  label: %lu\n", get_SymConst_label(n));
+                       fprintf(F, "  name: %s\n", get_enumeration_const_name(get_SymConst_enum(n)));
                        break;
                }
-               fprintf(F, "  type of value: %s \n", get_type_name_ex(get_SymConst_value_type(n), &bad));
+               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));
@@ -399,7 +400,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
        if (get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_consistent  ||
                get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_inconsistent  )
                if (get_irn_typeinfo_type(n) != firm_none_type)
-                       fprintf (F, "  Analysed type: %s\n", get_type_name_ex(get_irn_typeinfo_type(n), &bad));
+                       ir_fprintf (F, "  Analysed type: %s\n", get_irn_typeinfo_type(n));
 
        return bad;
 }
@@ -536,8 +537,7 @@ static void dump_type_list(FILE *F, ir_type *tp, char *prefix,
                        fprintf(F, ",\n%s   ", prefix);
                        comma = "";
                }
-               fprintf(F, "%s %s(%ld)", comma, get_type_name(get_type(tp, i)), get_type_nr(tp));
-               //dump_type_to_file(F, get_type(tp, i), dump_verbosity_onlynames);
+               ir_fprintf(F, "%s %+F", comma, get_type(tp, i));
                comma = ",";
        }
        fprintf(F, "\n");
@@ -622,36 +622,37 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
        owner = get_entity_owner(ent);
        type  = get_entity_type(ent);
        if (verbosity & dump_verbosity_onlynames) {
-               fprintf(F, "%sentity %s.%s (%ld)\n", prefix, get_type_name(get_entity_owner(ent)),
+               fprintf(F, "%sentity %s.%s (%ld)\n", prefix, get_compound_name(get_entity_owner(ent)),
                        get_entity_name(ent), get_entity_nr(ent));
                return;
        }
 
        if (verbosity & dump_verbosity_entattrs) {
                fprintf(F, "%sentity %s (%ld)\n", prefix, get_entity_name(ent), get_entity_nr(ent));
-               fprintf(F, "%s  type:  %s (%ld)\n", prefix, get_type_name(type),  get_type_nr(type));
-               fprintf(F, "%s  owner: %s (%ld)\n", prefix, get_type_name(owner), get_type_nr(owner));
+               ir_fprintf(F, "%s  type:  %+F\n", prefix, type);
+               ir_fprintf(F, "%s  owner: %+F\n", prefix, owner);
 
                if (is_Class_type(get_entity_owner(ent))) {
                        if (get_entity_n_overwrites(ent) > 0) {
                                fprintf(F, "%s  overwrites:\n", prefix);
                                for (i = 0; i < get_entity_n_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)));
+                                       ir_fprintf(F, "%s    %d: %s of class %+F\n", prefix, i,
+                                               get_entity_name(ov), get_entity_owner(ov));
                                }
                        } else {
-                               fprintf(F, "%s  Does not overwrite other entities. \n", prefix);
+                               fprintf(F, "%s  Does not overwrite other entities.\n", prefix);
                        }
                        if (get_entity_n_overwrittenby(ent) > 0) {
                                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);
-                                       fprintf(F, "%s    %d: %s of class %s\n", prefix, i, get_entity_name(ov),
-                                               get_type_name(get_entity_owner(ov)));
+                                       ir_fprintf(F, "%s    %d: %s of class %+F\n", prefix, i,
+                                                  get_entity_name(ov), get_entity_owner(ov));
                                }
                        } else {
-                               fprintf(F, "%s  Is not overwritten by other entities. \n", prefix);
+                               fprintf(F, "%s  Is not overwritten by other entities.\n",
+                                       prefix);
                        }
 
                        if (get_irp_inh_transitive_closure_state() != inh_transitive_closure_none) {
@@ -660,15 +661,15 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                for (ov = get_entity_trans_overwrites_first(ent);
                                ov;
                                ov = get_entity_trans_overwrites_next(ent)) {
-                                       fprintf(F, "%s    : %s of class %s\n", prefix, get_entity_name(ov),
-                                               get_type_name(get_entity_owner(ov)));
+                                       ir_fprintf(F, "%s    : %s of class %+F\n", prefix,
+                                                  get_entity_name(ov), get_entity_owner(ov));
                                }
                                fprintf(F, "%s  transitive overwritten by:\n", prefix);
                                for (ov = get_entity_trans_overwrittenby_first(ent);
                                ov;
                                ov = get_entity_trans_overwrittenby_next(ent)) {
-                                       fprintf(F, "%s    : %s of class %s\n", prefix, get_entity_name(ov),
-                                               get_type_name(get_entity_owner(ov)));
+                                       ir_fprintf(F, "%s    : %s of class %+F\n", prefix,
+                                                  get_entity_name(ov), get_entity_owner(ov));
                                }
                        }
                }
@@ -690,43 +691,49 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                        if (mask) {
                                fprintf(F, "\n%s  additional prop: ", prefix);
 
-                               if (mask & mtp_property_const)    fprintf(F, "const_function, ");
-                               if (mask & mtp_property_pure)     fprintf(F, "pure_function, ");
-                               if (mask & mtp_property_noreturn) fprintf(F, "noreturn_function, ");
-                               if (mask & mtp_property_nothrow)  fprintf(F, "nothrow_function, ");
-                               if (mask & mtp_property_naked)    fprintf(F, "naked_function, ");
-                               if (mask & mtp_property_weak)     fprintf(F, "weak_function, ");
+                               if (mask & mtp_property_const)         fputs("const_function, ", F);
+                               if (mask & mtp_property_pure)          fputs("pure_function, ", F);
+                               if (mask & mtp_property_noreturn)      fputs("noreturn_function, ", F);
+                               if (mask & mtp_property_nothrow)       fputs("nothrow_function, ", F);
+                               if (mask & mtp_property_naked)         fputs("naked_function, ", F);
+                               if (mask & mtp_property_malloc)        fputs("malloc_function, ", F);
+                               if (mask & mtp_property_weak)          fputs("weak_function, ", F);
+                               if (mask & mtp_property_returns_twice) fputs("weak_function, ", F);
+                               if (mask & mtp_property_intrinsic)     fputs("intrinsic_function, ", F);
+                               if (mask & mtp_property_runtime)       fputs("runtime_function, ", F);
+                               if (mask & mtp_property_private)       fputs("private_function, ", F);
+                               if (mask & mtp_property_has_loop)      fputs("has_loop_function, ", F);
                        }
                        fprintf(F, "\n%s  calling convention: ", prefix);
-                       if (cc & cc_reg_param) fprintf(F, "regparam, ");
-                       if (cc & cc_this_call) fprintf(F, "thiscall, ");
-                       if (cc & cc_compound_ret) fprintf(F, "compound_ret, ");
-                       if (cc & cc_frame_on_caller_stk) fprintf(F, "frame on caller's stack, ");
+                       if (cc & cc_reg_param)           fputs("regparam, ", F);
+                       if (cc & cc_this_call)           fputs("thiscall, ", F);
+                       if (cc & cc_compound_ret)        fputs("compound_ret, ", F);
+                       if (cc & cc_frame_on_caller_stk) fputs("frame on caller's stack, ", F);
                        cc &= ~(cc_compound_ret|cc_frame_on_caller_stk);
                        if (IS_CDECL(cc))
-                               fprintf(F, "cdecl");
+                               fputs("cdecl", F);
                        else if (IS_STDCALL(cc))
-                               fprintf(F, "stdcall");
+                               fputs("stdcall", F);
                        else {
-                               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");
+                               fputs(cc & cc_last_on_top      ? "last param on top, " : "first param on top, ", F);
+                               fputs(cc & cc_callee_clear_stk ? "callee clear stack" : "caller clear stack", F);
                        }
                        fprintf(F, "\n%s  vtable number:        %u", prefix, get_entity_vtable_number(ent));
                }
 
-               fprintf(F, "\n");
+               fputc('\n', F);
        } else {  /* no entattrs */
-               fprintf(F, "%s(%3d:%d) %-40s: %s", prefix,
+               ir_fprintf(F, "%s(%3d:%d) %+F: %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, "(...)");
+                       get_entity_type(ent), get_entity_name(ent));
+               if (is_Method_type(get_entity_type(ent))) fputs("(...)", F);
 
                if (verbosity & dump_verbosity_accessStats) {
-                       if (get_entity_allocation(ent) == allocation_static) fprintf(F, " (stat)");
-                       if (get_entity_peculiarity(ent) == peculiarity_description) fprintf(F, " (desc)");
-                       if (get_entity_peculiarity(ent) == peculiarity_inherited)   fprintf(F, " (inh)");
+                       if (get_entity_allocation(ent) == allocation_static)        fputs(" (stat)", F);
+                       if (get_entity_peculiarity(ent) == peculiarity_description) fputs(" (desc)", F);
+                       if (get_entity_peculiarity(ent) == peculiarity_inherited)   fputs(" (inh)", F);
                }
-               fprintf(F, "\n");
+               fputc('\n', F);
        }
 
        if (verbosity & dump_verbosity_entconsts) {
@@ -761,13 +768,14 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                        }
                                }
                        }
-                       fprintf(F, "\n");
+                       fputc('\n', F);
                }
        }
 
        if (verbosity & dump_verbosity_entattrs) {
                fprintf(F, "%s  volatility:  %s", prefix, get_volatility_name(get_entity_volatility(ent)));
-               fprintf(F, "\n%s  alignment:  %s", prefix, get_align_name(get_entity_align(ent)));
+               fprintf(F, "\n%s  aligned:  %s", prefix, get_align_name(get_entity_aligned(ent)));
+               fprintf(F, "\n%s  alignment:  %u", prefix, get_entity_alignment(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 bytes, %d rem bits", prefix, get_entity_offset(ent), get_entity_offset_bits_remainder(ent));
@@ -784,7 +792,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                fprintf(F, "\n%s  irg = NULL", prefix);
                        }
                }
-               fprintf(F, "\n");
+               fputc('\n', F);
        }
 
        if (get_trouts_state()) {
@@ -986,7 +994,7 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
 
        if (get_entity_allocation(ent) != allocation_static) {
 
-               fprintf(F, "%s_%s", get_type_name(get_entity_owner(ent)), get_entity_name(ent));
+               ir_fprintf(F, "%+F_%s", get_entity_owner(ent), get_entity_name(ent));
 
                if (max_L_freq >= 0) {
                        fprintf(F, "%s Load", comma);
@@ -995,7 +1003,10 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
                        }
                }
                if (max_S_freq >= 0) {
-                       if (max_L_freq >= 0)    fprintf(F, "\n%s_%s", get_type_name(get_entity_owner(ent)), get_entity_name(ent));
+                       if (max_L_freq >= 0) {
+                               ir_fprintf(F, "\n%+F_%s", get_entity_owner(ent),
+                                          get_entity_name(ent));
+                       }
                        fprintf(F, "%s Store", comma);
                        for (i = 0; i <= max_S_freq; ++i) {
                                fprintf(F, "%s %d", comma, S_freq[i]);
@@ -1032,7 +1043,7 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
 /* A fast hack to dump a CSV-file. */
 void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const char *comma) {
        int i;
-       char buf[1024 + 10];
+       char buf[1024];
        (void) comma;
 
        if (!is_Class_type(tp)) return;   // we also want array types. Stupid, these are classes in java.
@@ -1066,7 +1077,7 @@ void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const
                        assert(is_Alloc(all));
                }
 
-               fprintf(F, "%s ", get_type_name(tp));
+               ir_fprintf(F, "%+F ", tp);
                fprintf(F, "%s Alloc ", comma);
 
                if (max_freq >= 0) {
@@ -1087,7 +1098,7 @@ void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const
                }
 
                if (max_disp >= 0) {
-                       fprintf(F, "%s__disp_tab%s Load", get_type_name(tp), comma);
+                       ir_fprintf(F, "%+F__disp_tab%s Load", tp, comma);
                        for (i = 0; i <= max_disp; ++i) {
                                fprintf(F, "%s %d", comma, disp[i]);
                        }
@@ -1100,9 +1111,9 @@ void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const
 
 #define DISP_TAB_SUFFIX "__disp_tab"
                if (get_trouts_state() != outs_none) {
-                       assert(strlen(get_type_name(tp)) < 1024);
-                       fprintf(F, "%-44s %6.2lf  -1.00\n", get_type_name(tp), get_type_estimated_n_instances(tp));
-                       sprintf(buf, "%s%s", get_type_name(tp), DISP_TAB_SUFFIX);
+                       ir_fprintf(F, "%+F %6.2lf  -1.00\n", tp,
+                                  get_type_estimated_n_instances(tp));
+                       ir_snprintf(buf, sizeof(buf), "%+F%s", tp, DISP_TAB_SUFFIX);
                        fprintf(F, "%-44s %6.2lf   0.00\n", buf, get_class_estimated_n_dyncalls(tp));
                }
 
@@ -1131,14 +1142,14 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
        if ((is_Primitive_type(tp))   && (verbosity & dump_verbosity_noPrimitiveTypes)) return;
        if ((is_Enumeration_type(tp)) && (verbosity & dump_verbosity_noEnumerationTypes)) return;
 
-       fprintf(F, "%s type %s (%ld)", get_tpop_name(get_type_tpop(tp)), get_type_name(tp), get_type_nr(tp));
+       ir_fprintf(F, "%+F", tp);
        if (verbosity & dump_verbosity_onlynames) { fprintf(F, "\n"); return; }
 
        switch (get_type_tpop_code(tp)) {
 
        case tpo_class:
                if ((verbosity & dump_verbosity_methods) || (verbosity & dump_verbosity_fields)) {
-                       fprintf(F, "\n  members: \n");
+                       fprintf(F, "\n  members:\n");
                }
                for (i = 0; i < get_class_n_members(tp); ++i) {
                        ir_entity *mem = get_class_member(tp, i);
@@ -1153,12 +1164,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    %d %s", i, get_type_name(stp));
+                               ir_fprintf(F, "\n    %d %+F", i, 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    %d %s", i, get_type_name(stp));
+                               ir_fprintf(F, "\n    %d %+F", i, stp);
                        }
 
                        if (get_irp_inh_transitive_closure_state() != inh_transitive_closure_none) {
@@ -1167,13 +1178,13 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
                                for (stp = get_class_trans_supertype_first(tp);
                                stp;
                                stp = get_class_trans_supertype_next(tp)) {
-                                       fprintf(F, "\n    %s", get_type_name(stp));
+                                       ir_fprintf(F, "\n    %+F", stp);
                                }
                                fprintf(F, "\n  transitive subtypes: ");
                                for (stp = get_class_trans_subtype_first(tp);
                                stp;
                                stp = get_class_trans_subtype_next(tp)) {
-                                       fprintf(F, "\n    %s", get_type_name(stp));
+                                       ir_fprintf(F, "\n    %+F", stp);
                                }
                        }
 
@@ -1230,7 +1241,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
                                        fprintf(F, " %ld]", get_irn_node_nr(upper));
                                }
                        }
-                       fprintf(F, " of <%s (%ld)>", get_type_name(elem_tp), get_type_nr(elem_tp));
+                       ir_fprintf(F, " of <%+F>", elem_tp);
 
                        fprintf(F, "\n  order: ");
                        for (i = 0; i < n_dim; ++i)
@@ -1248,7 +1259,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
        case tpo_pointer:
                if (verbosity & dump_verbosity_typeattrs) {
                        ir_type *tt = get_pointer_points_to_type(tp);
-                       fprintf(F, "\n  points to %s (%ld)\n", get_type_name(tt), get_type_nr(tt));
+                       ir_fprintf(F, "\n  points to %+F\n", tt);
                }
                break;
 
@@ -1258,13 +1269,13 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
                        fprintf(F, "\n  return types: %d", get_method_n_ress(tp));
                        for (i = 0; i < get_method_n_ress(tp); ++i) {
                                ir_type *rtp = get_method_res_type(tp, i);
-                               fprintf(F, "\n    %s", get_type_name(rtp));
+                               ir_fprintf(F, "\n    %+F", rtp);
                        }
 
                        fprintf(F, "\n  parameter types: %d", get_method_n_params(tp));
                        for (i = 0; i < get_method_n_params(tp); ++i) {
                                ir_type *ptp = get_method_param_type(tp, i);
-                               fprintf(F, "\n    %s", get_type_name(ptp));
+                               ir_fprintf(F, "\n    %+F", ptp);
                        }
                        if (get_method_variadicity(tp)) {
                                fprintf(F, "\n    ...");
@@ -1277,12 +1288,11 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
                if (verbosity & dump_verbosity_typeattrs) {
                        ir_type *base_tp = get_primitive_base_type(tp);
                        if (base_tp != NULL)
-                               fprintf(F, "\n  base type: %s (%ld)", get_type_name(tp), get_type_nr(tp));
+                               ir_fprintf(F, "\n  base type: %+F", tp);
                        fprintf(F, "\n");
                }
                break;
 
-       case tpo_id:
        case tpo_none:
        case tpo_unknown:
                fprintf(F, "\n");
@@ -1376,7 +1386,7 @@ void dump_types_as_text(unsigned verbosity, const char *suffix) {
        FILE *F, *CSV = NULL;
        int i, n_types = get_irp_n_types();
 
-       basename = irp_prog_name_is_set() ? get_irp_prog_name() : "TextTypes";
+       basename = irp_prog_name_is_set() ? get_irp_name() : "TextTypes";
        F = text_open(basename, suffix, "-types", ".txt");
 
        if (verbosity & dump_verbosity_csv) {
@@ -1408,7 +1418,7 @@ void dump_globals_as_text(unsigned verbosity, const char *suffix) {
        ir_type *g = get_glob_type();
        int i, n_mems = get_class_n_members(g);
 
-       basename = irp_prog_name_is_set() ? get_irp_prog_name() : "TextGlobals";
+       basename = irp_prog_name_is_set() ? get_irp_name() : "TextGlobals";
        F = text_open (basename, suffix, "-globals", ".txt");
 
        if (verbosity & dump_verbosity_csv) {