X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdumptxt.c;h=afd542c1cf02fbec3c016864a1d2fefa80428141;hb=2814a774ee584b3c19ff3c87b3775ff46859b21e;hp=247bc41d2e7eb9a99069e4e7fae7feab258a655d;hpb=87da69a27791a9e0846e90da409d6e70e32814d3;p=libfirm

diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c
index 247bc41d2..afd542c1c 100644
--- a/ir/ir/irdumptxt.c
+++ b/ir/ir/irdumptxt.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -23,29 +23,22 @@
  * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-
 #include <stdarg.h>
 
 #include "irdump_t.h"
-
-#include "firm_common_t.h"
-
 #include "irgraph_t.h"
+
 #include "irprog_t.h"
 #include "entity_t.h"
 #include "trouts.h"
 #include "irgwalk.h"
 #include "tv_t.h"
+#include "irprintf.h"
+#include "error.h"
 
 #include "irdom.h"
 #include "field_temperature.h"
@@ -73,7 +66,7 @@ static FILE *text_open(const char *basename, const char * suffix1, const char *s
 	if (!suffix3) suffix3 = ".txt";
 
 	/* open file for vcg graph */
-	fname = xmalloc(strlen(basename)*2 + strlen(suffix1) + strlen(suffix2) + 5); /* *2: space for escapes. */
+	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 @. */
@@ -93,7 +86,7 @@ static FILE *text_open(const char *basename, const char * suffix1, const char *s
 	F = fopen(fname, "w");   /* open file for writing */
 	if (!F) {
 		perror(fname);
-		assert(0);
+		abort();
 	}
 	free(fname);
 
@@ -111,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)));
@@ -128,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));
@@ -142,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));
@@ -157,15 +150,14 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
 
 	fprintf(F, "  Private Attributes:\n");
 
-	if (get_irn_opcode(n) == iro_Proj)
+	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)
-		&& (get_irn_opcode(n) == iro_Filter || get_irn_opcode(n) == iro_Block)) {
+	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, "  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)));
@@ -179,9 +171,9 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
 	}
 
 	/* This is not nice, output it as a marker in the predecessor list. */
-	if ((get_irn_op(n) == op_Block) ||
-		(get_irn_op(n) == op_Phi) ||
-		((get_irn_op(n) == op_Filter) && get_interprocedural_view())) {
+	if (is_Block(n)             ||
+	    get_irn_op(n) == op_Phi ||
+	    (is_Filter(n) && get_interprocedural_view())) {
 		fprintf(F, "  backedges:");
 		comma = ' ';
 		for (i = 0; i < get_irn_arity(n); i++)
@@ -190,18 +182,22 @@ 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_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) {
 			fprintf(F, "  dom depth %d\n", get_Block_dom_depth(n));
 			fprintf(F, "  tree pre num %d\n", get_Block_dom_tree_pre_num(n));
@@ -222,17 +218,15 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
 			(get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent))
 			fprintf(F, "    final evaluation:           **%8.2lf**\n", get_irn_final_cost(n));
 #endif
-    if (has_Block_label(n))
-      fprintf(F, "    Label: %lu\n", get_Block_label(n));
 
 		/* not dumped: graph_arr */
 		/* not dumped: mature    */
 	}  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);
@@ -240,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");
@@ -274,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)));
 			}
@@ -292,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)) {
@@ -346,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));
@@ -404,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;
 }
@@ -529,9 +525,9 @@ static void dump_node_list(FILE *F, firm_kind *k, char *prefix,
  *  "prefix"    node16, node17\n
  */
 static void dump_type_list(FILE *F, ir_type *tp, char *prefix,
-                           int (*get_n_types)(ir_type *tp),
-                           ir_type *(*get_type)(ir_type *tp, int pos),
-                           char *name) {
+                           int (*get_n_types)(const ir_type *tp),
+                           ir_type *(*get_type)(const ir_type *tp, int pos),
+                           const char *name) {
 	int i, n_nodes = get_n_types(tp);
 	char *comma = "";
 
@@ -541,13 +537,98 @@ 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");
 }
 
+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;
+
+	if (need_nl) {
+		fprintf(F, "\n%s    ", prefix);
+		need_nl = 0;
+	}
+	switch (get_initializer_kind(initializer)) {
+	case IR_INITIALIZER_NULL:
+		fprintf(F, "\t = <NOT_SET>");
+		break;
+	case IR_INITIALIZER_TARVAL:
+		tv = get_initializer_tarval_value(initializer);
+		ir_fprintf(F, "\t = <TV>%F", tv);
+		break;
+	case IR_INITIALIZER_CONST:
+		value = get_initializer_const_value(initializer);
+		fprintf(F, "\t = <CONST>");
+		dump_node_opcode(F, value);
+		break;
+	case IR_INITIALIZER_COMPOUND:
+		if (is_Array_type(type)) {
+			size_t i, n = get_initializer_compound_n_entries(initializer);
+			ir_type *element_type = get_array_element_type(type);
+			for (i = 0; i < n; ++i) {
+				ir_initializer_t *sub_initializer
+					= get_initializer_compound_value(initializer, i);
+
+				if (need_nl) {
+					fprintf(F, "\n%s    ", prefix);
+					need_nl = 0;
+				}
+				fprintf(F, "[%d]", (int) i);
+				dump_ir_initializers_to_file(F, prefix, sub_initializer, element_type);
+			}
+		} else {
+			size_t i, n;
+			assert(is_compound_type(type));
+			n = get_compound_n_members(type);
+			for (i = 0; i < n; ++i) {
+				ir_entity        *member    = get_compound_member(type, i);
+				ir_type          *subtype   = get_entity_type(member);
+				ir_initializer_t *sub_initializer;
+
+				assert(i < get_initializer_compound_n_entries(initializer));
+				sub_initializer
+					= get_initializer_compound_value(initializer, i);
+
+				if (need_nl) {
+					fprintf(F, "\n%s    ", prefix);
+					need_nl = 0;
+				}
+				ir_fprintf(F, ".%F", member);
+				dump_ir_initializers_to_file(F, prefix, sub_initializer, subtype);
+			}
+		}
+		break;
+	default:
+		panic("invalid ir_initializer kind found");
+	}
+	need_nl = 1;
+}
+
+static void dump_entity_linkage(FILE *F, const ir_entity *entity)
+{
+	ir_linkage linkage = get_entity_linkage(entity);
+
+	if (linkage & IR_LINKAGE_CONSTANT)
+		fprintf(F, " constant");
+	if (linkage & IR_LINKAGE_WEAK)
+		fprintf(F, " weak");
+	if (linkage & IR_LINKAGE_GARBAGE_COLLECT)
+		fprintf(F, " garbage_collect");
+	if (linkage & IR_LINKAGE_MERGE)
+		fprintf(F, " merge");
+	if (linkage & IR_LINKAGE_HIDDEN_USER)
+		fprintf(F, " hidden_user");
+}
+
 void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned verbosity) {
 	int i, j;
 	ir_type *owner, *type;
@@ -556,36 +637,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) {
@@ -594,22 +676,21 @@ 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));
 				}
 			}
 		}
 
-		fprintf(F, "%s  allocation:  %s", prefix, get_allocation_name(get_entity_allocation(ent)));
-		fprintf(F, "\n%s  visibility:  %s", prefix, get_visibility_name(get_entity_visibility(ent)));
-		fprintf(F, "\n%s  variability: %s", prefix, get_variability_name(get_entity_variability(ent)));
+		fprintf(F, "%s  linkage:", prefix);
+		dump_entity_linkage(F, ent);
 
 		if (is_Method_type(get_entity_type(ent))) {
 			unsigned mask = get_entity_additional_properties(ent);
@@ -624,73 +705,82 @@ 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_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_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_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)");
+			dump_entity_linkage(F, ent);
 		}
-		fprintf(F, "\n");
+		fputc('\n', F);
 	}
 
 	if (verbosity & dump_verbosity_entconsts) {
-		if (get_entity_variability(ent) != variability_uninitialized) {
-			if (is_atomic_entity(ent)) {
-				fprintf(F, "%s  atomic value: ", prefix);
-				dump_node_opcode(F, get_atomic_ent_value(ent));
-			} else {
-				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);
-					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));
-					if (get_type_state(type) == layout_fixed)
-						fprintf(F, "(%3u:%u) ",   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) {
-						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, "\t = ");
-					dump_node_opcode(F, get_compound_ent_value(ent, i));
+		if (ent->initializer != NULL) {
+			const ir_initializer_t *initializer = get_entity_initializer(ent);
+			fprintf(F, "\n%s  Initializers:", prefix);
+			need_nl = 1;
+			dump_ir_initializers_to_file(F, prefix, initializer, get_entity_type(ent));
+		} else if (entity_has_compound_ent_values(ent)) {
+			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);
+				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));
+				if (get_type_state(type) == layout_fixed)
+					fprintf(F, "(%3u:%u) ",   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) {
+					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, "\t = ");
+				dump_node_opcode(F, get_compound_ent_value(ent, i));
 			}
-			fprintf(F, "\n");
+			fputc('\n', F);
 		}
 	}
 
 	if (verbosity & dump_verbosity_entattrs) {
+		fprintf(F, "%s  linkage:", prefix);
+		dump_entity_linkage(F, ent);
 		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  peculiarity: %s", prefix, get_peculiarity_name(get_entity_peculiarity(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  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));
 		if (is_Method_type(get_entity_type(ent))) {
@@ -706,7 +796,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()) {
@@ -737,7 +827,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
 			max_depth = (depth > max_depth) ? depth : max_depth ;
 		}
 
-		L_freq = xcalloc(4 * max_depth, sizeof(L_freq[0]));
+		L_freq = XMALLOCNZ(int, 4 * max_depth);
 
 		S_freq  = L_freq + 1*max_depth;
 		LA_freq = L_freq + 2*max_depth;
@@ -747,14 +837,14 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
 			ir_node *acc = get_entity_access(ent, i);
 			int depth = get_weighted_loop_depth(acc);
 			assert(depth < max_depth);
-			if ((get_irn_op(acc) == op_Load) || (get_irn_op(acc) == op_Call)) {
+			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 (get_irn_op(acc) == op_Store) {
+			} else if (is_Store(acc)) {
 				S_freq[depth]++;
 				max_S_freq = (depth > max_S_freq) ? depth : max_S_freq;
 				if (addr_is_alloc(acc)) {
@@ -843,204 +933,6 @@ void dump_entity(ir_entity *ent) {
   dump_entity_to_file(stdout, ent, dump_verbosity_max);
 }
 
-void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
-                                   unsigned verbosity, int *max_disp,
-                                   int disp[], const char *comma)
-{
-	(void) verbosity;
-	(void) max_disp;
-	(void) disp;
-	(void) comma;
-#if 0   /* Outputs loop depth of all occurrences. */
-	int n_acc = get_entity_n_accesses(ent);
-	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;
-	int i, max_depth = 0;
-
-	/* 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 = xcalloc(4 * (max_depth+1), sizeof(L_freq[0]));
-
-	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 ((get_irn_op(acc) == op_Load) || (get_irn_op(acc) == op_Call)) {
-			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;
-			}
-			if (get_entity_allocation(ent) == allocation_static) {
-				disp[depth]++;
-				*max_disp = (depth > *max_disp) ? depth : *max_disp;
-			}
-		} else if (get_irn_op(acc) == op_Store) {
-			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;
-			}
-			if (get_entity_allocation(ent) == allocation_static) {
-				assert(0);
-			}
-		} else {
-			assert(0);
-		}
-	}
-
-	if (get_entity_allocation(ent) != allocation_static) {
-
-		fprintf(F, "%s_%s", get_type_name(get_entity_owner(ent)), get_entity_name(ent));
-
-		if (max_L_freq >= 0) {
-			fprintf(F, "%s Load", comma);
-			for (i = 0; i <= max_L_freq; ++i) {
-				fprintf(F, "%s %d", comma, L_freq[i]);
-			}
-		}
-		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));
-			fprintf(F, "%s Store", comma);
-			for (i = 0; i <= max_S_freq; ++i) {
-				fprintf(F, "%s %d", comma, S_freq[i]);
-			}
-		}
-		fprintf(F, "\n");
-	}
-	free(L_freq);
-#endif
-
-	if (get_entity_allocation(ent) != allocation_static) {
-		if (is_Method_type(get_entity_type(ent))) return;
-
-		/* Output the entity name. */
-		fprintf(F, "%s%-40s ", prefix, get_entity_ld_name(ent));
-
-#ifdef INTERPROCEDURAL_VIEW
-		if (get_trouts_state() != outs_none) {
-			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, "%6.2lf ", get_entity_estimated_n_loads(ent));
-				fprintf(F, "%6.2lf", get_entity_estimated_n_stores(ent));
-			}
-		}
-#endif
-
-		fprintf(F, "\n");
-	}
-}
-
-#ifdef INTERPROCEDURAL_VIEW
-/* 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];
-	(void) comma;
-
-	if (!is_Class_type(tp)) return;   // we also want array types. Stupid, these are classes in java.
-
-	if (verbosity & dump_verbosity_accessStats) {
-
-#if 0
-		/* Outputs loop depth of all occurrences. */
-		int max_freq = -1;
-		int max_disp = -1;
-		int *freq, *disp; /* Accumulated accesses to static members: dispatch table. */
-		int n_all = get_type_n_allocs(tp);
-		int max_depth = 0;
-		/* 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 = xcalloc(2 * (max_depth+1), sizeof(freq[0]));
-
-		disp = freq + max_depth;
-
-		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(get_irn_op(all) == op_Alloc);
-		}
-
-		fprintf(F, "%s ", get_type_name(tp));
-		fprintf(F, "%s Alloc ", comma);
-
-		if (max_freq >= 0) {
-			for (i = 0; i <= max_freq; ++i) {
-				fprintf(F, "%s %d", comma, freq[i]);
-			}
-		}
-		fprintf(F, "\n");
-
-		for (i = 0; i < get_class_n_members(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))) {
-					dump_entitycsv_to_file_prefix(F, mem, "    ", verbosity, &max_disp, disp, comma);
-				}
-			}
-		}
-
-		if (max_disp >= 0) {
-			fprintf(F, "%s__disp_tab%s Load", get_type_name(tp), comma);
-			for (i = 0; i <= max_disp; ++i) {
-				fprintf(F, "%s %d", comma, disp[i]);
-			}
-			fprintf(F, "\n");
-		}
-
-		/* free allocated space */
-		free(freq);
-#endif
-
-#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);
-			fprintf(F, "%-44s %6.2lf   0.00\n", buf, get_class_estimated_n_dyncalls(tp));
-		}
-
-		for (i = 0; i < get_class_n_members(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))) {
-					dump_entitycsv_to_file_prefix(F, mem, "    ", verbosity, NULL, 0, 0);
-				}
-			}
-		}
-	}
-}
-#endif
-
 void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
 	int i;
 
@@ -1053,20 +945,20 @@ 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);
 			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))) {
+				if (!(verbosity & dump_verbosity_nostatic)) {
 					dump_entity_to_file_prefix(F, mem, "    ", verbosity);
 				}
 			}
@@ -1075,12 +967,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) {
@@ -1089,17 +981,16 @@ 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);
 				}
 			}
 
-			fprintf(F, "\n  peculiarity: %s\n", get_peculiarity_name(get_class_peculiarity(tp)));
 			fprintf(F, "\n  flags:       ");
 			if (is_class_final(tp))
 				fprintf(F, "final, ");
@@ -1138,21 +1029,21 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
 
 				fprintf(F, "[");
 
-				if (get_irn_op(lower) == op_Const)
+				if (is_Const(lower)) {
 					fprintf(F, "%ld .. ", get_tarval_long(get_Const_tarval(lower)));
-				else {
+				} else {
 					dump_node_opcode(F, lower);
 					fprintf(F, " %ld .. ", get_irn_node_nr(lower));
 				}
 
-				if (get_irn_op(upper) == op_Const)
+				if (is_Const(upper)) {
 					fprintf(F, "%ld]", get_tarval_long(get_Const_tarval(lower)));
-				else {
+				} else {
 					dump_node_opcode(F, upper);
 					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)
@@ -1170,7 +1061,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;
 
@@ -1180,13 +1071,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    ...");
@@ -1199,12 +1090,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");
@@ -1216,7 +1106,6 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
 		}
 	}
 
-	fprintf(F, "  visibility: %s,\n", get_visibility_name(get_type_visibility(tp)));
 	fprintf(F, "  state:      %s,\n", get_type_state_name(get_type_state(tp)));
 	fprintf(F, "  size:       %2u Bytes,\n", get_type_size_bytes(tp));
 	fprintf(F, "  alignment:  %2u Bytes,\n", get_type_alignment_bytes(tp));
@@ -1247,7 +1136,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
 			max_depth = (depth > max_depth) ? depth : max_depth ;
 		}
 
-		freq = xcalloc(max_depth+1, sizeof(freq[0]));
+		freq = XMALLOCNZ(int, max_depth + 1);
 
 		for (i = 0; i < n_all; ++i) {
 			ir_node *all = get_type_alloc(tp, i);
@@ -1255,7 +1144,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
 			assert(depth <= max_depth);
 			freq[depth]++;
 			max_freq = (depth > max_freq) ? depth : max_freq;
-			assert(get_irn_op(all) == op_Alloc);
+			assert(is_Alloc(all));
 		}
 
 		if (max_freq >= 0) {
@@ -1292,61 +1181,39 @@ 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) {
 	const char *basename;
-	FILE *F, *CSV = NULL;
+	FILE *F;
 	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) {
-		CSV = text_open(basename, suffix, "-types", ".csv");
-		//fprintf(CSV, "Class, Field, Operation, L0, L1, L2, L3\n");
-	}
-
 	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);
-#ifdef INTERPROCEDURAL_VIEW
-		if (CSV) {
-			dump_typecsv_to_file(CSV, t, verbosity, "");
-		}
-#endif
 	}
 
 	fclose(F);
-	if (CSV) fclose(CSV);
 }
 
-
 void dump_globals_as_text(unsigned verbosity, const char *suffix) {
 	const char *basename;
-	FILE *F, *CSV = NULL;
+	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_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) {
-		CSV = text_open (basename, suffix, "-types", ".csv");
-		//fprintf(CSV, "Class, Field, Operation, L0, L1, L2, L3\n");
-	}
-
 	for (i = 0; i < n_mems; ++i) {
 		ir_entity *e = get_class_member(g, i);
 
 		dump_entity_to_file(F, e, verbosity);
-		if (CSV) {
-			//dump_entitycsv_to_file_prefix(CSV, e, "", verbosity, ""???);
-		}
 	}
 
 	fclose (F);
-	if (CSV) fclose (CSV);
 }