X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=5305cc9323ca456405aa2f934f744eb16eadf061;hb=af0115376ccdcc72e0643caf221407218f4504f0;hp=c1c6db3066794991bcd6b408cbb8444c836130f3;hpb=1ce363f80e6a204d4011f85813362d9bd1d0e7e4;p=libfirm

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index c1c6db306..5305cc932 100644
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.c
@@ -23,24 +23,18 @@
  * @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 "firm_common_t.h"
 
 #include "list.h"
 
-#include "irnode.h"
-#include "irgraph.h"
+#include "irnode_t.h"
+#include "irgraph_t.h"
 #include "irprog_t.h"
 #include "entity_t.h"
 #include "irop.h"
@@ -58,6 +52,7 @@
 #include "irhooks.h"
 #include "dbginfo_t.h"
 #include "irtools.h"
+#include "irprintf.h"
 
 #include "irvrfy.h"
 
@@ -67,14 +62,6 @@
 #include "eset.h"
 #include "pset.h"
 
-#if DO_HEAPANALYSIS
-extern void dump_irn_chi_term(FILE *FL, ir_node *n);
-extern void dump_irn_state(FILE *FL, ir_node *n);
-extern int  get_opt_dump_abstvals(void);
-typedef unsigned long SeqNo;
-extern SeqNo get_Block_seqno(ir_node *n);
-#endif
-
 /** Dump only irgs with names that start with this prefix. */
 static ident *dump_file_filter_id = NULL;
 
@@ -106,6 +93,8 @@ static int dump_node_idx_labels = 0;
 static int dump_anchors = 0;
 /** An option to dump the macro block edges. */
 static int dump_macro_block_edges = 0;
+/** An option to dump block marker in the block title */
+static int dump_block_marker = 0;
 
 int dump_dominator_information_flag = 0;
 int opt_dump_analysed_type_info = 1;
@@ -254,6 +243,10 @@ void dump_macroblock_edges(int flag) {
 	dump_macro_block_edges = flag;
 }
 
+void dump_block_marker_in_title(int flag) {
+	dump_block_marker = flag;
+}
+
 /* -------------- some extended helper functions ----------------- */
 
 /**
@@ -321,6 +314,7 @@ static void init_colors(void)
 	custom_color(ird_color_phi,                   "105 255 105");
 	custom_color(ird_color_anchor,                "100 100 255");
 	named_color(ird_color_error,                  "red");
+	custom_color(ird_color_entity,                "204 204 255");
 
 	initialized = 1;
 }
@@ -369,7 +363,7 @@ static void print_type_ent_edge(FILE *F, ir_type *T, ir_entity *E, const char *f
  * Prints the edge from an entity E to an entity T with additional info fmt, ...
  * to the file F.
  */
-static void print_ent_ent_edge(FILE *F, ir_entity *E, ir_entity *T, int backedge, const char *fmt, ...)
+static void print_ent_ent_edge(FILE *F, ir_entity *E, ir_entity *T, int backedge, ird_color_t color, const char *fmt, ...)
 {
 	va_list ap;
 
@@ -381,6 +375,9 @@ static void print_ent_ent_edge(FILE *F, ir_entity *E, ir_entity *T, int backedge
 	PRINT_ENTID(E);
 	fprintf(F, "\" targetname: \""); PRINT_ENTID(T);  fprintf(F, "\"");
 	vfprintf(F, fmt, ap);
+	fprintf(F, " ");
+	if (color != (ird_color_t) -1)
+		print_vcg_color(F, color);
 	fprintf(F, "}\n");
 	va_end(ap);
 }
@@ -471,7 +468,7 @@ static void print_enum_item_edge(FILE *F, ir_type *E, int item, const char *fmt,
 /*-----------------------------------------------------------------*/
 
 static void dump_whole_node(ir_node *n, void *env);
-static INLINE void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg);
+static inline void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg);
 
 /*-----------------------------------------------------------------*/
 /* Helper functions.                                                */
@@ -601,9 +598,7 @@ static void collect_node(ir_node * node, void *env) {
 	(void) env;
 	if (is_Block(node)
 	    || node_floats(node)
-	    || get_irn_op(node) == op_Bad
-	    || get_irn_op(node) == op_Unknown
-	    || get_irn_op(node) == op_NoMem) {
+	    || (get_op_flags(get_irn_op(node)) & irop_flag_dump_noblock)) {
 		ir_node ** arr = (ir_node **) ird_get_irg_link(get_irn_irg(node));
 		if (!arr) arr = NEW_ARR_F(ir_node *, 0);
 		ARR_APP1(ir_node *, arr, node);
@@ -637,13 +632,14 @@ static ir_node **construct_block_lists(ir_graph *irg) {
 #ifdef INTERPROCEDURAL_VIEW
 	int      rem_view  = get_interprocedural_view();
 #endif
-	int      walk_flag = using_visited(irg);
+	int      walk_flag = ir_resources_reserved(irg) & IR_RESOURCE_IRN_VISITED;
 	ir_graph *rem      = current_ir_graph;
 
 	current_ir_graph = irg;
 
-	if(walk_flag)
-		clear_using_visited(current_ir_graph);
+	if(walk_flag) {
+		ir_free_resources(irg, IR_RESOURCE_IRN_VISITED);
+	}
 
 	for (i = get_irp_n_irgs() - 1; i >= 0; --i)
 		ird_set_irg_link(get_irp_irg(i), NULL);
@@ -664,8 +660,9 @@ static ir_node **construct_block_lists(ir_graph *irg) {
 	set_interprocedural_view(rem_view);
 #endif
 
-	if(walk_flag)
-		set_using_visited(current_ir_graph);
+	if(walk_flag) {
+		ir_reserve_resources(irg, IR_RESOURCE_IRN_VISITED);
+	}
 
 	current_ir_graph = rem;
 	return ird_get_irg_link(irg);
@@ -685,7 +682,7 @@ static list_tuple *construct_extblock_lists(ir_graph *irg) {
 	ir_node **blk_list = construct_block_lists(irg);
 	int i;
 	ir_graph *rem = current_ir_graph;
-	list_tuple *lists = xmalloc(sizeof(*lists));
+	list_tuple *lists = XMALLOC(list_tuple);
 
 	current_ir_graph = irg;
 
@@ -731,16 +728,7 @@ int dump_node_opcode(FILE *F, ir_node *n)
 
 	/* implementation for default nodes */
 	switch (get_irn_opcode(n)) {
-
-	case iro_Const: {
-		int res;
-		char buf[1024];
-		res = tarval_snprintf(buf, sizeof(buf), get_Const_tarval(n));
-		assert(res < (int) sizeof(buf) && "buffer to small for tarval_snprintf");
-		fprintf(F, buf);
-	} break;
-
-	case iro_SymConst: {
+	case iro_SymConst:
 		switch (get_SymConst_kind(n)) {
 		case symconst_addr_name:
 			/* don't use get_SymConst_ptr_info as it mangles the name. */
@@ -768,14 +756,14 @@ int dump_node_opcode(FILE *F, ir_node *n)
 			fprintf(F, "SymC %lu label", get_SymConst_label(n));
 			break;
 		}
-	} break;
+		break;
 
-	case iro_Filter: {
+	case iro_Filter:
 		if (!get_interprocedural_view())
 			fprintf(F, "Proj'");
 		else
 			goto default_case;
-	} break;
+		break;
 
 	case iro_Proj: {
 		ir_node *pred = get_Proj_pred(n);
@@ -790,20 +778,20 @@ int dump_node_opcode(FILE *F, ir_node *n)
 	case iro_Start:
 	case iro_End:
 	case iro_EndExcept:
-	case iro_EndReg: {
+	case iro_EndReg:
 		if (get_interprocedural_view()) {
 			fprintf(F, "%s %s", get_irn_opname(n), get_ent_dump_name(get_irg_entity(get_irn_irg(n))));
 			break;
 		} else
 			goto default_case;
-	}
+
 	case iro_CallBegin: {
 		ir_node *addr = get_CallBegin_ptr(n);
 		ir_entity *ent = NULL;
-		if (get_irn_op(addr) == op_Sel)
+		if (is_Sel(addr))
 			ent = get_Sel_entity(addr);
-		else if (is_SymConst_addr_ent(addr))
-			ent = get_SymConst_entity(addr);
+		else if (is_Global(addr))
+			ent = get_Global_entity(addr);
 		fprintf(F, "%s", get_irn_opname(n));
 		if (ent) fprintf(F, " %s", get_entity_name(ent));
 		break;
@@ -819,7 +807,9 @@ int dump_node_opcode(FILE *F, ir_node *n)
 		fprintf(F, "%s", get_irn_opname(n));
 		break;
 	case iro_Block:
-		fprintf(F, "%s%s", is_Block_dead(n) ? "Dead " : "", get_irn_opname(n));
+		fprintf(F, "%s%s%s",
+			is_Block_dead(n) ? "Dead " : "", get_irn_opname(n),
+			dump_block_marker ? (get_Block_mark(n) ? "*" : "") : "");
 		break;
 	case iro_Conv:
 		if (get_Conv_strict(n))
@@ -827,7 +817,10 @@ int dump_node_opcode(FILE *F, ir_node *n)
 		fprintf(F, "%s", get_irn_opname(n));
 		break;
 	case iro_Div:
-		fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_Div_resmode(n), &bad));
+		fprintf(F, "%s", get_irn_opname(n));
+		if (is_Div_remainderless(n))
+			fprintf(F, "RL");
+		fprintf(F, "[%s]", get_mode_name_ex(get_Div_resmode(n), &bad));
 		break;
 	case iro_Mod:
 		fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_Mod_resmode(n), &bad));
@@ -835,6 +828,9 @@ int dump_node_opcode(FILE *F, ir_node *n)
 	case iro_DivMod:
 		fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_DivMod_resmode(n), &bad));
 		break;
+	case iro_Builtin:
+		fprintf(F, "%s[%s]", get_irn_opname(n), get_builtin_kind_name(get_Builtin_kind(n)));
+		break;
 
 	default:
 default_case:
@@ -919,10 +915,8 @@ static const pns_lookup_t start_lut[] = {
 #define X(a)    { pn_Start_##a, #a }
 	X(X_initial_exec),
 	X(P_frame_base),
-	X(P_globals),
 	X(P_tls),
 	X(T_args),
-	X(P_value_arg_base)
 #undef X
 };
 
@@ -1098,6 +1092,10 @@ dump_node_nodeattr(FILE *F, ir_node *n)
 		}
 		break;
 
+	case iro_Const:
+		ir_fprintf(F, "%T ", get_Const_tarval(n));
+		break;
+
 	case iro_Proj:
 		pred    = get_Proj_pred(n);
 		proj_nr = get_Proj_proj(n);
@@ -1225,7 +1223,7 @@ static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
 		return;
 	}
 
-	mode = get_irn_mode(node);
+	mode = get_irn_mode(n);
 	if(mode == mode_M) {
 		print_vcg_color(F, ird_color_memory);
 		return;
@@ -1283,7 +1281,7 @@ static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
 /* Adds a new node info dumper callback. */
 void *dump_add_node_info_callback(dump_node_info_cb_t *cb, void *data)
 {
-	hook_entry_t *info = xmalloc(sizeof(*info));
+	hook_entry_t *info = XMALLOC(hook_entry_t);
 
 	info->hook._hook_node_info = cb;
 	info->context              = data;
@@ -1303,7 +1301,7 @@ void dump_remv_node_info_callback(void *handle)
 /**
  * Dump the node information of a node n to a file F.
  */
-static INLINE int dump_node_info(FILE *F, ir_node *n)
+static inline int dump_node_info(FILE *F, ir_node *n)
 {
 	int bad = 0;
 	const ir_op_ops *ops = get_op_ops(get_irn_op(n));
@@ -1321,7 +1319,7 @@ static INLINE int dump_node_info(FILE *F, ir_node *n)
 	return bad;
 }
 
-static INLINE int is_constlike_node(const ir_node *node)
+static inline int is_constlike_node(const ir_node *node)
 {
 	const ir_op *op = get_irn_op(node);
 	return is_op_constlike(op);
@@ -1345,7 +1343,7 @@ static void dump_const_node_local(FILE *F, ir_node *n) {
 
 	for (i = 0; i < get_irn_arity(n); i++) {
 		ir_node *con = get_irn_n(n, i);
-		if (is_constlike_node(con) && irn_not_visited(con)) {
+		if (is_constlike_node(con) && !irn_visited(con)) {
 			int bad = 0;
 
 			mark_irn_visited(con);
@@ -1438,26 +1436,30 @@ static void dump_node(FILE *F, ir_node *n)
 		return;
 
 	/* dump this node */
-	fprintf(F, "node: {title: \""); PRINT_NODEID(n); fprintf(F, "\" label: \"");
+	fputs("node: {title: \"", F);
+	PRINT_NODEID(n);
+	fputs("\"", F);
 
+	fputs(" label: \"", F);
 	bad = ! irn_vrfy_irg_dump(n, current_ir_graph, &p);
 	bad |= dump_node_label(F, n);
 	dump_node_ana_vals(F, n);
 	//dump_node_ana_info(F, n);
-	fprintf(F, "\" ");
+	fputs("\" ", F);
+
+	if (get_op_flags(get_irn_op(n)) & irop_flag_dump_noinput) {
+		//fputs(" node_class:23", F);
+	}
+
 	bad |= dump_node_info(F, n);
 	print_node_error(F, p);
 	print_dbg_info(F, get_irn_dbg_info(n));
 	dump_node_vcgattr(F, n, NULL, bad);
-	fprintf(F, "}\n");
+	fputs("}\n", F);
 	dump_const_node_local(F, n);
 
 	if(dump_node_edge_hook)
 		dump_node_edge_hook(F, n);
-#if DO_HEAPANALYSIS
-	dump_irn_chi_term(F, n);
-	dump_irn_state(F, n);
-#endif
 }
 
 /** dump the edge to the block this node belongs to */
@@ -1560,7 +1562,7 @@ static void print_edge_vcgattr(FILE *F, ir_node *from, int to) {
 /** dump edges to our inputs */
 static void dump_ir_data_edges(FILE *F, ir_node *n)  {
 	int i, num;
-	unsigned long visited = get_irn_visited(n);
+	ir_visited_t visited = get_irn_visited(n);
 
 	if (!dump_keepalive && is_End(n)) {
 		/* the End node has only keep-alive edges */
@@ -1706,10 +1708,6 @@ static void dump_whole_block(FILE *F, ir_node *block) {
 	PRINT_NODEID(block);
 	fprintf(F, "\"  label: \"");
 	dump_node_label(F, block);
-#if DO_HEAPANALYSIS
-	if (get_opt_dump_abstvals())
-		fprintf(F, " seqno: %d", (int)get_Block_seqno(block));
-#endif
 
 	/* colorize blocks */
 	if (! get_Block_matured(block))
@@ -1740,9 +1738,6 @@ static void dump_whole_block(FILE *F, ir_node *block) {
 	/* Close the vcg information for the block */
 	fprintf(F, "}\n");
 	dump_const_node_local(F, block);
-#if DO_HEAPANALYSIS
-	dump_irn_chi_term(F, block);
-#endif
 	fprintf(F, "\n");
 }
 
@@ -1988,17 +1983,15 @@ int dump_type_node(FILE *F, ir_type *tp)
 }
 
 
-void dump_entity_node(FILE *F, ir_entity *ent, int color)
+void dump_entity_node(FILE *F, ir_entity *ent)
 {
 	fprintf(F, "node: {title: \"");
 	PRINT_ENTID(ent); fprintf(F, "\"");
 	fprintf(F, DEFAULT_TYPE_ATTRIBUTE);
 	fprintf(F, "label: ");
-	fprintf(F, "\"ent %s\" ", get_ent_dump_name(ent));
-	if (color)
-		fprintf(F, "color:%d", color);
-	else
-		fprintf(F, ENTITY_NODE_ATTR);
+	fprintf(F, "\"%s\" ", get_ent_dump_name(ent));
+
+	print_vcg_color(F, ird_color_entity);
 	fprintf(F, "\n info1: \"");
 
 	dump_entity_to_file(F, ent, dump_verbosity_entattrs | dump_verbosity_entconsts);
@@ -2029,18 +2022,18 @@ static void dump_enum_item(FILE *F, ir_type *tp, int pos)
 
 /* dumps a type or entity and it's edges. */
 static void
-dump_type_info(type_or_ent *tore, void *env) {
+dump_type_info(type_or_ent tore, void *env) {
 	FILE *F = env;
 	int i = 0;  /* to shutup gcc */
 
 	/* dump this type or entity */
 
-	switch (get_kind(tore)) {
+	switch (get_kind(tore.ent)) {
 	case k_entity: {
-		ir_entity *ent = (ir_entity *)tore;
+		ir_entity *ent = tore.ent;
 		ir_node *value;
 		/* The node */
-		dump_entity_node(F, ent, 0);
+		dump_entity_node(F, ent);
 		/* The Edges */
 		/* skip this to reduce graph.  Member edge of type is parallel to this edge. *
 		fprintf(F, "edge: { sourcename: \"%p\" targetname: \"%p\" "
@@ -2048,7 +2041,7 @@ dump_type_info(type_or_ent *tore, void *env) {
 		print_ent_type_edge(F,ent, get_entity_type(ent), ENT_TYPE_EDGE_ATTR);
 		if (is_Class_type(get_entity_owner(ent))) {
 			for(i = 0; i < get_entity_n_overwrites(ent); i++)
-				print_ent_ent_edge(F,ent, get_entity_overwrites(ent, i), 0, ENT_OVERWRITES_EDGE_ATTR);
+				print_ent_ent_edge(F,ent, get_entity_overwrites(ent, i), 0, -1, ENT_OVERWRITES_EDGE_ATTR);
 		}
 		/* attached subgraphs */
 		if (const_entities && (get_entity_variability(ent) != variability_uninitialized)) {
@@ -2066,7 +2059,7 @@ dump_type_info(type_or_ent *tore, void *env) {
 					if (value) {
 						print_ent_node_edge(F, ent, value, ENT_VALUE_EDGE_ATTR, i);
 						dump_const_expression(F, value);
-						print_ent_ent_edge(F, ent, get_compound_ent_value_member(ent, i), 0, ENT_CORR_EDGE_ATTR, i);
+						print_ent_ent_edge(F, ent, get_compound_ent_value_member(ent, i), 0, -1, ENT_CORR_EDGE_ATTR, i);
 						/*
 						fprintf(F, "edge: { sourcename: \"%p\" targetname: \"%p\" "
 						ENT_CORR_EDGE_ATTR  "}\n", GET_ENTID(ent),
@@ -2079,7 +2072,7 @@ dump_type_info(type_or_ent *tore, void *env) {
 		break;
 	}
 	case k_type: {
-		ir_type *tp = (ir_type *)tore;
+		ir_type *tp = tore.typ;
 		dump_type_node(F, tp);
 		/* and now the edges */
 		switch (get_type_tpop_code(tp)) {
@@ -2146,30 +2139,32 @@ typedef struct _h_env {
  * If env->dump_ent dumps entities of classes and overwrites edges.
  */
 static void
-dump_class_hierarchy_node(type_or_ent *tore, void *ctx) {
+dump_class_hierarchy_node(type_or_ent tore, void *ctx) {
 	h_env_t *env = ctx;
 	FILE *F = env->f;
 	int i = 0;  /* to shutup gcc */
 
 	/* dump this type or entity */
-	switch (get_kind(tore)) {
+	switch (get_kind(tore.ent)) {
 	case k_entity: {
-		ir_entity *ent = (ir_entity *)tore;
+		ir_entity *ent = tore.ent;
 		if (get_entity_owner(ent) == get_glob_type()) break;
-		if (!is_Method_type(get_entity_type(ent))) break;  /* GL */
+		if (!is_Method_type(get_entity_type(ent)))
+			break;  /* GL */
 		if (env->dump_ent && is_Class_type(get_entity_owner(ent))) {
 			/* The node */
-			dump_entity_node(F, ent, 0);
+			dump_entity_node(F, ent);
 			/* The edges */
 			print_type_ent_edge(F,get_entity_owner(ent),ent,TYPE_MEMBER_EDGE_ATTR);
 			for(i = 0; i < get_entity_n_overwrites(ent); i++)
-				print_ent_ent_edge(F, get_entity_overwrites(ent, i), ent, 0, ENT_OVERWRITES_EDGE_ATTR);
+				print_ent_ent_edge(F, get_entity_overwrites(ent, i), ent, 0, -1, ENT_OVERWRITES_EDGE_ATTR);
 		}
 		break;
 	}
 	case k_type: {
-		ir_type *tp = (ir_type *)tore;
-		if (tp == get_glob_type()) break;
+		ir_type *tp = tore.typ;
+		if (tp == get_glob_type())
+			break;
 		switch (get_type_tpop_code(tp)) {
 		case tpo_class:
 			dump_type_node(F, tp);
@@ -2207,13 +2202,13 @@ dump_out_edge(ir_node *n, void *env) {
 	}
 }
 
-static INLINE void
+static inline void
 dump_loop_label(FILE *F, ir_loop *loop) {
 	fprintf(F, "loop %d, %d sons, %d nodes",
 	        get_loop_depth(loop), get_loop_n_sons(loop), get_loop_n_nodes(loop));
 }
 
-static INLINE void dump_loop_info(FILE *F, ir_loop *loop) {
+static inline void dump_loop_info(FILE *F, ir_loop *loop) {
 	fprintf(F, " info1: \"");
 	fprintf(F, " loop nr: %d", get_loop_loop_nr(loop));
 #ifdef DEBUG_libfirm   /* GL @@@ debug analyses */
@@ -2222,7 +2217,7 @@ static INLINE void dump_loop_info(FILE *F, ir_loop *loop) {
 	fprintf(F, "\"");
 }
 
-static INLINE void
+static inline void
 dump_loop_node(FILE *F, ir_loop *loop) {
 	fprintf(F, "node: {title: \"");
 	PRINT_LOOPID(loop);
@@ -2233,7 +2228,7 @@ dump_loop_node(FILE *F, ir_loop *loop) {
 	fprintf(F, "}\n");
 }
 
-static INLINE void
+static inline void
 dump_loop_node_edge(FILE *F, ir_loop *loop, int i) {
 	assert(loop);
 	fprintf(F, "edge: {sourcename: \"");
@@ -2244,7 +2239,7 @@ dump_loop_node_edge(FILE *F, ir_loop *loop, int i) {
 	fprintf(F, "}\n");
 }
 
-static INLINE void
+static inline void
 dump_loop_son_edge(FILE *F, ir_loop *loop, int i) {
 	assert(loop);
 	fprintf(F, "edge: {sourcename: \"");
@@ -2273,7 +2268,7 @@ void dump_loops(FILE *F, ir_loop *loop) {
 	}
 }
 
-static INLINE
+static inline
 void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg) {
 	ir_graph *rem = current_ir_graph;
 	current_ir_graph = irg;
@@ -2287,25 +2282,21 @@ void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg) {
 /**
  * dumps the VCG header
  */
-void dump_vcg_header(FILE *F, const char *name, const char *orientation) {
+void dump_vcg_header(FILE *F, const char *name, const char *layout, const char *orientation) {
 	int   i;
 	char *label;
 
 	init_colors();
 
-	if (edge_label) {
-		label = "yes";
-	} else {
-		label = "no";
-	}
-
+	label = edge_label ? "yes" : "no";
+	if (! layout)     layout = "Compilergraph";
 	if (!orientation) orientation = "bottom_to_top";
 
 	/* print header */
 	fprintf(F,
 		"graph: { title: \"ir graph of %s\"\n"
 		"display_edge_labels: %s\n"
-		"layoutalgorithm: mindepth\n"
+		"layoutalgorithm: mindepth //$ \"%s\"\n"
 		"manhattan_edges: yes\n"
 		"port_sharing: no\n"
 		"orientation: %s\n"
@@ -2331,13 +2322,14 @@ void dump_vcg_header(FILE *F, const char *name, const char *orientation) {
 		"classname 20: \"Keep Alive\"\n"
 		"classname 21: \"Out Edges\"\n"
 		"classname 22: \"Macro Block Edges\"\n"
+		//"classname 23: \"NoInput Nodes\"\n"
 		"infoname 1: \"Attribute\"\n"
 		"infoname 2: \"Verification errors\"\n"
 		"infoname 3: \"Debug info\"\n",
-		name, label, orientation);
+		name, label, layout, orientation);
 
 	for (i = 0; i < ird_color_count; ++i) {
-		if(color_rgb[i] != NULL) {
+		if (color_rgb[i] != NULL) {
 			fprintf(F, "colorentry %s: %s\n", color_names[i], color_rgb[i]);
 		}
 	}
@@ -2361,7 +2353,7 @@ FILE *vcg_open(ir_graph *irg, const char * suffix1, const char *suffix2) {
 	if (!suffix2) suffix2 = "";
 
 	/* open file for vcg graph */
-	fname = xmalloc (len * 2 + strlen(suffix1) + strlen(suffix2) + 5);
+	fname = XMALLOCN(char, len * 2 + strlen(suffix1) + strlen(suffix2) + 5);
 
 	/* strncpy (fname, nm, len); */     /* copy the filename */
 	j = 0;
@@ -2405,7 +2397,7 @@ FILE *vcg_open_name(const char *name, const char *suffix) {
 	if (!suffix) suffix = "";
 
 	/** open file for vcg graph */
-	fname = xmalloc(len * 2 + 5 + strlen(suffix));
+	fname = XMALLOCN(char, len * 2 + 5 + strlen(suffix));
 	/* strcpy (fname, name);*/    /* copy the filename */
 	j = 0;
 	for (i = 0; i < len; ++i) {  /* replace '/' in the name: escape by @. */
@@ -2484,7 +2476,7 @@ void dump_ir_graph_file(ir_graph *irg, FILE *out)
 		construct_backedges(irg);
 	}
 
-	dump_vcg_header(out, get_irg_dump_name(irg), NULL);
+	dump_vcg_header(out, get_irg_dump_name(irg), NULL, NULL);
 
 	/* call the dump graph hook */
 	if (dump_ir_graph_hook) {
@@ -2515,7 +2507,7 @@ void dump_ir_block_graph_file(ir_graph *irg, FILE *out)
 {
 	int i;
 
-	dump_vcg_header(out, get_irg_dump_name(irg), NULL);
+	dump_vcg_header(out, get_irg_dump_name(irg), NULL, NULL);
 
 	construct_block_lists(irg);
 
@@ -2550,7 +2542,7 @@ void dump_ir_extblock_graph_file(ir_graph *irg, FILE *F)
 	if (get_irg_extblk_state(irg) != extblk_valid)
 		compute_extbb(irg);
 
-	dump_vcg_header(F, get_irg_dump_name(irg), NULL);
+	dump_vcg_header(F, get_irg_dump_name(irg), NULL, NULL);
 
 	construct_extblock_lists(irg);
 
@@ -2609,7 +2601,7 @@ void dump_ir_graph_w_types_file(ir_graph *irg, FILE *out)
 	/* dumping types does not work with local nodes */
 	dump_const_local = 0;
 
-	dump_vcg_header(out, get_irg_dump_name(irg), NULL);
+	dump_vcg_header(out, get_irg_dump_name(irg), NULL, NULL);
 
 	/* dump common ir graph */
 	irg_walk(get_irg_end(irg), NULL, dump_whole_node, out);
@@ -2641,7 +2633,7 @@ void dump_ir_block_graph_w_types_file(ir_graph *irg, FILE *out)
 	/* dumping types does not work with local nodes */
 	dump_const_local = 0;
 
-	dump_vcg_header(out, get_irg_dump_name(irg), NULL);
+	dump_vcg_header(out, get_irg_dump_name(irg), NULL, NULL);
 
 	/* dump common blocked ir graph */
 	construct_block_lists(irg);
@@ -2716,7 +2708,7 @@ dump_block_to_cfg(ir_node *block, void *env) {
 		fprintf(F, "}\n");
 		/* Dump the edges */
 		for ( i = 0; i < get_Block_n_cfgpreds(block); i++)
-			if (get_irn_op(skip_Proj(get_Block_cfgpred(block, i))) != op_Bad) {
+			if (!is_Bad(skip_Proj(get_Block_cfgpred(block, i)))) {
 				pred = get_nodes_block(skip_Proj(get_Block_cfgpred(block, i)));
 				fprintf(F, "edge: { sourcename: \"");
 				PRINT_NODEID(block);
@@ -2762,7 +2754,7 @@ void dump_cfg(ir_graph *irg, const char *suffix)
 #endif
 
 		current_ir_graph = irg;
-		dump_vcg_header(f, get_irg_dump_name(irg), NULL);
+		dump_vcg_header(f, get_irg_dump_name(irg), NULL, NULL);
 
 #ifdef INTERPROCEDURAL_VIEW
 		if (ipv) {
@@ -2811,7 +2803,7 @@ void dump_subgraph(ir_node *root, int depth, const char *suffix) {
 	F = vcg_open(get_irn_irg(root), suffix, buf);
 	if (F != NULL) {
 		pset *mark_set = pset_new_ptr(1);
-		dump_vcg_header(F, get_irg_dump_name(get_irn_irg(root)), NULL);
+		dump_vcg_header(F, get_irg_dump_name(get_irn_irg(root)), NULL, NULL);
 		descend_and_dump(F, root, depth, mark_set);
 		dump_vcg_footer(F);
 		fclose(F);
@@ -2819,7 +2811,6 @@ void dump_subgraph(ir_node *root, int depth, const char *suffix) {
 	}
 }
 
-#ifdef INTERPROCEDURAL_VIEW
 void dump_callgraph(const char *suffix) {
 	FILE *F = vcg_open_name("Callgraph", suffix);
 
@@ -2827,29 +2818,24 @@ void dump_callgraph(const char *suffix) {
 		int i, rem = edge_label;
 		//int colorize;
 		edge_label = 1;
-		dump_vcg_header(F, "Callgraph", NULL);
-
-		//colorize = get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent;
+		dump_vcg_header(F, "Callgraph", "Hierarchiv", NULL);
 
 		for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
 			ir_graph *irg = get_irp_irg(i);
 			ir_entity *ent = get_irg_entity(irg);
 			int j;
-			//int n_callees = get_irg_n_callees(irg);
-			int color;
+			int n_callees = get_irg_n_callees(irg);
 
-			//color = colorize ? get_entity_color(ent) : ird_color_green;
-			color = ird_color_green;
-			dump_entity_node(F, ent, color);
+			dump_entity_node(F, ent);
 			for (j = 0; j < n_callees; ++j) {
 				ir_entity *c = get_irg_entity(get_irg_callee(irg, j));
 				//if (id_is_prefix(prefix, get_entity_ld_ident(c))) continue;
 				int be = is_irg_callee_backedge(irg, j);
 				char *attr;
 				attr = (be) ?
-					"label:\"recursion %d\" color:%d" :
-				"label:\"calls %d\" color:%d";
-				print_ent_ent_edge(F, ent, c, be, attr, get_irg_callee_loop_depth(irg, j), color);
+					"label:\"recursion %d\"" :
+				"label:\"calls %d\"";
+				print_ent_ent_edge(F, ent, c, be, ird_color_entity, attr, get_irg_callee_loop_depth(irg, j));
 			}
 		}
 
@@ -2859,6 +2845,7 @@ void dump_callgraph(const char *suffix) {
 	}
 }
 
+#if 0
 /* Dump all irgs in interprocedural view to a single file. */
 void dump_all_cg_block_graph(const char *suffix) {
 	FILE *f = vcg_open_name("All_graphs", suffix);
@@ -2908,7 +2895,7 @@ dump_type_graph(ir_graph *irg, const char *suffix)
 		ir_graph *rem = current_ir_graph;
 		current_ir_graph = irg;
 
-		dump_vcg_header(f, get_irg_dump_name(irg), NULL);
+		dump_vcg_header(f, get_irg_dump_name(irg), "Hierarchic", NULL);
 
 		/* walk over the blocks in the graph */
 		type_walk_irg(irg, dump_type_info, NULL, f);
@@ -2929,7 +2916,7 @@ dump_all_types(const char *suffix)
 {
 	FILE *f = vcg_open_name("All_types", suffix);
 	if (f) {
-		dump_vcg_header(f, "All_types", NULL);
+		dump_vcg_header(f, "All_types", "Hierarchic", NULL);
 		type_walk(dump_type_info, NULL, f);
 		inc_irg_visited(get_const_code_irg());
 
@@ -2947,7 +2934,7 @@ dump_class_hierarchy(int entities, const char *suffix)
 		h_env_t env;
 		env.f        = f;
 		env.dump_ent = entities;
-		dump_vcg_header(f, "class_hierarchy", NULL);
+		dump_vcg_header(f, "class_hierarchy", "Hierarchic", NULL);
 		type_walk(dump_class_hierarchy_node, NULL, &env);
 
 		dump_vcg_footer(f);
@@ -2985,15 +2972,14 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) {
 	dump_loop_node(F, loop);
 
 	/* Dump the loop elements. */
-
-	for(i = 0; i < get_loop_n_elements(loop); i++) {
+	for (i = 0; i < get_loop_n_elements(loop); i++) {
 		le = get_loop_element(loop, i);
 		son = le.son;
 		if (get_kind(son) == k_ir_loop) {
 
 			/* We are a loop son -> Recurse */
 
-			if(loop_node_started) { /* Close the "firm-nodes" node first if we started one. */
+			if (loop_node_started) { /* Close the "firm-nodes" node first if we started one. */
 				fprintf(F, "\" }\n");
 				fprintf(F, "edge: {sourcename: \"");
 				PRINT_LOOPID(loop);
@@ -3028,7 +3014,7 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) {
 			assert(get_kind(son) == k_ir_graph);
 
 			/* We are a loop node -> Collect firm graphs */
-			n = (ir_graph *)le.node;
+			n = le.irg;
 			if (!loop_node_started) {
 				/* Start a new node which contains all firm nodes of the current loop */
 				fprintf(F, "node: { title: \"");
@@ -3069,9 +3055,10 @@ void dump_loop_tree(ir_graph *irg, const char *suffix)
 		current_ir_graph = irg;
 		edge_label = 1;
 
-		dump_vcg_header(f, get_irg_dump_name(irg), "top_to_bottom");
+		dump_vcg_header(f, get_irg_dump_name(irg), "Tree", "top_to_bottom");
 
-		if (get_irg_loop(irg)) dump_loops_standalone(f, get_irg_loop(irg));
+		if (get_irg_loop(irg))
+			dump_loops_standalone(f, get_irg_loop(irg));
 
 		dump_vcg_footer(f);
 		fclose(f);
@@ -3084,7 +3071,7 @@ void dump_loop_tree(ir_graph *irg, const char *suffix)
 void dump_callgraph_loop_tree(const char *suffix) {
 	FILE *F;
 	F = vcg_open_name("Callgraph_looptree", suffix);
-	dump_vcg_header(F, "callgraph looptree", "top_to_bottom");
+	dump_vcg_header(F, "callgraph looptree", "Tree", "top_to_bottom");
 	dump_loops_standalone(F, irp->outermost_cg_loop);
 	dump_vcg_footer(F);
 	fclose(F);
@@ -3148,7 +3135,7 @@ void dump_loop(ir_loop *l, const char *suffix) {
 		eset *extnodes = eset_create();
 		ir_node *n, *b;
 
-		dump_vcg_header(F, name, NULL);
+		dump_vcg_header(F, name, NULL, NULL);
 
 		/* collect all nodes to dump */
 		collect_nodeloop(F, l, loopnodes);