X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdumptxt.c;h=2fdd57645046c9fa04c9f08836d9b4d8196c8fc7;hb=2c7e601484413ad272d685f9f0cb3ecc27b251f7;hp=92d5d7156d68f84c9c8b8fcaf128569bdede82ce;hpb=87d0e52206e83773dcd8a260418e53f3eb6bbb83;p=libfirm diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c index 92d5d7156..2fdd57645 100644 --- a/ir/ir/irdumptxt.c +++ b/ir/ir/irdumptxt.c @@ -22,7 +22,6 @@ * @brief Write text representation of firm to file. * @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt, * Matthias Braun - * @version $Id$ */ #include "config.h" @@ -33,6 +32,7 @@ #include "irdump_t.h" #include "irgraph_t.h" +#include "irnode_t.h" #include "irprog_t.h" #include "entity_t.h" @@ -56,8 +56,7 @@ ir_dump_verbosity_t ir_get_dump_verbosity(void) return verbosity; } -/* Write the irnode and all its attributes to the file passed. */ -void dump_irnode_to_file(FILE *F, ir_node *n) +void dump_irnode_to_file(FILE *F, const ir_node *n) { char comma; ir_graph *irg; @@ -101,8 +100,29 @@ void dump_irnode_to_file(FILE *F, ir_node *n) fprintf(F, " Private Attributes:\n"); - if (is_Proj(n)) - fprintf(F, " proj nr: %ld\n", get_Proj_proj(n)); + if (is_Proj(n)) { + ir_node *pred = get_Proj_pred(n); + long pn = get_Proj_proj(n); + fprintf(F, " proj nr: %ld\n", pn); + if (is_Switch(pred)) { + const ir_switch_table *table = get_Switch_table(pred); + size_t n_entries = ir_switch_table_get_n_entries(table); + size_t i; + for (i = 0; i < n_entries; ++i) { + const ir_switch_table_entry *entry + = ir_switch_table_get_entry_const(table, i); + if (entry->pn == pn && entry->min != NULL && entry->max != NULL) { + ir_tarval *min = entry->min; + ir_tarval *max = entry->max; + if (min != max) { + ir_fprintf(F, " switch case %+F .. %+F\n", min, max); + } else { + ir_fprintf(F, " switch case %+F\n", min); + } + } + } + } + } if (is_fragile_op(n)) { fprintf(F, " pinned state: %s\n", get_op_pin_state_name(get_irn_pinned(n))); @@ -120,7 +140,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n) } /* Loop node. Someone else please tell me what's wrong ... */ - if (is_irg_state(irg, IR_GRAPH_STATE_CONSISTENT_LOOPINFO)) { + if (irg_has_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_LOOPINFO)) { ir_loop *loop = get_irn_loop(n); if (loop != NULL) { fprintf(F, " in loop %ld with depth %u\n", @@ -131,16 +151,17 @@ void dump_irnode_to_file(FILE *F, ir_node *n) /* 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_entity *const entity = get_Block_entity(n); + if (entity != NULL) + fprintf(F, " Label: %lu\n", get_entity_label(entity)); fprintf(F, " block visited: %lu\n", get_Block_block_visited(n)); fprintf(F, " block marked: %u\n", get_Block_mark(n)); - if (is_irg_state(get_irn_irg(n), IR_GRAPH_STATE_CONSISTENT_DOMINANCE)) { + if (irg_has_properties(get_irn_irg(n), IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE)) { fprintf(F, " dom depth %d\n", get_Block_dom_depth(n)); fprintf(F, " domtree pre num %u\n", get_Block_dom_tree_pre_num(n)); fprintf(F, " max subtree pre num %u\n", get_Block_dom_max_subtree_pre_num(n)); } - if (is_irg_state(get_irn_irg(n), IR_GRAPH_STATE_CONSISTENT_POSTDOMINANCE)) { + if (irg_has_properties(get_irn_irg(n), IR_GRAPH_PROPERTY_CONSISTENT_POSTDOMINANCE)) { fprintf(F, " pdom depth %d\n", get_Block_postdom_depth(n)); fprintf(F, " pdomtree pre num %u\n", get_Block_pdom_tree_pre_num(n)); fprintf(F, " max pdomsubtree pre num %u\n", get_Block_pdom_max_subtree_pre_num(n)); @@ -157,7 +178,6 @@ void dump_irnode_to_file(FILE *F, ir_node *n) ir_fprintf(F, " param %d type: %+F\n", i, get_method_param_type(tp, i)); } break; case iro_Cond: { - 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))); @@ -183,8 +203,6 @@ void dump_irnode_to_file(FILE *F, ir_node *n) } break; case iro_Call: { ir_type *tp = get_Call_type(n); - if (get_Call_tail_call(n)) - fprintf(F, " tail call\n"); ir_fprintf(F, " calling method of type %+F\n", tp); if (get_unknown_type() != tp) { size_t i; @@ -229,11 +247,6 @@ void dump_irnode_to_file(FILE *F, ir_node *n) fprintf(F, " entity: "); dump_entity_to_file(F, get_SymConst_entity(n)); break; - case symconst_type_tag: - fprintf(F, " kind: type_tag\n"); - fprintf(F, " type: "); - dump_type_to_file(F, get_SymConst_type(n)); - break; case symconst_type_size: fprintf(F, " kind: size\n"); fprintf(F, " type: "); @@ -303,7 +316,7 @@ void dump_irnode_to_file(FILE *F, ir_node *n) if (get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_consistent || get_irg_typeinfo_state(get_irn_irg(n)) == ir_typeinfo_inconsistent ) - if (get_irn_typeinfo_type(n) != firm_none_type) + if (get_irn_typeinfo_type(n) != get_none_type()) ir_fprintf (F, " Analysed type: %s\n", get_irn_typeinfo_type(n)); } @@ -314,6 +327,41 @@ void dump_graph_as_text(FILE *out, ir_graph *irg) static int need_nl = 1; +static bool is_init_string(ir_initializer_t const* const init, ir_type *const type) +{ + ir_type *const element_type = get_array_element_type(type); + ir_mode * mode; + size_t n; + size_t i; + + if (!is_Primitive_type(element_type)) + return false; + + mode = get_type_mode(element_type); + if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8) + return false; + + n = get_initializer_compound_n_entries(init); + for (i = 0; i != n; ++i) { + ir_initializer_t const* const val = get_initializer_compound_value(init, i); + ir_tarval* tv; + long v; + + if (get_initializer_kind(val) != IR_INITIALIZER_TARVAL) + return false; + tv = get_initializer_tarval_value(val); + + if (!tarval_is_constant(tv)) + return false; + + v = get_tarval_long(tv); + if (v != 0 && (v < 0x07 || 0x0D < v) && v != 0x1B && (v < 0x20 || 0x80 <= v) && (v < 0xA0 || 0x100 <= v)) + return false; + } + + return true; +} + /** * Dump initializers. */ @@ -342,18 +390,46 @@ static void dump_ir_initializers_to_file(FILE *F, const char *prefix, 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; + size_t const n = get_initializer_compound_n_entries(initializer); + size_t i; + + if (is_init_string(initializer, type)) { + fprintf(F, "\t[0...%u] = '", (unsigned)n - 1); + for (i = 0; i != n; ++i) { + ir_initializer_t const* const val = get_initializer_compound_value(initializer, i); + ir_tarval* const tv = get_initializer_tarval_value(val); + long const v = get_tarval_long(tv); + + switch (v) { + case 0x00: fprintf(F, "\\\\000"); break; + case 0x07: fprintf(F, "\\\\a"); break; + case 0x08: fprintf(F, "\\\\b"); break; + case 0x09: fprintf(F, "\\\\t"); break; + case 0x0A: fprintf(F, "\\\\n"); break; + case 0x0B: fprintf(F, "\\\\v"); break; + case 0x0C: fprintf(F, "\\\\f"); break; + case 0x0D: fprintf(F, "\\\\r"); break; + case 0x1B: fprintf(F, "\\\\033"); break; + case 0x22: fprintf(F, "\\\\\\\""); break; + case 0x5C: fprintf(F, "\\\\\\\\"); break; + default: fprintf(F, "%c", (unsigned char)v); break; + } + } + fprintf(F, "'"); + } else { + ir_type *const 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); } - fprintf(F, "[%d]", (int) i); - dump_ir_initializers_to_file(F, prefix, sub_initializer, element_type); } } else { size_t i, n; @@ -526,27 +602,6 @@ static void dump_entity_to_file_prefix(FILE *F, ir_entity *ent, const char *pref need_nl = 1; dump_ir_initializers_to_file(F, prefix, initializer, get_entity_type(ent)); fputc('\n', F); - } else if (entity_has_compound_ent_values(ent)) { - size_t i; - fprintf(F, "%s compound values:", prefix); - for (i = 0; i < get_compound_ent_n_values(ent); ++i) { - size_t j; - 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, "(%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, "[%ld]", get_compound_graph_path_array_index(path, j)); - } - fprintf(F, "\t = "); - dump_node_opcode(F, get_compound_ent_value(ent, i)); - } - fputc('\n', F); } }