X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=ffcba0c490a9e1a59555eab135da7b693d0d4243;hb=671ced672859c875de7c1d9c4a4750a29514446f;hp=562af32145eaa7b7b1fee297cc94f935090c2575;hpb=4b394b858d56160b0b79e4ae0d51421221d70691;p=libfirm

diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c
index 562af3214..ffcba0c49 100644
--- a/ir/ir/irdump.c
+++ b/ir/ir/irdump.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 "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"
 
 #include "irdump_t.h"
+#include "irpass_t.h"
 
 #include "irgwalk.h"
 #include "tv_t.h"
@@ -58,6 +51,7 @@
 #include "irhooks.h"
 #include "dbginfo_t.h"
 #include "irtools.h"
+#include "irprintf.h"
 
 #include "irvrfy.h"
 
@@ -67,15 +61,7 @@
 #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 string */
+/** Dump only irgs with names that start with this prefix. */
 static ident *dump_file_filter_id = NULL;
 
 #define ERROR_TXT       "<ERROR>"
@@ -98,10 +84,18 @@ static int dump_ld_name = 1;
 static int dump_out_edge_flag = 0;
 static int dump_loop_information_flag = 0;
 static int dump_backedge_information_flag = 1;
+/** An option to dump const-like nodes locally. */
 static int dump_const_local = 1;
+/** An option to dump the node index number. */
 static int dump_node_idx_labels = 0;
+/** An option to dump the node number */
+static int dump_node_nr = 0;
 /** An option to dump all graph anchors */
 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;
@@ -121,108 +115,130 @@ static DUMP_NODE_EDGE_FUNC dump_block_edge_hook = NULL;
 static DUMP_NODE_EDGE_FUNC dump_node_edge_hook = NULL;
 
 /* Set the hook to be called to dump additional edges to a node. */
-void set_dump_node_edge_hook(DUMP_NODE_EDGE_FUNC func) {
+void set_dump_node_edge_hook(DUMP_NODE_EDGE_FUNC func)
+{
 	dump_node_edge_hook = func;
 }
 
 /* Get the additional edge dump hook. */
-DUMP_NODE_EDGE_FUNC get_dump_node_edge_hook(void) {
+DUMP_NODE_EDGE_FUNC get_dump_node_edge_hook(void)
+{
 	return dump_node_edge_hook;
 }
 
 /* Set the hook to be called to dump additional edges to a block. */
-void set_dump_block_edge_hook(DUMP_NODE_EDGE_FUNC func) {
+void set_dump_block_edge_hook(DUMP_NODE_EDGE_FUNC func)
+{
 	dump_block_edge_hook = func;
 }
 
 /* Get the additional block edge dump hook. */
-DUMP_NODE_EDGE_FUNC get_dump_block_edge_hook(void) {
+DUMP_NODE_EDGE_FUNC get_dump_block_edge_hook(void)
+{
 	return dump_node_edge_hook;
 }
 
 /* set the ir graph hook */
-void set_dump_ir_graph_hook(DUMP_IR_GRAPH_FUNC hook) {
+void set_dump_ir_graph_hook(DUMP_IR_GRAPH_FUNC hook)
+{
 	dump_ir_graph_hook = hook;
 }
 
 /* set the node attribute hook */
-void set_dump_node_vcgattr_hook(DUMP_NODE_VCGATTR_FUNC hook) {
+void set_dump_node_vcgattr_hook(DUMP_NODE_VCGATTR_FUNC hook)
+{
 	dump_node_vcgattr_hook = hook;
 }
 
 /* set the edge attribute hook */
-void set_dump_edge_vcgattr_hook(DUMP_EDGE_VCGATTR_FUNC hook) {
+void set_dump_edge_vcgattr_hook(DUMP_EDGE_VCGATTR_FUNC hook)
+{
 	dump_edge_vcgattr_hook = hook;
 }
 
-/* Returns 0 if dump_out_edge_flag or dump_loop_information_flag
+/** Returns 0 if dump_out_edge_flag or dump_loop_information_flag
  * are set, else returns dump_const_local_flag.
  */
-int get_opt_dump_const_local(void) {
+static int get_opt_dump_const_local(void)
+{
 	if (dump_out_edge_flag || dump_loop_information_flag || (dump_new_edges_flag && edges_activated(current_ir_graph)))
 		return 0;
 	return dump_const_local;
 }
 
 /* Set a prefix filter for output functions. */
-void only_dump_method_with_name(ident *name) {
+void only_dump_method_with_name(ident *name)
+{
 	dump_file_filter_id = name;
 }
 
 /* Returns the prefix filter set with only_dump_method_with_name(). */
-ident *get_dump_file_filter_ident(void) {
+ident *get_dump_file_filter_ident(void)
+{
 	return dump_file_filter_id;
 }
 
 /* Returns non-zero if dump file filter is not set, or if it is a prefix of name. */
-int is_filtered_dump_name(ident *name) {
+int is_filtered_dump_name(ident *name)
+{
 	if (!dump_file_filter_id) return 1;
 	return id_is_prefix(dump_file_filter_id, name);
 }
 
 /* To turn off display of edge labels.  Edge labels often cause xvcg to
    abort with a segmentation fault. */
-void turn_off_edge_labels(void) {
+void turn_off_edge_labels(void)
+{
 	edge_label = 0;
 }
 
-void dump_consts_local(int flag) {
+void dump_consts_local(int flag)
+{
 	dump_const_local = flag;
 }
 
-void dump_node_idx_label(int flag) {
+void dump_node_idx_label(int flag)
+{
 	dump_node_idx_labels = flag;
 }
 
-void dump_constant_entity_values(int flag) {
+void dump_constant_entity_values(int flag)
+{
 	const_entities = flag;
 }
 
-void dump_keepalive_edges(int flag) {
+void dump_keepalive_edges(int flag)
+{
 	dump_keepalive = flag;
 }
 
-void dump_new_edges(int flag) {
+void dump_new_edges(int flag)
+{
 	dump_new_edges_flag = flag;
 }
 
-int get_opt_dump_keepalive_edges(void) {
+int get_opt_dump_keepalive_edges(void)
+{
 	return dump_keepalive;
 }
 
-void dump_out_edges(int flag) {
+void dump_out_edges(int flag)
+{
 	dump_out_edge_flag = flag;
 }
 
-void dump_dominator_information(int flag) {
+void dump_dominator_information(int flag)
+{
 	dump_dominator_information_flag = flag;
 }
 
-void dump_loop_information(int flag) {
+void dump_loop_information(int flag)
+{
 	dump_loop_information_flag = flag;
 }
 
-void dump_backedge_information(int flag) {
+void dump_backedge_information(int flag)
+{
 	dump_backedge_information_flag = flag;
 }
 
@@ -230,51 +246,56 @@ void dump_backedge_information(int flag) {
  * If the flag is set, the type name is output in [] in the node label,
  * else it is output as info.
  */
-void set_opt_dump_analysed_type_info(int flag) {
+void set_opt_dump_analysed_type_info(int flag)
+{
 	opt_dump_analysed_type_info = flag;
 }
 
-void dump_pointer_values_to_info(int flag) {
+void dump_pointer_values_to_info(int flag)
+{
 	opt_dump_pointer_values_to_info = flag;
 }
 
-void dump_ld_names(int flag) {
+void dump_ld_names(int flag)
+{
 	dump_ld_name = flag;
 }
 
-void dump_all_anchors(int flag) {
+void dump_all_anchors(int flag)
+{
 	dump_anchors = flag;
 }
 
+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 ----------------- */
 
 /**
- * returns the name of a mode or <ERROR> if mode is NOT a mode object.
- * in the later case, sets bad
+ * returns the name of a mode or ERROR_TXT if mode is NOT a mode object.
+ * in the later case, sets bad.
  */
-const char *get_mode_name_ex(ir_mode *mode, int *bad) {
+const char *get_mode_name_ex(const ir_mode *mode, int *bad)
+{
 	if (is_mode(mode))
 		return get_mode_name(mode);
 	*bad |= 1;
 	return ERROR_TXT;
 }
 
-/**
- * returns the name of a type or <ERROR> if mode is NOT a mode object.
- * in the later case, sets bad
- */
-const char *get_type_name_ex(ir_type *tp, int *bad) {
-	if (is_type(tp))
-		return get_type_name(tp);
-	*bad |= 1;
-	return ERROR_TXT;
-}
-
 #define CUSTOM_COLOR_BASE    100
 static const char *color_names[ird_color_count];
 static const char *color_rgb[ird_color_count];
 static struct obstack color_obst;
 
+/** define a custom color. */
 static void custom_color(int num, const char *rgb_def)
 {
 	assert(num < ird_color_count);
@@ -285,6 +306,7 @@ static void custom_color(int num, const char *rgb_def)
 	color_names[num] = obstack_finish(&color_obst);
 }
 
+/** Define a named color. */
 static void named_color(int num, const char *name)
 {
 	assert(num < ird_color_count);
@@ -292,10 +314,11 @@ static void named_color(int num, const char *name)
 	color_names[num] = name;
 }
 
+/** Initializes the used colors. */
 static void init_colors(void)
 {
 	static int initialized = 0;
-	if(initialized)
+	if (initialized)
 		return;
 
 	obstack_init(&color_obst);
@@ -313,6 +336,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;
 }
@@ -320,16 +344,31 @@ static void init_colors(void)
 /**
  * Prints the VCG color to a file.
  */
-static void print_vcg_color(FILE *F, ird_color_t color) {
+static void print_vcg_color(FILE *F, ird_color_t color)
+{
 	assert(color < ird_color_count);
 	fprintf(F, "color:%s", color_names[color]);
 }
 
+/**
+ * Prints the edge kind of a given IR node.
+ *
+ * Projs should be dumped near their predecessor, so they get "nearedge".
+ */
+static void print_node_edge_kind(FILE *F, ir_node *node)
+{
+	if (is_Proj(node)) {
+		fprintf(F, "nearedge: ");
+	} else {
+		fprintf(F, "edge: ");
+	}
+}
+
 /**
  * Prints the edge from a type S to a type T with additional info fmt, ...
  * to the file F.
  */
-static void print_type_type_edge(FILE *F, ir_type *S, ir_type *T, const char *fmt, ...)
+static void print_type_type_edge(FILE *F, const ir_type *S, const ir_type *T, const char *fmt, ...)
 {
 	va_list ap;
 
@@ -342,26 +381,26 @@ static void print_type_type_edge(FILE *F, ir_type *S, ir_type *T, const char *fm
 }
 
 /**
- * Prints the edge from a type T to an entity E with additional info fmt, ...
+ * Prints the edge from a type tp to an entity ent with additional info fmt, ...
  * to the file F.
  */
-static void print_type_ent_edge(FILE *F, ir_type *T, ir_entity *E, const char *fmt, ...)
+static void print_type_ent_edge(FILE *F, const ir_type *tp, const ir_entity *ent, const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	fprintf(F, "edge: { sourcename: "); PRINT_TYPEID(T);
-	fprintf(F, " targetname: \""); PRINT_ENTID(E); fprintf(F, "\"");
+	fprintf(F, "edge: { sourcename: "); PRINT_TYPEID(tp);
+	fprintf(F, " targetname: \""); PRINT_ENTID(ent); fprintf(F, "\"");
 	vfprintf(F, fmt, ap);
 	fprintf(F, "}\n");
 	va_end(ap);
 }
 
 /**
- * Prints the edge from an entity E to an entity T with additional info fmt, ...
+ * Prints the edge from an entity ent1 to an entity ent2 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, const ir_entity *ent1, const ir_entity *ent2, int backedge, ird_color_t color, const char *fmt, ...)
 {
 	va_list ap;
 
@@ -370,56 +409,59 @@ static void print_ent_ent_edge(FILE *F, ir_entity *E, ir_entity *T, int backedge
 		fprintf(F, "backedge: { sourcename: \"");
 	else
 		fprintf(F, "edge: { sourcename: \"");
-	PRINT_ENTID(E);
-	fprintf(F, "\" targetname: \""); PRINT_ENTID(T);  fprintf(F, "\"");
+	PRINT_ENTID(ent1);
+	fprintf(F, "\" targetname: \""); PRINT_ENTID(ent2);  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);
 }
 
 /**
- * Prints the edge from an entity E to a type T with additional info fmt, ...
+ * Prints the edge from an entity ent to a type tp with additional info fmt, ...
  * to the file F.
  */
-static void print_ent_type_edge(FILE *F, ir_entity *E, ir_type *T, const char *fmt, ...)
+static void print_ent_type_edge(FILE *F, const ir_entity *ent, const ir_type *tp, const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	fprintf(F, "edge: { sourcename: \""); PRINT_ENTID(E);
-	fprintf(F, "\" targetname: "); PRINT_TYPEID(T);
+	fprintf(F, "edge: { sourcename: \""); PRINT_ENTID(ent);
+	fprintf(F, "\" targetname: "); PRINT_TYPEID(tp);
 	vfprintf(F, fmt, ap);
 	fprintf(F,"}\n");
 	va_end(ap);
 }
 
 /**
- * Prints the edge from a node N to a type T with additional info fmt, ...
+ * Prints the edge from a node irn to a type tp with additional info fmt, ...
  * to the file F.
  */
-static void print_node_type_edge(FILE *F, const ir_node *N, ir_type *T, const char *fmt, ...)
+static void print_node_type_edge(FILE *F, const ir_node *irn, ir_type *tp, const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	fprintf(F, "edge: { sourcename: \""); PRINT_NODEID(N);
-	fprintf(F, "\" targetname: "); PRINT_TYPEID(T);
+	fprintf(F, "edge: { sourcename: \""); PRINT_NODEID(irn);
+	fprintf(F, "\" targetname: "); PRINT_TYPEID(tp);
 	vfprintf(F, fmt, ap);
 	fprintf(F,"}\n");
 	va_end(ap);
 }
 
 /**
- * Prints the edge from a node N to an entity E with additional info fmt, ...
+ * Prints the edge from a node irn to an entity ent with additional info fmt, ...
  * to the file F.
  */
-static void print_node_ent_edge(FILE *F, const ir_node *N, ir_entity *E, const char *fmt, ...)
+static void print_node_ent_edge(FILE *F, const ir_node *irn, const ir_entity *ent, const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	fprintf(F, "edge: { sourcename: \""); PRINT_NODEID(N);
-	fprintf(F, "\" targetname: \""); PRINT_ENTID(E);
+	fprintf(F, "edge: { sourcename: \""); PRINT_NODEID(irn);
+	fprintf(F, "\" targetname: \""); PRINT_ENTID(ent);
 	fprintf(F, "\"");
 	vfprintf(F, fmt, ap);
 	fprintf(F,"}\n");
@@ -427,32 +469,32 @@ static void print_node_ent_edge(FILE *F, const ir_node *N, ir_entity *E, const c
 }
 
 /**
- * Prints the edge from an entity E to a node N with additional info fmt, ...
+ * Prints the edge from an entity ent to a node irn with additional info fmt, ...
  * to the file F.
  */
-static void print_ent_node_edge(FILE *F, ir_entity *E, const ir_node *N, const char *fmt, ...)
+static void print_ent_node_edge(FILE *F, const ir_entity *ent, const ir_node *irn, const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	fprintf(F, "edge: { sourcename: \""); PRINT_ENTID(E);
-	fprintf(F, "\" targetname: \""); PRINT_NODEID(N); fprintf(F, "\"");
+	fprintf(F, "edge: { sourcename: \""); PRINT_ENTID(ent);
+	fprintf(F, "\" targetname: \""); PRINT_NODEID(irn); fprintf(F, "\"");
 	vfprintf(F, fmt, ap);
 	fprintf(F,"}\n");
 	va_end(ap);
 }
 
 /**
- * Prints the edge from a type E to an enumeration item item with additional info fmt, ...
+ * Prints the edge from a type tp to an enumeration item item with additional info fmt, ...
  * to the file F.
  */
-static void print_enum_item_edge(FILE *F, ir_type *E, int item, const char *fmt, ...)
+static void print_enum_item_edge(FILE *F, const ir_type *tp, int item, const char *fmt, ...)
 {
 	va_list ap;
 
 	va_start(ap, fmt);
-	fprintf(F, "edge: { sourcename: "); PRINT_TYPEID(E);
-	fprintf(F, " targetname: \""); PRINT_ITEMID(E, item); fprintf(F, "\" ");
+	fprintf(F, "edge: { sourcename: "); PRINT_TYPEID(tp);
+	fprintf(F, " targetname: \""); PRINT_ITEMID(tp, item); fprintf(F, "\" ");
 	vfprintf(F, fmt, ap);
 	fprintf(F,"}\n");
 	va_end(ap);
@@ -463,7 +505,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.                                                */
@@ -482,7 +524,8 @@ static pmap *irdump_link_map = NULL;
  * initialization is performed lazily and not called from within init_firm.
  *
  * Creates the link attribute map. */
-static void init_irdump(void) {
+static void init_irdump(void)
+{
 	/* We need a new, empty map. */
 	if (irdump_link_map) pmap_destroy(irdump_link_map);
 	irdump_link_map = pmap_create();
@@ -493,48 +536,56 @@ static void init_irdump(void) {
 /**
  * Returns the private link field.
  */
-static void *ird_get_irn_link(ir_node *n) {
+static void *ird_get_irn_link(const ir_node *n)
+{
 	void *res = NULL;
-	if (!irdump_link_map) return NULL;
+	if (irdump_link_map == NULL)
+		return NULL;
 
-	if (pmap_contains(irdump_link_map, (void *)n))
-		res = pmap_get(irdump_link_map, (void *)n);
+	if (pmap_contains(irdump_link_map, n))
+		res = pmap_get(irdump_link_map, n);
 	return res;
 }
 
 /**
  * Sets the private link field.
  */
-static void ird_set_irn_link(ir_node *n, void *x) {
-	if (!irdump_link_map)
+static void ird_set_irn_link(const ir_node *n, void *x)
+{
+	if (irdump_link_map == NULL)
 		init_irdump();
-	pmap_insert(irdump_link_map, (void *)n, x);
+	pmap_insert(irdump_link_map, n, x);
 }
 
 /**
  * Gets the private link field of an irg.
  */
-static void *ird_get_irg_link(ir_graph *irg) {
+static void *ird_get_irg_link(const ir_graph *irg)
+{
 	void *res = NULL;
-	if (!irdump_link_map) return NULL;
+	if (irdump_link_map == NULL)
+		return NULL;
 
-	if (pmap_contains(irdump_link_map, (void *)irg))
-		res = pmap_get(irdump_link_map, (void *)irg);
+	if (pmap_contains(irdump_link_map, irg))
+		res = pmap_get(irdump_link_map, irg);
 	return res;
 }
 
 /**
  * Sets the private link field of an irg.
  */
-static void ird_set_irg_link(ir_graph *irg, void *x) {
-	if (!irdump_link_map) init_irdump();
-	pmap_insert(irdump_link_map, (void *)irg, x);
+static void ird_set_irg_link(const ir_graph *irg, void *x)
+{
+	if (irdump_link_map == NULL)
+		init_irdump();
+	pmap_insert(irdump_link_map, irg, x);
 }
 
 /**
  * Walker, clears the private link field.
  */
-static void clear_link(ir_node * node, void * env) {
+static void clear_link(ir_node *node, void *env)
+{
 	(void) env;
 	ird_set_irn_link(node, NULL);
 }
@@ -543,12 +594,14 @@ static void clear_link(ir_node * node, void * env) {
  * If the entity has a ld_name, returns it if the dump_ld_name is set,
  * else returns the name of the entity.
  */
-static const char *_get_ent_dump_name(ir_entity *ent, int dump_ld_name) {
-	if (!ent)
+static const char *_get_ent_dump_name(const ir_entity *ent, int dump_ld_name)
+{
+	if (ent == NULL)
 		return "<NULL entity>";
 	if (dump_ld_name) {
 		/* Don't use get_entity_ld_ident (ent) as it computes the mangled name! */
-		if (ent->ld_name) return get_id_str(ent->ld_name);
+		if (ent->ld_name != NULL)
+			return get_id_str(ent->ld_name);
 	}
 	return get_id_str(ent->name);
 }
@@ -557,12 +610,14 @@ static const char *_get_ent_dump_name(ir_entity *ent, int dump_ld_name) {
  * If the entity has a ld_name, returns it if the option dump_ld_name is set,
  * else returns the name of the entity.
  */
-const char *get_ent_dump_name(ir_entity *ent) {
+const char *get_ent_dump_name(const ir_entity *ent)
+{
 	return _get_ent_dump_name(ent, dump_ld_name);
 }
 
 /* Returns the name of an IRG. */
-const char *get_irg_dump_name(ir_graph *irg) {
+const char *get_irg_dump_name(const ir_graph *irg)
+{
 	/* Don't use get_entity_ld_ident (ent) as it computes the mangled name! */
 	return _get_ent_dump_name(get_irg_entity(irg), 1);
 }
@@ -570,7 +625,8 @@ const char *get_irg_dump_name(ir_graph *irg) {
 /**
  * Returns non-zero if a node is in floating state.
  */
-static int node_floats(ir_node *n) {
+static int node_floats(const ir_node *n)
+{
 	return ((get_irn_pinned(n) == op_pin_state_floats) &&
 	        (get_irg_pinned(current_ir_graph) == op_pin_state_floats));
 }
@@ -578,7 +634,8 @@ static int node_floats(ir_node *n) {
 /**
  *  Walker that visits the anchors
  */
-static void ird_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env) {
+static void ird_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
 	if (dump_anchors || (dump_new_edges_flag && edges_activated(irg))) {
 		irg_walk_anchors(irg, pre, post, env);
 	} else {
@@ -589,13 +646,12 @@ static void ird_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *pos
 /**
  * Walker, allocates an array for all blocks and puts it's nodes non-floating nodes into this array.
  */
-static void collect_node(ir_node * node, void *env) {
+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);
@@ -624,18 +680,20 @@ static void collect_node(ir_node * node, void *env) {
  * graphs not visited.
  * Free the list with DEL_ARR_F().
  */
-static ir_node **construct_block_lists(ir_graph *irg) {
+static ir_node **construct_block_lists(ir_graph *irg)
+{
 	int      i;
 #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);
@@ -656,8 +714,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);
@@ -673,11 +732,12 @@ typedef struct _list_tuple {
  * Sets the irg link field to NULL in all
  * graphs not visited.
  */
-static list_tuple *construct_extblock_lists(ir_graph *irg) {
+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;
 
@@ -723,21 +783,8 @@ 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. */
-			fprintf(F, "SymC %s", get_id_str(get_SymConst_name(n)));
-			break;
 		case symconst_addr_ent:
 			fprintf(F, "SymC &%s", get_entity_name(get_SymConst_entity(n)));
 			break;
@@ -745,57 +792,59 @@ int dump_node_opcode(FILE *F, ir_node *n)
 			fprintf(F, "SymC %s offset", get_entity_name(get_SymConst_entity(n)));
 			break;
 		case symconst_type_tag:
-			fprintf(F, "SymC %s tag", get_type_name_ex(get_SymConst_type(n), &bad));
+			ir_fprintf(F, "SymC %+F tag", get_SymConst_type(n));
 			break;
 		case symconst_type_size:
-			fprintf(F, "SymC %s size", get_type_name_ex(get_SymConst_type(n), &bad));
+			ir_fprintf(F, "SymC %+F size", get_SymConst_type(n));
 			break;
 		case symconst_type_align:
-			fprintf(F, "SymC %s align", get_type_name_ex(get_SymConst_type(n), &bad));
+			ir_fprintf(F, "SymC %+F align", get_SymConst_type(n));
 			break;
 		case symconst_enum_const:
-			fprintf(F, "SymC %s enum", get_enumeration_name(get_SymConst_enum(n)));
-			break;
-		case symconst_label:
-			fprintf(F, "SymC %lu label", get_SymConst_label(n));
+			fprintf(F, "SymC %s enum", get_enumeration_const_name(get_SymConst_enum(n)));
 			break;
 		}
-	} break;
+		break;
 
-	case iro_Filter: {
+#ifdef INTERPROCEDURAL_VIEW
+	case iro_Filter:
 		if (!get_interprocedural_view())
 			fprintf(F, "Proj'");
 		else
 			goto default_case;
-	} break;
+		break;
+#endif
 
 	case iro_Proj: {
 		ir_node *pred = get_Proj_pred(n);
 
 		if (get_irn_opcode(pred) == iro_Cond
-			&& get_Proj_proj(n) == get_Cond_defaultProj(pred)
+			&& get_Proj_proj(n) == get_Cond_default_proj(pred)
 			&& get_irn_mode(get_Cond_selector(pred)) != mode_b)
 			fprintf(F, "defProj");
 		else
 			goto default_case;
 	} break;
+
+#ifdef INTERPROCEDURAL_VIEW
 	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;
-	}
+#endif
+
 	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 ((get_irn_op(addr) == op_SymConst) && (get_SymConst_kind(addr) == symconst_addr_ent))
-			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;
@@ -811,7 +860,14 @@ 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));
+		if (is_Block_dead(n))
+			fputs("Dead ", F);
+		if (n == get_irg_start_block(get_irn_irg(n)))
+			fputs("Start ", F);
+		if (n == get_irg_end_block(get_irn_irg(n)))
+			fputs("End ", F);
+		fprintf(F, "%s%s", get_irn_opname(n),
+			dump_block_marker ? (get_Block_mark(n) ? "*" : "") : "");
 		break;
 	case iro_Conv:
 		if (get_Conv_strict(n))
@@ -819,7 +875,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 (get_Div_no_remainder(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));
@@ -827,6 +886,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:
@@ -842,9 +904,10 @@ default_case:
  */
 static int dump_node_mode(FILE *F, ir_node *n)
 {
-	int bad = 0;
+	int             bad = 0;
 	const ir_op_ops *ops = get_op_ops(get_irn_op(n));
-	ir_opcode iro;
+	ir_opcode       iro;
+	ir_mode         *mode;
 
 	/* call the dump_node operation if available */
 	if (ops->dump_node)
@@ -862,32 +925,32 @@ static int dump_node_mode(FILE *F, ir_node *n)
 	case iro_Jmp:
 	case iro_NoMem:
 		break;
-	default: {
-		ir_mode *mode = get_irn_mode(n);
+	default:
+		mode = get_irn_mode(n);
 
-		if (mode && mode != mode_BB && mode != mode_ANY && mode != mode_BAD &&
+		if (mode != NULL && mode != mode_BB && mode != mode_ANY && mode != mode_BAD &&
 			(mode != mode_T || iro == iro_Proj))
 			fprintf(F, "%s", get_mode_name_ex(mode, &bad));
 	}
-	}
-
 	return bad;
 }
 
 /**
  * Dump the type of a node n to a file F if it's known.
  */
-static int dump_node_typeinfo(FILE *F, ir_node *n) {
+static int dump_node_typeinfo(FILE *F, ir_node *n)
+{
 	int bad = 0;
 
 	if (opt_dump_analysed_type_info) {
 		if (get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_consistent  ||
 			get_irg_typeinfo_state(current_ir_graph) == ir_typeinfo_inconsistent) {
 			ir_type *tp = get_irn_typeinfo_type(n);
-			if (tp != firm_none_type)
-				fprintf(F, "[%s] ", get_type_name_ex(tp, &bad));
-			else
+			if (tp != firm_none_type) {
+				ir_fprintf(F, "[%+F]", tp);
+			} else {
 				fprintf(F, "[] ");
+			}
 		}
 	}
 	return bad;
@@ -911,10 +974,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
 };
 
@@ -929,11 +990,10 @@ static const pns_lookup_t cond_lut[] = {
 /** the lookup table for Proj(Call) names */
 static const pns_lookup_t call_lut[] = {
 #define X(a)    { pn_Call_##a, #a }
-	X(M_regular),
+	X(M),
 	X(X_regular),
 	X(X_except),
 	X(T_result),
-	X(M_except),
 	X(P_value_res_base)
 #undef X
 };
@@ -1014,7 +1074,6 @@ static const pns_lookup_t copyb_lut[] = {
 	X(M),
 	X(X_regular),
 	X(X_except),
-	X(M_except)
 #undef X
 };
 
@@ -1025,7 +1084,6 @@ static const pns_lookup_t instof_lut[] = {
 	X(X_regular),
 	X(X_except),
 	X(res),
-	X(M_except),
 #undef X
 };
 
@@ -1070,8 +1128,7 @@ static const proj_lookup_t proj_lut[] = {
 /**
  * Dump additional node attributes of some nodes to a file F.
  */
-static int
-dump_node_nodeattr(FILE *F, ir_node *n)
+static int dump_node_nodeattr(FILE *F, ir_node *n)
 {
 	int bad = 0;
 	ir_node *pred;
@@ -1084,16 +1141,16 @@ dump_node_nodeattr(FILE *F, ir_node *n)
 		return ops->dump_node(n, F, dump_node_nodeattr_txt);
 
 	switch (get_irn_opcode(n)) {
-	case iro_Start:
-		if (0 && get_interprocedural_view()) {
-			fprintf(F, "%s ", get_ent_dump_name(get_irg_entity(current_ir_graph)));
-		}
+	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);
+#ifdef INTERPROCEDURAL_VIEW
 handle_lut:
+#endif
 		code    = get_irn_opcode(pred);
 
 		if (code == iro_Cmp)
@@ -1129,24 +1186,26 @@ handle_lut:
 		break;
 	case iro_Filter:
 		proj_nr = get_Filter_proj(n);
+#ifdef INTERPROCEDURAL_VIEW
 		if (! get_interprocedural_view()) {
 			/* it's a Proj' */
 			pred    = get_Filter_pred(n);
 			goto handle_lut;
 		} else
+#endif
 			fprintf(F, "%ld ", proj_nr);
 		break;
 	case iro_Sel:
 		fprintf(F, "%s ", get_ent_dump_name(get_Sel_entity(n)));
 		break;
 	case iro_Cast:
-		fprintf(F, "(%s) ", get_type_name_ex(get_Cast_type(n), &bad));
+		ir_fprintf(F, "(%+F)", get_Cast_type(n));
 		break;
 	case iro_Confirm:
 		fprintf(F, "%s ", get_pnc_string(get_Confirm_cmp(n)));
 		break;
 	case iro_CopyB:
-		fprintf(F, "(%s) ", get_type_name_ex(get_CopyB_type(n), &bad));
+		ir_fprintf(F, "(%+F)", get_CopyB_type(n));
 		break;
 
 	default:
@@ -1159,7 +1218,8 @@ handle_lut:
 #include <math.h>
 #include "execution_frequency.h"
 
-static void dump_node_ana_vals(FILE *F, ir_node *n) {
+static void dump_node_ana_vals(FILE *F, ir_node *n)
+{
 	(void) F;
 	(void) n;
 	return;
@@ -1175,23 +1235,46 @@ static void dump_node_ana_vals(FILE *F, ir_node *n) {
 
 
 /* Dumps a node label without the enclosing ". */
-int dump_node_label(FILE *F, ir_node *n) {
+int dump_node_label(FILE *F, ir_node *n)
+{
 	int bad = 0;
 
 	bad |= dump_node_opcode(F, n);
+	fputs(" ", F);
 	bad |= dump_node_mode(F, n);
 	fprintf(F, " ");
 	bad |= dump_node_typeinfo(F, n);
 	bad |= dump_node_nodeattr(F, n);
-	if(dump_node_idx_labels) {
-		fprintf(F, "%ld:%d", get_irn_node_nr(n), get_irn_idx(n));
-	} else {
+	if (dump_node_nr) {
 		fprintf(F, "%ld", get_irn_node_nr(n));
 	}
+	if (dump_node_idx_labels) {
+		fprintf(F, ":%u", get_irn_idx(n));
+	}
 
 	return bad;
 }
 
+/* Dumps the vrp information of a node to a file */
+int dump_vrp_info(FILE *F, ir_node *n)
+{
+	vrp_attr *vrp = vrp_get_info(n);
+	if (!n) {
+		return 1;
+	}
+
+	fprintf(F, "range_type: %d\n", (int) vrp->range_type);
+	if (vrp->range_type == VRP_RANGE || vrp->range_type ==
+			VRP_ANTIRANGE) {
+		ir_fprintf(F, "range_bottom: %F\n",vrp->range_bottom);
+		ir_fprintf(F, "range_top: %F\n", vrp->range_top);
+	}
+	ir_fprintf(F, "bits_set: %T\n", vrp->bits_set);
+	ir_fprintf(F, "bits_not_set: %T\n", vrp->bits_not_set);
+
+	return 0;
+}
+
 /**
  * Dumps the attributes of a node n into the file F.
  * Currently this is only the color of a node.
@@ -1217,12 +1300,12 @@ static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
 		return;
 	}
 
-	mode = get_irn_mode(node);
-	if(mode == mode_M) {
+	mode = get_irn_mode(n);
+	if (mode == mode_M) {
 		print_vcg_color(F, ird_color_memory);
 		return;
 	}
-	if(mode == mode_X) {
+	if (mode == mode_X) {
 		print_vcg_color(F, ird_color_controlflow);
 		return;
 	}
@@ -1259,14 +1342,12 @@ static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
 	default: {
 		ir_op *op = get_irn_op(node);
 
-		if(is_op_constlike(op)) {
+		if (is_op_constlike(op)) {
 			print_vcg_color(F, ird_color_const);
-		} else if(is_op_uses_memory(op)) {
+		} else if (is_op_uses_memory(op)) {
 			print_vcg_color(F, ird_color_uses_memory);
-		} else if(is_op_cfopcode(op) || is_op_forking(op)) {
+		} else if (is_op_cfopcode(op) || is_op_forking(op)) {
 			print_vcg_color(F, ird_color_controlflow);
-		} else {
-			PRINT_DEFAULT_NODE_ATTR;
 		}
 	}
 	}
@@ -1275,7 +1356,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;
@@ -1295,7 +1376,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));
@@ -1313,7 +1394,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);
@@ -1322,7 +1403,8 @@ static INLINE int is_constlike_node(const ir_node *node)
 
 /** outputs the predecessors of n, that are constants, local.  I.e.,
    generates a copy of the constant predecessors for each node called with. */
-static void dump_const_node_local(FILE *F, ir_node *n) {
+static void dump_const_node_local(FILE *F, ir_node *n)
+{
 	int i;
 	if (!get_opt_dump_const_local()) return;
 
@@ -1337,7 +1419,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);
@@ -1355,7 +1437,8 @@ static void dump_const_node_local(FILE *F, ir_node *n) {
 }
 
 /** If the block of an edge is a const_like node, dump it local with an edge */
-static void dump_const_block_local(FILE *F, ir_node *n) {
+static void dump_const_block_local(FILE *F, ir_node *n)
+{
 	ir_node *blk;
 
 	if (!get_opt_dump_const_local()) return;
@@ -1411,13 +1494,19 @@ static void print_dbg_info(FILE *F, dbg_info *dbg)
 {
 	char buf[1024];
 
-	if (__dbg_info_snprint) {
-		buf[0] = '\0';
-		if (__dbg_info_snprint(buf, sizeof(buf), dbg) > 0)
-			fprintf(F, " info3: \"%s\"\n", buf);
+	ir_dbg_info_snprint(buf, sizeof(buf), dbg);
+	if (buf[0] != 0) {
+		fprintf(F, " info3: \"%s\"\n", buf);
 	}
 }
 
+static void print_type_dbg_info(FILE *F, type_dbg_info *dbg)
+{
+	(void) F;
+	(void) dbg;
+	/* TODO */
+}
+
 /**
  * Dump a node
  */
@@ -1430,31 +1519,35 @@ 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)
+	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 */
-static void
-dump_ir_block_edge(FILE *F, ir_node *n)  {
+static void dump_ir_block_edge(FILE *F, ir_node *n)
+{
 	if (get_opt_dump_const_local() && is_constlike_node(n)) return;
 	if (is_no_Block(n)) {
 		ir_node *block = get_nodes_block(n);
@@ -1483,8 +1576,8 @@ dump_ir_block_edge(FILE *F, ir_node *n)  {
 	}
 }
 
-static void
-print_data_edge_vcgattr(FILE *F, ir_node *from, int to) {
+static void print_data_edge_vcgattr(FILE *F, ir_node *from, int to)
+{
 	/*
 	 * do not use get_nodes_block() here, will fail
 	 * if the irg is not pinned.
@@ -1495,8 +1588,8 @@ print_data_edge_vcgattr(FILE *F, ir_node *from, int to) {
 		fprintf(F, INTER_DATA_EDGE_ATTR);
 }
 
-static void
-print_mem_edge_vcgattr(FILE *F, ir_node *from, int to) {
+static void print_mem_edge_vcgattr(FILE *F, ir_node *from, int to)
+{
 	/*
 	 * do not use get_nodes_block() here, will fail
 	 * if the irg is not pinned.
@@ -1508,7 +1601,8 @@ print_mem_edge_vcgattr(FILE *F, ir_node *from, int to) {
 }
 
 /** Print the vcg attributes for the edge from node from to it's to's input */
-static void print_edge_vcgattr(FILE *F, ir_node *from, int to) {
+static void print_edge_vcgattr(FILE *F, ir_node *from, int to)
+{
 	assert(from);
 
 	if (dump_edge_vcgattr_hook)
@@ -1550,19 +1644,23 @@ 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;
-	unsigned long visited = get_irn_visited(n);
+static void dump_ir_data_edges(FILE *F, ir_node *n)
+{
+	int i, num;
 
-	if ((get_irn_op(n) == op_End) && (!dump_keepalive))
+	if (!dump_keepalive && is_End(n)) {
+		/* the End node has only keep-alive edges */
 		return;
+	}
 
 	/* dump the dependency edges. */
-	for (i = 0; i < get_irn_deps(n); ++i) {
+	num = get_irn_deps(n);
+	for (i = 0; i < num; ++i) {
 		ir_node *dep = get_irn_dep(n, i);
 
 		if (dep) {
-			fprintf(F, "edge: {sourcename: \"");
+			print_node_edge_kind(F, n);
+			fprintf(F, "{sourcename: \"");
 			PRINT_NODEID(n);
 			fprintf(F, "\" targetname: ");
 			if ((get_opt_dump_const_local()) && is_constlike_node(dep)) {
@@ -1577,17 +1675,22 @@ static void dump_ir_data_edges(FILE *F, ir_node *n)  {
 		}
 	}
 
-	for (i = 0; i < get_irn_arity(n); i++) {
-		ir_node * pred = get_irn_n(n, i);
+	num = get_irn_arity(n);
+	for (i = 0; i < num; i++) {
+		ir_node *pred = get_irn_n(n, i);
 		assert(pred);
 
-		if ((get_interprocedural_view() && get_irn_visited(pred) < visited))
+#ifdef INTERPROCEDURAL_VIEW
+		if ((get_interprocedural_view() && get_irn_visited(pred) < get_irn_visited(n)))
 			continue; /* pred not dumped */
+#endif
 
 		if (dump_backedge_information_flag && is_backedge(n, i))
 			fprintf(F, "backedge: {sourcename: \"");
-		else
-			fprintf(F, "edge: {sourcename: \"");
+		else {
+			print_node_edge_kind(F, n);
+			fprintf(F, "{sourcename: \"");
+		}
 		PRINT_NODEID(n);
 		fprintf(F, "\" targetname: ");
 		if ((get_opt_dump_const_local()) && is_constlike_node(pred)) {
@@ -1599,20 +1702,31 @@ static void dump_ir_data_edges(FILE *F, ir_node *n)  {
 		print_edge_vcgattr(F, n, i);
 		fprintf(F, "}\n");
 	}
+
+	if (dump_macro_block_edges && is_Block(n)) {
+		ir_node *mb = get_Block_MacroBlock(n);
+		fprintf(F, "edge: {sourcename: \"");
+		PRINT_NODEID(n);
+		fprintf(F, "\" targetname: \"");
+		PRINT_NODEID(mb);
+		fprintf(F, "\" label: \"mb\" " MACROBLOCK_EDGE_ATTR);
+		fprintf(F, "}\n");
+	}
 }
 
 /**
  * Dump the ir_edges
  */
-static void
-dump_ir_edges(FILE *F, ir_node *n) {
+static void dump_ir_edges(FILE *F, ir_node *n)
+{
 	const ir_edge_t *edge;
 	int i = 0;
 
 	foreach_out_edge(n, edge) {
 		ir_node *succ = get_edge_src_irn(edge);
 
-		fprintf(F, "edge: {sourcename: \"");
+		print_node_edge_kind(F, succ);
+		fprintf(F, "{sourcename: \"");
 		PRINT_NODEID(n);
 		fprintf(F, "\" targetname: \"");
 		PRINT_NODEID(succ);
@@ -1626,19 +1740,17 @@ dump_ir_edges(FILE *F, ir_node *n) {
 }
 
 
-/** Dumps a node and its edges but not the block edge
- */
-static void
-dump_node_wo_blockedge(ir_node *n, void *env) {
+/** Dumps a node and its edges but not the block edge  */
+static void dump_node_wo_blockedge(ir_node *n, void *env)
+{
 	FILE *F = env;
 	dump_node(F, n);
 	dump_ir_data_edges(F, n);
 }
 
-/** Dumps a node and its edges.
- */
-static void
-dump_whole_node(ir_node *n, void *env) {
+/** Dumps a node and its edges. */
+static void dump_whole_node(ir_node *n, void *env)
+{
 	FILE *F = env;
 	dump_node_wo_blockedge(n, env);
 	if (!node_floats(n))
@@ -1647,8 +1759,9 @@ dump_whole_node(ir_node *n, void *env) {
 		dump_ir_edges(F, n);
 }
 
-static void
-dump_const_node(ir_node *n, void *env) {
+/** Dumps a const-like node. */
+static void dump_const_node(ir_node *n, void *env)
+{
 	if (is_Block(n)) return;
 	dump_node_wo_blockedge(n, env);
 }
@@ -1659,7 +1772,8 @@ dump_const_node(ir_node *n, void *env) {
 
 /** Dumps a constant expression as entity initializer, array bound ...
  */
-static void dump_const_expression(FILE *F, ir_node *value) {
+static void dump_const_expression(FILE *F, ir_node *value)
+{
 	ir_graph *rem = current_ir_graph;
 	int rem_dump_const_local = dump_const_local;
 	dump_const_local = 0;
@@ -1678,7 +1792,8 @@ static void dump_const_expression(FILE *F, ir_node *value) {
  *  Expects to find nodes belonging to the block as list in its
  *  link field.
  *  Dumps the edges of all nodes including itself. */
-static void dump_whole_block(FILE *F, ir_node *block) {
+static void dump_whole_block(FILE *F, ir_node *block)
+{
 	ir_node *node;
 	ird_color_t color = ird_color_block_background;
 
@@ -1688,10 +1803,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))
@@ -1722,16 +1833,13 @@ 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");
 }
 
 /** dumps a graph block-wise. Expects all blockless nodes in arr in irgs link.
  *  The outermost nodes: blocks and nodes not op_pin_state_pinned, Bad, Unknown. */
-static void
-dump_block_graph(FILE *F, ir_graph *irg) {
+static void dump_block_graph(FILE *F, ir_graph *irg)
+{
 	int i;
 	ir_graph *rem = current_ir_graph;
 	ir_node **arr = ird_get_irg_link(irg);
@@ -1765,7 +1873,8 @@ dump_block_graph(FILE *F, ir_graph *irg) {
  * Dump the info for an irg.
  * Parsed by XVCG but not shown. use yComp.
  */
-static void dump_graph_info(FILE *F, ir_graph *irg) {
+static void dump_graph_info(FILE *F, ir_graph *irg)
+{
 	fprintf(F, "info1: \"");
 	dump_entity_to_file(F, get_irg_entity(irg), dump_verbosity_entattrs | dump_verbosity_entconsts);
 	fprintf(F, "\"\n");
@@ -1774,7 +1883,8 @@ static void dump_graph_info(FILE *F, ir_graph *irg) {
 /** Dumps an irg as a graph clustered by block nodes.
  *  If interprocedural view edges can point to nodes out of this graph.
  */
-static void dump_graph_from_list(FILE *F, ir_graph *irg) {
+static void dump_graph_from_list(FILE *F, ir_graph *irg)
+{
 	ir_entity *ent = get_irg_entity(irg);
 
 	fprintf(F, "graph: { title: \"");
@@ -1793,8 +1903,8 @@ static void dump_graph_from_list(FILE *F, ir_graph *irg) {
 
 /** dumps a graph extended block-wise. Expects all blockless nodes in arr in irgs link.
  *  The outermost nodes: blocks and nodes not op_pin_state_pinned, Bad, Unknown. */
-static void
-dump_extblock_graph(FILE *F, ir_graph *irg) {
+static void dump_extblock_graph(FILE *F, ir_graph *irg)
+{
 	int i;
 	ir_graph *rem = current_ir_graph;
 	ir_extblk **arr = ird_get_irg_link(irg);
@@ -1875,7 +1985,8 @@ static void dump_node2type_edges(ir_node *n, void *env)
 }
 
 #if 0
-static int print_type_info(FILE *F, ir_type *tp) {
+static int print_type_info(FILE *F, ir_type *tp)
+{
 	int bad = 0;
 
 	if (get_type_state(tp) == layout_undefined) {
@@ -1890,7 +2001,8 @@ static int print_type_info(FILE *F, ir_type *tp) {
 	return bad;
 }
 
-static void print_typespecific_info(FILE *F, ir_type *tp) {
+static void print_typespecific_info(FILE *F, ir_type *tp)
+{
 	switch (get_type_tpop_code(tp)) {
 	case tpo_class:
 		fprintf(F, "peculiarity: %s\n", get_peculiarity_string(get_class_peculiarity(tp)));
@@ -1918,13 +2030,11 @@ static void print_typespecific_info(FILE *F, ir_type *tp) {
 }
 #endif
 
-static void print_typespecific_vcgattr(FILE *F, ir_type *tp) {
+static void print_typespecific_vcgattr(FILE *F, ir_type *tp)
+{
 	switch (get_type_tpop_code(tp)) {
 	case tpo_class:
-		if (peculiarity_existent == get_class_peculiarity(tp))
-			fprintf(F, " " TYPE_CLASS_NODE_ATTR);
-		else
-			fprintf(F, " " TYPE_DESCRIPTION_NODE_ATTR);
+		fprintf(F, " " TYPE_CLASS_NODE_ATTR);
 		break;
 	case tpo_struct:
 		fprintf(F, " " TYPE_METH_NODE_ATTR);
@@ -1946,23 +2056,16 @@ static void print_typespecific_vcgattr(FILE *F, ir_type *tp) {
 	} /* switch type */
 }
 
-
 int dump_type_node(FILE *F, ir_type *tp)
 {
 	int bad = 0;
 
 	fprintf(F, "node: {title: ");
 	PRINT_TYPEID(tp);
-	fprintf(F, " label: \"%s %s\"", get_type_tpop_name(tp), get_type_name_ex(tp, &bad));
-	fprintf(F, " info1: \"");
-#if 0
-	bad |= print_type_info(F, tp);
-	print_typespecific_info(F, tp);
-#else
+	ir_fprintf(F, " label: \"%s %+F\" info1: \"", get_type_tpop_name(tp), tp);
 	dump_type_to_file(F, tp, dump_verbosity_max);
-#endif
 	fprintf(F, "\"\n");
-	print_dbg_info(F, get_type_dbg_info(tp));
+	print_type_dbg_info(F, get_type_dbg_info(tp));
 	print_typespecific_vcgattr(F, tp);
 	fprintf(F, "}\n");
 
@@ -1970,17 +2073,14 @@ int dump_type_node(FILE *F, ir_type *tp)
 }
 
 
-void dump_entity_node(FILE *F, ir_entity *ent, int color)
+static 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, " label: ");
+	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);
@@ -1994,7 +2094,7 @@ static void dump_enum_item(FILE *F, ir_type *tp, int pos)
 {
 	char buf[1024];
 	ir_enum_const *ec = get_enumeration_const(tp, pos);
-	ident         *id = get_enumeration_nameid(ec);
+	ident         *id = get_enumeration_const_nameid(ec);
 	tarval        *tv = get_enumeration_value(ec);
 
 	if (tv)
@@ -2003,52 +2103,57 @@ static void dump_enum_item(FILE *F, ir_type *tp, int pos)
 		strncpy(buf, "<not set>", sizeof(buf));
 	fprintf(F, "node: {title: \"");
 	PRINT_ITEMID(tp, pos); fprintf(F, "\"");
-	fprintf(F, DEFAULT_ENUM_ITEM_ATTRIBUTE);
-	fprintf(F, "label: ");
+	fprintf(F, " label: ");
 	fprintf(F, "\"enum item %s\" " ENUM_ITEM_NODE_ATTR, get_id_str(id));
 	fprintf(F, "\n info1: \"value: %s\"}\n", buf);
 }
 
-/* dumps a type or entity and it's edges. */
-static void
-dump_type_info(type_or_ent *tore, void *env) {
+/**
+ * Dumps a new style initializer.
+ */
+static void dump_entity_initializer(FILE *F, const ir_entity *ent)
+{
+	/* TODO */
+	(void) F;
+	(void) ent;
+}
+
+/** Dumps a type or entity and it's edges. */
+static void 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\" "
 		ENT_OWN_EDGE_ATTR "}\n", ent, get_entity_owner(ent));*/
 		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);
+			for (i = get_entity_n_overwrites(ent) - 1; i >= 0; --i)
+				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)) {
-			if (is_atomic_entity(ent)) {
-				value = get_atomic_ent_value(ent);
-				if (value) {
-					print_ent_node_edge(F, ent, value, ENT_VALUE_EDGE_ATTR, i);
-					/* DDMN(value);  $$$ */
-					dump_const_expression(F, value);
-				}
-			}
-			if (is_compound_entity(ent)) {
-				for (i = 0; i < get_compound_ent_n_values(ent); i++) {
+		if (const_entities) {
+			if (ent->initializer != NULL) {
+				/* new style initializers */
+				dump_entity_initializer(F, ent);
+			} else if (entity_has_compound_ent_values(ent)) {
+				/* old style compound entity values */
+				for (i = get_compound_ent_n_values(ent) - 1; i >= 0; --i) {
 					value = get_compound_ent_value(ent, i);
 					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),
@@ -2061,34 +2166,34 @@ 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)) {
 		case tpo_class:
-			for (i=0; i < get_class_n_supertypes(tp); i++)
-				print_type_type_edge(F, tp,get_class_supertype(tp, i),TYPE_SUPER_EDGE_ATTR);
-			for (i=0; i < get_class_n_members(tp); i++)
-				print_type_ent_edge(F,tp,get_class_member(tp, i),TYPE_MEMBER_EDGE_ATTR);
+			for (i = get_class_n_supertypes(tp) - 1; i >= 0; --i)
+				print_type_type_edge(F, tp, get_class_supertype(tp, i), TYPE_SUPER_EDGE_ATTR);
+			for (i = get_class_n_members(tp) - 1; i >= 0; --i)
+				print_type_ent_edge(F, tp, get_class_member(tp, i), TYPE_MEMBER_EDGE_ATTR);
 			break;
 		case tpo_struct:
-			for (i=0; i < get_struct_n_members(tp); i++)
-				print_type_ent_edge(F,tp,get_struct_member(tp, i),TYPE_MEMBER_EDGE_ATTR);
+			for (i = get_struct_n_members(tp) - 1; i >= 0; --i)
+				print_type_ent_edge(F, tp, get_struct_member(tp, i), TYPE_MEMBER_EDGE_ATTR);
 			break;
 		case tpo_method:
-			for (i = 0; i < get_method_n_params(tp); i++)
-				print_type_type_edge(F,tp,get_method_param_type(tp, i),METH_PAR_EDGE_ATTR,i);
-			for (i = 0; i < get_method_n_ress(tp); i++)
-				print_type_type_edge(F,tp,get_method_res_type(tp, i),METH_RES_EDGE_ATTR,i);
+			for (i = get_method_n_params(tp) - 1; i >= 0; --i)
+				print_type_type_edge(F, tp, get_method_param_type(tp, i), METH_PAR_EDGE_ATTR,i);
+			for (i = get_method_n_ress(tp) - 1; i >= 0; --i)
+				print_type_type_edge(F, tp, get_method_res_type(tp, i), METH_RES_EDGE_ATTR,i);
 			break;
 		case tpo_union:
-			for (i = 0; i < get_union_n_members(tp); i++)
-				print_type_ent_edge(F,tp,get_union_member(tp, i),UNION_EDGE_ATTR);
+			for (i = get_union_n_members(tp) - 1; i >= 0; --i)
+				print_type_ent_edge(F, tp, get_union_member(tp, i), UNION_EDGE_ATTR);
 			break;
 		case tpo_array:
-			print_type_type_edge(F,tp,get_array_element_type(tp),ARR_ELT_TYPE_EDGE_ATTR);
-			print_type_ent_edge(F,tp,get_array_element_entity(tp),ARR_ENT_EDGE_ATTR);
-			for (i = 0; i < get_array_n_dimensions(tp); i++) {
+			print_type_type_edge(F, tp, get_array_element_type(tp), ARR_ELT_TYPE_EDGE_ATTR);
+			print_type_ent_edge(F, tp, get_array_element_entity(tp), ARR_ENT_EDGE_ATTR);
+			for (i = get_array_n_dimensions(tp) - 1; i >= 0; --i) {
 				ir_node *upper = get_array_upper_bound(tp, i);
 				ir_node *lower = get_array_lower_bound(tp, i);
 				print_node_type_edge(F, upper, tp, "label: \"upper %d\"", get_array_order(tp, i));
@@ -2098,13 +2203,13 @@ dump_type_info(type_or_ent *tore, void *env) {
 			}
 			break;
 		case tpo_enumeration:
-			for (i = 0; i < get_enumeration_n_enums(tp); ++i) {
+			for (i = get_enumeration_n_enums(tp) - 1; i >= 0; --i) {
 				dump_enum_item(F, tp, i);
 				print_enum_item_edge(F, tp, i, "label: \"item %d\"", i);
 			}
 			break;
 		case tpo_pointer:
-			print_type_type_edge(F,tp,get_pointer_points_to_type(tp), PTR_PTS_TO_EDGE_ATTR);
+			print_type_type_edge(F, tp, get_pointer_points_to_type(tp), PTR_PTS_TO_EDGE_ATTR);
 			break;
 		case tpo_primitive:
 			break;
@@ -2127,36 +2232,38 @@ typedef struct _h_env {
  * Dumps a class type node and a superclass edge.
  * If env->dump_ent dumps entities of classes and overwrites edges.
  */
-static void
-dump_class_hierarchy_node(type_or_ent *tore, void *ctx) {
+static void 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_type_ent_edge(F, get_entity_owner(ent), ent, TYPE_MEMBER_EDGE_ATTR);
+			for (i = get_entity_n_overwrites(ent) - 1; i >= 0; --i)
+				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);
 			/* and now the edges */
-			for (i=0; i < get_class_n_supertypes(tp); i++) {
+			for (i = get_class_n_supertypes(tp) - 1; i >= 0; --i) {
 				print_type_type_edge(F,tp,get_class_supertype(tp, i),TYPE_SUPER_EDGE_ATTR);
 			}
 			break;
@@ -2174,28 +2281,31 @@ dump_class_hierarchy_node(type_or_ent *tore, void *ctx) {
 /*******************************************************************/
 
 /* dump out edges */
-static void
-dump_out_edge(ir_node *n, void *env) {
+static void dump_out_edge(ir_node *n, void *env)
+{
 	FILE *F = env;
 	int i;
-	for (i = 0; i < get_irn_n_outs(n); i++) {
-		assert(get_irn_out(n, i));
-		fprintf(F, "edge: {sourcename: \"");
+	for (i = get_irn_n_outs(n) - 1; i >= 0; --i) {
+		ir_node *succ = get_irn_out(n, i);
+		assert(succ);
+		print_node_edge_kind(F, succ);
+		fprintf(F, "{sourcename: \"");
 		PRINT_NODEID(n);
 		fprintf(F, "\" targetname: \"");
-		PRINT_NODEID(get_irn_out(n, i));
+		PRINT_NODEID(succ);
 		fprintf(F, "\" color: red linestyle: dashed");
 		fprintf(F, "}\n");
 	}
 }
 
-static INLINE void
-dump_loop_label(FILE *F, ir_loop *loop) {
+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 */
@@ -2204,8 +2314,8 @@ static INLINE void dump_loop_info(FILE *F, ir_loop *loop) {
 	fprintf(F, "\"");
 }
 
-static INLINE void
-dump_loop_node(FILE *F, ir_loop *loop) {
+static inline void dump_loop_node(FILE *F, ir_loop *loop)
+{
 	fprintf(F, "node: {title: \"");
 	PRINT_LOOPID(loop);
 	fprintf(F, "\" label: \"");
@@ -2215,8 +2325,8 @@ dump_loop_node(FILE *F, ir_loop *loop) {
 	fprintf(F, "}\n");
 }
 
-static INLINE void
-dump_loop_node_edge(FILE *F, ir_loop *loop, int i) {
+static inline void dump_loop_node_edge(FILE *F, ir_loop *loop, int i)
+{
 	assert(loop);
 	fprintf(F, "edge: {sourcename: \"");
 	PRINT_LOOPID(loop);
@@ -2226,8 +2336,8 @@ dump_loop_node_edge(FILE *F, ir_loop *loop, int i) {
 	fprintf(F, "}\n");
 }
 
-static INLINE void
-dump_loop_son_edge(FILE *F, ir_loop *loop, int i) {
+static inline void dump_loop_son_edge(FILE *F, ir_loop *loop, int i)
+{
 	assert(loop);
 	fprintf(F, "edge: {sourcename: \"");
 	PRINT_LOOPID(loop);
@@ -2237,57 +2347,58 @@ dump_loop_son_edge(FILE *F, ir_loop *loop, int i) {
 	        get_loop_element_pos(loop, get_loop_son(loop, i)));
 }
 
-static
-void dump_loops(FILE *F, ir_loop *loop) {
+static void dump_loops(FILE *F, ir_loop *loop)
+{
 	int i;
 	/* dump this loop node */
 	dump_loop_node(F, loop);
 
 	/* dump edges to nodes in loop -- only if it is a real loop */
 	if (get_loop_depth(loop) != 0) {
-		for (i = 0; i < get_loop_n_nodes(loop); i++) {
+		for (i = get_loop_n_nodes(loop) - 1; i >= 0; --i) {
 			dump_loop_node_edge(F, loop, i);
 		}
 	}
-	for (i = 0; i < get_loop_n_sons(loop); i++) {
+	for (i = get_loop_n_sons(loop) - 1; i >= 0; --i) {
 		dump_loops(F, get_loop_son(loop, i));
 		dump_loop_son_edge(F, loop, i);
 	}
 }
 
-static INLINE
-void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg) {
-	ir_graph *rem = current_ir_graph;
-	current_ir_graph = irg;
+static inline void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg)
+{
+	ir_loop *loop = get_irg_loop(irg);
 
-	if (get_irg_loop(irg)) dump_loops(F, get_irg_loop(irg));
+	if (loop != NULL) {
+		ir_graph *rem = current_ir_graph;
+		current_ir_graph = irg;
 
-	current_ir_graph = rem;
+		dump_loops(F, loop);
+
+		current_ir_graph = rem;
+	}
 }
 
 
 /**
  * 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"
@@ -2312,13 +2423,15 @@ void dump_vcg_header(FILE *F, const char *name, const char *orientation) {
 		"classname 19: \"Postdominators\"\n"
 		"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]);
 		}
 	}
@@ -2332,7 +2445,8 @@ void dump_vcg_header(FILE *F, const char *name, const char *orientation) {
  * @param suffix1 first filename suffix
  * @param suffix2 second filename suffix
  */
-FILE *vcg_open(ir_graph *irg, const char * suffix1, const char *suffix2) {
+FILE *vcg_open(const ir_graph *irg, const char *suffix1, const char *suffix2)
+{
 	FILE *F;
 	const char *nm = get_irg_dump_name(irg);
 	int len = strlen(nm), i, j;
@@ -2342,7 +2456,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;
@@ -2367,7 +2481,7 @@ FILE *vcg_open(ir_graph *irg, const char * suffix1, const char *suffix2) {
 	if (!F) {
 		perror(fname);
 	}
-	free(fname);
+	xfree(fname);
 
 	return F;
 }
@@ -2378,7 +2492,8 @@ FILE *vcg_open(ir_graph *irg, const char * suffix1, const char *suffix2) {
  * @param name    prefix file name
  * @param suffix  filename suffix
  */
-FILE *vcg_open_name(const char *name, const char *suffix) {
+FILE *vcg_open_name(const char *name, const char *suffix)
+{
 	FILE *F;
 	char *fname;  /* filename to put the vcg information in */
 	int i, j, len = strlen(name);
@@ -2386,7 +2501,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 @. */
@@ -2409,7 +2524,7 @@ FILE *vcg_open_name(const char *name, const char *suffix) {
 	if (!F) {
 		perror(fname);
 	}
-	free(fname);
+	xfree(fname);
 
 	return F;
 }
@@ -2417,7 +2532,8 @@ FILE *vcg_open_name(const char *name, const char *suffix) {
 /**
  * Dumps the vcg file footer
  */
-void dump_vcg_footer(FILE *F) {
+void dump_vcg_footer(FILE *F)
+{
 	fprintf(F, "}\n");
 }
 
@@ -2445,9 +2561,12 @@ static void do_dump(ir_graph *irg, const char *suffix, const char *suffix_ip,
 
 	rem = current_ir_graph;
 	current_ir_graph = irg;
+	(void) suffix_ip;
+#ifdef INTERPROCEDURAL_VIEW
 	if (get_interprocedural_view())
 		suffix1 = suffix_ip;
 	else
+#endif
 		suffix1 = suffix_nonip;
 	current_ir_graph = rem;
 
@@ -2465,7 +2584,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) {
@@ -2496,7 +2615,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);
 
@@ -2531,7 +2650,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);
 
@@ -2590,7 +2709,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);
@@ -2622,7 +2741,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);
@@ -2658,8 +2777,8 @@ void dump_ir_block_graph_w_types(ir_graph *irg, const char *suffix)
 /* The following routines dump a control flow graph.                   */
 /*---------------------------------------------------------------------*/
 
-static void
-dump_block_to_cfg(ir_node *block, void *env) {
+static void dump_block_to_cfg(ir_node *block, void *env)
+{
 	FILE *F = env;
 	int i, fl = 0;
 	ir_node *pred;
@@ -2682,7 +2801,7 @@ dump_block_to_cfg(ir_node *block, void *env) {
 		dump_irnode_to_file(F, block);
 
 		/* Check whether we have bad predecessors to color the block. */
-		for (i = 0; i < get_Block_n_cfgpreds(block); ++i)
+		for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i)
 			if ((fl = is_Bad(get_Block_cfgpred(block, i))))
 				break;
 
@@ -2696,8 +2815,8 @@ 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) {
+		for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i)
+			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);
@@ -2743,7 +2862,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) {
@@ -2766,8 +2885,10 @@ void dump_cfg(ir_graph *irg, const char *suffix)
 }
 
 
-static void descend_and_dump(FILE *F, ir_node *n, int depth, pset *mark_set) {
-	if (pset_find_ptr(mark_set, n)) return;
+static void descend_and_dump(FILE *F, ir_node *n, int depth, pset *mark_set)
+{
+	if (pset_find_ptr(mark_set, n))
+		return;
 
 	pset_insert_ptr(mark_set, n);
 
@@ -2784,7 +2905,8 @@ static void descend_and_dump(FILE *F, ir_node *n, int depth, pset *mark_set) {
 }
 
 static int subgraph_counter = 0;
-void dump_subgraph(ir_node *root, int depth, const char *suffix) {
+void dump_subgraph(ir_node *root, int depth, const char *suffix)
+{
 	FILE *F;
 	char buf[32];
 
@@ -2792,7 +2914,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);
@@ -2800,37 +2922,32 @@ void dump_subgraph(ir_node *root, int depth, const char *suffix) {
 	}
 }
 
-#ifdef INTERPROCEDURAL_VIEW
-void dump_callgraph(const char *suffix) {
+void dump_callgraph(const char *suffix)
+{
 	FILE *F = vcg_open_name("Callgraph", suffix);
 
 	if (F != NULL) {
 		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));
 			}
 		}
 
@@ -2840,8 +2957,10 @@ 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) {
+void dump_all_cg_block_graph(const char *suffix)
+{
 	FILE *f = vcg_open_name("All_graphs", suffix);
 
 	if (f != NULL) {
@@ -2876,8 +2995,7 @@ void dump_all_cg_block_graph(const char *suffix) {
 /* the following routines dumps type information without any ir nodes. */
 /*---------------------------------------------------------------------*/
 
-void
-dump_type_graph(ir_graph *irg, const char *suffix)
+void dump_type_graph(ir_graph *irg, const char *suffix)
 {
 	FILE *f;
 
@@ -2889,7 +3007,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);
@@ -2905,12 +3023,11 @@ dump_type_graph(ir_graph *irg, const char *suffix)
 	}
 }
 
-void
-dump_all_types(const char *suffix)
+void dump_all_types(const char *suffix)
 {
 	FILE *f = vcg_open_name("All_types", suffix);
-	if (f) {
-		dump_vcg_header(f, "All_types", NULL);
+	if (f != NULL) {
+		dump_vcg_header(f, "All_types", "Hierarchic", NULL);
 		type_walk(dump_type_info, NULL, f);
 		inc_irg_visited(get_const_code_irg());
 
@@ -2919,8 +3036,7 @@ dump_all_types(const char *suffix)
 	}
 }
 
-void
-dump_class_hierarchy(int entities, const char *suffix)
+void dump_class_hierarchy(int entities, const char *suffix)
 {
 	FILE *f = vcg_open_name("class_hierarchy", suffix);
 
@@ -2928,7 +3044,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);
@@ -2945,19 +3061,57 @@ dump_class_hierarchy(int entities, const char *suffix)
 /*  dump_ir_graph_w_types                                              */
 /*---------------------------------------------------------------------*/
 
-void dump_all_ir_graphs(dump_graph_func *dmp_grph, const char *suffix) {
+void dump_all_ir_graphs(dump_graph_func *dmp_grph, const char *suffix)
+{
 	int i;
 	for (i = get_irp_n_irgs() - 1; i >= 0; --i)
 		dmp_grph(get_irp_irg(i), suffix);
 }
 
+struct pass_t {
+	ir_prog_pass_t  pass;
+	dump_graph_func *dump_graph;
+	char            suffix[1];
+};
+
+/**
+ * Wrapper around dump_all_ir_graphs().
+ */
+static int dump_all_ir_graphs_wrapper(ir_prog *irp, void *context)
+{
+	struct pass_t *pass = context;
+
+	(void)irp;
+	dump_all_ir_graphs(pass->dump_graph, pass->suffix);
+	return 0;
+}
+
+ir_prog_pass_t *dump_all_ir_graph_pass(const char *name,
+                                       dump_graph_func *dump_graph,
+                                       const char *suffix)
+{
+	size_t         len   = strlen(suffix);
+	struct pass_t  *pass = xmalloc(sizeof(*pass) + len);
+	ir_prog_pass_t *res  = def_prog_pass_constructor(
+		&pass->pass, name ? name : "dump_all_graphs", dump_all_ir_graphs_wrapper);
+
+	/* this pass does not change anything, so neither dump nor verify is needed. */
+	res->dump_irprog   = ir_prog_no_dump;
+	res->verify_irprog = ir_prog_no_verify;
+
+	pass->dump_graph = dump_graph;
+	strcpy(pass->suffix, suffix);
+
+	return res;
+}
 
 /*--------------------------------------------------------------------------------*
  * Dumps a stand alone loop graph with firm nodes which belong to one loop node   *
  * packed together in one subgraph/box                                            *
  *--------------------------------------------------------------------------------*/
 
-void dump_loops_standalone(FILE *F, ir_loop *loop) {
+static void dump_loops_standalone(FILE *F, ir_loop *loop)
+{
 	int i = 0, loop_node_started = 0, son_number = 0, first = 0;
 	loop_element le;
 	ir_loop *son = NULL;
@@ -2966,15 +3120,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);
@@ -3009,7 +3162,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: \"");
@@ -3040,7 +3193,8 @@ void dump_loop_tree(ir_graph *irg, const char *suffix)
 	FILE *f;
 
 	/* if a filter is set, dump only the irg's that match the filter */
-	if (!is_filtered_dump_name(get_entity_ident(get_irg_entity(irg)))) return;
+	if (!is_filtered_dump_name(get_entity_ident(get_irg_entity(irg))))
+		return;
 
 	f = vcg_open(irg, suffix, "-looptree");
 	if (f != NULL) {
@@ -3050,9 +3204,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);
@@ -3062,10 +3217,11 @@ void dump_loop_tree(ir_graph *irg, const char *suffix)
 	}
 }
 
-void dump_callgraph_loop_tree(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);
@@ -3076,7 +3232,8 @@ void dump_callgraph_loop_tree(const char *suffix) {
 /* Dumps the firm nodes in the loop tree to a graph along with the loop nodes.*/
 /*----------------------------------------------------------------------------*/
 
-void collect_nodeloop(FILE *F, ir_loop *loop, eset *loopnodes) {
+static void collect_nodeloop(FILE *F, ir_loop *loop, eset *loopnodes)
+{
 	int i, son_number = 0, node_number = 0;
 
 	if (dump_loop_information_flag) dump_loop_node(F, loop);
@@ -3094,10 +3251,12 @@ void collect_nodeloop(FILE *F, ir_loop *loop, eset *loopnodes) {
 	}
 }
 
-void collect_nodeloop_external_nodes(ir_loop *loop, eset *loopnodes, eset *extnodes) {
+static void collect_nodeloop_external_nodes(ir_loop *loop, eset *loopnodes,
+                                            eset *extnodes)
+{
 	int i, j, start;
 
-	for(i = 0; i < get_loop_n_elements(loop); i++) {
+	for (i = 0; i < get_loop_n_elements(loop); i++) {
 		loop_element le = get_loop_element(loop, i);
 		if (*(le.kind) == k_ir_loop) {
 			/* Recur */
@@ -3118,7 +3277,8 @@ void collect_nodeloop_external_nodes(ir_loop *loop, eset *loopnodes, eset *extno
 	}
 }
 
-void dump_loop(ir_loop *l, const char *suffix) {
+void dump_loop(ir_loop *l, const char *suffix)
+{
 	FILE *F;
 	char name[50];
 
@@ -3129,7 +3289,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);