BugFix: works again for RAW with non twos-complement

[libfirm] / ir / ir / irdumptxt.c

diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c
index 1203855..1c4e15d 100644 (file)
--- a/ir/ir/irdumptxt.c
+++ b/ir/ir/irdumptxt.c
@@ -75,7 +75,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 @. */
@@ -95,7 +95,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);
 
@@ -159,15 +159,14 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
 
        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));
 
 #ifdef INTERPROCEDURAL_VIEW
-       if ((get_irp_ip_view_state() != ip_view_no)
-               && (get_irn_opcode(n) == iro_Filter || get_irn_opcode(n) == iro_Block)) {
+       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) {
+               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)));
@@ -181,9 +180,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++)
@@ -202,8 +201,11 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
        /* Source types */
        switch (get_irn_opcode(n)) {
        case iro_Block: {
+               if (has_Block_label(n))
+                       fprintf(F, "  Label: %lu\n", get_Block_label(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));
@@ -224,8 +226,6 @@ int dump_irnode_to_file(FILE *F, ir_node *n) {
                        (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    */
@@ -589,7 +589,7 @@ static void dump_ir_initializers_to_file(FILE *F, const char *prefix,
                                        fprintf(F, "\n%s    ", prefix);
                                        need_nl = 0;
                                }
-                               fprintf(F, "[%d]", i);
+                               fprintf(F, "[%d]", (int) i);
                                dump_ir_initializers_to_file(F, prefix, sub_initializer, element_type);
                        }
                } else {
@@ -702,6 +702,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned
                                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_weak)     fprintf(F, "weak_function, ");
                        }
                        fprintf(F, "\n%s  calling convention: ", prefix);
                        if (cc & cc_reg_param) fprintf(F, "regparam, ");
@@ -821,7 +822,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;
@@ -831,14 +832,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)) {
@@ -954,7 +955,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;
@@ -964,7 +965,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)) {
@@ -975,7 +976,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)) {
@@ -1059,7 +1060,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;
 
@@ -1069,7 +1070,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));
@@ -1222,16 +1223,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));
                                }
@@ -1331,7 +1332,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);
@@ -1339,7 +1340,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) {