respect ir_dump_flag_loop
[libfirm] / ir / ir / irdumptxt.c
index 8930cc8..4443725 100644 (file)
@@ -61,7 +61,6 @@ ir_dump_verbosity_t ir_get_dump_verbosity(void)
 /* Write the irnode and all its attributes to the file passed. */
 void dump_irnode_to_file(FILE *F, ir_node *n)
 {
-       int      i;
        char     comma;
        ir_graph *irg;
        vrp_attr *vrp_info;
@@ -73,7 +72,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        if (ir_get_dump_flags() & ir_dump_flag_analysed_types)
                fprintf (F, "  addr:    %p\n", (void *)n);
        fprintf (F, "  mode:    %s\n", get_mode_name(get_irn_mode(n)));
-       fprintf (F, "  visited: %ld\n", get_irn_visited(n));
+       fprintf (F, "  visited: %lu\n", get_irn_visited(n));
        irg = get_irn_irg(n);
        if (irg != get_const_code_irg())
                fprintf (F, "  irg:     %s\n", get_ent_dump_name(get_irg_entity(irg)));
@@ -93,10 +92,14 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                dump_node_opcode(F, get_irn_n(n, -1));
                fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, -1)));
        }
-       for ( i = 0; i < get_irn_arity(n); ++i) {
-               fprintf(F, "     %d: %s ", i, is_backedge(n, i) ? "be" : "  ");
-               dump_node_opcode(F, get_irn_n(n, i));
-               fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, i)));
+
+       {
+               int i;
+               for (i = 0; i < get_irn_arity(n); ++i) {
+                       fprintf(F, "     %d: %s ", i, is_backedge(n, i) ? "be" : "  ");
+                       dump_node_opcode(F, get_irn_n(n, i));
+                       fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, i)));
+               }
        }
 
        fprintf(F, "  Private Attributes:\n");
@@ -110,8 +113,8 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        }
 
        /* This is not nice, output it as a marker in the predecessor list. */
-       if (is_Block(n)             ||
-           get_irn_op(n) == op_Phi) {
+       if (is_Block(n) || get_irn_op(n) == op_Phi) {
+           int i;
                fprintf(F, "  backedges:");
                comma = ' ';
                for (i = 0; i < get_irn_arity(n); i++)
@@ -120,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",
@@ -133,12 +136,17 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        case iro_Block: {
                if (has_Block_entity(n))
                        fprintf(F, "  Label: %lu\n", get_entity_label(get_Block_entity(n)));
-               fprintf(F, "  block visited: %ld\n", get_Block_block_visited(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_none) {
+               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, "  tree pre num %d\n", get_Block_dom_tree_pre_num(n));
-                       fprintf(F, "  max subtree pre num %d\n", get_Block_dom_max_subtree_pre_num(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 (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));
                }
 
                fprintf(F, "  Execution frequency statistics:\n");
@@ -269,6 +277,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                fprintf(F, "  assembler text: %s", get_id_str(get_ASM_text(n)));
                l = get_ASM_n_input_constraints(n);
                if (l > 0) {
+                       int i;
                        fprintf(F, "\n  inputs:  ");
                        cons = get_ASM_input_constraints(n);
                        for (i = 0; i < l; ++i)
@@ -276,6 +285,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                }
                l = get_ASM_n_output_constraints(n);
                if (l > 0) {
+                       int i;
                        fprintf(F, "\n  outputs: ");
                        cons = get_ASM_output_constraints(n);
                        for (i = 0; i < l; ++i)
@@ -283,6 +293,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                }
                l = get_ASM_n_clobbers(n);
                if (l > 0) {
+                       int i;
                        fprintf(F, "\n  clobber: ");
                        clobber = get_ASM_clobbers(n);
                        for (i = 0; i < l; ++i)
@@ -313,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;
 
 /**
@@ -392,8 +350,7 @@ static void dump_ir_initializers_to_file(FILE *F, const char *prefix,
                break;
        case IR_INITIALIZER_CONST:
                value = get_initializer_const_value(initializer);
-               fprintf(F, "\t = <CONST>");
-               dump_node_opcode(F, value);
+               ir_fprintf(F, "\t = %F", value);
                break;
        case IR_INITIALIZER_COMPOUND:
                if (is_Array_type(type)) {
@@ -442,6 +399,10 @@ static void dump_entity_linkage(FILE *F, const ir_entity *entity)
 {
        ir_linkage linkage = get_entity_linkage(entity);
 
+       if (linkage == IR_LINKAGE_DEFAULT) {
+               fprintf(F, " default");
+               return;
+       }
        if (linkage & IR_LINKAGE_CONSTANT)
                fprintf(F, " constant");
        if (linkage & IR_LINKAGE_WEAK)
@@ -516,21 +477,18 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref
                        }
                }
 
-               fprintf(F, "%s  linkage:", prefix);
-               dump_entity_linkage(F, ent);
-
                if (is_Method_type(get_entity_type(ent))) {
                        unsigned mask = get_entity_additional_properties(ent);
                        unsigned cc   = get_method_calling_convention(get_entity_type(ent));
                        ir_graph *irg = get_entity_irg(ent);
 
                        if (irg) {
-                               fprintf(F, "\n%s  estimated node count: %u", prefix, get_irg_estimated_node_cnt(irg));
-                               fprintf(F, "\n%s  maximum node index:   %u", prefix, get_irg_last_idx(irg));
+                               fprintf(F, "%s  estimated node count: %u\n", prefix, get_irg_estimated_node_cnt(irg));
+                               fprintf(F, "%s  maximum node index:   %u\n", prefix, get_irg_last_idx(irg));
                        }
 
                        if (mask) {
-                               fprintf(F, "\n%s  additional prop: ", prefix);
+                               fprintf(F, "%s  additional prop: ", prefix);
 
                                if (mask & mtp_property_const)         fputs("const_function, ", F);
                                if (mask & mtp_property_pure)          fputs("pure_function, ", F);
@@ -543,8 +501,9 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref
                                if (mask & mtp_property_runtime)       fputs("runtime_function, ", F);
                                if (mask & mtp_property_private)       fputs("private_function, ", F);
                                if (mask & mtp_property_has_loop)      fputs("has_loop_function, ", F);
+                               fputc('\n', F);
                        }
-                       fprintf(F, "\n%s  calling convention: ", prefix);
+                       fprintf(F, "%s  calling convention: ", prefix);
                        if (cc & cc_reg_param)           fputs("regparam, ", F);
                        if (cc & cc_this_call)           fputs("thiscall, ", F);
                        if (cc & cc_compound_ret)        fputs("compound_ret, ", F);
@@ -558,10 +517,8 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref
                                fputs(cc & cc_last_on_top      ? "last param on top, " : "first param on top, ", F);
                                fputs(cc & cc_callee_clear_stk ? "callee clear stack" : "caller clear stack", F);
                        }
-                       fprintf(F, "\n%s  vtable number:        %u", prefix, get_entity_vtable_number(ent));
+                       fprintf(F, "\n%s  vtable number:        %u\n", prefix, get_entity_vtable_number(ent));
                }
-
-               fputc('\n', F);
        } else {  /* no entattrs */
                ir_fprintf(F, "%s(%3d:%d) %+F: %s", prefix,
                        get_entity_offset(ent), get_entity_offset_bits_remainder(ent),
@@ -580,6 +537,7 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref
                        fprintf(F, "\n%s  Initializers:", prefix);
                        need_nl = 1;
                        dump_ir_initializers_to_file(F, prefix, initializer, get_entity_type(ent));
+                       fputc('\n', F);
                } else if (entity_has_compound_ent_values(ent)) {
                        size_t i;
                        fprintf(F, "%s  compound values:", prefix);
@@ -587,7 +545,7 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref
                                size_t j;
                                compound_graph_path *path = get_compound_ent_value_path(ent, i);
                                ir_entity *ent0 = get_compound_graph_path_node(path, 0);
-                               fprintf(F, "\n%s    %3d:%u ", prefix, get_entity_offset(ent0), get_entity_offset_bits_remainder(ent0));
+                               fprintf(F, "\n%s    %3d:%d ", prefix, get_entity_offset(ent0), get_entity_offset_bits_remainder(ent0));
                                if (get_type_state(type) == layout_fixed)
                                        fprintf(F, "(%3u:%u) ",   get_compound_ent_value_offset_bytes(ent, i), get_compound_ent_value_offset_bit_remainder(ent, i));
                                fprintf(F, "%s", get_entity_name(ent));
@@ -607,7 +565,7 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref
        if (verbosity & dump_verbosity_entattrs) {
                fprintf(F, "%s  linkage:", prefix);
                dump_entity_linkage(F, ent);
-               fprintf(F, "%s  volatility:  %s", prefix, get_volatility_name(get_entity_volatility(ent)));
+               fprintf(F, "\n%s  volatility:  %s", prefix, get_volatility_name(get_entity_volatility(ent)));
                fprintf(F, "\n%s  aligned:  %s", prefix, get_align_name(get_entity_aligned(ent)));
                fprintf(F, "\n%s  alignment:  %u", prefix, get_entity_alignment(ent));
                fprintf(F, "\n%s  ld_name: %s", prefix, ent->ld_name ? get_entity_ld_name(ent) : "no yet set");
@@ -621,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)
@@ -720,7 +670,7 @@ void dump_type_to_file(FILE *F, ir_type *tp)
 
        case tpo_array:
                if (verbosity & dump_verbosity_typeattrs) {
-                       size_t i, n_dim;
+                       size_t n_dim;
                        ir_type *elem_tp = get_array_element_type(tp);
 
                        fprintf(F, "\n  array ");
@@ -772,6 +722,8 @@ void dump_type_to_file(FILE *F, ir_type *tp)
 
        case tpo_method:
                if (verbosity & dump_verbosity_typeattrs) {
+                       mtp_additional_properties mtp = get_method_additional_properties(tp);
+                       unsigned cconv = get_method_calling_convention(tp);
                        fprintf(F, "\n  variadicity: %s", get_variadicity_name(get_method_variadicity(tp)));
                        fprintf(F, "\n  return types: %lu",
                                (unsigned long) get_method_n_ress(tp));
@@ -786,6 +738,46 @@ void dump_type_to_file(FILE *F, ir_type *tp)
                                ir_type *ptp = get_method_param_type(tp, i);
                                ir_fprintf(F, "\n    %+F", ptp);
                        }
+                       fprintf(F, "\n  properties:");
+                       if (mtp & mtp_property_const)
+                               fputs(" const", F);
+                       if (mtp & mtp_property_pure)
+                               fputs(" pure", F);
+                       if (mtp & mtp_property_noreturn)
+                               fputs(" noreturn", F);
+                       if (mtp & mtp_property_nothrow)
+                               fputs(" nothrow", F);
+                       if (mtp & mtp_property_naked)
+                               fputs(" naked", F);
+                       if (mtp & mtp_property_malloc)
+                               fputs(" malloc", F);
+                       if (mtp & mtp_property_returns_twice)
+                               fputs(" returns_twice", F);
+                       if (mtp & mtp_property_intrinsic)
+                               fputs(" intrinsic", F);
+                       if (mtp & mtp_property_runtime)
+                               fputs(" runtime", F);
+                       if (mtp & mtp_property_private)
+                               fputs(" private", F);
+                       if (mtp & mtp_property_has_loop)
+                               fputs(" has_Loop", F);
+
+                       fprintf(F, "\n  calling convention:");
+                       if (cconv & cc_reg_param)
+                               fputs(" regparam", F);
+                       if (cconv & cc_last_on_top)
+                               fputs(" last_on_top", F);
+                       if (cconv & cc_callee_clear_stk)
+                               fputs(" calle_clear_stk", F);
+                       if (cconv & cc_this_call)
+                               fputs(" this_call", F);
+                       if (cconv & cc_compound_ret)
+                               fputs(" compound_ret", F);
+                       if (cconv & cc_frame_on_caller_stk)
+                               fputs(" frame_on_caller_stk", F);
+                       if (cconv & cc_fpreg_param)
+                               fputs(" fpreg_param", F);
+
                        if (get_method_variadicity(tp)) {
                                fprintf(F, "\n    ...");
                        }
@@ -819,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");
 }