size/aligment of types is now unsigned and in bytes, this fixes fehler095.c (array...
[libfirm] / ir / ir / irdumptxt.c
index 030ba11..82a67d2 100644 (file)
@@ -125,6 +125,7 @@ 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");
@@ -138,12 +139,28 @@ 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)
                fprintf(F, "  proj nr: %ld\n", get_Proj_proj(n));
 
+#ifdef INTERPROCEDURAL_VIEW
        if ((get_irp_ip_view_state() != ip_view_no)
                && (get_irn_opcode(n) == iro_Filter || get_irn_opcode(n) == iro_Block)) {
                fprintf(F, "  inter arity: %d\n", get_irn_inter_arity(n));
@@ -154,6 +171,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                        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)));
@@ -192,6 +210,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                fprintf(F, "  Execution freqency 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",
                        get_irg_method_execution_frequency(get_irn_irg(n)));
@@ -201,6 +220,9 @@ 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
+    if (has_Block_label(n))
+      fprintf(F, "    Label: %lu\n", get_Block_label(n));
 
                /* not dumped: graph_arr */
                /* not dumped: mature    */
@@ -210,6 +232,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                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));
+#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,6 +243,7 @@ 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");
@@ -285,8 +309,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                }
        } break;
        case iro_Const: {
-               ir_type *tp = get_Const_type(n);
-               assert(tp != firm_none_type);
+               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: {
@@ -324,15 +347,21 @@ 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));
        } 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)));
@@ -342,7 +371,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                ident **clobber;
                int l;
 
-               fprintf(F, "  assembler text: %s", get_ASM_text(n));
+               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:  ");
@@ -414,6 +443,7 @@ void dump_graph_as_text(ir_graph *irg, const char *suffix) {
        fclose (F);
 }
 
+#ifdef EXTENDED_ACCESS_STATS
 static int addr_is_alloc(ir_node *acc) {
        ir_node *addr = NULL;
        ir_opcode addr_op;
@@ -459,6 +489,7 @@ static int addr_is_alloc(ir_node *acc) {
        /* In addition, the alloc must be in the same loop. */
        return 1;
 }
+#endif
 
 /** dumps something like:
  *
@@ -637,9 +668,9 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                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));
+                                       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, "(%3d:%d) ",   get_compound_ent_value_offset_bytes(ent, i), get_compound_ent_value_offset_bit_remainder(ent, i));
+                                               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);
@@ -657,16 +688,19 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
 
        if (verbosity & dump_verbosity_entattrs) {
                fprintf(F, "%s  volatility:  %s", prefix, get_volatility_name(get_entity_volatility(ent)));
+               fprintf(F, "\n%s  alignment:  %s", prefix, get_align_name(get_entity_align(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);
                        }
@@ -683,7 +717,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
        }
 
        if (verbosity & dump_verbosity_accessStats) {
-#if 0
+#ifdef EXTENDED_ACCESS_STATS
                int n_acc = get_entity_n_accesses(ent);
                int max_depth = 0;
                int max_L_freq = -1;
@@ -786,6 +820,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));
@@ -793,6 +828,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
                }
        }
 }
@@ -806,9 +842,14 @@ void dump_entity(ir_entity *ent) {
   dump_entity_to_file(stdout, ent, dump_verbosity_max);
 }
 
-void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned verbosity,
-                                    int *max_disp, int disp[], const char *comma) {
-
+void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix,
+                                   unsigned verbosity, int *max_disp,
+                                   int disp[], const char *comma)
+{
+       (void) verbosity;
+       (void) max_disp;
+       (void) disp;
+       (void) comma;
 #if 0   /* Outputs loop depth of all occurrences. */
        int n_acc = get_entity_n_accesses(ent);
        int max_L_freq = -1;
@@ -892,6 +933,7 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsign
                /* 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));
@@ -901,15 +943,19 @@ void dump_entitycsv_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsign
                                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;
        char buf[1024 + 10];
+       (void) comma;
+
        if (!is_Class_type(tp)) return;   // we also want array types. Stupid, these are classes in java.
 
        if (verbosity & dump_verbosity_accessStats) {
@@ -992,6 +1038,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;
@@ -1148,6 +1195,14 @@ void dump_type_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity) {
                break;
 
        case tpo_primitive:
+               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_id:
        case tpo_none:
        case tpo_unknown:
@@ -1162,8 +1217,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)));
 
@@ -1215,6 +1270,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)) {
@@ -1224,6 +1280,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
 
        }
 
@@ -1254,9 +1311,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);