respect ir_dump_flag_loop

[libfirm] / ir / ir / irdumptxt.c

diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c
index 6a8832d..4443725 100644 (file)
--- a/ir/ir/irdumptxt.c
+++ b/ir/ir/irdumptxt.c
@@ -123,7 +123,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        }
 
        /* Loop node.   Someone else please tell me what's wrong ... */
-       if (get_irg_loopinfo_state(irg) & loopinfo_valid) {
+       if (is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_LOOPINFO)) {
                ir_loop *loop = get_irn_loop(n);
                if (loop != NULL) {
                        fprintf(F, "  in loop %ld with depth %u\n",
@@ -138,12 +138,12 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                        fprintf(F, "  Label: %lu\n", get_entity_label(get_Block_entity(n)));
                fprintf(F, "  block visited: %lu\n", get_Block_block_visited(n));
                fprintf(F, "  block marked: %u\n", get_Block_mark(n));
-               if (get_irg_dom_state(get_irn_irg(n)) == dom_consistent) {
+               if (is_irg_state(get_irn_irg(n), IR_GRAPH_STATE_CONSISTENT_DOMINANCE)) {
                        fprintf(F, "  dom depth %d\n", get_Block_dom_depth(n));
                        fprintf(F, "  domtree pre num %u\n", get_Block_dom_tree_pre_num(n));
                        fprintf(F, "  max subtree pre num %u\n", get_Block_dom_max_subtree_pre_num(n));
                }
-               if (get_irg_postdom_state(get_irn_irg(n)) == dom_consistent) {
+               if (is_irg_state(get_irn_irg(n), IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE)) {
                        fprintf(F, "  pdom depth %d\n", get_Block_postdom_depth(n));
                        fprintf(F, "  pdomtree pre num %u\n", get_Block_pdom_tree_pre_num(n));
                        fprintf(F, "  max pdomsubtree pre num %u\n", get_Block_pdom_max_subtree_pre_num(n));
@@ -324,59 +324,6 @@ void dump_graph_as_text(FILE *out, ir_graph *irg)
        fprintf(out, "graph %s\n", get_irg_dump_name(irg));
 }
 
-/** dumps something like:
- *
- *  "prefix"  "Name" (x): node1, ... node7,\n
- *  "prefix"    node8, ... node15,\n
- *  "prefix"    node16, node17\n
- */
-static void dump_node_list(FILE *F, firm_kind *k, const char *prefix,
-                           size_t (*get_entity_n_nodes)(firm_kind *ent),
-                           ir_node *(*get_entity_node)(firm_kind *ent, size_t pos),
-                           const char *name)
-{
-       size_t i, n_nodes = get_entity_n_nodes(k);
-       const char *comma = "";
-
-       ir_fprintf(F, "%s  %s (%zu):", prefix, name, n_nodes);
-       for (i = 0; i < n_nodes; ++i) {
-               if (i > 7 && !(i & 7)) { /* line break every eight node. */
-                       fprintf(F, ",\n%s   ", prefix);
-                       comma = "";
-               }
-               fprintf(F, "%s ", comma);
-               dump_node_label(F, get_entity_node(k, i));
-               comma = ",";
-       }
-       fprintf(F, "\n");
-}
-
-/** dumps something like:
- *
- *  "prefix"  "Name" (x): node1, ... node7,\n
- *  "prefix"    node8, ... node15,\n
- *  "prefix"    node16, node17\n
- */
-static void dump_type_list(FILE *F, ir_type *tp, const char *prefix,
-                           size_t (*get_n_types)(const ir_type *tp),
-                           ir_type *(*get_type)(const ir_type *tp, size_t pos),
-                           const char *name)
-{
-       size_t i, n_nodes = get_n_types(tp);
-       const char *comma = "";
-
-       ir_fprintf(F, "%s  %s (%zu):", prefix, name, n_nodes);
-       for (i = 0; i < n_nodes; ++i) {
-               if (i > 7 && !(i & 7)) { /* line break every eight node. */
-                       fprintf(F, ",\n%s   ", prefix);
-                       comma = "";
-               }
-               ir_fprintf(F, "%s %+F", comma, get_type(tp, i));
-               comma = ",";
-       }
-       fprintf(F, "\n");
-}
-
 static int need_nl = 1;
 
 /**
@@ -632,14 +579,6 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref
                }
                fputc('\n', F);
        }
-
-       if (get_trouts_state()) {
-               fprintf(F, "%s  Entity outs:\n", prefix);
-               dump_node_list(F, (firm_kind *)ent, prefix, (size_t(*)(firm_kind *))get_entity_n_accesses,
-                       (ir_node *(*)(firm_kind *, size_t))get_entity_access, "Accesses");
-               dump_node_list(F, (firm_kind *)ent, prefix, (size_t(*)(firm_kind *))get_entity_n_references,
-                       (ir_node *(*)(firm_kind *, size_t))get_entity_reference, "References");
-       }
 }
 
 void dump_entity_to_file(FILE *out, ir_entity *ent)
@@ -872,15 +811,6 @@ void dump_type_to_file(FILE *F, ir_type *tp)
        if (is_atomic_type(tp) || is_Method_type(tp))
                fprintf(F, "  mode:       %s,\n",  get_mode_name(get_type_mode(tp)));
 
-       if (get_trouts_state()) {
-               fprintf(F, "\n  Type outs:\n");
-               dump_node_list(F, (firm_kind *)tp, "  ", (size_t(*)(firm_kind *))get_type_n_allocs,
-                       (ir_node *(*)(firm_kind *, size_t))get_type_alloc, "Allocations");
-               dump_node_list(F, (firm_kind *)tp, "  ", (size_t(*)(firm_kind *))get_type_n_casts,
-                       (ir_node *(*)(firm_kind *, size_t))get_type_cast, "Casts");
-               dump_type_list(F, tp, "  ", get_type_n_pointertypes_to, get_type_pointertype_to, "PointerTpsTo");
-       }
-
        fprintf(F, "\n\n");
 }