iropt: Remove repeated get_irn_irg().
[libfirm] / ir / ir / irdumptxt.c
index 2f91488..ce1e6f4 100644 (file)
@@ -22,7 +22,6 @@
  * @brief   Write text representation of firm to file.
  * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt,
  *          Matthias Braun
- * @version $Id$
  */
 #include "config.h"
 
 
 #include "irdump_t.h"
 #include "irgraph_t.h"
+#include "irnode_t.h"
 
 #include "irprog_t.h"
 #include "entity_t.h"
 #include "trouts.h"
 #include "irgwalk.h"
 #include "tv_t.h"
-#include "vrp.h"
 #include "irprintf.h"
 #include "error.h"
 
 #include "irdom.h"
-#include "field_temperature.h"
 
 static ir_dump_verbosity_t  verbosity = dump_verbosity_max;
 
@@ -58,13 +56,10 @@ ir_dump_verbosity_t ir_get_dump_verbosity(void)
        return verbosity;
 }
 
-/* Write the irnode and all its attributes to the file passed. */
-void dump_irnode_to_file(FILE *F, ir_node *n)
+void dump_irnode_to_file(FILE *F, const ir_node *n)
 {
-       int      i;
        char     comma;
        ir_graph *irg;
-       vrp_attr *vrp_info;
 
        dump_node_opcode(F, n);
        fprintf(F, " %ld\n", get_irn_node_nr(n));
@@ -73,7 +68,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)));
@@ -81,8 +76,9 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        if (get_irn_pinned(n) == op_pin_state_floats &&
                get_irg_pinned(get_irn_irg(n)) == op_pin_state_floats) {
                fprintf(F, "  node was pinned in ");
-               dump_node_opcode(F, get_irn_n(n, -1));
-               fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, -1)));
+               ir_node *const block = get_nodes_block(n);
+               dump_node_opcode(F, block);
+               fprintf(F, " %ld\n", get_irn_node_nr(block));
        }
 
        fprintf(F, "  arity:   %d\n", get_irn_arity(n));
@@ -90,19 +86,45 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        fprintf(F, "  pred nodes:\n");
        if (!is_Block(n)) {
                fprintf(F, "    -1:    ");
-               dump_node_opcode(F, get_irn_n(n, -1));
-               fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, -1)));
+               ir_node *const block = get_nodes_block(n);
+               dump_node_opcode(F, block);
+               fprintf(F, " %ld\n", get_irn_node_nr(block));
        }
-       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");
 
-       if (is_Proj(n))
-               fprintf(F, "  proj nr: %ld\n", get_Proj_proj(n));
+       if (is_Proj(n)) {
+               ir_node *pred = get_Proj_pred(n);
+               long     pn   = get_Proj_proj(n);
+               fprintf(F, "  proj nr: %ld\n", pn);
+               if (is_Switch(pred)) {
+                       const ir_switch_table *table = get_Switch_table(pred);
+                       size_t n_entries = ir_switch_table_get_n_entries(table);
+                       size_t i;
+                       for (i = 0; i < n_entries; ++i) {
+                               const ir_switch_table_entry *entry
+                                       = ir_switch_table_get_entry_const(table, i);
+                               if (entry->pn == pn && entry->min != NULL && entry->max != NULL) {
+                                       ir_tarval *min = entry->min;
+                                       ir_tarval *max = entry->max;
+                                       if (min != max) {
+                                               ir_fprintf(F, "  switch case %+F .. %+F\n", min, max);
+                                       } else {
+                                               ir_fprintf(F, "  switch case %+F\n", min);
+                                       }
+                               }
+                       }
+               }
+       }
 
        if (is_fragile_op(n)) {
                fprintf(F, "  pinned state: %s\n", get_op_pin_state_name(get_irn_pinned(n)));
@@ -110,8 +132,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) || is_Phi(n)) {
+           int i;
                fprintf(F, "  backedges:");
                comma = ' ';
                for (i = 0; i < get_irn_arity(n); i++)
@@ -120,7 +142,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 (irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO)) {
                ir_loop *loop = get_irn_loop(n);
                if (loop != NULL) {
                        fprintf(F, "  in loop %ld with depth %u\n",
@@ -131,19 +153,21 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        /* Source types */
        switch (get_irn_opcode(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));
+               ir_entity *const entity = get_Block_entity(n);
+               if (entity != NULL)
+                       fprintf(F, "  Label: %lu\n", get_entity_label(entity));
+               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 (irg_has_properties(get_irn_irg(n), IR_GRAPH_PROPERTY_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 (irg_has_properties(get_irn_irg(n), IR_GRAPH_PROPERTY_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");
-               if (get_irg_exec_freq_state(get_irn_irg(n)) != exec_freq_none)
-                       fprintf(F, "    procedure local evaluation:   %8.2lf\n", get_irn_exec_freq(n));
 
                /* not dumped: graph_arr */
                /* not dumped: mature    */
@@ -156,7 +180,6 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                        ir_fprintf(F, "    param %d type: %+F\n", i, get_method_param_type(tp, i));
        } break;
        case iro_Cond: {
-               fprintf(F, "  default ProjNr: %ld\n", get_Cond_default_proj(n));
                if (get_Cond_jmp_pred(n) != COND_JMP_PRED_NONE) {
                        fprintf(F, "  jump prediction: %s\n",
                                get_cond_jmp_predicate_name(get_Cond_jmp_pred(n)));
@@ -182,8 +205,6 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
        } break;
        case iro_Call: {
                ir_type *tp = get_Call_type(n);
-               if (get_Call_tail_call(n))
-                       fprintf(F, "  tail call\n");
                ir_fprintf(F, "  calling method of type %+F\n", tp);
                if (get_unknown_type() != tp) {
                        size_t i;
@@ -200,9 +221,6 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                        }
                }
        } break;
-       case iro_Cast: {
-               ir_fprintf(F, "  cast to type: %+F\n", get_Cast_type(n));
-       } break;
        case iro_Cmp: {
                ir_relation relation = get_Cmp_relation(n);
                ir_fprintf(F, "  relation: %s\n", get_relation_string(relation));
@@ -228,11 +246,6 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                        fprintf(F, "  entity: ");
                        dump_entity_to_file(F, get_SymConst_entity(n));
                        break;
-               case symconst_type_tag:
-                       fprintf(F, "  kind: type_tag\n");
-                       fprintf(F, "  type: ");
-                       dump_type_to_file(F, get_SymConst_type(n));
-                       break;
                case symconst_type_size:
                        fprintf(F, "  kind: size\n");
                        fprintf(F, "  type: ");
@@ -250,7 +263,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                }
        } break;
        case iro_Load:
-               fprintf(F, "  mode of loaded value: %s\n", get_mode_name_ex(get_Load_mode(n), NULL));
+               fprintf(F, "  mode of loaded value: %s\n", get_mode_name_ex(get_Load_mode(n)));
                fprintf(F, "  volatility: %s\n", get_volatility_name(get_Load_volatility(n)));
                fprintf(F, "  align: %s\n", get_align_name(get_Load_unaligned(n)));
                break;
@@ -262,49 +275,40 @@ void dump_irnode_to_file(FILE *F, ir_node *n)
                fprintf(F, "  compare operation: %s\n", get_relation_string(get_Confirm_relation(n)));
                break;
        case iro_ASM: {
-               const ir_asm_constraint *cons;
-               ident **clobber;
-               int l;
-
                fprintf(F, "  assembler text: %s", get_id_str(get_ASM_text(n)));
-               l = get_ASM_n_input_constraints(n);
-               if (l > 0) {
-                       fprintf(F, "\n  inputs:  ");
-                       cons = get_ASM_input_constraints(n);
-                       for (i = 0; i < l; ++i)
-                               fprintf(F, "%%%u %s ", cons[i].pos, get_id_str(cons[i].constraint));
-               }
-               l = get_ASM_n_output_constraints(n);
-               if (l > 0) {
-                       fprintf(F, "\n  outputs: ");
-                       cons = get_ASM_output_constraints(n);
-                       for (i = 0; i < l; ++i)
-                               fprintf(F, "%%%u %s ", cons[i].pos, get_id_str(cons[i].constraint));
+               fprintf(F, "\n  inputs:  ");
+               const ir_asm_constraint *in_cons = get_ASM_input_constraints(n);
+               int n_inputs = get_ASM_n_inputs(n);
+               for (int i = 0; i < n_inputs; ++i) {
+                       fprintf(F, "%%%u %s ", in_cons[i].pos,
+                               get_id_str(in_cons[i].constraint));
                }
-               l = get_ASM_n_clobbers(n);
-               if (l > 0) {
-                       fprintf(F, "\n  clobber: ");
-                       clobber = get_ASM_clobbers(n);
-                       for (i = 0; i < l; ++i)
-                               fprintf(F, "%s ", get_id_str(clobber[i]));
+               fprintf(F, "\n  outputs: ");
+               const ir_asm_constraint *out_cons = get_ASM_output_constraints(n);
+               int n_outputs = get_ASM_n_output_constraints(n);
+               for (int i = 0; i < n_outputs; ++i) {
+                       fprintf(F, "%%%u %s ", out_cons[i].pos,
+                               get_id_str(out_cons[i].constraint));
                }
+
+               fprintf(F, "\n  clobber: ");
+               ident **clobber = get_ASM_clobbers(n);
+               int n_clobbers = get_ASM_n_clobbers(n);
+               for (int i = 0; i < n_clobbers; ++i)
+                       fprintf(F, "%s ", get_id_str(clobber[i]));
                if (get_irn_pinned(n) != op_pin_state_floats)
                        fprintf(F, "\n  volatile");
                fprintf(F, "\n");
-       } break;
-
-       default:
                break;
        }
 
-       vrp_info = vrp_get_info(n);
-       if (vrp_info) {
-               dump_vrp_info(F, n);
+       default:
+               break;
        }
 
        if (get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_consistent  ||
                get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_inconsistent  )
-               if (get_irn_typeinfo_type(n) != firm_none_type)
+               if (get_irn_typeinfo_type(n) != get_none_type())
                        ir_fprintf (F, "  Analysed type: %s\n", get_irn_typeinfo_type(n));
 }
 
@@ -313,60 +317,42 @@ 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");
-}
+static int need_nl = 1;
 
-/** 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)
+static bool is_init_string(ir_initializer_t const* const init, ir_type *const type)
 {
-       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 = ",";
+       ir_type *const element_type = get_array_element_type(type);
+       ir_mode *      mode;
+       size_t         n;
+       size_t         i;
+
+       if (!is_Primitive_type(element_type))
+               return false;
+
+       mode = get_type_mode(element_type);
+       if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
+               return false;
+
+       n = get_initializer_compound_n_entries(init);
+       for (i = 0; i != n; ++i) {
+               ir_initializer_t const* const val = get_initializer_compound_value(init, i);
+               ir_tarval*                    tv;
+               long                          v;
+
+               if (get_initializer_kind(val) != IR_INITIALIZER_TARVAL)
+                       return false;
+               tv = get_initializer_tarval_value(val);
+
+               if (!tarval_is_constant(tv))
+                       return false;
+
+               v = get_tarval_long(tv);
+               if (v != 0 && (v < 0x07 || 0x0D < v) && v != 0x1B && (v < 0x20 || 0x80 <= v) && (v < 0xA0 || 0x100 <= v))
+                       return false;
        }
-       fprintf(F, "\n");
-}
 
-static int need_nl = 1;
+       return true;
+}
 
 /**
  * Dump initializers.
@@ -392,23 +378,50 @@ 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)) {
-                       size_t i, n = get_initializer_compound_n_entries(initializer);
-                       ir_type *element_type = get_array_element_type(type);
-                       for (i = 0; i < n; ++i) {
-                               ir_initializer_t *sub_initializer
-                                       = get_initializer_compound_value(initializer, i);
-
-                               if (need_nl) {
-                                       fprintf(F, "\n%s    ", prefix);
-                                       need_nl = 0;
+                       size_t const n = get_initializer_compound_n_entries(initializer);
+                       size_t       i;
+
+                       if (is_init_string(initializer, type)) {
+                               fprintf(F, "\t[0...%u] = '", (unsigned)n - 1);
+                               for (i = 0; i != n; ++i) {
+                                       ir_initializer_t const* const val = get_initializer_compound_value(initializer, i);
+                                       ir_tarval*              const tv  = get_initializer_tarval_value(val);
+                                       long                    const v   = get_tarval_long(tv);
+
+                                       switch (v) {
+                                               case 0x00: fprintf(F, "\\\\000");  break;
+                                               case 0x07: fprintf(F, "\\\\a");    break;
+                                               case 0x08: fprintf(F, "\\\\b");    break;
+                                               case 0x09: fprintf(F, "\\\\t");    break;
+                                               case 0x0A: fprintf(F, "\\\\n");    break;
+                                               case 0x0B: fprintf(F, "\\\\v");    break;
+                                               case 0x0C: fprintf(F, "\\\\f");    break;
+                                               case 0x0D: fprintf(F, "\\\\r");    break;
+                                               case 0x1B: fprintf(F, "\\\\033");  break;
+                                               case 0x22: fprintf(F, "\\\\\\\""); break;
+                                               case 0x5C: fprintf(F, "\\\\\\\\"); break;
+                                               default:   fprintf(F, "%c", (unsigned char)v); break;
+                                       }
+                               }
+                               fprintf(F, "'");
+                       } else {
+                               ir_type *const element_type = get_array_element_type(type);
+
+                               for (i = 0; i < n; ++i) {
+                                       ir_initializer_t *sub_initializer
+                                               = get_initializer_compound_value(initializer, i);
+
+                                       if (need_nl) {
+                                               fprintf(F, "\n%s    ", prefix);
+                                               need_nl = 0;
+                                       }
+                                       fprintf(F, "[%d]", (int) i);
+                                       dump_ir_initializers_to_file(F, prefix, sub_initializer, element_type);
                                }
-                               fprintf(F, "[%d]", (int) i);
-                               dump_ir_initializers_to_file(F, prefix, sub_initializer, element_type);
                        }
                } else {
                        size_t i, n;
@@ -442,6 +455,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,35 +533,30 @@ 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  maximum node index:   %u\n", prefix, get_irg_last_idx(irg));
                        }
 
-                       if (mask) {
-                               fprintf(F, "\n%s  additional prop: ", prefix);
-
-                               if (mask & mtp_property_const)         fputs("const_function, ", F);
-                               if (mask & mtp_property_pure)          fputs("pure_function, ", F);
-                               if (mask & mtp_property_noreturn)      fputs("noreturn_function, ", F);
-                               if (mask & mtp_property_nothrow)       fputs("nothrow_function, ", F);
-                               if (mask & mtp_property_naked)         fputs("naked_function, ", F);
-                               if (mask & mtp_property_malloc)        fputs("malloc_function, ", F);
-                               if (mask & mtp_property_returns_twice) fputs("weak_function, ", F);
-                               if (mask & mtp_property_intrinsic)     fputs("intrinsic_function, ", F);
-                               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);
-                       }
-                       fprintf(F, "\n%s  calling convention: ", 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);
+                       if (mask & mtp_property_noreturn)      fputs("noreturn_function, ", F);
+                       if (mask & mtp_property_nothrow)       fputs("nothrow_function, ", F);
+                       if (mask & mtp_property_naked)         fputs("naked_function, ", F);
+                       if (mask & mtp_property_malloc)        fputs("malloc_function, ", F);
+                       if (mask & mtp_property_returns_twice) fputs("weak_function, ", F);
+                       if (mask & mtp_property_intrinsic)     fputs("intrinsic_function, ", F);
+                       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, "%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 +570,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,26 +590,6 @@ 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));
-               } else if (entity_has_compound_ent_values(ent)) {
-                       size_t i;
-                       fprintf(F, "%s  compound values:", prefix);
-                       for (i = 0; i < get_compound_ent_n_values(ent); ++i) {
-                               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));
-                               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));
-                               for (j = 0; j < get_compound_graph_path_length(path); ++j) {
-                                       ir_entity *node = get_compound_graph_path_node(path, j);
-                                       fprintf(F, ".%s", get_entity_name(node));
-                                       if (is_Array_type(get_entity_owner(node)))
-                                               fprintf(F, "[%ld]", get_compound_graph_path_array_index(path, j));
-                               }
-                               fprintf(F, "\t = ");
-                               dump_node_opcode(F, get_compound_ent_value(ent, i));
-                       }
                        fputc('\n', F);
                }
        }
@@ -607,7 +597,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 +611,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 +702,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 ");
@@ -752,7 +734,7 @@ void dump_type_to_file(FILE *F, ir_type *tp)
 
                        fprintf(F, "\n  order: ");
                        for (i = 0; i < n_dim; ++i)
-                               fprintf(F, "<%d>", get_array_order(tp, i));
+                               fprintf(F, "<%zu>", get_array_order(tp, i));
 
                        fprintf(F, "\n");
 
@@ -772,6 +754,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 +770,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 +843,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");
 }