X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdumptxt.c;h=b465aaa37c38b03814c33aba07a9d6a06f7650dc;hb=79b409329e8b6e9f43ac71df6599372fa0dbe497;hp=4c4a879177a32bce107d620f110ec4be9dea6a49;hpb=e9acaaa06c895c2632071e8d42e8632253c3d9f8;p=libfirm diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c index 4c4a87917..b465aaa37 100644 --- a/ir/ir/irdumptxt.c +++ b/ir/ir/irdumptxt.c @@ -23,17 +23,10 @@ * @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif -#ifdef HAVE_STRING_H #include -#endif -#ifdef HAVE_STDLIB_H #include -#endif - #include #include "irdump_t.h" @@ -75,7 +68,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 +88,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); @@ -191,11 +184,12 @@ 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 */ @@ -250,7 +244,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { } 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; @@ -697,42 +691,49 @@ 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_compound_ret) fprintf(F, "compound_ret, "); - if (cc & cc_frame_on_caller_stk) fprintf(F, "frame on caller's stack, "); + 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) { @@ -767,13 +768,14 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned } } } - 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 alignment: %s", prefix, get_align_name(get_entity_align(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)); @@ -790,7 +792,7 @@ void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, char *prefix, unsigned fprintf(F, "\n%s irg = NULL", prefix); } } - fprintf(F, "\n"); + fputc('\n', F); } if (get_trouts_state()) { @@ -821,7 +823,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; @@ -954,7 +956,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; @@ -1059,7 +1061,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; @@ -1331,7 +1333,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);