X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdumptxt.c;h=f8918b8142368274941a5aa31cf20110ca938c8f;hb=1de3ff1c7f4478924c6348f774608e60b962d055;hp=2c64e6aefd057c3fb791d4dd4118c940613f9411;hpb=af300963705d97b2f596e8cf2887813c25de6ad8;p=libfirm diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c index 2c64e6aef..f8918b814 100644 --- a/ir/ir/irdumptxt.c +++ b/ir/ir/irdumptxt.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2011 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -135,11 +135,16 @@ void dump_irnode_to_file(FILE *F, ir_node *n) fprintf(F, " Label: %lu\n", get_entity_label(get_Block_entity(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) { + if (get_irg_dom_state(get_irn_irg(n)) == dom_consistent) { 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, " domtree 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)); } + if (get_irg_postdom_state(get_irn_irg(n)) == dom_consistent) { + fprintf(F, " pdom depth %d\n", get_Block_postdom_depth(n)); + fprintf(F, " pdomtree pre num %d\n", get_Block_pdom_tree_pre_num(n)); + fprintf(F, " max pdomsubtree pre num %d\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) @@ -193,9 +198,10 @@ void dump_irnode_to_file(FILE *F, ir_node *n) ir_fprintf(F, " result %d type: %+F\n", i, get_method_res_type(tp, i)); } if (Call_has_callees(n)) { + size_t i; 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))); + ir_fprintf(F, " %zu: %s\n", i, get_ent_dump_name(get_Call_callee(n, i))); } } } break; @@ -251,11 +257,11 @@ void dump_irnode_to_file(FILE *F, ir_node *n) case iro_Load: fprintf(F, " mode of loaded value: %s\n", get_mode_name_ex(get_Load_mode(n), NULL)); fprintf(F, " volatility: %s\n", get_volatility_name(get_Load_volatility(n))); - fprintf(F, " align: %s\n", get_align_name(get_Load_align(n))); + fprintf(F, " align: %s\n", get_align_name(get_Load_unaligned(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))); + fprintf(F, " align: %s\n", get_align_name(get_Store_unaligned(n))); break; case iro_Confirm: fprintf(F, " compare operation: %s\n", get_relation_string(get_Confirm_relation(n))); @@ -319,14 +325,14 @@ void dump_graph_as_text(FILE *out, ir_graph *irg) * "prefix" node16, node17\n */ static void dump_node_list(FILE *F, firm_kind *k, const char *prefix, - int (*get_entity_n_nodes)(firm_kind *ent), - ir_node *(*get_entity_node)(firm_kind *ent, int pos), + size_t (*get_entity_n_nodes)(firm_kind *ent), + ir_node *(*get_entity_node)(firm_kind *ent, size_t pos), const char *name) { - int i, n_nodes = get_entity_n_nodes(k); + size_t i, n_nodes = get_entity_n_nodes(k); const char *comma = ""; - fprintf(F, "%s %s (%d):", prefix, name, n_nodes); + 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); @@ -346,14 +352,14 @@ static void dump_node_list(FILE *F, firm_kind *k, const char *prefix, * "prefix" node16, node17\n */ static void dump_type_list(FILE *F, ir_type *tp, const char *prefix, - int (*get_n_types)(const ir_type *tp), - ir_type *(*get_type)(const ir_type *tp, int pos), + size_t (*get_n_types)(const ir_type *tp), + ir_type *(*get_type)(const ir_type *tp, size_t pos), const char *name) { - int i, n_nodes = get_n_types(tp); + size_t i, n_nodes = get_n_types(tp); const char *comma = ""; - fprintf(F, "%s %s (%d):", prefix, name, n_nodes); + 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); @@ -623,10 +629,10 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref if (get_trouts_state()) { fprintf(F, "%s Entity outs:\n", prefix); - dump_node_list(F, (firm_kind *)ent, prefix, (int(*)(firm_kind *))get_entity_n_accesses, - (ir_node *(*)(firm_kind *, int))get_entity_access, "Accesses"); - dump_node_list(F, (firm_kind *)ent, prefix, (int(*)(firm_kind *))get_entity_n_references, - (ir_node *(*)(firm_kind *, int))get_entity_reference, "References"); + 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"); } } @@ -719,7 +725,7 @@ void dump_type_to_file(FILE *F, ir_type *tp) case tpo_array: if (verbosity & dump_verbosity_typeattrs) { - int i, n_dim; + size_t i, n_dim; ir_type *elem_tp = get_array_element_type(tp); fprintf(F, "\n array "); @@ -751,7 +757,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"); @@ -820,10 +826,10 @@ void dump_type_to_file(FILE *F, ir_type *tp) if (get_trouts_state()) { fprintf(F, "\n Type outs:\n"); - dump_node_list(F, (firm_kind *)tp, " ", (int(*)(firm_kind *))get_type_n_allocs, - (ir_node *(*)(firm_kind *, int))get_type_alloc, "Allocations"); - dump_node_list(F, (firm_kind *)tp, " ", (int(*)(firm_kind *))get_type_n_casts, - (ir_node *(*)(firm_kind *, int))get_type_cast, "Casts"); + 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"); } @@ -832,8 +838,7 @@ void dump_type_to_file(FILE *F, ir_type *tp) void dump_types_as_text(FILE *out) { - int i; - int n_types = get_irp_n_types(); + size_t i, n_types = get_irp_n_types(); for (i = 0; i < n_types; ++i) { ir_type *type = get_irp_type(i); @@ -844,8 +849,8 @@ void dump_types_as_text(FILE *out) void dump_globals_as_text(FILE *out) { ir_type *global_type = get_glob_type(); - int n_members = get_class_n_members(global_type); - int i; + size_t n_members = get_class_n_members(global_type); + size_t i; for (i = 0; i < n_members; ++i) { ir_entity *entity = get_class_member(global_type, i);