X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=a3743cd27a814c6e5eba0b602843a176feb75d06;hb=c3c48d7bd83f042cc2951754377de928d66fe51e;hp=f3ba9a7b061e02ad979cc11ac380516701003a2c;hpb=989c6997e30f0abffa09c42c3b2fdbd54dd58fd3;p=libfirm diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c index f3ba9a7b0..a3743cd27 100644 --- a/ir/ir/irdump.c +++ b/ir/ir/irdump.c @@ -42,8 +42,7 @@ # include "pmap.h" # include "eset.h" -#undef HEAPANAL -#ifdef HEAPANAL +#if DO_HEAPANALYSIS void dump_chi_term(FILE *FL, ir_node *n); void dump_state(FILE *FL, ir_node *n); int get_opt_dump_abstvals(void); @@ -58,10 +57,13 @@ SeqNo get_Block_seqno(ir_node *n); #define DEFAULT_ENUM_ITEM_ATTRIBUTE " " /* Attributes of edges between Firm nodes */ -#define BLOCK_EDGE_ATTR "class:2 priority:2 linestyle:dotted" -#define CF_EDGE_ATTR "class:13 color:red" -#define MEM_EDGE_ATTR "class:14 color:blue" -#define DOMINATOR_EDGE_ATTR "class:15 color:red" +#define INTRA_DATA_EDGE_ATTR "class:1 priority:50" +#define INTER_DATA_EDGE_ATTR "class:16 priority:10" +#define BLOCK_EDGE_ATTR "class:2 priority:50 linestyle:dotted" +#define CF_EDGE_ATTR "class:13 priority:60 color:red" +#define INTRA_MEM_EDGE_ATTR "class:14 priority:50 color:blue" +#define INTER_MEM_EDGE_ATTR "class:17 priority:10 color:blue" +#define DOMINATOR_EDGE_ATTR "class:15 color:red" #define BACK_EDGE_ATTR "linestyle:dashed " @@ -107,6 +109,14 @@ SeqNo get_Block_seqno(ir_node *n); #define PRINT_ITEMID(X,Y) fprintf(F, "i%pT%d", (void *) (X), (Y)) #endif +static const char *get_mode_name_ex(ir_mode *mode, int *bad) +{ + if (is_mode(mode)) + return get_mode_name(mode); + *bad |= 1; + return ""; +} + static const char *get_type_name_ex(type *tp, int *bad) { if (is_type(tp)) @@ -278,7 +288,7 @@ static void clear_link(ir_node * node, void * env) { static int node_floats(ir_node *n) { return ((get_op_pinned(get_irn_op(n)) == floats) && - (get_irg_pinned(current_ir_graph) == floats)); + (get_irg_pinned(current_ir_graph) == floats)); } static const char *get_ent_dump_name(entity *ent) { @@ -319,7 +329,7 @@ static void collect_node(ir_node * node, void *env) { * graphs not visited. * Free the list with DEL_ARR_F. */ static ir_node ** construct_block_lists(ir_graph *irg) { - int i; + int i, rem_view = interprocedural_view; ir_graph *rem = current_ir_graph; current_ir_graph = irg; @@ -328,6 +338,14 @@ static ir_node ** construct_block_lists(ir_graph *irg) { irg_walk_graph(current_ir_graph, clear_link, collect_node, current_ir_graph); + /* Collect also EndReg and EndExcept. We do not want to change the walker. */ + interprocedural_view = 0; + set_irg_visited(current_ir_graph, get_irg_visited(current_ir_graph)-1); + irg_walk(get_irg_end_reg(current_ir_graph), clear_link, collect_node, current_ir_graph); + set_irg_visited(current_ir_graph, get_irg_visited(current_ir_graph)-1); + irg_walk(get_irg_end_except(current_ir_graph), clear_link, collect_node, current_ir_graph); + interprocedural_view = rem_view; + current_ir_graph = rem; return ird_get_irg_link(irg); } @@ -434,14 +452,18 @@ dump_node_opcode(FILE *F, ir_node *n) } break; case iro_SymConst: { - if (get_SymConst_kind(n) == linkage_ptr_info) { + if (get_SymConst_kind(n) == symconst_addr_name) { /* don't use get_SymConst_ptr_info as it mangles the name. */ - fprintf (F, "SymC %s", get_id_str(get_SymConst_ptrinfo(n))); + fprintf (F, "SymC %s", get_id_str(get_SymConst_name(n))); + } else if (get_SymConst_kind(n) == symconst_addr_ent) { + assert(get_SymConst_entity(n)); + assert(is_entity(get_SymConst_entity(n))); + fprintf (F, "SymC &%s", get_entity_name(get_SymConst_entity(n))); } else { assert(get_kind(get_SymConst_type(n)) == k_type); assert(get_type_ident(get_SymConst_type(n))); fprintf (F, "SymC %s ", get_type_name_ex(get_SymConst_type(n), &bad)); - if (get_SymConst_kind(n) == type_tag) + if (get_SymConst_kind(n) == symconst_type_tag) fprintf (F, "tag"); else fprintf (F, "size"); @@ -453,6 +475,17 @@ dump_node_opcode(FILE *F, ir_node *n) else fprintf(F, "%s", get_irn_opname(n)); } break; + case iro_Proj: { + ir_node *cond = get_Proj_pred(n); + + if (get_irn_opcode(cond) == iro_Cond + && get_Proj_proj(n) == get_Cond_defaultProj(cond) + && get_irn_mode(get_Cond_selector(cond)) != mode_b) + fprintf (F, "defProj"); + else + fprintf (F, "%s", get_irn_opname(n)); + } break; + case iro_Start: { if (interprocedural_view) { fprintf(F, "%s %s", get_irn_opname(n), get_ent_dump_name(get_irg_ent(get_irn_irg(n)))); @@ -468,9 +501,11 @@ dump_node_opcode(FILE *F, ir_node *n) return bad; } -static INLINE void +static INLINE int dump_node_mode (ir_node *n) { + int bad = 0; + switch (get_irn_opcode(n)) { case iro_Phi: case iro_Const: @@ -490,11 +525,12 @@ dump_node_mode (ir_node *n) case iro_Abs: case iro_Cmp: case iro_Confirm: - fprintf (F, "%s", get_mode_name(get_irn_mode(n))); + fprintf (F, "%s", get_mode_name_ex(get_irn_mode(n), &bad)); break; default: ; } + return bad; } static int dump_node_typeinfo(ir_node *n) { @@ -502,12 +538,12 @@ static int dump_node_typeinfo(ir_node *n) { if (opt_dump_analysed_type_info) { if (get_irg_typeinfo_state(current_ir_graph) == irg_typeinfo_consistent || - get_irg_typeinfo_state(current_ir_graph) == irg_typeinfo_inconsistent ) { + get_irg_typeinfo_state(current_ir_graph) == irg_typeinfo_inconsistent ) { type *tp = get_irn_type(n); if (tp != none_type) - fprintf(F, " [%s]", get_type_name_ex(tp, &bad)); + fprintf(F, " [%s]", get_type_name_ex(tp, &bad)); else - fprintf(F, " []"); + fprintf(F, " []"); } } return bad; @@ -594,6 +630,7 @@ static INLINE int dump_node_info(ir_node *n) fprintf (F, " info1: \""); if (opt_dump_pointer_values_to_info) fprintf (F, "addr: %p \n", (void *)n); + fprintf (F, "mode: %s\n", get_mode_name(get_irn_mode(n))); fprintf (F, "visited: %ld \n", get_irn_visited(n)); irg = get_irn_irg(n); if (irg != get_const_code_irg()) @@ -610,6 +647,15 @@ static INLINE int dump_node_info(ir_node *n) } fprintf(F, "\n"); + /* Loop node Someone else please tell me what's wrong ... + if (get_irn_loop(n)) { + 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)); + } + */ + /* Source types */ switch (get_irn_opcode(n)) { case iro_Start: { @@ -646,11 +692,11 @@ static INLINE int dump_node_info(ir_node *n) if (Call_has_callees(n)) { fprintf(F, "possible callees: \n"); for (i = 0; i < get_Call_n_callees(n); i++) { - if (!get_Call_callee(n, i)) { - fprintf(F, " %d external method\n", i); - } else { - fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(n, i))); - } + if (!get_Call_callee(n, i)) { + fprintf(F, " %d external method\n", i); + } else { + fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(n, i))); + } } } } break; @@ -659,11 +705,11 @@ static INLINE int dump_node_info(ir_node *n) if (Call_has_callees(call)) { fprintf(F, "possible callees: \n"); for (i = 0; i < get_Call_n_callees(call); i++) { - if (!get_Call_callee(call, i)) { - fprintf(F, " %d external method\n", i); - } else { - fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(call, i))); - } + if (!get_Call_callee(call, i)) { + fprintf(F, " %d external method\n", i); + } else { + fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(call, i))); + } } } } break; @@ -672,7 +718,7 @@ static INLINE int dump_node_info(ir_node *n) type *tp = get_entity_type(get_irg_ent(get_irn_irg(n))); fprintf(F, "return in method of type %s \n", get_type_name_ex(tp, &bad)); for (i = 0; i < get_method_n_ress(tp); ++i) - fprintf(F, " res %d type: %s \n", i, get_type_name_ex(get_method_res_type(tp, i), &bad)); + fprintf(F, " res %d type: %s \n", i, get_type_name_ex(get_method_res_type(tp, i), &bad)); } } break; case iro_Const: { @@ -685,15 +731,15 @@ static INLINE int dump_node_info(ir_node *n) if (interprocedural_view) { fprintf(F, "intra predecessor nodes:\n"); for (i = 0; i < get_irn_intra_arity(n); i++) { - ir_node *pred = get_irn_intra_n(n, i); - fprintf(F, " %s%s %ld\n", get_irn_opname(pred), get_irn_modename(pred), get_irn_node_nr(pred)); + ir_node *pred = get_irn_intra_n(n, i); + fprintf(F, " %s%s %ld\n", get_irn_opname(pred), get_irn_modename(pred), get_irn_node_nr(pred)); } } else { fprintf(F, "inter predecessor nodes:\n"); for (i = 0; i < get_irn_inter_arity(n); i++) { - ir_node *pred = get_irn_inter_n(n, i); - fprintf(F, " %s%s %ld \tin graph %s\n", get_irn_opname(pred), get_irn_modename(pred), - get_irn_node_nr(pred), get_ent_dump_name(get_irg_entity(get_irn_irg(pred)))); + ir_node *pred = get_irn_inter_n(n, i); + fprintf(F, " %s%s %ld \tin graph %s\n", get_irn_opname(pred), get_irn_modename(pred), + get_irn_node_nr(pred), get_ent_dump_name(get_irg_entity(get_irn_irg(pred)))); } } } break; @@ -740,11 +786,11 @@ static void dump_const_node_local(ir_node *n) { mark_irn_visited(con); /* Generate a new name for the node by appending the names of - n and const. */ + n and const. */ fprintf(F, "node: {title: "); PRINT_CONSTID(n, con); fprintf(F, " label: \""); bad |= dump_node_opcode(F, con); - dump_node_mode (con); + bad |= dump_node_mode (con); bad |= dump_node_typeinfo(con); fprintf (F, " "); bad |= dump_node_nodeattr(con); @@ -776,7 +822,7 @@ static void dump_node(ir_node *n) bad = ! irn_vrfy_irg_dump(n, current_ir_graph, &p); bad |= dump_node_opcode(F, n); - dump_node_mode (n); + bad |= dump_node_mode (n); bad |= dump_node_typeinfo(n); fprintf(F, " "); bad |= dump_node_nodeattr(n); @@ -787,7 +833,7 @@ static void dump_node(ir_node *n) dump_node_vcgattr(n, bad); fprintf(F, "}\n"); dump_const_node_local(n); -#ifdef HEAPANAL +#if DO_HEAPANALYSIS dump_chi_term(F, n); dump_state(F, n); #endif @@ -802,11 +848,28 @@ dump_ir_block_edge(ir_node *n) { PRINT_NODEID(n); fprintf (F, "\" targetname: \""); PRINT_NODEID(get_nodes_block(n)); - fprintf (F, "\" " BLOCK_EDGE_ATTR "}\n"); + fprintf (F, "\" " BLOCK_EDGE_ATTR "}\n"); } } -static void print_edge_vcgattr(ir_node *from, int to) { +static void +print_data_edge_vcgattr(FILE *F, ir_node *from, int to) { + if (get_nodes_block(from) == get_nodes_block(get_irn_n(from, to))) + fprintf (F, INTRA_DATA_EDGE_ATTR); + else + fprintf (F, INTER_DATA_EDGE_ATTR); +} + +static void +print_mem_edge_vcgattr(FILE *F, ir_node *from, int to) { + if (get_nodes_block(from) == get_nodes_block(get_irn_n(from, to))) + fprintf (F, INTRA_MEM_EDGE_ATTR); + else + fprintf (F, INTER_MEM_EDGE_ATTR); +} + +static void +print_edge_vcgattr(ir_node *from, int to) { assert(from); if (dump_backedge_information_flag && is_backedge(from, to)) @@ -820,58 +883,81 @@ static void print_edge_vcgattr(ir_node *from, int to) { case iro_End: if (to >= 0) { if (get_irn_mode(get_End_keepalive(from, to)) == mode_BB) - fprintf (F, CF_EDGE_ATTR); + fprintf (F, CF_EDGE_ATTR); if (get_irn_mode(get_End_keepalive(from, to)) == mode_X) - fprintf (F, MEM_EDGE_ATTR); + fprintf (F, INTER_MEM_EDGE_ATTR); } break; - case iro_EndReg: break; - case iro_EndExcept: break; - case iro_Jmp: break; - case iro_Break: break; - case iro_Cond: break; + case iro_EndReg: + case iro_EndExcept: + case iro_Jmp: + case iro_Break: + case iro_Cond: + print_data_edge_vcgattr(F, from, to); + break; case iro_Return: case iro_Raise: - if (to == 0) fprintf (F, MEM_EDGE_ATTR); + if (to == 0) + print_mem_edge_vcgattr(F, from, to); + else + print_data_edge_vcgattr(F, from, to); + break; + case iro_Const: + case iro_SymConst: + print_data_edge_vcgattr(F, from, to); break; - case iro_Const: break; - case iro_SymConst:break; case iro_Sel: case iro_Call: - if (to == 0) fprintf (F, MEM_EDGE_ATTR); + if (to == 0) + print_mem_edge_vcgattr(F, from, to); + else + print_data_edge_vcgattr(F, from, to); + break; + case iro_CallBegin: + case iro_Add: + case iro_Sub: + case iro_Minus: + case iro_Mul: + print_data_edge_vcgattr(F, from, to); break; - case iro_CallBegin: break; - case iro_Add: break; - case iro_Sub: break; - case iro_Minus: break; - case iro_Mul: break; case iro_Quot: case iro_DivMod: case iro_Div: case iro_Mod: - if (to == 0) fprintf (F, MEM_EDGE_ATTR); + if (to == 0) + print_mem_edge_vcgattr(F, from, to); + else + print_data_edge_vcgattr(F, from, to); + break; + case iro_Abs: + case iro_And: + case iro_Or: + case iro_Eor: + case iro_Shl: + case iro_Shr: + case iro_Shrs: + case iro_Rot: + case iro_Cmp: + case iro_Conv: + print_data_edge_vcgattr(F, from, to); break; - case iro_Abs: break; - case iro_And: break; - case iro_Or: break; - case iro_Eor: break; - case iro_Shl: break; - case iro_Shr: break; - case iro_Shrs: break; - case iro_Rot: break; - case iro_Cmp: break; - case iro_Conv: break; case iro_Phi: - if (get_irn_modecode(from) == irm_M) fprintf (F, MEM_EDGE_ATTR); + if (get_irn_modecode(from) == irm_M) + fprintf (F, INTER_MEM_EDGE_ATTR); + else + print_data_edge_vcgattr(F, from, to); break; case iro_Load: case iro_Store: case iro_Alloc: case iro_Free: - if (to == 0) fprintf (F, MEM_EDGE_ATTR); + if (to == 0) + print_mem_edge_vcgattr(F, from, to); + else + print_data_edge_vcgattr(F, from, to); break; case iro_Sync: - fprintf (F, MEM_EDGE_ATTR); + print_mem_edge_vcgattr(F, from, to); break; case iro_Tuple: break; case iro_Proj: @@ -881,14 +967,27 @@ static void print_edge_vcgattr(ir_node *from, int to) { fprintf (F, CF_EDGE_ATTR); break; case irm_M: - fprintf (F, MEM_EDGE_ATTR); + fprintf (F, INTER_MEM_EDGE_ATTR); + break; + default: + print_data_edge_vcgattr(F, from, to); break; - default: break; } break; - case iro_Bad: break; + case iro_Bad: break; case iro_Unknown: break; - case iro_Id: break; + case iro_Id: + switch (get_irn_modecode(from)) { + case irm_M: + fprintf (F, INTRA_MEM_EDGE_ATTR); + break; + case irm_X: + fprintf (F, CF_EDGE_ATTR); + break; + default: + print_data_edge_vcgattr(F, from, to); + break; + } break; default: ; } @@ -983,12 +1082,12 @@ dump_whole_block(ir_node *block) { fprintf(F, "\" label: \""); dump_node_opcode(F, block); fprintf (F, " %ld", get_irn_node_nr(block)); -#ifdef HEAPANAL +#if DO_HEAPANALYSIS if (get_opt_dump_abstvals()) fprintf (F, " seqno: %d", (int)get_Block_seqno(block)); #endif fprintf(F, "\" status:clustered color:%s \n", - get_Block_matured(block) ? "yellow" : "red"); + get_Block_matured(block) ? "yellow" : "red"); /* dump the blocks edges */ dump_ir_data_edges(block); @@ -1002,7 +1101,7 @@ dump_whole_block(ir_node *block) { /* Close the vcg information for the block */ fprintf(F, "}\n"); dump_const_node_local(block); -#ifdef HEAPANAL +#if DO_HEAPANALYSIS dump_chi_term(F, block); #endif fprintf(F, "\n"); @@ -1021,7 +1120,7 @@ dump_block_graph(ir_graph *irg) { ir_node * node = arr[i]; if (is_Block(node)) { /* Dumps the block and all the nodes in the block, which are to - be found in Block->link. */ + be found in Block->link. */ dump_whole_block(node); } else { /* Nodes that are not in a Block. */ @@ -1043,7 +1142,7 @@ static void dump_graph(ir_graph *irg) { fprintf(F, "graph: { title: \""); PRINT_IRGID(irg); fprintf(F, "\" label: \"%s\" status:clustered color:white \n", - get_ent_dump_name(get_irg_ent(irg))); + get_ent_dump_name(get_irg_ent(irg))); dump_block_graph (irg); @@ -1065,10 +1164,10 @@ static void dump_node2type_edges (ir_node *n, void *env) /* @@@ some consts have an entity */ break; case iro_SymConst: - if ( (get_SymConst_kind(n) == type_tag) - || (get_SymConst_kind(n) == size)) + if ( (get_SymConst_kind(n) ==symconst_type_tag) + || (get_SymConst_kind(n) ==symconst_size)) { - print_node_type_edge(F,n,get_SymConst_type(n),NODE2TYPE_EDGE_ATTR); + print_node_type_edge(F,n,get_SymConst_type(n),NODE2TYPE_EDGE_ATTR); } break; case iro_Sel: { @@ -1092,15 +1191,19 @@ static void dump_node2type_edges (ir_node *n, void *env) } -static void print_type_info(type *tp) { +static int print_type_info(type *tp) { + int bad = 0; + if (get_type_state(tp) == layout_undefined) { fprintf(F, "state: layout_undefined\n"); } else { fprintf(F, "state: layout_fixed,\n"); } if (get_type_mode(tp)) - fprintf(F, "mode: %s,\n", get_mode_name(get_type_mode(tp))); - fprintf(F, "size: %dB,\n", get_type_size(tp)); + fprintf(F, "mode: %s,\n", get_mode_name_ex(get_type_mode(tp), &bad)); + fprintf(F, "size: %db,\n", get_type_size_bits(tp)); + + return bad; } static void print_typespecific_info(type *tp) { @@ -1143,9 +1246,9 @@ static void print_typespecific_vcgattr(type *tp) { case tpo_class: { if (peculiarity_existent == get_class_peculiarity(tp)) - fprintf (F, " " TYPE_CLASS_NODE_ATTR); + fprintf (F, " " TYPE_CLASS_NODE_ATTR); else - fprintf (F, " " TYPE_DESCRIPTION_NODE_ATTR); + fprintf (F, " " TYPE_DESCRIPTION_NODE_ATTR); } break; case tpo_struct: { @@ -1181,7 +1284,7 @@ static int print_type_node(type *tp) PRINT_TYPEID(tp); fprintf (F, " label: \"%s %s\"", get_type_tpop_name(tp), get_type_name_ex(tp, &bad)); fprintf (F, " info1: \""); - print_type_info(tp); + bad |= print_type_info(tp); print_typespecific_info(tp); fprintf (F, "\""); print_typespecific_vcgattr(tp); @@ -1190,7 +1293,7 @@ static int print_type_node(type *tp) return bad; } -#define X(a) case a: fprintf(F, #a); break +#define X(a) case a: fprintf(F, #a); break void dump_entity_node(entity *ent) { fprintf (F, "node: {title: \""); @@ -1229,10 +1332,10 @@ void dump_entity_node(entity *ent) X(volatility_is_volatile); } - fprintf(F, "\npeculiarity: %s", get_peculiarity_string(get_entity_peculiarity(ent))); - fprintf(F, "\nname: %s\nld_name: %s", - get_entity_name(ent), ent->ld_name ? get_entity_ld_name(ent) : "no yet set"); - fprintf(F, "\noffset: %d", get_entity_offset(ent)); + fprintf(F, "\npeculiarity: %s", get_peculiarity_string(get_entity_peculiarity(ent))); + fprintf(F, "\nname: %s\nld_name: %s", + get_entity_name(ent), ent->ld_name ? get_entity_ld_name(ent) : "no yet set"); + fprintf(F, "\noffset(bits): %d", get_entity_offset_bits(ent)); if (is_method_type(get_entity_type(ent))) { if (get_entity_irg(ent)) /* can be null */ { fprintf (F, "\nirg = "); PRINT_IRGID(get_entity_irg(ent)); } @@ -1278,35 +1381,35 @@ dump_type_info (type_or_ent *tore, void *env) { ENT_OWN_EDGE_ATTR "}\n", ent, get_entity_owner(ent));*/ print_ent_type_edge(F,ent, get_entity_type(ent), ENT_TYPE_EDGE_ATTR); if(is_class_type(get_entity_owner(ent))) { - for(i = 0; i < get_entity_n_overwrites(ent); i++){ - print_ent_ent_edge(F,ent, get_entity_overwrites(ent, i), ENT_OVERWRITES_EDGE_ATTR); - } + for(i = 0; i < get_entity_n_overwrites(ent); i++){ + print_ent_ent_edge(F,ent, get_entity_overwrites(ent, i), ENT_OVERWRITES_EDGE_ATTR); + } } /* attached subgraphs */ if (const_entities && (get_entity_variability(ent) != variability_uninitialized)) { - if (is_atomic_entity(ent)) { - value = get_atomic_ent_value(ent); - if (value) { + if (is_atomic_entity(ent)) { + value = get_atomic_ent_value(ent); + if (value) { print_ent_node_edge(F,ent, value, ENT_VALUE_EDGE_ATTR, i); - /* DDMN(value); $$$ */ - dump_const_expression(value); - } - } - if (is_compound_entity(ent)) { - for (i = 0; i < get_compound_ent_n_values(ent); i++) { - value = get_compound_ent_value(ent, i); - if (value) { + /* DDMN(value); $$$ */ + dump_const_expression(value); + } + } + if (is_compound_entity(ent)) { + for (i = 0; i < get_compound_ent_n_values(ent); i++) { + value = get_compound_ent_value(ent, i); + if (value) { print_ent_node_edge(F,ent,value,ENT_VALUE_EDGE_ATTR,i); - dump_const_expression(value); - print_ent_ent_edge(F,ent, get_compound_ent_value_member(ent, i), ENT_CORR_EDGE_ATTR, i); - /* - fprintf (F, "edge: { sourcename: \"%p\" targetname: \"%p\" " - ENT_CORR_EDGE_ATTR "}\n", GET_ENTID(ent), - get_compound_ent_value_member(ent, i), i); - */ - } - } - } + dump_const_expression(value); + print_ent_ent_edge(F,ent, get_compound_ent_value_member(ent, i), ENT_CORR_EDGE_ATTR, i); + /* + fprintf (F, "edge: { sourcename: \"%p\" targetname: \"%p\" " + ENT_CORR_EDGE_ATTR "}\n", GET_ENTID(ent), + get_compound_ent_value_member(ent, i), i); + */ + } + } + } } } break; case k_type: @@ -1316,67 +1419,67 @@ dump_type_info (type_or_ent *tore, void *env) { /* and now the edges */ switch (get_type_tpop_code(tp)) { case tpo_class: - { - for (i=0; i < get_class_n_supertypes(tp); i++) { - print_type_type_edge(F, tp,get_class_supertype(tp, i),TYPE_SUPER_EDGE_ATTR); - } - - for (i=0; i < get_class_n_members(tp); i++) { - print_type_ent_edge(F,tp,get_class_member(tp, i),TYPE_MEMBER_EDGE_ATTR); - } - } break; + { + for (i=0; i < get_class_n_supertypes(tp); i++) { + print_type_type_edge(F, tp,get_class_supertype(tp, i),TYPE_SUPER_EDGE_ATTR); + } + + for (i=0; i < get_class_n_members(tp); i++) { + print_type_ent_edge(F,tp,get_class_member(tp, i),TYPE_MEMBER_EDGE_ATTR); + } + } break; case tpo_struct: - { - for (i=0; i < get_struct_n_members(tp); i++) { - print_type_ent_edge(F,tp,get_struct_member(tp, i),TYPE_MEMBER_EDGE_ATTR); - } - } break; + { + for (i=0; i < get_struct_n_members(tp); i++) { + print_type_ent_edge(F,tp,get_struct_member(tp, i),TYPE_MEMBER_EDGE_ATTR); + } + } break; case tpo_method: - { - for (i = 0; i < get_method_n_params(tp); i++) - { + { + for (i = 0; i < get_method_n_params(tp); i++) + { print_type_type_edge(F,tp,get_method_param_type(tp, i),METH_PAR_EDGE_ATTR,i); - } - for (i = 0; i < get_method_n_ress(tp); i++) - { + } + for (i = 0; i < get_method_n_ress(tp); i++) + { print_type_type_edge(F,tp,get_method_res_type(tp, i),METH_RES_EDGE_ATTR,i); - } - } break; + } + } break; case tpo_union: - { - for (i = 0; i < get_union_n_members(tp); i++) - { + { + for (i = 0; i < get_union_n_members(tp); i++) + { print_type_ent_edge(F,tp,get_union_member(tp, i),UNION_EDGE_ATTR); - } - } break; + } + } break; case tpo_array: - { - print_type_type_edge(F,tp,get_array_element_type(tp),ARR_ELT_TYPE_EDGE_ATTR); - print_type_ent_edge(F,tp,get_array_element_entity(tp),ARR_ENT_EDGE_ATTR); - for (i = 0; i < get_array_n_dimensions(tp); i++) { - ir_node *upper = get_array_upper_bound(tp, i); - ir_node *lower = get_array_lower_bound(tp, i); - print_node_type_edge(F,upper, tp, "label: \"upper %d\"", get_array_order(tp, i)); - print_node_type_edge(F,lower, tp, "label: \"lower %d\"", get_array_order(tp, i)); - dump_const_expression(upper); - dump_const_expression(lower); - } - - } break; + { + print_type_type_edge(F,tp,get_array_element_type(tp),ARR_ELT_TYPE_EDGE_ATTR); + print_type_ent_edge(F,tp,get_array_element_entity(tp),ARR_ENT_EDGE_ATTR); + for (i = 0; i < get_array_n_dimensions(tp); i++) { + ir_node *upper = get_array_upper_bound(tp, i); + ir_node *lower = get_array_lower_bound(tp, i); + print_node_type_edge(F,upper, tp, "label: \"upper %d\"", get_array_order(tp, i)); + print_node_type_edge(F,lower, tp, "label: \"lower %d\"", get_array_order(tp, i)); + dump_const_expression(upper); + dump_const_expression(lower); + } + + } break; case tpo_enumeration: - { - for (i = 0; i < get_enumeration_n_enums(tp); ++i) { - dump_enum_item(tp, i); - print_enum_item_edge(F, tp, i, "label: \"item %d\"", i); - } - } break; + { + for (i = 0; i < get_enumeration_n_enums(tp); ++i) { + dump_enum_item(tp, i); + print_enum_item_edge(F, tp, i, "label: \"item %d\"", i); + } + } break; case tpo_pointer: - { + { print_type_type_edge(F,tp,get_pointer_points_to_type(tp), PTR_PTS_TO_EDGE_ATTR); - } break; + } break; case tpo_primitive: - { - } break; + { + } break; default: break; } /* switch type */ } @@ -1418,12 +1521,12 @@ dump_class_hierarchy_node (type_or_ent *tore, void *env) { if (tp == get_glob_type()) break; switch (get_type_tpop_code(tp)) { case tpo_class: { - print_type_node(tp); - /* and now the edges */ - for (i=0; i < get_class_n_supertypes(tp); i++) - { - print_type_type_edge(F,tp,get_class_supertype(tp, i),TYPE_SUPER_EDGE_ATTR); - } + print_type_node(tp); + /* and now the edges */ + for (i=0; i < get_class_n_supertypes(tp); i++) + { + print_type_type_edge(F,tp,get_class_supertype(tp, i),TYPE_SUPER_EDGE_ATTR); + } } break; default: break; } /* switch type */ @@ -1458,7 +1561,7 @@ dump_out_edge (ir_node *n, void* env) { static INLINE void dump_loop_label(ir_loop *loop) { fprintf (F, "loop %d, %d sons, %d nodes", - get_loop_depth(loop), get_loop_n_sons(loop), get_loop_n_nodes(loop)); + get_loop_depth(loop), get_loop_n_sons(loop), get_loop_n_nodes(loop)); } static INLINE void dump_loop_info(ir_loop *loop) { @@ -1501,7 +1604,7 @@ dump_loop_son_edge (ir_loop *loop, int i) { fprintf (F, "\" targetname: \""); PRINT_LOOPID(get_loop_son(loop, i)); fprintf (F, "\" color: darkgreen label: \"%d\"}\n", - get_loop_element_pos(loop, get_loop_son(loop, i))); + get_loop_element_pos(loop, get_loop_son(loop, i))); } static @@ -1551,32 +1654,34 @@ dump_vcg_header(const char *name, const char *orientation) { /* print header */ fprintf (F, - "graph: { title: \"ir graph of %s\"\n" - "display_edge_labels: %s\n" - "layoutalgorithm: mindepth\n" - "manhattan_edges: yes\n" - "port_sharing: no\n" - "orientation: %s\n" - "classname 1: \"Data\"\n" - "classname 2: \"Block\"\n" - "classname 13:\"Control Flow\"\n" - "classname 14:\"Memory\"\n" - "classname 15:\"Dominators\"\n" - "classname 3: \"Entity type\"\n" - "classname 4: \"Entity owner\"\n" - "classname 5: \"Method Param\"\n" - "classname 6: \"Method Res\"\n" - "classname 7: \"Super\"\n" - "classname 8: \"Union\"\n" - "classname 9: \"Points-to\"\n" - "classname 10: \"Array Element Type\"\n" - "classname 11: \"Overwrites\"\n" - "classname 12: \"Member\"\n" - "infoname 1: \"Attribute\"\n" - "infoname 2: \"Verification errors\"\n", - name, label, orientation); - - fprintf (F, "\n"); /* a separator */ + "graph: { title: \"ir graph of %s\"\n" + "display_edge_labels: %s\n" + "layoutalgorithm: mindepth\n" + "manhattan_edges: yes\n" + "port_sharing: no\n" + "orientation: %s\n" + "classname 1: \"intrablock Data\"\n" + "classname 16: \"interblock Data\"\n" + "classname 2: \"Block\"\n" + "classname 13: \"Control Flow\"\n" + "classname 14: \"intrablock Memory\"\n" + "classname 17: \"interblock Memory\"\n" + "classname 15: \"Dominators\"\n" + "classname 3: \"Entity type\"\n" + "classname 4: \"Entity owner\"\n" + "classname 5: \"Method Param\"\n" + "classname 6: \"Method Res\"\n" + "classname 7: \"Super\"\n" + "classname 8: \"Union\"\n" + "classname 9: \"Points-to\"\n" + "classname 10: \"Array Element Type\"\n" + "classname 11: \"Overwrites\"\n" + "classname 12: \"Member\"\n" + "infoname 1: \"Attribute\"\n" + "infoname 2: \"Verification errors\"\n", + name, label, orientation); + + fprintf (F, "\n"); /* a separator */ } static void vcg_open (ir_graph *irg, char * suffix1, char *suffix2) { @@ -1590,7 +1695,7 @@ static void vcg_open (ir_graph *irg, char * suffix1, char *suffix2) { /** open file for vcg graph */ fname = malloc (len * 2 + strlen(suffix1) + strlen(suffix2) + 5); - //strncpy (fname, nm, len); /* copy the filename */ + /* strncpy (fname, nm, len); */ /* copy the filename */ j = 0; for (i = 0; i < len; ++i) { /* replase '/' in the name: escape by @. */ if (nm[i] == '/') { @@ -1620,7 +1725,7 @@ static void vcg_open_name (const char *name, char *suffix) { /** open file for vcg graph */ fname = malloc (len * 2 + 5 + strlen(suffix)); - //strcpy (fname, name); /* copy the filename */ + /* strcpy (fname, name);*/ /* copy the filename */ j = 0; for (i = 0; i < len; ++i) { /* replase '/' in the name: escape by @. */ if (name[i] == '/') { @@ -1670,7 +1775,7 @@ dump_ir_graph (ir_graph *irg) char *suffix; rem = current_ir_graph; - if(strncmp(get_irg_dump_name(irg),dump_file_filter,strlen(dump_file_filter))!=0) return; + if(strncmp(get_entity_name(get_irg_ent(irg)),dump_file_filter,strlen(dump_file_filter))!=0) return; current_ir_graph = irg; if (interprocedural_view) suffix = "-pure-ip"; @@ -1699,7 +1804,7 @@ dump_ir_block_graph (ir_graph *irg) int i; char *suffix; - if(strncmp(get_irg_dump_name(irg),dump_file_filter,strlen(dump_file_filter))!=0) return; + if(strncmp(get_entity_name(get_irg_ent(irg)),dump_file_filter,strlen(dump_file_filter))!=0) return; if (interprocedural_view) suffix = "-ip"; else suffix = ""; @@ -1806,12 +1911,12 @@ dump_block_to_cfg (ir_node *block, void *env) { /* Dump the edges */ for ( i = 0; i < get_Block_n_cfgpreds(block); i++) if (get_irn_op(skip_Proj(get_Block_cfgpred(block, i))) != op_Bad) { - pred = get_nodes_block(skip_Proj(get_Block_cfgpred(block, i))); - fprintf (F, "edge: { sourcename: \""); - PRINT_NODEID(block); - fprintf (F, "\" targetname: \""); - PRINT_NODEID(pred); - fprintf (F, "\"}\n"); + pred = get_nodes_block(skip_Proj(get_Block_cfgpred(block, i))); + fprintf (F, "edge: { sourcename: \""); + PRINT_NODEID(block); + fprintf (F, "\" targetname: \""); + PRINT_NODEID(pred); + fprintf (F, "\"}\n"); } /* Dump dominator edge */ @@ -1963,58 +2068,60 @@ void dump_all_ir_graphs (dump_graph_func *dmp_grph) { void dump_loops_standalone (ir_loop *loop) { - int i, loop_node_started = 0, son_number = 0, first = 0; + int i = 0, loop_node_started = 0, son_number = 0, first = 0; loop_element le; + ir_loop *son = NULL; /* Dump a new loop node. */ dump_loop_node(loop); /* Dump the loop elements. */ - for(i = 0; i < get_loop_n_elements(loop); i++) { - ir_loop *son; - - le = get_loop_element(loop, i); - - son = le.son; - if (get_kind(son) == k_ir_loop) { - /* We are a loop son -> Recurse */ - - if(loop_node_started) { /* Close the "firm-nodes" node first if we started one. */ - fprintf(F, "\" }\n"); - fprintf (F, "edge: {sourcename: \""); - PRINT_LOOPID(loop); - fprintf (F, "\" targetname: \""); - PRINT_LOOPID(loop); - fprintf (F, "-%d-nodes\" label:\"%d...%d\"}\n", first, first, i-1); - loop_node_started = 0; - } - dump_loop_son_edge(loop, son_number++); - dump_loops_standalone(son); - } - else { - /* We are a loop node -> Collect firm nodes */ - - ir_node *n = le.node; - if (!loop_node_started) { - /* Start a new node which contains all firm nodes of the current loop */ - fprintf (F, "node: { title: \""); - PRINT_LOOPID(loop); - fprintf (F, "-%d-nodes\" color: lightyellow label: \"", i); - loop_node_started = 1; - first = i; + for(i = 0; i < get_loop_n_elements(loop); i++) + { + le = get_loop_element(loop, i); + son = le.son; + if (get_kind(son) == k_ir_loop) { + + /* We are a loop son -> Recurse */ + + if(loop_node_started) { /* Close the "firm-nodes" node first if we started one. */ + fprintf(F, "\" }\n"); + fprintf (F, "edge: {sourcename: \""); + PRINT_LOOPID(loop); + fprintf (F, "\" targetname: \""); + PRINT_LOOPID(loop); + fprintf (F, "-%d-nodes\" label:\"%d...%d\"}\n", first, first, i-1); + loop_node_started = 0; + } + dump_loop_son_edge(loop, son_number++); + dump_loops_standalone(son); + } + else { + /* We are a loop node -> Collect firm nodes */ + + ir_node *n = le.node; + int bad = 0; + + if (!loop_node_started) { + /* Start a new node which contains all firm nodes of the current loop */ + fprintf (F, "node: { title: \""); + PRINT_LOOPID(loop); + fprintf (F, "-%d-nodes\" color: lightyellow label: \"", i); + loop_node_started = 1; + first = i; + } + else + fprintf(F, "\n"); + + bad |= dump_node_opcode(F, n); + bad |= dump_node_mode (n); + bad |= dump_node_typeinfo(n); + fprintf (F, " "); + bad |= dump_node_nodeattr(n); + fprintf (F, " %ld", get_irn_node_nr(n)); } - else - fprintf(F, "\n"); - - dump_node_opcode(F, n); - dump_node_mode (n); - dump_node_typeinfo(n); - fprintf (F, " "); - dump_node_nodeattr(n); - fprintf (F, " %ld", get_irn_node_nr(n)); } - } if (loop_node_started) { fprintf(F, "\" }\n"); @@ -2033,6 +2140,7 @@ void dump_loop_tree(ir_graph *irg, char *suffix) int el_rem = edge_label; edge_label = 1; + /* @@@ AS: What does that do? */ if(strncmp(get_irg_dump_name(irg),dump_file_filter,strlen(dump_file_filter))!=0) return; current_ir_graph = irg; @@ -2082,14 +2190,14 @@ void collect_nodeloop_external_nodes(ir_loop *loop, eset *loopnodes, eset *extno } else { if (is_Block(le.node)) start = 0; else start = -1; for (j = start; j < get_irn_arity(le.node); j++) { - ir_node *pred = get_irn_n(le.node, j); - if (!eset_contains(loopnodes, pred)) { - eset_insert(extnodes, pred); - if (!is_Block(pred)) { - pred = get_nodes_block(pred); - if (!eset_contains(loopnodes, pred)) eset_insert(extnodes, pred); + ir_node *pred = get_irn_n(le.node, j); + if (!eset_contains(loopnodes, pred)) { + eset_insert(extnodes, pred); + if (!is_Block(pred)) { + pred = get_nodes_block(pred); + if (!eset_contains(loopnodes, pred)) eset_insert(extnodes, pred); } - } + } } } } @@ -2141,10 +2249,10 @@ void dump_loop (ir_loop *l, char *suffix) { /* dump the nodes that go into the block */ for (n = get_irn_link(b); n; n = get_irn_link(n)) { - if (eset_contains(extnodes, n)) overrule_nodecolor = "lightblue"; - dump_node(n); - overrule_nodecolor = NULL; - if (!eset_contains(extnodes, n)) dump_ir_data_edges(n); + if (eset_contains(extnodes, n)) overrule_nodecolor = "lightblue"; + dump_node(n); + overrule_nodecolor = NULL; + if (!eset_contains(extnodes, n)) dump_ir_data_edges(n); } /* Close the vcg information for the block */ @@ -2163,10 +2271,10 @@ void dump_loop (ir_loop *l, char *suffix) { /* dump the nodes that go into the block */ for (n = get_irn_link(b); n; n = get_irn_link(n)) { - if (!eset_contains(loopnodes, n)) overrule_nodecolor = "lightblue"; - dump_node(n); - overrule_nodecolor = NULL; - if (eset_contains(loopnodes, n)) dump_ir_data_edges(n); + if (!eset_contains(loopnodes, n)) overrule_nodecolor = "lightblue"; + dump_node(n); + overrule_nodecolor = NULL; + if (eset_contains(loopnodes, n)) dump_ir_data_edges(n); } /* Close the vcg information for the block */