Add a hint about the infamous pn_Cmp_Lg/Ne mixup in the assertion message of verify_n...
[libfirm] / ir / ir / irdump.c
index 38572b8..f371e04 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
 /**
  * @file
  * @brief   Write vcg representation of firm to file.
- * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt
+ * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt,
+ *          Matthias Braun
  * @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 <stdbool.h>
+#include <errno.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"
 #include "irhooks.h"
 #include "dbginfo_t.h"
 #include "irtools.h"
+#include "irprintf.h"
 
-#include "irvrfy.h"
+#include "irverify.h"
 
 #include "error.h"
 #include "array.h"
 #include "pmap.h"
+#include "obst.h"
 #include "eset.h"
 #include "pset.h"
+#include "util.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
-
-/* basis for a color range for vcg */
-static int n_colors   = 0;
-static int base_color = 0;
-
-/** 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>"
-
-/*******************************************************************/
-/* flags to steer output                                           */
-/*******************************************************************/
+static ir_dump_flags_t flags =
+       ir_dump_flag_blocks_as_subgraphs |
+       ir_dump_flag_keepalive_edges |
+       ir_dump_flag_ld_names |
+       ir_dump_flag_back_edges |
+       ir_dump_flag_consts_local |
+       ir_dump_flag_analysed_types |
+       ir_dump_flag_entities_in_hierarchy |
+       ir_dump_flag_number_label;
 
-/** An option to turn off edge labels */
-static int edge_label = 1;
-/** An option to turn off dumping values of constant entities */
-static int const_entities = 1;
-/** An option to dump the keep alive edges */
-static int dump_keepalive = 0;
-/** An option to dump the new out edges */
-static int dump_new_edges_flag = 0;
-/** An option to dump ld_names instead of names. */
-static int dump_ld_name = 1;
-/** Compiler options to dump analysis information in dump_ir_graph */
-static int dump_out_edge_flag = 0;
-static int dump_loop_information_flag = 0;
-static int dump_backedge_information_flag = 1;
-static int dump_const_local = 0;
-static int dump_node_idx_labels = 0;
-/** An option to dump all graph anchors */
-static int dump_anchors = 0;
-
-int dump_dominator_information_flag = 0;
-int opt_dump_analysed_type_info = 1;
-int opt_dump_pointer_values_to_info = 0;  /* default off: for test compares!! */
-
-static dumper_colors overrule_nodecolor = ird_color_default;
+static ird_color_t overrule_nodecolor = ird_color_default_node;
 
 /** The vcg node attribute hook. */
-static DUMP_IR_GRAPH_FUNC dump_ir_graph_hook = NULL;
-/** The vcg node attribute hook. */
-static DUMP_NODE_VCGATTR_FUNC dump_node_vcgattr_hook = NULL;
+static dump_node_vcgattr_func dump_node_vcgattr_hook = NULL;
 /** The vcg edge attribute hook. */
-static DUMP_EDGE_VCGATTR_FUNC dump_edge_vcgattr_hook = NULL;
+static dump_edge_vcgattr_func dump_edge_vcgattr_hook = NULL;
 /** The vcg dump block edge hook */
-static DUMP_NODE_EDGE_FUNC dump_block_edge_hook = NULL;
+static dump_node_edge_func dump_block_edge_hook = NULL;
 /** The vcg dump node edge hook. */
-static DUMP_NODE_EDGE_FUNC dump_node_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) {
-       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
- * are set, else returns dump_const_local_flag.
- */
-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;
+void ir_set_dump_flags(ir_dump_flags_t new_flags)
+{
+       flags = new_flags;
 }
 
-/* Set a prefix filter for output functions. */
-void only_dump_method_with_name(ident *name) {
-       dump_file_filter_id = name;
+void ir_add_dump_flags(ir_dump_flags_t new_flags)
+{
+       flags |= new_flags;
 }
 
-/* Returns the prefix filter set with only_dump_method_with_name(). */
-ident *get_dump_file_filter_ident(void) {
-       return dump_file_filter_id;
+void ir_remove_dump_flags(ir_dump_flags_t to_remove)
+{
+       flags &= ~to_remove;
 }
 
-/* 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) {
-       if (!dump_file_filter_id) return 1;
-       return id_is_prefix(dump_file_filter_id, name);
+ir_dump_flags_t ir_get_dump_flags(void)
+{
+       return flags;
 }
 
-/* To turn off display of edge labels.  Edge labels often cause xvcg to
-   abort with a segmentation fault. */
-void turn_off_edge_labels(void) {
-       edge_label = 0;
+/** Returns 0 if dump_out_edge_flag or dump_loop_information_flag
+ * are set, else returns dump_const_local_flag.
+ */
+static bool get_opt_dump_const_local(void)
+{
+       return (flags & ir_dump_flag_out_edges)
+               || (flags & ir_dump_flag_loops)
+               || (flags & ir_dump_flag_consts_local)
+               || (flags & ir_dump_flag_iredges);
 }
 
-void dump_consts_local(int flag) {
-       dump_const_local = flag;
-}
+static char *dump_filter;
 
-void dump_node_idx_label(int flag) {
-       dump_node_idx_labels = flag;
+void ir_set_dump_filter(const char *new_filter)
+{
+       xfree(dump_filter);
+       dump_filter = xstrdup(new_filter);
 }
 
-void dump_constant_entity_values(int flag) {
-       const_entities = flag;
+const char *ir_get_dump_filter(void)
+{
+       return dump_filter;
 }
 
-void dump_keepalive_edges(int flag) {
-       dump_keepalive = flag;
-}
+int ir_should_dump(const char *name)
+{
+       const char *f, *n;
 
-void dump_new_edges(int flag) {
-       dump_new_edges_flag = flag;
-}
+       if (dump_filter == NULL || dump_filter[0] == '\0')
+               return 1;
 
-int get_opt_dump_keepalive_edges(void) {
-       return dump_keepalive;
+       for (n = name, f = dump_filter; *f != '\0' && *n != '\0';
+                       ++n, ++f) {
+               if (*n != *f)
+                       return 0;
+       }
+       return 1;
 }
 
-void dump_out_edges(int flag) {
-       dump_out_edge_flag = flag;
-}
+/* -------------- some extended helper functions ----------------- */
 
-void dump_dominator_information(int flag) {
-       dump_dominator_information_flag = flag;
+const char *get_mode_name_ex(const ir_mode *mode, int *bad)
+{
+       if (is_mode(mode))
+               return get_mode_name(mode);
+       if (bad != NULL)
+               *bad |= 1;
+       return "<ERROR>";
 }
 
-void dump_loop_information(int flag) {
-       dump_loop_information_flag = flag;
-}
+#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;
 
-void dump_backedge_information(int flag) {
-       dump_backedge_information_flag = flag;
-}
+/** define a custom color. */
+static void custom_color(int num, const char *rgb_def)
+{
+       assert(num < ird_color_count);
+       obstack_printf(&color_obst, "%d", CUSTOM_COLOR_BASE + num);
+       obstack_1grow(&color_obst, '\0');
 
-/* Dump the information of type field specified in ana/irtypeinfo.h.
- * 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) {
-       opt_dump_analysed_type_info = flag;
+       color_rgb[num]   = rgb_def;
+       color_names[num] = (const char*)obstack_finish(&color_obst);
 }
 
-void dump_pointer_values_to_info(int flag) {
-       opt_dump_pointer_values_to_info = flag;
+/** Define a named color. */
+static void named_color(int num, const char *name)
+{
+       assert(num < ird_color_count);
+       color_rgb[num]   = NULL;
+       color_names[num] = name;
 }
 
-void dump_ld_names(int flag) {
-       dump_ld_name = flag;
-}
+/** Initializes the used colors. */
+static void init_colors(void)
+{
+       static int initialized = 0;
+       if (initialized)
+               return;
 
-void dump_all_anchors(int flag) {
-       dump_anchors = flag;
-}
+       obstack_init(&color_obst);
 
-/* -------------- some extended helper functions ----------------- */
+       custom_color(ird_color_prog_background,       "204 204 204");
+       custom_color(ird_color_block_background,      "255 255 0");
+       custom_color(ird_color_dead_block_background, "190 150 150");
+       named_color(ird_color_block_inout,            "lightblue");
+       named_color(ird_color_default_node,           "white");
+       custom_color(ird_color_memory,                "153 153 255");
+       custom_color(ird_color_controlflow,           "255 153 153");
+       custom_color(ird_color_const,                 "204 255 255");
+       custom_color(ird_color_proj,                  "255 255 153");
+       custom_color(ird_color_uses_memory,           "153 153 255");
+       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");
 
-/**
- * returns the name of a mode or <ERROR> if mode is NOT a mode object.
- * in the later case, sets bad
- */
-const char *get_mode_name_ex(ir_mode *mode, int *bad) {
-       if (is_mode(mode))
-               return get_mode_name(mode);
-       *bad |= 1;
-       return ERROR_TXT;
+       initialized = 1;
 }
 
 /**
- * returns the name of a type or <ERROR> if mode is NOT a mode object.
- * in the later case, sets bad
+ * Prints the VCG color to a file.
  */
-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;
+static void print_vcg_color(FILE *out, ird_color_t color)
+{
+       assert(color < ird_color_count);
+       fprintf(out, "color:%s", color_names[color]);
 }
 
 /**
- * printf the VCG color to a file
+ * Prints the edge kind of a given IR node.
+ *
+ * Projs should be dumped near their predecessor, so they get "nearedge".
  */
-static void print_vcg_color(FILE *F, dumper_colors color) {
-       static const char *color_names[32] = {
-               "white",        "blue",      "red",        "green",
-               "yellow",       "magenta",   "cyan",       "darkgray",
-               "darkblue",     "darkred",   "darkgreen",  "darkyellow",
-               "darkmagenta",  "darkcyan",  "gold",       "lightgray",
-               "lightblue",    "lightred",  "lightgreen", "lightyellow",
-               "lightmagenta", "lightcyan", "lilac",      "turquoise",
-               "aquamarine",   "khaki",     "purple",     "yellowgreen",
-               "pink",         "orange",    "orchid",     "black"
-       };
-
-       if (color != ird_color_default)
-               fprintf(F, "color:%s", color_names[color]);
+static void print_node_edge_kind(FILE *out, ir_node *node)
+{
+       if (is_Proj(node)) {
+               fprintf(out, "nearedge: ");
+       } else {
+               fprintf(out, "edge: ");
+       }
 }
 
 /**
- * prints the edge from a type S to a type T with additional info fmt, ...
- * to the file F
+ * 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;
 
@@ -310,26 +281,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, ...
- * to the file F
+ * 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, ...
- * to the file F
+ * 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;
 
@@ -338,56 +309,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_none)
+               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, ...
- * to the file F
+ * 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, ...
- * to the file F
+ * 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, ...
- * to the file F
+ * 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");
@@ -395,32 +369,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, ...
- * to the file F
+ * 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, ...
- * to the file F
+ * 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);
@@ -430,8 +404,8 @@ static void print_enum_item_edge(FILE *F, ir_type *E, int item, const char *fmt,
 /* global and ahead declarations                                   */
 /*-----------------------------------------------------------------*/
 
-static void dump_whole_node(ir_node *n, void *env);
-static INLINE void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg);
+static void dump_node_with_edges(ir_node *n, void *env);
+static void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg);
 
 /*-----------------------------------------------------------------*/
 /* Helper functions.                                                */
@@ -450,7 +424,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();
@@ -461,48 +436,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);
 }
@@ -511,34 +494,34 @@ 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, bool 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);
 }
 
-/**
- * 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) {
-       return _get_ent_dump_name(ent, dump_ld_name);
+const char *get_ent_dump_name(const ir_entity *ent)
+{
+       return _get_ent_dump_name(ent, flags & ir_dump_flag_ld_names);
 }
 
-/* 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);
+       return _get_ent_dump_name(get_irg_entity(irg), true);
 }
 
 /**
  * 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));
 }
@@ -546,8 +529,10 @@ 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) {
-       if (dump_anchors || (dump_new_edges_flag && edges_activated(irg))) {
+static void ird_walk_graph(ir_graph *irg, irg_walk_func *pre, irg_walk_func *post, void *env)
+{
+       if ((flags & ir_dump_flag_all_anchors)
+                       || ((flags & ir_dump_flag_iredges) && edges_activated(irg))) {
                irg_walk_anchors(irg, pre, post, env);
        } else {
                irg_walk_graph(irg, pre, post, env);
@@ -555,15 +540,15 @@ 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.
+ * 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);
@@ -592,54 +577,46 @@ 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;
-       int      rem_view  = get_interprocedural_view();
-       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);
 
        ird_walk_graph(current_ir_graph, clear_link, collect_node, current_ir_graph);
 
-       /* Collect also EndReg and EndExcept. We do not want to change the walker. */
-       set_interprocedural_view(0);
-
-       set_irg_visited(current_ir_graph, get_irg_visited(current_ir_graph)-1);
-       irg_walk(get_irg_end_reg(current_ir_graph), clear_link, collect_node, current_ir_graph);
-       set_irg_visited(current_ir_graph, get_irg_visited(current_ir_graph)-1);
-       irg_walk(get_irg_end_except(current_ir_graph), clear_link, collect_node, current_ir_graph);
-
-       set_interprocedural_view(rem_view);
-
-       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);
+       return (ir_node**)ird_get_irg_link(irg);
 }
 
-typedef struct _list_tuple {
+typedef struct list_tuple {
        ir_node **blk_list;
        ir_extblk **extbb_list;
 } list_tuple;
 
 /** Construct lists to walk IR extended block-wise.
- * Free the lists in the tuple with DEL_ARR_F().
- * Sets the irg link field to NULL in all
- * graphs not visited.
+ * Free the lists in the tuple with DEL_ARR_F(). 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;
+       size_t i, n;
        ir_graph *rem = current_ir_graph;
-       list_tuple *lists = xmalloc(sizeof(*lists));
+       list_tuple *lists = XMALLOC(list_tuple);
 
        current_ir_graph = irg;
 
@@ -647,7 +624,7 @@ static list_tuple *construct_extblock_lists(ir_graph *irg) {
        lists->extbb_list = NEW_ARR_F(ir_extblk *, 0);
 
        inc_irg_block_visited(irg);
-       for (i = ARR_LEN(blk_list) - 1; i >= 0; --i) {
+       for (i = 0, n = ARR_LEN(blk_list); i < n; ++i) {
                ir_extblk *ext;
 
                if (is_Block(blk_list[i])) {
@@ -667,39 +644,20 @@ static list_tuple *construct_extblock_lists(ir_graph *irg) {
        return lists;
 }
 
-/*-----------------------------------------------------------------*/
-/* Routines to dump information about a single ir node.            */
-/*-----------------------------------------------------------------*/
-
-/*
- * dump the name of a node n to the File F.
- */
-int dump_node_opcode(FILE *F, ir_node *n)
+void dump_node_opcode(FILE *F, ir_node *n)
 {
-       int bad = 0;
        const ir_op_ops *ops = get_op_ops(get_irn_op(n));
 
        /* call the dump_node operation if available */
-       if (ops->dump_node)
-               return ops->dump_node(n, F, dump_node_opcode_txt);
+       if (ops->dump_node) {
+               ops->dump_node(F, n, dump_node_opcode_txt);
+               return;
+       }
 
        /* 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;
@@ -707,65 +665,35 @@ 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;
-
-       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);
 
                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;
-       case iro_Start:
-       case iro_End:
-       case iro_EndExcept:
-       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)
-                       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);
-               fprintf(F, "%s", get_irn_opname(n));
-               if (ent) fprintf(F, " %s", get_entity_name(ent));
-               break;
-       }
+
        case iro_Load:
                if (get_Load_align(n) == align_non_aligned)
                        fprintf(F, "ua");
-               fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_Load_mode(n), &bad));
+               fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_Load_mode(n), NULL));
                break;
        case iro_Store:
                if (get_Store_align(n) == align_non_aligned)
@@ -773,7 +701,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),
+                       (flags & ir_dump_flag_show_marks) ? (get_Block_mark(n) ? "*" : "") : "");
                break;
        case iro_Conv:
                if (get_Conv_strict(n))
@@ -781,36 +716,42 @@ 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), NULL));
                break;
        case iro_Mod:
-               fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_Mod_resmode(n), &bad));
+               fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_Mod_resmode(n), NULL));
                break;
        case iro_DivMod:
-               fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_DivMod_resmode(n), &bad));
+               fprintf(F, "%s[%s]", get_irn_opname(n), get_mode_name_ex(get_DivMod_resmode(n), NULL));
+               break;
+       case iro_Builtin:
+               fprintf(F, "%s[%s]", get_irn_opname(n), get_builtin_kind_name(get_Builtin_kind(n)));
                break;
 
        default:
 default_case:
                fprintf(F, "%s", get_irn_opname(n));
-
-       }  /* end switch */
-       return bad;
+       }
 }
 
 /**
  * Dump the mode of a node n to a file F.
  * Ignore modes that are "always known".
  */
-static int dump_node_mode(FILE *F, ir_node *n)
+static void dump_node_mode(FILE *F, ir_node *n)
 {
-       int bad = 0;
        const ir_op_ops *ops = get_op_ops(get_irn_op(n));
-       ir_opcode iro;
+       unsigned         iro;
+       ir_mode         *mode;
 
        /* call the dump_node operation if available */
-       if (ops->dump_node)
-               return ops->dump_node(n, F, dump_node_mode_txt);
+       if (ops->dump_node) {
+               ops->dump_node(F, n, dump_node_mode_txt);
+               return;
+       }
 
        /* default implementation */
        iro = get_irn_opcode(n);
@@ -824,59 +765,54 @@ 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));
+                       fprintf(F, "%s", get_mode_name_ex(mode, NULL));
        }
-       }
-
-       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 (ir_get_dump_flags() & ir_dump_flag_analysed_types) {
                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;
 }
 
-typedef struct _pns_lookup {
+typedef struct pns_lookup {
        long       nr;      /**< the proj number */
        const char *name;   /**< the name of the Proj */
 } pns_lookup_t;
 
-typedef struct _proj_lookup {
-       ir_opcode          code;      /**< the opcode of the Proj predecessor */
+typedef struct proj_lookup {
+       unsigned           code;      /**< the opcode of the Proj predecessor */
        unsigned           num_data;  /**< number of data entries */
        const pns_lookup_t *data;     /**< the data */
 } proj_lookup_t;
 
-#define ARR_SIZE(a)       (sizeof(a)/sizeof(a[0]))
-
 /** the lookup table for Proj(Start) names */
 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
 };
 
@@ -891,11 +827,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
 };
@@ -976,7 +911,6 @@ static const pns_lookup_t copyb_lut[] = {
        X(M),
        X(X_regular),
        X(X_except),
-       X(M_except)
 #undef X
 };
 
@@ -987,7 +921,6 @@ static const pns_lookup_t instof_lut[] = {
        X(X_regular),
        X(X_except),
        X(res),
-       X(M_except),
 #undef X
 };
 
@@ -1011,7 +944,7 @@ static const pns_lookup_t bound_lut[] = {
 
 /** the Proj lookup table */
 static const proj_lookup_t proj_lut[] = {
-#define E(a)  ARR_SIZE(a), a
+#define E(a)  ARRAY_SIZE(a), a
        { iro_Start,   E(start_lut) },
        { iro_Cond,    E(cond_lut) },
        { iro_Call,    E(call_lut) },
@@ -1032,30 +965,27 @@ 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 void dump_node_nodeattr(FILE *F, ir_node *n)
 {
-       int bad = 0;
        ir_node *pred;
-       ir_opcode code;
+       unsigned code;
        long proj_nr;
        const ir_op_ops *ops = get_op_ops(get_irn_op(n));
 
        /* call the dump_node operation if available */
-       if (ops->dump_node)
-               return ops->dump_node(n, F, dump_node_nodeattr_txt);
+       if (ops->dump_node) {
+               ops->dump_node(F, n, dump_node_nodeattr_txt);
+               return;
+       }
 
        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);
-handle_lut:
                code    = get_irn_opcode(pred);
 
                if (code == iro_Cmp)
@@ -1067,7 +997,7 @@ handle_lut:
                else {
                        unsigned i, j, f = 0;
 
-                       for (i = 0; i < ARR_SIZE(proj_lut); ++i) {
+                       for (i = 0; i < ARRAY_SIZE(proj_lut); ++i) {
                                if (code == proj_lut[i].code) {
                                        for (j = 0; j < proj_lut[i].num_data; ++j) {
                                                if (proj_nr == proj_lut[i].data[j].nr) {
@@ -1089,67 +1019,66 @@ handle_lut:
                        }
                }
                break;
-       case iro_Filter:
-               proj_nr = get_Filter_proj(n);
-               if (! get_interprocedural_view()) {
-                       /* it's a Proj' */
-                       pred    = get_Filter_pred(n);
-                       goto handle_lut;
-               } else
-                       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:
                ;
        } /* end switch */
-
-       return bad;
 }
 
 #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;
-       fprintf(F, " %lf*(%2.0lf + %2.0lf) = %2.0lf ",
-               get_irn_exec_freq(n),
-               get_irg_method_execution_frequency(get_irn_irg(n)),
-               pow(5, get_irg_recursion_depth(get_irn_irg(n))),
-               get_irn_exec_freq(n) * (get_irg_method_execution_frequency(get_irn_irg(n)) + pow(5, get_irg_recursion_depth(get_irn_irg(n))))
-       );
 }
 
-
-/* Dumps a node label without the enclosing ". */
-int dump_node_label(FILE *F, ir_node *n) {
-       int bad = 0;
-
-       bad |= dump_node_opcode(F, n);
-       bad |= dump_node_mode(F, n);
+void dump_node_label(FILE *F, ir_node *n)
+{
+       dump_node_opcode(F, n);
+       fputs(" ", F);
+       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 {
+       dump_node_typeinfo(F, n);
+       dump_node_nodeattr(F, n);
+       if (flags & ir_dump_flag_number_label) {
                fprintf(F, "%ld", get_irn_node_nr(n));
        }
-
-       return bad;
+       if (flags & ir_dump_flag_idx_label) {
+               fprintf(F, ":%u", get_irn_idx(n));
+       }
 }
 
+void dump_vrp_info(FILE *F, ir_node *n)
+{
+       vrp_attr *vrp = vrp_get_info(n);
+       if (n == NULL) {
+               return;
+       }
+
+       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);
+}
 
 /**
  * Dumps the attributes of a node n into the file F.
@@ -1157,67 +1086,80 @@ int dump_node_label(FILE *F, ir_node *n) {
  */
 static void dump_node_vcgattr(FILE *F, ir_node *node, ir_node *local, int bad)
 {
+       ir_mode *mode;
        ir_node *n;
 
        if (bad) {
-               print_vcg_color(F, ird_color_red);
+               print_vcg_color(F, ird_color_error);
                return;
        }
 
-       if (dump_node_vcgattr_hook)
-               if (dump_node_vcgattr_hook(F, node, local))
-                       return;
+       if (dump_node_vcgattr_hook != NULL) {
+               dump_node_vcgattr_hook(F, node, local);
+               return;
+       }
 
        n = local ? local : node;
 
-       if (overrule_nodecolor != ird_color_default) {
+       if (overrule_nodecolor != ird_color_default_node) {
                print_vcg_color(F, overrule_nodecolor);
                return;
        }
 
+       mode = get_irn_mode(n);
+       if (mode == mode_M) {
+               print_vcg_color(F, ird_color_memory);
+               return;
+       }
+       if (mode == mode_X) {
+               print_vcg_color(F, ird_color_controlflow);
+               return;
+       }
+
        switch (get_irn_opcode(n)) {
        case iro_Start:
-       case iro_EndReg:
-               /* fall through */
-       case iro_EndExcept:
-               /* fall through */
        case iro_End:
-               print_vcg_color(F, ird_color_blue);
+               print_vcg_color(F, ird_color_anchor);
+               break;
+       case iro_Bad:
+               print_vcg_color(F, ird_color_error);
                break;
        case iro_Block:
                if (is_Block_dead(n))
-                       print_vcg_color(F, ird_color_lightred);
+                       print_vcg_color(F, ird_color_dead_block_background);
                else
-                       print_vcg_color(F, ird_color_lightyellow);
+                       print_vcg_color(F, ird_color_block_background);
                break;
        case iro_Phi:
-               print_vcg_color(F, ird_color_green);
-               break;
-       case iro_Mux:
-       case iro_Psi:
-               print_vcg_color(F, ird_color_gold);
+               print_vcg_color(F, ird_color_phi);
                break;
        case iro_Pin:
-               print_vcg_color(F, ird_color_orchid);
+               print_vcg_color(F, ird_color_memory);
                break;
+       case iro_SymConst:
        case iro_Const:
-       case iro_Proj:
-       case iro_Filter:
-       case iro_Tuple:
-               print_vcg_color(F, ird_color_yellow);
+               print_vcg_color(F, ird_color_const);
                break;
-       case iro_ASM:
-               print_vcg_color(F, ird_color_darkyellow);
+       case iro_Proj:
+               print_vcg_color(F, ird_color_proj);
                break;
-       default:
-               PRINT_DEFAULT_NODE_ATTR;
+       default: {
+               ir_op *op = get_irn_op(node);
+
+               if (is_op_constlike(op)) {
+                       print_vcg_color(F, ird_color_const);
+               } 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)) {
+                       print_vcg_color(F, ird_color_controlflow);
+               }
+       }
        }
 }
 
-/* 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;
@@ -1226,10 +1168,9 @@ void *dump_add_node_info_callback(dump_node_info_cb_t *cb, void *data)
        return info;
 }
 
-/* Remove a previously added info dumper callback. */
-void dump_remv_node_info_callback(void *handle)
+void dump_remove_node_info_callback(void *handle)
 {
-       hook_entry_t *info = handle;
+       hook_entry_t *info = (hook_entry_t*)handle;
        unregister_hook(hook_node_info, info);
        xfree(info);
 }
@@ -1237,37 +1178,32 @@ 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 void dump_node_info(FILE *F, ir_node *n)
 {
-       int bad = 0;
        const ir_op_ops *ops = get_op_ops(get_irn_op(n));
 
        fprintf(F, " info1: \"");
-       bad = dump_irnode_to_file(F, n);
+       dump_irnode_to_file(F, n);
        /* call the dump_node operation if available */
        if (ops->dump_node)
-               bad = ops->dump_node(n, F, dump_node_info_txt);
+               ops->dump_node(F, n, dump_node_info_txt);
 
        /* allow additional info to be added */
        hook_node_info(F, n);
        fprintf(F, "\"\n");
-
-       return bad;
 }
 
-/**
- * checks whether a node is "constant-like" ie can be treated "block-less"
- */
-static INLINE
-int is_constlike_node(ir_node *n) {
-       ir_opcode code = get_irn_opcode(n);
-       return (code == iro_Const || code == iro_Bad || code == iro_NoMem || code == iro_SymConst || code == iro_Unknown);
+static int is_constlike_node(const ir_node *node)
+{
+       const ir_op *op = get_irn_op(node);
+       return is_op_constlike(op);
 }
 
 
 /** 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;
 
@@ -1282,41 +1218,38 @@ 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)) {
-                       int bad = 0;
-
+               if (is_constlike_node(con) && !irn_visited(con)) {
                        mark_irn_visited(con);
                        /* Generate a new name for the node by appending the names of
                        n and const. */
                        fprintf(F, "node: {title: "); PRINT_CONSTID(n, con);
                        fprintf(F, " label: \"");
-                       bad |= dump_node_label(F, con);
+                       dump_node_label(F, con);
                        fprintf(F, "\" ");
-                       bad |= dump_node_info(F, con);
-                       dump_node_vcgattr(F, n, con, bad);
+                       dump_node_info(F, con);
+                       dump_node_vcgattr(F, n, con, 0);
                        fprintf(F, "}\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;
 
        blk = get_nodes_block(n);
        if (is_constlike_node(blk)) {
-               int bad = 0;
-
                /* Generate a new name for the node by appending the names of
                n and blk. */
                fprintf(F, "node: {title: \""); PRINT_CONSTBLKID(n, blk);
                fprintf(F, "\" label: \"");
-               bad |= dump_node_label(F, blk);
+               dump_node_label(F, blk);
                fprintf(F, "\" ");
-               bad |= dump_node_info(F, blk);
-               dump_node_vcgattr(F, n, blk, bad);
+               dump_node_info(F, blk);
+               dump_node_vcgattr(F, n, blk, 0);
                fprintf(F, "}\n");
 
                fprintf(F, "edge: { sourcename: \"");
@@ -1356,13 +1289,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
  */
@@ -1375,33 +1314,37 @@ 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);
 
-       bad = ! irn_vrfy_irg_dump(n, current_ir_graph, &p);
-       bad |= dump_node_label(F, n);
+       fputs(" label: \"", F);
+       bad = ! irn_verify_irg_dump(n, current_ir_graph, &p);
+       dump_node_label(F, n);
        dump_node_ana_vals(F, n);
        //dump_node_ana_info(F, n);
-       fprintf(F, "\" ");
-       bad |= dump_node_info(F, n);
+       fputs("\" ", F);
+
+       if (get_op_flags(get_irn_op(n)) & irop_flag_dump_noinput) {
+               //fputs(" node_class:23", F);
+       }
+
+       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)) {
+       if (!is_Block(n)) {
                ir_node *block = get_nodes_block(n);
 
                if (get_opt_dump_const_local() && is_constlike_node(block)) {
@@ -1428,8 +1371,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.
@@ -1440,8 +1383,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.
@@ -1453,14 +1396,15 @@ 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)
                if (dump_edge_vcgattr_hook(F, from, to))
                        return;
 
-       if (dump_backedge_information_flag && is_backedge(from, to))
+       if ((flags & ir_dump_flag_back_edges) && is_backedge(from, to))
                fprintf(F, BACK_EDGE_ATTR);
 
        switch (get_irn_opcode(from)) {
@@ -1495,19 +1439,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 (!(flags & ir_dump_flag_keepalive_edges) && 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)) {
@@ -1522,17 +1470,17 @@ 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))
-                       continue; /* pred not dumped */
-
-               if (dump_backedge_information_flag && is_backedge(n, i))
+               if ((flags & ir_dump_flag_back_edges) && 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)) {
@@ -1549,16 +1497,18 @@ static void dump_ir_data_edges(FILE *F, ir_node *n)  {
 /**
  * Dump the ir_edges
  */
-static void
-dump_ir_edges(FILE *F, ir_node *n) {
+static void dump_ir_edges(ir_node *node, void *env)
+{
+       int              i = 0;
+       FILE            *F = (FILE*)env;
        const ir_edge_t *edge;
-       int i = 0;
 
-       foreach_out_edge(n, edge) {
+       foreach_out_edge(node, edge) {
                ir_node *succ = get_edge_src_irn(edge);
 
-               fprintf(F, "edge: {sourcename: \"");
-               PRINT_NODEID(n);
+               print_node_edge_kind(F, succ);
+               fprintf(F, "{sourcename: \"");
+               PRINT_NODEID(node);
                fprintf(F, "\" targetname: \"");
                PRINT_NODEID(succ);
                fprintf(F, "\"");
@@ -1571,29 +1521,26 @@ 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) {
-       FILE *F = 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 = (FILE*)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) {
-       FILE *F = env;
+/** Dumps a node and its edges. */
+static void dump_node_with_edges(ir_node *n, void *env)
+{
+       FILE *F = (FILE*)env;
        dump_node_wo_blockedge(n, env);
        if (!node_floats(n))
                dump_ir_block_edge(F, n);
-       if (dump_new_edges_flag && edges_activated(current_ir_graph))
-               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);
 }
@@ -1602,20 +1549,22 @@ dump_const_node(ir_node *n, void *env) {
 /* the following routines dump the nodes/irgs bracketed to graphs.     */
 /***********************************************************************/
 
-/** Dumps a constant expression as entity initializer, array bound ...
- */
-static void dump_const_expression(FILE *F, ir_node *value) {
+/** Dumps a constant expression as entity initializer, array bound ... */
+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;
+       ir_dump_flags_t old_flags = ir_get_dump_flags();
+       ir_remove_dump_flags(ir_dump_flag_consts_local);
+
        current_ir_graph = get_const_code_irg();
        irg_walk(value, dump_const_node, NULL, F);
        /* Decrease visited flag so that we walk with the same flag for the next
           expression.  This guarantees that we don't dump the same node twice,
           as for const expressions cse is performed to save memory. */
        set_irg_visited(current_ir_graph, get_irg_visited(current_ir_graph) -1);
+
+       ir_set_dump_flags(old_flags);
        current_ir_graph = rem;
-       dump_const_local = rem_dump_const_local;
 }
 
 /** Dump a block as graph containing its nodes.
@@ -1623,10 +1572,10 @@ 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;
-       dumper_colors color = ird_color_yellow;
+       ird_color_t color = ird_color_block_background;
 
        assert(is_Block(block));
 
@@ -1634,16 +1583,12 @@ 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))
-               color = ird_color_red;
+               color = ird_color_block_background;
        if (is_Block_dead(block))
-               color = ird_color_orange;
+               color = ird_color_dead_block_background;
 
        fprintf(F, "\" status:clustered ");
        print_vcg_color(F, color);
@@ -1660,7 +1605,7 @@ dump_whole_block(FILE *F, ir_node *block) {
                dump_block_edge_hook(F, block);
 
        /* dump the nodes that go into the block */
-       for (node = ird_get_irn_link(block); node; node = ird_get_irn_link(node)) {
+       for (node = (ir_node*)ird_get_irn_link(block); node; node = (ir_node*)ird_get_irn_link(node)) {
                dump_node(F, node);
                dump_ir_data_edges(F, node);
        }
@@ -1668,23 +1613,20 @@ 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) {
-       int i;
+static void dump_block_graph(FILE *F, ir_graph *irg)
+{
+       size_t i, n;
        ir_graph *rem = current_ir_graph;
-       ir_node **arr = ird_get_irg_link(irg);
+       ir_node **arr = (ir_node**)ird_get_irg_link(irg);
        current_ir_graph = irg;
 
-       for (i = ARR_LEN(arr) - 1; i >= 0; --i) {
-               ir_node * node = arr[i];
+       for (i = 0, n = ARR_LEN(arr); i < n; ++i) {
+               ir_node *node = arr[i];
                if (is_Block(node)) {
                /* Dumps the block and all the nodes in the block, which are to
                        be found in Block->link. */
@@ -1697,11 +1639,11 @@ dump_block_graph(FILE *F, ir_graph *irg) {
                        }
                        dump_ir_data_edges(F, node);
                }
-               if (dump_new_edges_flag && edges_activated(irg))
-                       dump_ir_edges(F, node);
+               if ((flags & ir_dump_flag_iredges) && edges_activated(irg))
+                       dump_ir_edges(node, F);
        }
 
-       if (dump_loop_information_flag && (get_irg_loopinfo_state(irg) & loopinfo_valid))
+       if ((flags & ir_dump_flag_loops) && (get_irg_loopinfo_state(irg) & loopinfo_valid))
                dump_loop_nodes_into_graph(F, irg);
 
        current_ir_graph = rem;
@@ -1711,22 +1653,24 @@ 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);
+       dump_entity_to_file(F, get_irg_entity(irg));
        fprintf(F, "\"\n");
 }
 
 /** 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: \"");
        PRINT_IRGID(irg);
-       fprintf(F, "\" label: \"%s\" status:clustered color:white \n",
-         get_ent_dump_name(ent));
+       fprintf(F, "\" label: \"%s\" status:clustered color:%s \n",
+         get_ent_dump_name(ent), color_names[ird_color_prog_background]);
 
        dump_graph_info(F, irg);
        print_dbg_info(F, get_entity_dbg_info(ent));
@@ -1737,60 +1681,15 @@ static void dump_graph_from_list(FILE *F, ir_graph *irg) {
        fprintf(F, "}\n\n");
 }
 
-/** 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) {
-       int i;
-       ir_graph *rem = current_ir_graph;
-       ir_extblk **arr = ird_get_irg_link(irg);
-       current_ir_graph = irg;
-
-       for (i = ARR_LEN(arr) - 1; i >= 0; --i) {
-               ir_extblk *extbb = arr[i];
-               ir_node *leader = get_extbb_leader(extbb);
-               int j;
+/*******************************************************************/
+/* Basic type and entity nodes and edges.                          */
+/*******************************************************************/
 
-               fprintf(F, "graph: { title: \"");
-               PRINT_EXTBBID(leader);
-               fprintf(F, "\"  label: \"ExtBB %ld\" status:clustered color:lightgreen\n",
-                       get_irn_node_nr(leader));
-
-               for (j = ARR_LEN(extbb->blks) - 1; j >= 0; --j) {
-                       ir_node * node = extbb->blks[j];
-                       if (is_Block(node)) {
-                       /* Dumps the block and all the nodes in the block, which are to
-                               be found in Block->link. */
-                               dump_whole_block(F, node);
-                       } else {
-                               /* Nodes that are not in a Block. */
-                               dump_node(F, node);
-                               if (is_Bad(get_nodes_block(node)) && !node_floats(node)) {
-                                       dump_const_block_local(F, node);
-                               }
-                               dump_ir_data_edges(F, node);
-                       }
-               }
-               fprintf(F, "}\n");
-       }
-
-       if (dump_loop_information_flag && (get_irg_loopinfo_state(irg) & loopinfo_valid))
-               dump_loop_nodes_into_graph(F, irg);
-
-       current_ir_graph = rem;
-       free_extbb(irg);
-}
-
-
-/*******************************************************************/
-/* Basic type and entity nodes and edges.                          */
-/*******************************************************************/
-
-/** dumps the edges between nodes and their type or entity attributes. */
-static void dump_node2type_edges(ir_node *n, void *env)
-{
-       FILE *F = env;
-       assert(n);
+/** dumps the edges between nodes and their type or entity attributes. */
+static void dump_node2type_edges(ir_node *n, void *env)
+{
+       FILE *F = (FILE*)env;
+       assert(n);
 
        switch (get_irn_opcode(n)) {
        case iro_Const :
@@ -1821,7 +1720,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) {
@@ -1836,7 +1736,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)));
@@ -1864,13 +1765,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);
@@ -1892,44 +1791,37 @@ static void print_typespecific_vcgattr(FILE *F, ir_type *tp) {
        } /* switch type */
 }
 
-
-int dump_type_node(FILE *F, ir_type *tp)
+void 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
-       dump_type_to_file(F, tp, dump_verbosity_max);
-#endif
+       fprintf(F, " label: \"%s ", get_type_tpop_name(tp));
+       if (tp->dbi != NULL) {
+               char buf[256];
+               ir_print_type(buf, sizeof(buf), tp);
+               fprintf(F, "'%s'", buf);
+       } else {
+               ir_fprintf(F, "%+F", tp);
+       }
+       fputs("\" info1: \"", F);
+       dump_type_to_file(F, tp);
        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");
-
-       return bad;
 }
 
-
-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);
+       dump_entity_to_file(F, ent);
 
        fprintf(F, "\"\n");
        print_dbg_info(F, get_entity_dbg_info(ent));
@@ -1940,8 +1832,8 @@ 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);
-       tarval        *tv = get_enumeration_value(ec);
+       ident         *id = get_enumeration_const_nameid(ec);
+       ir_tarval     *tv = get_enumeration_value(ec);
 
        if (tv)
                tarval_snprintf(buf, sizeof(buf), tv);
@@ -1949,52 +1841,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) {
-       FILE *F = 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 = (FILE*)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, ird_color_none, 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 (! (flags & ir_dump_flag_no_entity_values)) {
+                       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, ird_color_none, ENT_CORR_EDGE_ATTR, i);
                                                /*
                                                fprintf(F, "edge: { sourcename: \"%p\" targetname: \"%p\" "
                                                ENT_CORR_EDGE_ATTR  "}\n", GET_ENTID(ent),
@@ -2007,34 +1904,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));
@@ -2044,13 +1941,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;
@@ -2064,45 +1961,41 @@ dump_type_info(type_or_ent *tore, void *env) {
        } /* switch kind_or_entity */
 }
 
-typedef struct _h_env {
-       int dump_ent;
-       FILE *f;
-} h_env_t;
-
 /** For dumping class hierarchies.
  * 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) {
-       h_env_t *env = ctx;
-       FILE *F = env->f;
+static void dump_class_hierarchy_node(type_or_ent tore, void *ctx)
+{
+       FILE *F = (FILE*)ctx;
        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 (env->dump_ent && is_Class_type(get_entity_owner(ent))) {
+               if (!is_Method_type(get_entity_type(ent)))
+                       break;  /* GL */
+               if (flags & ir_dump_flag_entities_in_hierarchy
+                               && 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, ird_color_none, 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;
@@ -2120,28 +2013,31 @@ dump_class_hierarchy_node(type_or_ent *tore, void *ctx) {
 /*******************************************************************/
 
 /* dump out edges */
-static void
-dump_out_edge(ir_node *n, void *env) {
-       FILE *F = env;
+static void dump_out_edge(ir_node *n, void *env)
+{
+       FILE *F = (FILE*)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 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 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 */
@@ -2150,8 +2046,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 void dump_loop_node(FILE *F, ir_loop *loop)
+{
        fprintf(F, "node: {title: \"");
        PRINT_LOOPID(loop);
        fprintf(F, "\" label: \"");
@@ -2161,8 +2057,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 void dump_loop_node_edge(FILE *F, ir_loop *loop, int i)
+{
        assert(loop);
        fprintf(F, "edge: {sourcename: \"");
        PRINT_LOOPID(loop);
@@ -2172,8 +2068,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 void dump_loop_son_edge(FILE *F, ir_loop *loop, int i)
+{
        assert(loop);
        fprintf(F, "edge: {sourcename: \"");
        PRINT_LOOPID(loop);
@@ -2183,54 +2079,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 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) {
-       char *label;
+void dump_vcg_header(FILE *F, const char *name, const char *layout, const char *orientation)
+{
+       int   i;
+       const char *label
+               = (flags & ir_dump_flag_disable_edge_labels) ? "no" : "yes";
 
-       if (edge_label) {
-               label = "yes";
-       } else {
-               label = "no";
-       }
+       init_colors();
 
+       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"
@@ -2255,401 +2155,191 @@ 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);
 
-       /* don't use all, the range is too wide. */
-       n_colors   = 18;
-       base_color = 105;
-       fprintf(F,
-               "colorentry 100:    0   0    0\n"
-               "colorentry 101:   20   0    0\n"
-               "colorentry 102:   40   0    0\n"
-               "colorentry 103:   60   0    0\n"
-               "colorentry 104:   80   0    0\n"
-               "colorentry 105:  100   0    0\n"
-               "colorentry 106:  120   0    0\n"
-               "colorentry 107:  140   0    0\n"
-               "colorentry 108:  150   0    0\n"
-               "colorentry 109:  180   0    0\n"
-               "colorentry 110:  200   0    0\n"
-               "colorentry 111:  220   0    0\n"
-               "colorentry 112:  240   0    0\n"
-               "colorentry 113:  255   0    0\n"
-               "colorentry 113:  255  20   20\n"
-               "colorentry 114:  255  40   40\n"
-               "colorentry 115:  255  60   60\n"
-               "colorentry 116:  255  80   80\n"
-               "colorentry 117:  255 100  100\n"
-               "colorentry 118:  255 120  120\n"
-               "colorentry 119:  255 140  140\n"
-               "colorentry 120:  255 150  150\n"
-               "colorentry 121:  255 180  180\n"
-               "colorentry 122:  255 200  200\n"
-               "colorentry 123:  255 220  220\n"
-               "colorentry 124:  255 240  240\n"
-               "colorentry 125:  255 250  250\n"
-               );
-
-       fprintf(F, "\n");        /* a separator */
-}
-
-/**
- * open a vcg file
- *
- * @param irg     The graph to be dumped
- * @param suffix1 first filename suffix
- * @param suffix2 second filename suffix
- */
-FILE *vcg_open(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;
-       char *fname;  /* filename to put the vcg information in */
-
-       if (!suffix1) suffix1 = "";
-       if (!suffix2) suffix2 = "";
-
-       /* open file for vcg graph */
-       fname = xmalloc (len * 2 + strlen(suffix1) + strlen(suffix2) + 5);
-
-       /* strncpy (fname, nm, len); */     /* copy the filename */
-       j = 0;
-       for (i = 0; i < len; ++i) {  /* replace '/' in the name: escape by @. */
-               if (nm[i] == '/') {
-                       fname[j] = '@'; j++; fname[j] = '1'; j++;
-               } else if (nm[i] == '@') {
-                       fname[j] = '@'; j++; fname[j] = '2'; j++;
-               } else {
-                       fname[j] = nm[i]; j++;
+       for (i = 0; i < ird_color_count; ++i) {
+               if (color_rgb[i] != NULL) {
+                       fprintf(F, "colorentry %s: %s\n", color_names[i], color_rgb[i]);
                }
        }
-       fname[j] = '\0';
-       strcat(fname, suffix1);  /* append file suffix */
-       strcat(fname, suffix2);  /* append file suffix */
-       strcat(fname, ".vcg");   /* append the .vcg suffix */
-
-       /* vcg really expect only a <CR> at end of line, so
-        * the "b"inary mode is what you mean (and even needed for Win32)
-        */
-       F = fopen(fname, "wb");  /* open file for writing */
-       if (!F) {
-               perror(fname);
-       }
-       free(fname);
-
-       return F;
-}
-
-/**
- * open a vcg file
- *
- * @param name    prefix file name
- * @param suffix  filename 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);
-
-       if (!suffix) suffix = "";
-
-       /** open file for vcg graph */
-       fname = xmalloc(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 @. */
-               if (name[i] == '/') {
-                       fname[j] = '@'; j++; fname[j] = '1'; j++;
-               } else if (name[i] == '@') {
-                       fname[j] = '@'; j++; fname[j] = '2'; j++;
-               } else {
-                       fname[j] = name[i]; j++;
-               }
-       }
-       fname[j] = '\0';
-       strcat(fname, suffix);
-       strcat(fname, ".vcg");  /* append the .vcg suffix */
-
-       /* vcg really expect only a <CR> at end of line, so
-        * the "b"inary mode is what you mean (and even needed for Win32)
-        */
-       F = fopen(fname, "wb");  /* open file for writing */
-       if (!F) {
-               perror(fname);
-       }
-       free(fname);
-
-       return F;
+       fprintf(F, "\n");
 }
 
 /**
  * Dumps the vcg file footer
  */
-static void dump_vcg_footer(FILE *F) {
+void dump_vcg_footer(FILE *F)
+{
        fprintf(F, "}\n");
 }
 
-/**
- * close the vcg file
- */
-void vcg_close(FILE *F) {
-       dump_vcg_footer(F);    /* print footer */
-       fclose (F);           /* close vcg file */
-}
-
-/************************************************************************/
-/************************************************************************/
-/* Routines that dump all or parts of the firm representation to a file */
-/************************************************************************/
-/************************************************************************/
 
-/************************************************************************/
-/* Dump ir graphs, different formats and additional information.        */
-/************************************************************************/
 
-/** Routine to dump a graph, blocks as conventional nodes.  */
-void
-dump_ir_graph(ir_graph *irg, const char *suffix )
+static void dump_blocks_as_subgraphs(FILE *out, ir_graph *irg)
 {
-       FILE *f;
-       ir_graph *rem;
-       char *suffix1;
-
-       if (!is_filtered_dump_name(get_entity_ident(get_irg_entity(irg))))
-               return;
-
-       if (dump_backedge_information_flag && get_irg_loopinfo_state(irg) != loopinfo_consistent) {
-               construct_backedges(irg);
-       }
-
-       rem = current_ir_graph;
-       current_ir_graph = irg;
-       if (get_interprocedural_view()) suffix1 = "-pure-ip";
-       else                            suffix1 = "-pure";
-       f = vcg_open(irg, suffix, suffix1);
-       if (f != NULL) {
-               dump_vcg_header(f, get_irg_dump_name(irg), NULL);
-
-               /* call the dump graph hook */
-               if (dump_ir_graph_hook)
-                       if (dump_ir_graph_hook(f, irg)) {
-                               current_ir_graph = rem;
-                               return;
-                       }
-
-                       /* walk over the graph */
-                       /* dump_whole_node must be called in post visiting predecessors */
-                       ird_walk_graph(irg, NULL, dump_whole_node, f);
+       int i;
 
-                       /* dump the out edges in a separate walk */
-                       if ((dump_out_edge_flag) && (get_irg_outs_state(irg) != outs_none)) {
-                               irg_out_walk(get_irg_start(irg), dump_out_edge, NULL, f);
-                       }
+       construct_block_lists(irg);
 
-                       vcg_close(f);
+       /*
+        * If we are in the interprocedural view, we dump not
+        * only the requested irg but also all irgs that can be reached
+        * from irg.
+        */
+       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+               ir_graph *irg = get_irp_irg(i);
+               ir_node **arr = (ir_node**)ird_get_irg_link(irg);
+               if (arr == NULL)
+                       continue;
+
+               dump_graph_from_list(out, irg);
+               DEL_ARR_F(arr);
        }
-       current_ir_graph = rem;
 }
 
-/* Dump a firm graph without explicit block nodes. */
-void dump_ir_block_graph(ir_graph *irg, const char *suffix)
+/** 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)
 {
-       FILE *f;
-       int i;
-       char *suffix1;
+       size_t i, arr_len;
+       ir_graph *rem = current_ir_graph;
+       ir_extblk **arr = (ir_extblk**)ird_get_irg_link(irg);
+       current_ir_graph = irg;
 
-       if (!is_filtered_dump_name(get_entity_ident(get_irg_entity(irg))))
-               return;
+       for (i = 0, arr_len = ARR_LEN(arr); i < arr_len; ++i) {
+               ir_extblk *extbb = arr[i];
+               ir_node *leader = get_extbb_leader(extbb);
+               size_t j, n_blks;
 
-       if (get_interprocedural_view()) suffix1 = "-ip";
-       else                            suffix1 = "";
-       f = vcg_open(irg, suffix, suffix1);
-
-       if (f != NULL) {
-               dump_vcg_header(f, get_irg_dump_name(irg), NULL);
-
-               construct_block_lists(irg);
-
-               /*
-                * If we are in the interprocedural view, we dump not
-                * only the requested irg but also all irgs that can be reached
-                * from irg.
-                */
-               for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-                       ir_graph *g = get_irp_irg(i);
-                       ir_node **arr = ird_get_irg_link(g);
-                       if (arr) {
-                               dump_graph_from_list(f, g);
-                               DEL_ARR_F(arr);
+               fprintf(F, "graph: { title: \"");
+               PRINT_EXTBBID(leader);
+               fprintf(F, "\"  label: \"ExtBB %ld\" status:clustered color:lightgreen\n",
+                       get_irn_node_nr(leader));
+
+               for (j = 0, n_blks = ARR_LEN(extbb->blks); j < n_blks; ++j) {
+                       ir_node *node = extbb->blks[j];
+                       if (is_Block(node)) {
+                       /* Dumps the block and all the nodes in the block, which are to
+                               be found in Block->link. */
+                               dump_whole_block(F, node);
+                       } else {
+                               /* Nodes that are not in a Block. */
+                               dump_node(F, node);
+                               if (is_Bad(get_nodes_block(node)) && !node_floats(node)) {
+                                       dump_const_block_local(F, node);
+                               }
+                               dump_ir_data_edges(F, node);
                        }
                }
-
-               vcg_close(f);
+               fprintf(F, "}\n");
        }
+
+       if ((flags & ir_dump_flag_loops)
+                       && (get_irg_loopinfo_state(irg) & loopinfo_valid))
+               dump_loop_nodes_into_graph(F, irg);
+
+       current_ir_graph = rem;
+       free_extbb(irg);
 }
 
-/* Dump a firm graph without explicit block nodes but grouped in extended blocks. */
-void dump_ir_extblock_graph(ir_graph *irg, const char *suffix)
+static void dump_blocks_extbb_grouped(FILE *F, ir_graph *irg)
 {
-       FILE *F;
-       int i;
-       char *suffix1;
-       ir_entity *ent;
-
-       if (!is_filtered_dump_name(get_entity_ident(get_irg_entity(irg))))
-               return;
+       int        i;
+       ir_entity *ent = get_irg_entity(irg);
 
-       if (get_irg_extblk_state(irg) != extblk_valid)
+       if (get_irg_extblk_state(irg) != ir_extblk_info_valid)
                compute_extbb(irg);
 
-       if (get_interprocedural_view()) suffix1 = "-ip";
-       else                            suffix1 = "";
+       construct_extblock_lists(irg);
 
-       ent = get_irg_entity(irg);
-
-       F = vcg_open(irg, suffix, suffix1);
-       if (F != NULL) {
-               dump_vcg_header(F, get_irg_dump_name(irg), NULL);
+       fprintf(F, "graph: { title: \"");
+       PRINT_IRGID(irg);
+       fprintf(F, "\" label: \"%s\" status:clustered color: white \n",
+               get_ent_dump_name(ent));
 
-               construct_extblock_lists(irg);
+       dump_graph_info(F, irg);
+       print_dbg_info(F, get_entity_dbg_info(ent));
 
-               fprintf(F, "graph: { title: \"");
-               PRINT_IRGID(irg);
-               fprintf(F, "\" label: \"%s\" status:clustered color: white \n",
-                       get_ent_dump_name(ent));
-
-               dump_graph_info(F, irg);
-               print_dbg_info(F, get_entity_dbg_info(ent));
-
-               for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-                       ir_graph *irg     = get_irp_irg(i);
-                       list_tuple *lists = ird_get_irg_link(irg);
-
-                       if (lists) {
-                               /* dump the extended blocks first */
-                               if (ARR_LEN(lists->extbb_list)) {
-                                       ird_set_irg_link(irg, lists->extbb_list);
-                                       dump_extblock_graph(F, irg);
-                               }
+       for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
+               ir_graph *irg     = get_irp_irg(i);
+               list_tuple *lists = (list_tuple*)ird_get_irg_link(irg);
 
-                               /* we may have blocks without extended blocks, bad for instance */
-                               if (ARR_LEN(lists->blk_list)) {
-                                       ird_set_irg_link(irg, lists->blk_list);
-                                       dump_block_graph(F, irg);
-                               }
+               if (lists) {
+                       /* dump the extended blocks first */
+                       if (ARR_LEN(lists->extbb_list)) {
+                               ird_set_irg_link(irg, lists->extbb_list);
+                               dump_extblock_graph(F, irg);
+                       }
 
-                               DEL_ARR_F(lists->extbb_list);
-                               DEL_ARR_F(lists->blk_list);
-                               xfree(lists);
+                       /* we may have blocks without extended blocks, bad for instance */
+                       if (ARR_LEN(lists->blk_list)) {
+                               ird_set_irg_link(irg, lists->blk_list);
+                               dump_block_graph(F, irg);
                        }
+
+                       DEL_ARR_F(lists->extbb_list);
+                       DEL_ARR_F(lists->blk_list);
+                       xfree(lists);
                }
+       }
 
-               /* Close the vcg information for the irg */
-               fprintf(F, "}\n\n");
+       /* Close the vcg information for the irg */
+       fprintf(F, "}\n\n");
 
-               vcg_close(F);
-               free_extbb(irg);
-       }
+       free_extbb(irg);
 }
 
-/* dumps a graph with type information */
-void
-dump_ir_graph_w_types(ir_graph *irg, const char *suffix)
+void dump_ir_graph_file(FILE *out, ir_graph *irg)
 {
-       FILE *f;
-       char *suffix1;
+       dump_vcg_header(out, get_irg_dump_name(irg), NULL, NULL);
 
-       /* 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;
+       /* dump nodes */
+       if (flags & ir_dump_flag_blocks_as_subgraphs) {
+               if (flags & ir_dump_flag_group_extbb) {
+                       dump_blocks_extbb_grouped(out, irg);
+               } else {
+                       dump_blocks_as_subgraphs(out, irg);
+               }
+       } else {
+               /* dump_node_with_edges must be called in post visiting predecessors */
+               ird_walk_graph(irg, NULL, dump_node_with_edges, out);
+       }
 
-       if (get_interprocedural_view()) suffix1 = "-pure-wtypes-ip";
-       else                            suffix1 = "-pure-wtypes";
-       f = vcg_open(irg,suffix, suffix1);
-       if (f != NULL) {
+       /* dump type info */
+       if (flags & ir_dump_flag_with_typegraph) {
                ir_graph *rem = current_ir_graph;
-               int rem_dump_const_local;
-
                current_ir_graph = irg;
-               rem_dump_const_local = dump_const_local;
-               /* dumping types does not work with local nodes */
-               dump_const_local = 0;
-
-               dump_vcg_header(f, get_irg_dump_name(irg), NULL);
 
-               /* dump common ir graph */
-               irg_walk(get_irg_end(irg), NULL, dump_whole_node, f);
-               /* dump type info */
-               type_walk_irg(irg, dump_type_info, NULL, f);
+               type_walk_irg(irg, dump_type_info, NULL, out);
                inc_irg_visited(get_const_code_irg());
                /* dump edges from graph to type info */
-               irg_walk(get_irg_end(irg), dump_node2type_edges, NULL, f);
+               irg_walk(get_irg_end(irg), dump_node2type_edges, NULL, out);
 
-               vcg_close(f);
-               dump_const_local = rem_dump_const_local;
                current_ir_graph = rem;
        }
-}
-
-void
-dump_ir_block_graph_w_types(ir_graph *irg, const char *suffix)
-{
-       FILE *f;
-       int i;
-       char *suffix1;
-
-       /* 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 (get_interprocedural_view()) suffix1 = "-wtypes-ip";
-       else                            suffix1 = "-wtypes";
-       f = vcg_open(irg, suffix, suffix1);
-       if (f != NULL) {
-               ir_graph *rem = current_ir_graph;
-               int rem_dump_const_local;
-
-               rem_dump_const_local = dump_const_local;
-               /* dumping types does not work with local nodes */
-               dump_const_local = 0;
 
-               dump_vcg_header(f, get_irg_dump_name(irg), NULL);
-
-               /* dump common blocked ir graph */
-               construct_block_lists(irg);
-
-               for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-                       ir_node **arr = ird_get_irg_link(get_irp_irg(i));
-                       if (arr) {
-                               dump_graph_from_list(f, get_irp_irg(i));
-                               DEL_ARR_F(arr);
-                       }
-               }
-
-               /* dump type info */
-               current_ir_graph = irg;
-               type_walk_irg(irg, dump_type_info, NULL, f);
-               inc_irg_visited(get_const_code_irg());
-
-               /* dump edges from graph to type info */
-               irg_walk(get_irg_end(irg), dump_node2type_edges, NULL, f);
+       /* dump iredges out edges */
+       if ((flags & ir_dump_flag_iredges) && edges_activated(current_ir_graph)) {
+               irg_walk_edges(get_irg_start_block(irg), dump_ir_edges, NULL, out);
+       }
 
-               vcg_close(f);
-               dump_const_local = rem_dump_const_local;
-               current_ir_graph = rem;
+       /* dump the out edges in a separate walk */
+       if ((flags & ir_dump_flag_out_edges)
+                       && (get_irg_outs_state(irg) != outs_none)) {
+               irg_out_walk(get_irg_start(irg), dump_out_edge, NULL, out);
        }
-}
 
-/*---------------------------------------------------------------------*/
-/* The following routines dump a control flow graph.                   */
-/*---------------------------------------------------------------------*/
+       dump_vcg_footer(out);
+}
 
-static void
-dump_block_to_cfg(ir_node *block, void *env) {
-       FILE *F = env;
+static void dump_block_to_cfg(ir_node *block, void *env)
+{
+       FILE *F = (FILE*)env;
        int i, fl = 0;
        ir_node *pred;
 
@@ -2671,7 +2361,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;
 
@@ -2685,8 +2375,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);
@@ -2696,7 +2386,7 @@ dump_block_to_cfg(ir_node *block, void *env) {
                        }
 
                /* Dump dominator/postdominator edge */
-               if (dump_dominator_information_flag) {
+               if (ir_get_dump_flags() & ir_dump_flag_dominance) {
                        if (get_irg_dom_state(current_ir_graph) == dom_consistent && get_Block_idom(block)) {
                                pred = get_Block_idom(block);
                                fprintf(F, "edge: { sourcename: \"");
@@ -2717,264 +2407,63 @@ dump_block_to_cfg(ir_node *block, void *env) {
        }
 }
 
-void
-dump_cfg(ir_graph *irg, const char *suffix)
+void dump_cfg(FILE *F, ir_graph *irg)
 {
-       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;
-
-       f = vcg_open(irg, suffix, "-cfg");
-       if (f != NULL) {
-               ir_graph *rem = current_ir_graph;
-               int ipv = get_interprocedural_view();
-
-               current_ir_graph = irg;
-               dump_vcg_header(f, get_irg_dump_name(irg), NULL);
-
-               if (ipv) {
-                       printf("Warning: dumping cfg not in interprocedural view!\n");
-                       set_interprocedural_view(0);
-               }
-
-               /* walk over the blocks in the graph */
-               irg_block_walk(get_irg_end(irg), dump_block_to_cfg, NULL, f);
-               dump_node(f, get_irg_bad(irg));
-
-               set_interprocedural_view(ipv);
-               vcg_close(f);
-               current_ir_graph = rem;
-       }
-}
-
-
-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);
+       dump_vcg_header(F, get_irg_dump_name(irg), NULL, NULL);
 
-       if (depth > 0) {
-               int i, start = is_Block(n) ? 0 : -1;
-               dump_whole_node(n, F);
-               for (i = start; i < get_irn_arity(n); ++i)
-                       descend_and_dump(F, get_irn_n(n, i), depth-1, mark_set);
-       } else {
-               dump_node(F, n);
-               /* Don't dump edges to nodes further out.  These might be edges to
-                  nodes we already dumped, if there is a shorter path to these. */
-       }
-}
+       /* walk over the blocks in the graph */
+       irg_block_walk(get_irg_end(irg), dump_block_to_cfg, NULL, F);
+       dump_node(F, get_irg_bad(irg));
 
-static int subgraph_counter = 0;
-void dump_subgraph(ir_node *root, int depth, const char *suffix) {
-       FILE *F;
-       char buf[32];
-
-       sprintf(buf, "-subg_%03d", subgraph_counter++);
-       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);
-               descend_and_dump(F, root, depth, mark_set);
-               vcg_close(F);
-               del_pset(mark_set);
-       }
+       dump_vcg_footer(F);
 }
 
+void dump_callgraph(FILE *F)
+{
+       int             i;
+       ir_dump_flags_t old_flags = ir_get_dump_flags();
 
-static int weight_overall(int rec, int loop) {
-       return 2*rec + loop;
-}
-
-static int compute_color(int my, int max) {
-       int color;
-       if (!max) {
-               color = 0;
-       } else {
-               int step;
-
-               /* if small, scale to the full color range. */
-               if (max < n_colors)
-                       my = my * (n_colors/max);
-
-               step = 1 + (max / n_colors);
+       ir_remove_dump_flags(ir_dump_flag_disable_edge_labels);
+       dump_vcg_header(F, "Callgraph", "Hierarchic", NULL);
 
-               color = my/step;
-       }
-       return base_color + n_colors - color;
-}
-
-/**
- * Calculate a entity color depending on it's execution propability.
- */
-static int get_entity_color(ir_entity *ent) {
-       ir_graph *irg = get_entity_irg(ent);
-       assert(irg);
-
-       {
-               int rec_depth     = get_irg_recursion_depth(irg);
-               int loop_depth    = get_irg_loop_depth(irg);
-               int overall_depth = weight_overall(rec_depth, loop_depth);
-
-               int max_rec_depth     = irp->max_callgraph_recursion_depth;
-               int max_loop_depth    = irp->max_callgraph_loop_depth;
-               int max_overall_depth = weight_overall(max_rec_depth, max_loop_depth);
-
-               /* int my_rec_color     = compute_color(rec_depth, max_rec_depth); */
-               /* int my_loop_color    = compute_color(loop_depth, max_loop_depth); */
-               int my_overall_color = compute_color(overall_depth, max_overall_depth);
-
-               return my_overall_color;
-       }
-}
-
-void dump_callgraph(const char *suffix) {
-       FILE *F = vcg_open_name("Callgraph", suffix);
-
-       if (F != NULL) {
-               int i, rem = edge_label, colorize;
-               edge_label = 1;
-               dump_vcg_header(F, "Callgraph", NULL);
-
-               colorize = get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent;
-
-               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, n_callees = get_irg_n_callees(irg);
-                       int color;
-
-                       color = colorize ? get_entity_color(ent) : ird_color_green;
-                       dump_entity_node(F, ent, color);
-                       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);
-                       }
+       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);
+
+               dump_entity_node(F, ent);
+               for (j = 0; j < n_callees; ++j) {
+                       ir_entity  *c    = get_irg_entity(get_irg_callee(irg, j));
+                       int         be   = is_irg_callee_backedge(irg, j);
+                       const char *attr = be
+                               ? "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));
                }
-
-               edge_label = rem;
-               vcg_close(F);
        }
-}
-
-/* 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);
-
-       if (f != NULL) {
-               int i;
-               int rem_view = get_interprocedural_view();
-
-               set_interprocedural_view(1);
-               dump_vcg_header(f, "All_graphs", NULL);
 
-               /* collect nodes in all irgs reachable in call graph*/
-               for (i = get_irp_n_irgs() - 1; i >= 0; --i)
-                       ird_set_irg_link(get_irp_irg(i), NULL);
-
-               cg_walk(clear_link, collect_node, NULL);
-
-               /* dump all graphs */
-               for (i = get_irp_n_irgs() - 1; i >= 0; --i) {
-                       current_ir_graph = get_irp_irg(i);
-                       assert(ird_get_irg_link(current_ir_graph));
-                       dump_graph_from_list(f, current_ir_graph);
-                       DEL_ARR_F(ird_get_irg_link(current_ir_graph));
-               }
-
-               vcg_close(f);
-               set_interprocedural_view(rem_view);
-       }
+       ir_set_dump_flags(old_flags);
+       dump_vcg_footer(F);
 }
 
-/*---------------------------------------------------------------------*/
-/* the following routines dumps type information without any ir nodes. */
-/*---------------------------------------------------------------------*/
-
-void
-dump_type_graph(ir_graph *irg, const char *suffix)
+void dump_typegraph(FILE *out)
 {
-       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;
-
-       f = vcg_open(irg, suffix, "-type");
-       if (f != NULL) {
-               ir_graph *rem = current_ir_graph;
-               current_ir_graph = irg;
-
-               dump_vcg_header(f, get_irg_dump_name(irg), NULL);
-
-               /* walk over the blocks in the graph */
-               type_walk_irg(irg, dump_type_info, NULL, f);
-               /* The walker for the const code can be called several times for the
-                  same (sub) expression.  So that no nodes are dumped several times
-                  we decrease the visited flag of the corresponding graph after each
-                  walk.  So now increase it finally. */
-               inc_irg_visited(get_const_code_irg());
-
-               vcg_close(f);
-               current_ir_graph = rem;
-       }
+       dump_vcg_header(out, "All_types", "Hierarchic", NULL);
+       type_walk(dump_type_info, NULL, out);
+       dump_vcg_footer(out);
 }
 
-void
-dump_all_types(const char *suffix)
+void dump_class_hierarchy(FILE *out)
 {
-       FILE *f = vcg_open_name("All_types", suffix);
-       if (f) {
-               dump_vcg_header(f, "All_types", NULL);
-               type_walk(dump_type_info, NULL, f);
-               inc_irg_visited(get_const_code_irg());
-               vcg_close(f);
-       }
+       dump_vcg_header(out, "class_hierarchy", "Hierarchic", NULL);
+       type_walk(dump_class_hierarchy_node, NULL, out);
+       dump_vcg_footer(out);
 }
 
-void
-dump_class_hierarchy(int entities, const char *suffix)
+static void dump_loops_standalone(FILE *F, ir_loop *loop)
 {
-       FILE *f = vcg_open_name("class_hierarchy", suffix);
-
-       if (f != NULL) {
-               h_env_t env;
-               env.f        = f;
-               env.dump_ent = entities;
-               dump_vcg_header(f, "class_hierarchy", NULL);
-               type_walk(dump_class_hierarchy_node, NULL, &env);
-               vcg_close(f);
-       }
-}
-
-/*---------------------------------------------------------------------*/
-/* dumps all graphs with the graph-dumper passed. Possible dumpers:    */
-/*  dump_ir_graph                                                      */
-/*  dump_ir_block_graph                                                */
-/*  dump_cfg                                                           */
-/*  dump_type_graph                                                    */
-/*  dump_ir_graph_w_types                                              */
-/*---------------------------------------------------------------------*/
-
-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);
-}
-
-
-/*--------------------------------------------------------------------------------*
- * 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) {
        int i = 0, loop_node_started = 0, son_number = 0, first = 0;
        loop_element le;
        ir_loop *son = NULL;
@@ -2983,15 +2472,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);
@@ -3006,8 +2494,6 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) {
                        /* We are a loop node -> Collect firm nodes */
 
                        ir_node *n = le.node;
-                       int bad = 0;
-
                        if (!loop_node_started) {
                                /* Start a new node which contains all firm nodes of the current loop */
                                fprintf(F, "node: { title: \"");
@@ -3018,7 +2504,7 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) {
                        } else
                                fprintf(F, "\n");
 
-                       bad |= dump_node_label(F, n);
+                       dump_node_label(F, n);
                        /* Causes indeterministic output: if (is_Block(n)) fprintf(F, "\t ->%d", (int)get_irn_link(n)); */
                        if (has_backedges(n)) fprintf(F, "\t loop head!");
                } else { /* for callgraph loop tree */
@@ -3026,7 +2512,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: \"");
@@ -3052,67 +2538,60 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) {
        }
 }
 
-void dump_loop_tree(ir_graph *irg, const char *suffix)
+void dump_loop_tree(FILE *out, ir_graph *irg)
 {
-       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;
-
-       f = vcg_open(irg, suffix, "-looptree");
-       if (f != NULL) {
-               ir_graph *rem = current_ir_graph;
-               int el_rem = edge_label;
+       ir_graph       *rem       = current_ir_graph;
+       ir_dump_flags_t old_flags = ir_get_dump_flags();
 
-               current_ir_graph = irg;
-               edge_label = 1;
+       current_ir_graph = irg;
+       ir_remove_dump_flags(ir_dump_flag_disable_edge_labels);
 
-               dump_vcg_header(f, get_irg_dump_name(irg), "top_to_bottom");
+       dump_vcg_header(out, 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(out, get_irg_loop(irg));
 
-               vcg_close(f);
+       dump_vcg_footer(out);
 
-               edge_label = el_rem;
-               current_ir_graph = rem;
-       }
+       ir_set_dump_flags(old_flags);
+       current_ir_graph = rem;
 }
 
-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_loops_standalone(F, irp->outermost_cg_loop);
-       vcg_close(F);
+void dump_callgraph_loop_tree(FILE *out)
+{
+       dump_vcg_header(out, "callgraph looptree", "Tree", "top_to_bottom");
+       dump_loops_standalone(out, irp->outermost_cg_loop);
+       dump_vcg_footer(out);
 }
 
-
-/*----------------------------------------------------------------------------*/
-/* 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);
+       if (flags & ir_dump_flag_loops)
+               dump_loop_node(F, loop);
 
        for (i = 0; i < get_loop_n_elements(loop); i++) {
                loop_element le = get_loop_element(loop, i);
                if (*(le.kind) == k_ir_loop) {
-                       if (dump_loop_information_flag) dump_loop_son_edge(F, loop, son_number++);
+                       if (flags & ir_dump_flag_loops)
+                               dump_loop_son_edge(F, loop, son_number++);
                        /* Recur */
                        collect_nodeloop(F, le.son, loopnodes);
                } else {
-                       if (dump_loop_information_flag) dump_loop_node_edge(F, loop, node_number++);
+                       if (flags & ir_dump_flag_loops)
+                               dump_loop_node_edge(F, loop, node_number++);
                        eset_insert(loopnodes, le.node);
                }
        }
 }
 
-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 */
@@ -3133,96 +2612,252 @@ void collect_nodeloop_external_nodes(ir_loop *loop, eset *loopnodes, eset *extno
        }
 }
 
-void dump_loop(ir_loop *l, const char *suffix) {
-       FILE *F;
+void dump_loop(FILE *F, ir_loop *l)
+{
+       eset *loopnodes = eset_create();
+       eset *extnodes = eset_create();
+       ir_node *n, *b;
        char name[50];
 
        snprintf(name, sizeof(name), "loop_%d", get_loop_loop_nr(l));
-       F = vcg_open_name(name, suffix);
-       if (F != NULL) {
-               eset *loopnodes = eset_create();
-               eset *extnodes = eset_create();
-               ir_node *n, *b;
-
-               dump_vcg_header(F, name, NULL);
-
-               /* collect all nodes to dump */
-               collect_nodeloop(F, l, loopnodes);
-               collect_nodeloop_external_nodes(l, loopnodes, extnodes);
-
-               /* build block lists */
-               for (n = eset_first(loopnodes); n != NULL; n = eset_next(loopnodes))
-                       set_irn_link(n, NULL);
-               for (n = eset_first(extnodes); n != NULL; n = eset_next(extnodes))
-                       set_irn_link(n, NULL);
-               for (n = eset_first(loopnodes); n != NULL; n = eset_next(loopnodes)) {
-                       if (!is_Block(n)) {
-                               b = get_nodes_block(n);
-                               set_irn_link(n, get_irn_link(b));
-                               set_irn_link(b, n);
-                       }
+       dump_vcg_header(F, name, NULL, NULL);
+
+       /* collect all nodes to dump */
+       collect_nodeloop(F, l, loopnodes);
+       collect_nodeloop_external_nodes(l, loopnodes, extnodes);
+
+       /* build block lists */
+       eset_foreach(loopnodes, ir_node*, n) {
+               set_irn_link(n, NULL);
+       }
+       eset_foreach(extnodes, ir_node*, n) {
+               set_irn_link(n, NULL);
+       }
+       eset_foreach(loopnodes, ir_node*, n) {
+               if (!is_Block(n)) {
+                       b = get_nodes_block(n);
+                       set_irn_link(n, get_irn_link(b));
+                       set_irn_link(b, n);
                }
-               for (n = eset_first(extnodes); n != NULL; n = eset_next(extnodes)) {
-                       if (!is_Block(n)) {
-                               b = get_nodes_block(n);
-                               set_irn_link(n, get_irn_link(b));
-                               set_irn_link(b, n);
-                       }
+       }
+       eset_foreach(extnodes, ir_node*, n) {
+               if (!is_Block(n)) {
+                       b = get_nodes_block(n);
+                       set_irn_link(n, get_irn_link(b));
+                       set_irn_link(b, n);
                }
+       }
 
-               for (b = eset_first(loopnodes); b != NULL; b = eset_next(loopnodes)) {
-                       if (is_Block(b)) {
-                               fprintf(F, "graph: { title: \"");
-                               PRINT_NODEID(b);
-                               fprintf(F, "\"  label: \"");
-                               dump_node_opcode(F, b);
-                               fprintf(F, " %ld:%d", get_irn_node_nr(b), get_irn_idx(b));
-                               fprintf(F, "\" status:clustered color:yellow\n");
-
-                               /* dump the blocks edges */
-                               dump_ir_data_edges(F, b);
-
-                               /* dump the nodes that go into the block */
-                               for (n = get_irn_link(b); n; n = get_irn_link(n)) {
-                                       if (eset_contains(extnodes, n))
-                                               overrule_nodecolor = ird_color_lightblue;
-                                       dump_node(F, n);
-                                       overrule_nodecolor = ird_color_default;
-                                       if (!eset_contains(extnodes, n)) dump_ir_data_edges(F, n);
-                               }
+       eset_foreach(loopnodes, ir_node*, b) {
+               if (is_Block(b)) {
+                       fprintf(F, "graph: { title: \"");
+                       PRINT_NODEID(b);
+                       fprintf(F, "\"  label: \"");
+                       dump_node_opcode(F, b);
+                       fprintf(F, " %ld:%d", get_irn_node_nr(b), get_irn_idx(b));
+                       fprintf(F, "\" status:clustered color:yellow\n");
+
+                       /* dump the blocks edges */
+                       dump_ir_data_edges(F, b);
+
+                       /* dump the nodes that go into the block */
+                       for (n = (ir_node*)get_irn_link(b); n; n = (ir_node*)get_irn_link(n)) {
+                               if (eset_contains(extnodes, n))
+                                       overrule_nodecolor = ird_color_block_inout;
+                               dump_node(F, n);
+                               overrule_nodecolor = ird_color_default_node;
+                               if (!eset_contains(extnodes, n)) dump_ir_data_edges(F, n);
+                       }
 
-                               /* Close the vcg information for the block */
-                               fprintf(F, "}\n");
-                               dump_const_node_local(F, b);
-                               fprintf(F, "\n");
+                       /* Close the vcg information for the block */
+                       fprintf(F, "}\n");
+                       dump_const_node_local(F, b);
+                       fprintf(F, "\n");
+               }
+       }
+       eset_foreach(extnodes, ir_node*, b) {
+               if (is_Block(b)) {
+                       fprintf(F, "graph: { title: \"");
+                       PRINT_NODEID(b);
+                       fprintf(F, "\"  label: \"");
+                       dump_node_opcode(F, b);
+                       fprintf(F, " %ld:%d", get_irn_node_nr(b), get_irn_idx(b));
+                       fprintf(F, "\" status:clustered color:lightblue\n");
+
+                       /* dump the nodes that go into the block */
+                       for (n = (ir_node*)get_irn_link(b); n; n = (ir_node*)get_irn_link(n)) {
+                               if (!eset_contains(loopnodes, n))
+                                       overrule_nodecolor = ird_color_block_inout;
+                               dump_node(F, n);
+                               overrule_nodecolor = ird_color_default_node;
+                               if (eset_contains(loopnodes, n)) dump_ir_data_edges(F, n);
                        }
+
+                       /* Close the vcg information for the block */
+                       fprintf(F, "}\n");
+                       dump_const_node_local(F, b);
+                       fprintf(F, "\n");
                }
-               for (b = eset_first(extnodes); b != NULL; b = eset_next(extnodes)) {
-                       if (is_Block(b)) {
-                               fprintf(F, "graph: { title: \"");
-                               PRINT_NODEID(b);
-                               fprintf(F, "\"  label: \"");
-                               dump_node_opcode(F, b);
-                               fprintf(F, " %ld:%d", get_irn_node_nr(b), get_irn_idx(b));
-                               fprintf(F, "\" status:clustered color:lightblue\n");
-
-                               /* dump the nodes that go into the block */
-                               for (n = get_irn_link(b); n; n = get_irn_link(n)) {
-                                       if (!eset_contains(loopnodes, n))
-                                               overrule_nodecolor = ird_color_lightblue;
-                                       dump_node(F, n);
-                                       overrule_nodecolor = ird_color_default;
-                                       if (eset_contains(loopnodes, n)) dump_ir_data_edges(F, n);
-                               }
+       }
+       eset_destroy(loopnodes);
+       eset_destroy(extnodes);
 
-                               /* Close the vcg information for the block */
-                               fprintf(F, "}\n");
-                               dump_const_node_local(F, b);
-                               fprintf(F, "\n");
-                       }
+       dump_vcg_footer(F);
+}
+
+static bool   obstack_init;
+static struct obstack obst;
+static char  *dump_path;
+
+void ir_set_dump_path(const char *path)
+{
+       xfree(dump_path);
+       dump_path = xstrdup(path);
+}
+
+static void add_string_escaped(const char *string)
+{
+       const char *p;
+       for (p = string; *p != '\0'; ++p) {
+               char c = *p;
+               if (c == '/') {
+                       obstack_1grow(&obst, '@');
+                       obstack_1grow(&obst, '1');
+               } else if (c == '@') {
+                       obstack_1grow(&obst, '@');
+                       obstack_1grow(&obst, '2');
+               } else {
+                       obstack_1grow(&obst, c);
                }
-               eset_destroy(loopnodes);
-               eset_destroy(extnodes);
-               vcg_close(F);
        }
 }
+
+static void add_dump_path(void)
+{
+       if (!obstack_init) {
+               obstack_init(&obst);
+               obstack_init = true;
+       }
+
+       if (dump_path != NULL) {
+               size_t len = strlen(dump_path);
+               obstack_grow(&obst, dump_path, len);
+               if (len > 0 && dump_path[len-1] != '/')
+                       obstack_1grow(&obst, '/');
+       }
+}
+
+void dump_ir_graph_ext(ir_graph_dump_func func, ir_graph *graph,
+                       const char *suffix)
+{
+       const char *dump_name = get_irg_dump_name(graph);
+       char       *file_name;
+       FILE       *out;
+
+       if (!ir_should_dump(dump_name))
+               return;
+
+       add_dump_path();
+
+       add_string_escaped(dump_name);
+       obstack_printf(&obst, "-%02u", graph->dump_nr++);
+
+       if (suffix != NULL) {
+               if (suffix[0] != '.')
+                       obstack_1grow(&obst, '-');
+               add_string_escaped(suffix);
+       }
+       obstack_1grow(&obst, '\0');
+
+       file_name = (char*)obstack_finish(&obst);
+       /* xvcg expects only <CR> so we need "b"inary mode (for win32) */
+       out       = fopen(file_name, "wb");
+       obstack_free(&obst, file_name);
+
+       if (out == NULL) {
+               fprintf(stderr, "Couldn't open '%s': %s\n", file_name, strerror(errno));
+               return;
+       }
+
+       func(out, graph);
+       fclose(out);
+}
+
+void dump_ir_prog_ext(ir_prog_dump_func func, const char *suffix)
+{
+       char *file_name;
+       FILE *out;
+
+       add_dump_path();
+
+       obstack_printf(&obst, "%02u", irp->dump_nr++);
+       if (suffix != NULL) {
+               if (suffix[0] != '.')
+                       obstack_1grow(&obst, '-');
+               add_string_escaped(suffix);
+       }
+       obstack_1grow(&obst, '\0');
+
+       file_name = (char*)obstack_finish(&obst);
+       out       = fopen(file_name, "wb");
+       obstack_free(&obst, file_name);
+
+       if (out == NULL) {
+               fprintf(stderr, "Couldn't open '%s': %s\n", file_name, strerror(errno));
+               return;
+       }
+       func(out);
+       fclose(out);
+}
+
+void dump_ir_graph(ir_graph *graph, const char *suffix)
+{
+       char buf[256];
+
+       snprintf(buf, sizeof(buf), "%s.vcg", suffix);
+       dump_ir_graph_ext(dump_ir_graph_file, graph, buf);
+}
+
+void dump_all_ir_graphs(const char *suffix)
+{
+       int n_irgs = get_irp_n_irgs();
+       int i;
+
+       for (i = 0; i < n_irgs; ++i) {
+               ir_graph *irg = get_irp_irg(i);
+               dump_ir_graph(irg, suffix);
+       }
+}
+
+typedef struct pass_t {
+       ir_prog_pass_t pass;
+       char           suffix[1];
+} pass_t;
+
+/**
+ * Wrapper around dump_all_ir_graphs().
+ */
+static int dump_all_ir_graphs_wrapper(ir_prog *irp, void *context)
+{
+       pass_t *pass = (pass_t*)context;
+
+       (void)irp;
+       dump_all_ir_graphs(pass->suffix);
+       return 0;
+}
+
+ir_prog_pass_t *dump_all_ir_graph_pass(const char *name, const char *suffix)
+{
+       size_t  len  = strlen(suffix) + 1;
+       pass_t *pass = XMALLOCF(pass_t, suffix, 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;
+
+       memcpy(pass->suffix, suffix, len);
+
+       return res;
+}