Fixed some obviously wrong conditions.
[libfirm] / ir / ir / irdumptxt.c
index 04da80b..7f2267e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
  * @author  Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt
  * @version $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#ifdef HAVE_STRING_H
 #include <string.h>
-#endif
-#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
-#endif
-
 #include <stdarg.h>
 
 #include "irdump_t.h"
-
-#include "firm_common_t.h"
-
 #include "irgraph_t.h"
+
 #include "irprog_t.h"
 #include "entity_t.h"
 #include "trouts.h"
 #include "irgwalk.h"
 #include "tv_t.h"
+#include "irprintf.h"
+#include "error.h"
 
 #include "irdom.h"
 #include "field_temperature.h"
@@ -73,7 +66,7 @@ static FILE *text_open(const char *basename, const char * suffix1, const char *s
        if (!suffix3) suffix3 = ".txt";
 
        /* open file for vcg graph */
-       fname = xmalloc(strlen(basename)*2 + strlen(suffix1) + strlen(suffix2) + 5); /* *2: space for escapes. */
+       fname = XMALLOCN(char, strlen(basename)*2 + strlen(suffix1) + strlen(suffix2) + 5); /* *2: space for escapes. */
 
        j = 0;
        for (i = 0; i < len; ++i) {  /* replace '/' in the name: escape by @. */
@@ -93,7 +86,7 @@ static FILE *text_open(const char *basename, const char * suffix1, const char *s
        F = fopen(fname, "w");   /* open file for writing */
        if (!F) {
                perror(fname);
-               assert(0);
+               abort();
        }
        free(fname);
 
@@ -111,9 +104,9 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
 
        fprintf(F, "  index: %u\n", get_irn_idx(n));
        if (opt_dump_pointer_values_to_info)
-               fprintf (F, "  addr:    %p \n", (void *)n);
+               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: %ld\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)));
@@ -125,9 +118,10 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                fprintf(F, " %ld\n", get_irn_node_nr(get_irn_n(n, -1)));
        }
 
+#ifdef INTERPROCEDURAL_VIEW
        fprintf(F, "  arity:   %d\n", get_irn_intra_arity(n));
        /* show all predecessor nodes */
-       fprintf(F, "  pred nodes: \n");
+       fprintf(F, "  pred nodes:\n");
        if (!is_Block(n)) {
                fprintf(F, "    -1:    ");
                dump_node_opcode(F, get_irn_n(n, -1));
@@ -138,22 +132,38 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                dump_node_opcode(F, get_irn_intra_n(n, i));
                fprintf(F, " %ld\n", get_irn_node_nr(get_irn_intra_n(n, i)));
        }
+#else
+       fprintf(F, "  arity:   %d\n", get_irn_arity(n));
+       /* show all predecessor nodes */
+       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)));
+       }
+       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)));
+       }
+#endif
 
        fprintf(F, "  Private Attributes:\n");
 
-       if (get_irn_opcode(n) == iro_Proj)
+       if (is_Proj(n))
                fprintf(F, "  proj nr: %ld\n", get_Proj_proj(n));
 
-       if ((get_irp_ip_view_state() != ip_view_no)
-               && (get_irn_opcode(n) == iro_Filter || get_irn_opcode(n) == iro_Block)) {
+#ifdef INTERPROCEDURAL_VIEW
+       if ((get_irp_ip_view_state() != ip_view_no) && (is_Filter(n) || is_Block(n))) {
                fprintf(F, "  inter arity: %d\n", get_irn_inter_arity(n));
-               fprintf(F, "  inter pred nodes: \n");
-               for ( i = 0; i < get_irn_inter_arity(n); ++i) {
+               fprintf(F, "  inter pred nodes:\n");
+               for (i = 0; i < get_irn_inter_arity(n); ++i) {
                        fprintf(F, "     %d: %s ", i, is_intra_backedge(n, i) ? "be" : "  ");
                        dump_node_opcode(F, get_irn_inter_n(n, i));
                        fprintf(F, " %ld\n", get_irn_node_nr(get_irn_inter_n(n, i)));
                }
        }
+#endif
 
        if (is_fragile_op(n)) {
                fprintf(F, "  pinned state: %s\n", get_op_pin_state_name(get_irn_pinned(n)));
@@ -161,9 +171,9 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
        }
 
        /* This is not nice, output it as a marker in the predecessor list. */
-       if ((get_irn_op(n) == op_Block) ||
-               (get_irn_op(n) == op_Phi) ||
-               ((get_irn_op(n) == op_Filter) && get_interprocedural_view())) {
+       if (is_Block(n)             ||
+           get_irn_op(n) == op_Phi ||
+           (is_Filter(n) && get_interprocedural_view())) {
                fprintf(F, "  backedges:");
                comma = ' ';
                for (i = 0; i < get_irn_arity(n); i++)
@@ -172,28 +182,34 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
        }
 
        /* Loop node.   Someone else please tell me what's wrong ... */
-       if (get_irn_loop(n)) {
+       if (get_irg_loopinfo_state(irg) & loopinfo_valid) {
                ir_loop *loop = get_irn_loop(n);
-               assert(loop);
-               fprintf(F, "  in loop %d with depth %d\n",
-                       get_loop_loop_nr(loop), get_loop_depth(loop));
+               if (loop != NULL) {
+                       fprintf(F, "  in loop %d with depth %d\n",
+                               get_loop_loop_nr(loop), get_loop_depth(loop));
+               }
        }
 
        /* 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)));
+               ir_fprintf(F, "  macro Block: %+F\n", get_Block_MacroBlock(n));
                fprintf(F, "  block visited: %ld\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) {
                        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, "  Execution freqency statistics:\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));
+#ifdef INTERPROCEDURAL_VIEW
                if (get_irp_loop_nesting_depth_state() != loop_nesting_depth_none)
-                       fprintf(F, "    call freqency of procedure:   %8.2lf\n",
+                       fprintf(F, "    call frequency of procedure:   %8.2lf\n",
                        get_irg_method_execution_frequency(get_irn_irg(n)));
                if (get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent)
                        fprintf(F, "    recursion depth of procedure: %8.2lf\n", (double)get_irn_recursion_depth(n));
@@ -201,15 +217,17 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                        (get_irp_loop_nesting_depth_state() != loop_nesting_depth_none) &&
                        (get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent))
                        fprintf(F, "    final evaluation:           **%8.2lf**\n", get_irn_final_cost(n));
+#endif
 
                /* not dumped: graph_arr */
                /* not dumped: mature    */
        }  break;
        case iro_Start: {
                ir_type *tp = get_entity_type(get_irg_entity(get_irn_irg(n)));
-               fprintf(F, "  start of method of type %s \n", get_type_name_ex(tp, &bad));
+               fprintf(F, "  start of method of type %s\n", get_type_name_ex(tp, &bad));
                for (i = 0; i < get_method_n_params(tp); ++i)
-                       fprintf(F, "    param %d type: %s \n", i, get_type_name_ex(get_method_param_type(tp, i), &bad));
+                       fprintf(F, "    param %d type: %s\n", i, get_type_name_ex(get_method_param_type(tp, i), &bad));
+#ifdef INTERPROCEDURAL_VIEW
                if ((get_irp_ip_view_state() == ip_view_valid) && !get_interprocedural_view()) {
                        ir_node *sbl = get_nodes_block(n);
                        int i, n_cfgpreds = get_Block_cg_n_cfgpreds(sbl);
@@ -220,19 +238,20 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                                        get_irg_dump_name(get_irn_irg(cfgpred)));
                        }
                }
+#endif
        } break;
        case iro_Cond: {
                fprintf(F, "  condition kind: %s\n",  get_Cond_kind(n) == dense ? "dense" : "fragmentary");
-               fprintf(F, "  default ProjNr: %ld\n", get_Cond_defaultProj(n));
+               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)));
        } break;
        case iro_Alloc: {
-               fprintf(F, "  allocating entity of type: %s \n", get_type_name_ex(get_Alloc_type(n), &bad));
+               fprintf(F, "  allocating entity of type: %s\n", get_type_name_ex(get_Alloc_type(n), &bad));
                fprintf(F, "  allocating on: the %s\n", (get_Alloc_where(n) == stack_alloc) ? "stack" : "heap");
        } break;
        case iro_Free: {
-               fprintf(F, "  freeing entity of type %s \n", get_type_name_ex(get_Free_type(n), &bad));
+               fprintf(F, "  freeing entity of type %s\n", get_type_name_ex(get_Free_type(n), &bad));
                fprintf(F, "  allocated on: the %s\n", (get_Free_where(n) == stack_alloc) ? "stack" : "heap");
        } break;
        case iro_Sel: {
@@ -249,15 +268,17 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
        } break;
        case iro_Call: {
                ir_type *tp = get_Call_type(n);
-               fprintf(F, "  calling method of type %s \n", get_type_name_ex(tp, &bad));
+               if (get_Call_tail_call(n))
+                       fprintf(F, "  tail call\n");
+               fprintf(F, "  calling method of type %s\n", get_type_name_ex(tp, &bad));
                if(get_unknown_type() != tp) {
                        for (i = 0; i < get_method_n_params(tp); ++i)
-                               fprintf(F, "    param %d type: %s \n", i, get_type_name_ex(get_method_param_type(tp, i), &bad));
+                               fprintf(F, "    param %d type: %s\n", i, get_type_name_ex(get_method_param_type(tp, i), &bad));
                        for (i = 0; i < get_method_n_ress(tp); ++i)
-                               fprintf(F, "    resul %d type: %s \n", i, get_type_name_ex(get_method_res_type(tp, i), &bad));
+                               fprintf(F, "    resul %d type: %s\n", i, get_type_name_ex(get_method_res_type(tp, i), &bad));
                }
                if (Call_has_callees(n)) {
-                       fprintf(F, "  possible callees: \n");
+                       fprintf(F, "  possible callees:\n");
                        for (i = 0; i < get_Call_n_callees(n); i++) {
                                fprintf(F, "    %d: %s\n", i, get_ent_dump_name(get_Call_callee(n, i)));
                        }
@@ -267,7 +288,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                ir_node *call = get_CallBegin_call(n);
                fprintf(F, "  Call: %ld\n", get_irn_node_nr(call));
                if (Call_has_callees(call)) {
-                       fprintf(F, "  possible callees: \n");
+                       fprintf(F, "  possible callees:\n");
                        for (i = 0; i < get_Call_n_callees(call); i++) {
                                fprintf(F, "    %d: %s\n", i, get_ent_dump_name(get_Call_callee(call, i)));
                        }
@@ -279,15 +300,14 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
        case iro_Return: {
                if (!get_interprocedural_view()) {
                        ir_type *tp = get_entity_type(get_irg_entity(get_irn_irg(n)));
-                       fprintf(F, "  return in method of type %s \n", get_type_name_ex(tp, &bad));
+                       fprintf(F, "  return in method of type %s\n", get_type_name_ex(tp, &bad));
                        for (i = 0; i < get_method_n_ress(tp); ++i)
-                               fprintf(F, "    res %d type: %s \n", i, get_type_name_ex(get_method_res_type(tp, i), &bad));
+                               fprintf(F, "    res %d type: %s\n", i, get_type_name_ex(get_method_res_type(tp, i), &bad));
                }
        } break;
        case iro_Const: {
-               ir_type *tp = get_Const_type(n);
-               assert(tp != firm_none_type);
-               fprintf(F, "  Const of type %s \n", get_type_name_ex(get_Const_type(n), &bad));
+               assert(get_Const_type(n) != firm_none_type);
+               fprintf(F, "  Const of type %s\n", get_type_name_ex(get_Const_type(n), &bad));
        } break;
        case iro_SymConst: {
                switch(get_SymConst_kind(n)) {
@@ -324,19 +344,17 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                        fprintf(F, "  kind: enumeration\n");
                        fprintf(F, "  name: %s\n", get_enumeration_name(get_SymConst_enum(n)));
                        break;
-               case symconst_label:
-                       fprintf(F, "  kind: label\n");
-                       fprintf(F, "  label: %lu\n", get_SymConst_label(n));
-                       break;
                }
-               fprintf(F, "  type of value: %s \n", get_type_name_ex(get_SymConst_value_type(n), &bad));
+               fprintf(F, "  type of value: %s\n", get_type_name_ex(get_SymConst_value_type(n), &bad));
        } break;
        case iro_Load:
                fprintf(F, "  mode of loaded value: %s\n", get_mode_name_ex(get_Load_mode(n), &bad));
                fprintf(F, "  volatility: %s\n", get_volatility_name(get_Load_volatility(n)));
+               fprintf(F, "  align: %s\n", get_align_name(get_Load_align(n)));
                break;
        case iro_Store:
                fprintf(F, "  volatility: %s\n", get_volatility_name(get_Store_volatility(n)));
+               fprintf(F, "  align: %s\n", get_align_name(get_Store_align(n)));
                break;
        case iro_Confirm:
                fprintf(F, "  compare operation: %s\n", get_pnc_string(get_Confirm_cmp(n)));
@@ -503,9 +521,9 @@ static void dump_node_list(FILE *F, firm_kind *k, char *prefix,
  *  "prefix"    node16, node17\n
  */
 static void dump_type_list(FILE *F, ir_type *tp, char *prefix,
-                           int (*get_n_types)(ir_type *tp),
-                           ir_type *(*get_type)(ir_type *tp, int pos),
-                           char *name) {
+                           int (*get_n_types)(const ir_type *tp),
+                           ir_type *(*get_type)(const ir_type *tp, int pos),
+                           const char *name) {
        int i, n_nodes = get_n_types(tp);
        char *comma = "";
 
@@ -522,6 +540,77 @@ static void dump_type_list(FILE *F, ir_type *tp, char *prefix,
        fprintf(F, "\n");
 }
 
+static int need_nl = 1;
+
+/**
+ * Dump initializers.
+ */
+static void dump_ir_initializers_to_file(FILE *F, const char *prefix,
+                                                                                const ir_initializer_t *initializer, ir_type *type) {
+       tarval  *tv;
+       ir_node *value;
+
+       if (need_nl) {
+               fprintf(F, "\n%s    ", prefix);
+               need_nl = 0;
+       }
+       switch (get_initializer_kind(initializer)) {
+       case IR_INITIALIZER_NULL:
+               fprintf(F, "\t = <NOT_SET>");
+               break;
+       case IR_INITIALIZER_TARVAL:
+               tv = get_initializer_tarval_value(initializer);
+               ir_fprintf(F, "\t = <TV>%F", tv);
+               break;
+       case IR_INITIALIZER_CONST:
+               value = get_initializer_const_value(initializer);
+               fprintf(F, "\t = <CONST>");
+               dump_node_opcode(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;
+                               }
+                               fprintf(F, "[%d]", (int) i);
+                               dump_ir_initializers_to_file(F, prefix, sub_initializer, element_type);
+                       }
+               } else {
+                       size_t i, n;
+                       assert(is_compound_type(type));
+                       n = get_compound_n_members(type);
+                       for (i = 0; i < n; ++i) {
+                               ir_entity        *member    = get_compound_member(type, i);
+                               ir_type          *subtype   = get_entity_type(member);
+                               ir_initializer_t *sub_initializer;
+
+                               assert(i < get_initializer_compound_n_entries(initializer));
+                               sub_initializer
+                                       = get_initializer_compound_value(initializer, i);
+
+                               if (need_nl) {
+                                       fprintf(F, "\n%s    ", prefix);
+                                       need_nl = 0;
+                               }
+                               ir_fprintf(F, ".%F", member);
+                               dump_ir_initializers_to_file(F, prefix, sub_initializer, subtype);
+                       }
+               }
+               break;
+       default:
+               panic("invalid ir_initializer kind found");
+       }
+       need_nl = 1;
+}
+
+
 void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned verbosity) {
        int i, j;
        ir_type *owner, *type;
@@ -549,7 +638,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                                get_type_name(get_entity_owner(ov)));
                                }
                        } else {
-                               fprintf(F, "%s  Does not overwrite other entities. \n", prefix);
+                               fprintf(F, "%s  Does not overwrite other entities.\n", prefix);
                        }
                        if (get_entity_n_overwrittenby(ent) > 0) {
                                fprintf(F, "%s  overwritten by:\n", prefix);
@@ -559,7 +648,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                                get_type_name(get_entity_owner(ov)));
                                }
                        } else {
-                               fprintf(F, "%s  Is not overwritten by other entities. \n", prefix);
+                               fprintf(F, "%s  Is not overwritten by other entities.\n", prefix);
                        }
 
                        if (get_irp_inh_transitive_closure_state() != inh_transitive_closure_none) {
@@ -598,86 +687,108 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                        if (mask) {
                                fprintf(F, "\n%s  additional prop: ", prefix);
 
-                               if (mask & mtp_property_const)    fprintf(F, "const_function, ");
-                               if (mask & mtp_property_pure)     fprintf(F, "pure_function, ");
-                               if (mask & mtp_property_noreturn) fprintf(F, "noreturn_function, ");
-                               if (mask & mtp_property_nothrow)  fprintf(F, "nothrow_function, ");
-                               if (mask & mtp_property_naked)    fprintf(F, "naked_function, ");
+                               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_weak)          fputs("weak_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);
-                       if (cc & cc_reg_param) fprintf(F, "regparam, ");
-                       if (cc & cc_this_call) fprintf(F, "thiscall, ");
+                       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);
+                       if (cc & cc_frame_on_caller_stk) fputs("frame on caller's stack, ", F);
+                       cc &= ~(cc_compound_ret|cc_frame_on_caller_stk);
                        if (IS_CDECL(cc))
-                               fprintf(F, "cdecl");
+                               fputs("cdecl", F);
                        else if (IS_STDCALL(cc))
-                               fprintf(F, "stdcall");
+                               fputs("stdcall", F);
                        else {
-                               fprintf(F, (cc & cc_last_on_top) ? "last param on top, " : "first param on top, ");
-                               fprintf(F, (cc & cc_callee_clear_stk) ? "callee clear stack" : "caller clear stack");
+                               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");
+               fputc('\n', F);
        } else {  /* no entattrs */
                fprintf(F, "%s(%3d:%d) %-40s: %s", prefix,
                        get_entity_offset(ent), get_entity_offset_bits_remainder(ent),
                        get_type_name(get_entity_type(ent)), get_entity_name(ent));
-               if (is_Method_type(get_entity_type(ent))) fprintf(F, "(...)");
+               if (is_Method_type(get_entity_type(ent))) fputs("(...)", F);
 
                if (verbosity & dump_verbosity_accessStats) {
-                       if (get_entity_allocation(ent) == allocation_static) fprintf(F, " (stat)");
-                       if (get_entity_peculiarity(ent) == peculiarity_description) fprintf(F, " (desc)");
-                       if (get_entity_peculiarity(ent) == peculiarity_inherited)   fprintf(F, " (inh)");
+                       if (get_entity_allocation(ent) == allocation_static)        fputs(" (stat)", F);
+                       if (get_entity_peculiarity(ent) == peculiarity_description) fputs(" (desc)", F);
+                       if (get_entity_peculiarity(ent) == peculiarity_inherited)   fputs(" (inh)", F);
                }
-               fprintf(F, "\n");
+               fputc('\n', F);
        }
 
        if (verbosity & dump_verbosity_entconsts) {
                if (get_entity_variability(ent) != variability_uninitialized) {
-                       if (is_atomic_entity(ent)) {
-                               fprintf(F, "%s  atomic value: ", prefix);
-                               dump_node_opcode(F, get_atomic_ent_value(ent));
+                       if (ent->has_initializer) {
+                               const ir_initializer_t *initializer = get_entity_initializer(ent);
+                               fprintf(F, "\n%s  Initializers:", prefix);
+                               need_nl = 1;
+                               dump_ir_initializers_to_file(F, prefix, initializer, get_entity_type(ent));
                        } else {
-                               fprintf(F, "%s  compound values:", prefix);
-                               for (i = 0; i < get_compound_ent_n_values(ent); ++i) {
-                                       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:%d ", prefix, get_entity_offset(ent0), get_entity_offset_bits_remainder(ent0));
-                                       if (get_type_state(type) == layout_fixed)
-                                               fprintf(F, "(%3d:%d) ",   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, "[%d]", get_compound_graph_path_array_index(path, j));
+                               /* old compound_graph_path based initializers */
+                               if (is_atomic_entity(ent)) {
+                                       fprintf(F, "%s  atomic value: ", prefix);
+                                       dump_node_opcode(F, get_atomic_ent_value(ent));
+                               } else {
+                                       fprintf(F, "%s  compound values:", prefix);
+                                       for (i = 0; i < get_compound_ent_n_values(ent); ++i) {
+                                               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, "[%d]", get_compound_graph_path_array_index(path, j));
+                                               }
+                                               fprintf(F, "\t = ");
+                                               dump_node_opcode(F, get_compound_ent_value(ent, i));
                                        }
-                                       fprintf(F, "\t = ");
-                                       dump_node_opcode(F, get_compound_ent_value(ent, i));
                                }
                        }
-                       fprintf(F, "\n");
+                       fputc('\n', F);
                }
        }
 
        if (verbosity & dump_verbosity_entattrs) {
                fprintf(F, "%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  peculiarity: %s", prefix, get_peculiarity_name(get_entity_peculiarity(ent)));
                fprintf(F, "\n%s  ld_name: %s", prefix, ent->ld_name ? get_entity_ld_name(ent) : "no yet set");
                fprintf(F, "\n%s  offset:  %d bytes, %d rem bits", prefix, get_entity_offset(ent), get_entity_offset_bits_remainder(ent));
                if (is_Method_type(get_entity_type(ent))) {
                        if (get_entity_irg(ent))   /* can be null */ {
                                fprintf(F, "\n%s  irg = %ld", prefix, get_irg_graph_nr(get_entity_irg(ent)));
+#ifdef INTERPROCEDURAL_VIEW
                                if (get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent) {
                                        fprintf(F, "\n%s    recursion depth %d", prefix, get_irg_recursion_depth(get_entity_irg(ent)));
                                        fprintf(F, "\n%s    loop depth      %d", prefix, get_irg_loop_depth(get_entity_irg(ent)));
                                }
+#endif
                        } else {
                                fprintf(F, "\n%s  irg = NULL", prefix);
                        }
                }
-               fprintf(F, "\n");
+               fputc('\n', F);
        }
 
        if (get_trouts_state()) {
@@ -708,7 +819,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                        max_depth = (depth > max_depth) ? depth : max_depth ;
                }
 
-               L_freq = xcalloc(4 * max_depth, sizeof(L_freq[0]));
+               L_freq = XMALLOCNZ(int, 4 * max_depth);
 
                S_freq  = L_freq + 1*max_depth;
                LA_freq = L_freq + 2*max_depth;
@@ -718,14 +829,14 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                        ir_node *acc = get_entity_access(ent, i);
                        int depth = get_weighted_loop_depth(acc);
                        assert(depth < max_depth);
-                       if ((get_irn_op(acc) == op_Load) || (get_irn_op(acc) == op_Call)) {
+                       if (is_Load(acc) || is_Call(acc)) {
                                L_freq[depth]++;
                                max_L_freq = (depth > max_L_freq) ? depth : max_L_freq;
                                if (addr_is_alloc(acc)) {
                                        LA_freq[depth]++;
                                        max_LA_freq = (depth > max_LA_freq) ? depth : max_LA_freq;
                                }
-                       } else if (get_irn_op(acc) == op_Store) {
+                       } else if (is_Store(acc)) {
                                S_freq[depth]++;
                                max_S_freq = (depth > max_S_freq) ? depth : max_S_freq;
                                if (addr_is_alloc(acc)) {
@@ -792,6 +903,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                free(L_freq);
 #endif
                if (get_trouts_state() != outs_none) {
+#ifdef INTERPROCEDURAL_VIEW
                        if (is_Method_type(get_entity_type(ent))) {
                                fprintf(F, "%s  Estimated #Calls:    %lf\n", prefix, get_entity_estimated_n_calls(ent));
                                fprintf(F, "%s  Estimated #dynCalls: %lf\n", prefix, get_entity_estimated_n_calls(ent));
@@ -799,6 +911,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                fprintf(F, "%s  Estimated #Loads:  %lf\n", prefix, get_entity_estimated_n_loads(ent));
                                fprintf(F, "%s  Estimated #Stores: %lf\n", prefix, get_entity_estimated_n_stores(ent));
                        }
+#endif
                }
        }
 }
@@ -839,7 +952,7 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
                max_depth = (depth > max_depth) ? depth : max_depth ;
        }
 
-       L_freq = xcalloc(4 * (max_depth+1), sizeof(L_freq[0]));
+       L_freq = XMALLOCNZ(int, 4 * (max_depth + 1));
 
        S_freq  = L_freq + 1*max_depth;
        LA_freq = L_freq + 2*max_depth;
@@ -849,7 +962,7 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
                ir_node *acc = get_entity_access(ent, i);
                int depth = get_weighted_loop_depth(acc);
                assert(depth <= max_depth);
-               if ((get_irn_op(acc) == op_Load) || (get_irn_op(acc) == op_Call)) {
+               if (is_Load(acc) || is_Call(acc)) {
                        L_freq[depth]++;
                        max_L_freq = (depth > max_L_freq) ? depth : max_L_freq;
                        if (addr_is_alloc(acc)) {
@@ -860,7 +973,7 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
                                disp[depth]++;
                                *max_disp = (depth > *max_disp) ? depth : *max_disp;
                        }
-               } else if (get_irn_op(acc) == op_Store) {
+               } else if (is_Store(acc)) {
                        S_freq[depth]++;
                        max_S_freq = (depth > max_S_freq) ? depth : max_S_freq;
                        if (addr_is_alloc(acc)) {
@@ -903,6 +1016,7 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
                /* Output the entity name. */
                fprintf(F, "%s%-40s ", prefix, get_entity_ld_name(ent));
 
+#ifdef INTERPROCEDURAL_VIEW
                if (get_trouts_state() != outs_none) {
                        if (is_Method_type(get_entity_type(ent))) {
                                //fprintf(F, "%s  Estimated #Calls:    %lf\n", prefix, get_entity_estimated_n_calls(ent));
@@ -912,11 +1026,13 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
                                fprintf(F, "%6.2lf", get_entity_estimated_n_stores(ent));
                        }
                }
+#endif
 
                fprintf(F, "\n");
        }
 }
 
+#ifdef INTERPROCEDURAL_VIEW
 /* A fast hack to dump a CSV-file. */
 void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const char *comma) {
        int i;
@@ -941,7 +1057,7 @@ void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const
                        max_depth = (depth > max_depth) ? depth : max_depth ;
                }
 
-               freq = xcalloc(2 * (max_depth+1), sizeof(freq[0]));
+               freq = XMALLOCNZ(int, 2 * (max_depth + 1));
 
                disp = freq + max_depth;
 
@@ -951,7 +1067,7 @@ void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const
                        assert(depth <= max_depth);
                        freq[depth]++;
                        max_freq = (depth > max_freq) ? depth : max_freq;
-                       assert(get_irn_op(all) == op_Alloc);
+                       assert(is_Alloc(all));
                }
 
                fprintf(F, "%s ", get_type_name(tp));
@@ -1005,6 +1121,7 @@ void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const
                }
        }
 }
+#endif
 
 void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
        int i;
@@ -1025,7 +1142,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
 
        case tpo_class:
                if ((verbosity & dump_verbosity_methods) || (verbosity & dump_verbosity_fields)) {
-                       fprintf(F, "\n  members: \n");
+                       fprintf(F, "\n  members:\n");
                }
                for (i = 0; i < get_class_n_members(tp); ++i) {
                        ir_entity *mem = get_class_member(tp, i);
@@ -1103,16 +1220,16 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
 
                                fprintf(F, "[");
 
-                               if (get_irn_op(lower) == op_Const)
+                               if (is_Const(lower)) {
                                        fprintf(F, "%ld .. ", get_tarval_long(get_Const_tarval(lower)));
-                               else {
+                               else {
                                        dump_node_opcode(F, lower);
                                        fprintf(F, " %ld .. ", get_irn_node_nr(lower));
                                }
 
-                               if (get_irn_op(upper) == op_Const)
+                               if (is_Const(upper)) {
                                        fprintf(F, "%ld]", get_tarval_long(get_Const_tarval(lower)));
-                               else {
+                               else {
                                        dump_node_opcode(F, upper);
                                        fprintf(F, " %ld]", get_irn_node_nr(upper));
                                }
@@ -1161,7 +1278,14 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
                break;
 
        case tpo_primitive:
-       case tpo_id:
+               if (verbosity & dump_verbosity_typeattrs) {
+                       ir_type *base_tp = get_primitive_base_type(tp);
+                       if (base_tp != NULL)
+                               fprintf(F, "\n  base type: %s (%ld)", get_type_name(tp), get_type_nr(tp));
+                       fprintf(F, "\n");
+               }
+               break;
+
        case tpo_none:
        case tpo_unknown:
                fprintf(F, "\n");
@@ -1175,8 +1299,8 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
 
        fprintf(F, "  visibility: %s,\n", get_visibility_name(get_type_visibility(tp)));
        fprintf(F, "  state:      %s,\n", get_type_state_name(get_type_state(tp)));
-       fprintf(F, "  size:       %2d Bits,\n",  get_type_size_bits(tp));
-       fprintf(F, "  alignment:  %2d Bits,\n",  get_type_alignment_bits(tp));
+       fprintf(F, "  size:       %2u Bytes,\n", get_type_size_bytes(tp));
+       fprintf(F, "  alignment:  %2u Bytes,\n", get_type_alignment_bytes(tp));
        if (is_atomic_type(tp) || is_Method_type(tp))
                fprintf(F, "  mode:       %s,\n",  get_mode_name(get_type_mode(tp)));
 
@@ -1204,7 +1328,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
                        max_depth = (depth > max_depth) ? depth : max_depth ;
                }
 
-               freq = xcalloc(max_depth+1, sizeof(freq[0]));
+               freq = XMALLOCNZ(int, max_depth + 1);
 
                for (i = 0; i < n_all; ++i) {
                        ir_node *all = get_type_alloc(tp, i);
@@ -1212,7 +1336,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
                        assert(depth <= max_depth);
                        freq[depth]++;
                        max_freq = (depth > max_freq) ? depth : max_freq;
-                       assert(get_irn_op(all) == op_Alloc);
+                       assert(is_Alloc(all));
                }
 
                if (max_freq >= 0) {
@@ -1228,6 +1352,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
 
                free(freq);
 #endif
+#ifdef INTERPROCEDURAL_VIEW
                if (get_trouts_state() != outs_none) {
                        fprintf(F, "  Estimated #Instances: %lf\n", get_type_estimated_n_instances(tp));
                        if (is_Class_type(tp) && (get_irp_typeinfo_state() != ir_typeinfo_none)) {
@@ -1237,6 +1362,7 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
                                assert(get_class_n_upcasts(tp) + get_class_n_downcasts(tp) == get_type_n_casts(tp));
                        }
                }
+#endif
 
        }
 
@@ -1253,7 +1379,7 @@ void dump_types_as_text(unsigned verbosity, const char *suffix) {
        FILE *F, *CSV = NULL;
        int i, n_types = get_irp_n_types();
 
-       basename = irp_prog_name_is_set() ? get_irp_prog_name() : "TextTypes";
+       basename = irp_prog_name_is_set() ? get_irp_name() : "TextTypes";
        F = text_open(basename, suffix, "-types", ".txt");
 
        if (verbosity & dump_verbosity_csv) {
@@ -1267,9 +1393,11 @@ void dump_types_as_text(unsigned verbosity, const char *suffix) {
                //if (is_jack_rts_class(t)) continue;
 
                dump_type_to_file(F, t, verbosity);
+#ifdef INTERPROCEDURAL_VIEW
                if (CSV) {
                        dump_typecsv_to_file(CSV, t, verbosity, "");
                }
+#endif
        }
 
        fclose(F);
@@ -1283,7 +1411,7 @@ void dump_globals_as_text(unsigned verbosity, const char *suffix) {
        ir_type *g = get_glob_type();
        int i, n_mems = get_class_n_members(g);
 
-       basename = irp_prog_name_is_set() ? get_irp_prog_name() : "TextGlobals";
+       basename = irp_prog_name_is_set() ? get_irp_name() : "TextGlobals";
        F = text_open (basename, suffix, "-globals", ".txt");
 
        if (verbosity & dump_verbosity_csv) {