X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdumptxt.c;h=319747b717097d8b4688117af125d55c7d6447cd;hb=95ea45b6d9050f3638c68dda8c4fcc92a79c81ed;hp=5c0336d6001654289eaee09cb8dc87668ebb8de5;hpb=dd637b77e15fc74e573cc313966cf8670e57188d;p=libfirm diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c index 5c0336d60..319747b71 100644 --- a/ir/ir/irdumptxt.c +++ b/ir/ir/irdumptxt.c @@ -83,6 +83,7 @@ static FILE *text_open (const char *basename, const char * suffix1, const char * return F; } +/* Write the irnode and all its attributes to the file passed. */ int dump_irnode_to_file(FILE *F, ir_node *n) { int i, bad = 0; char comma; @@ -122,6 +123,9 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { fprintf(F, " Private Attributes:\n"); + if (get_irn_opcode(n) == iro_Proj) + fprintf(F, " proj nr: %ld\n", get_Proj_proj(n)); + if ((get_irp_ip_view_state() != ip_view_no) && (get_irn_opcode(n) == iro_Filter || get_irn_opcode(n) == iro_Block)) { fprintf(F, " inter arity: %d\n", get_irn_inter_arity(n)); @@ -177,15 +181,15 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { if (get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent) fprintf(F, " recursion depth of procedure: %8.2lf\n", (double)get_irn_recursion_depth(n)); if ((get_irg_exec_freq_state(get_irn_irg(n)) != exec_freq_none) && - (get_irp_loop_nesting_depth_state() != loop_nesting_depth_none) && - (get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent)) + (get_irp_loop_nesting_depth_state() != loop_nesting_depth_none) && + (get_irp_callgraph_state() == irp_callgraph_and_calltree_consistent)) fprintf(F, " final evaluation: **%8.2lf**\n", get_irn_final_cost(n)); /* not dumped: graph_arr */ /* not dumped: mature */ } break; case iro_Start: { - type *tp = get_entity_type(get_irg_entity(get_irn_irg(n))); + ir_type *tp = get_entity_type(get_irg_entity(get_irn_irg(n))); fprintf(F, " start of method of type %s \n", get_type_name_ex(tp, &bad)); for (i = 0; i < get_method_n_params(tp); ++i) fprintf(F, " param %d type: %s \n", i, get_type_name_ex(get_method_param_type(tp, i), &bad)); @@ -203,6 +207,8 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { 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)); + 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; case iro_Alloc: { fprintf(F, " allocating entity of type: %s \n", get_type_name_ex(get_Alloc_type(n), &bad)); @@ -210,14 +216,14 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { } break; case iro_Free: { fprintf(F, " freeing entity of type %s \n", get_type_name_ex(get_Free_type(n), &bad)); + fprintf(F, " allocated on: the %s\n", (get_Free_where(n) == stack_alloc) ? "stack" : "heap"); } break; case iro_Sel: { entity *ent = get_Sel_entity(n); - if (ent) { - fprintf(F, " Selecting entity of type %s\n", get_type_name_ex(get_entity_type(ent), &bad)); - fprintf(F, " from entity %s (%ld)\n", get_entity_name(ent), get_entity_nr(ent)); - fprintf(F, " of type %s\n", get_type_name_ex(get_entity_owner(ent), &bad)); + fprintf(F, " Selecting entity %s (%ld)\n", get_entity_name(ent), get_entity_nr(ent)); + fprintf(F, " of type %s\n", get_type_name_ex(get_entity_type(ent), &bad)); + fprintf(F, " with owner %s.\n", get_type_name_ex(get_entity_owner(ent), &bad)); } else { fprintf(F, " \n"); @@ -225,18 +231,18 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { } } break; case iro_Call: { - type *tp = get_Call_type(n); + ir_type *tp = get_Call_type(n); fprintf(F, " calling method of type %s \n", get_type_name_ex(tp, &bad)); if(get_unknown_type() != tp) { for (i = 0; i < get_method_n_params(tp); ++i) - fprintf(F, " param %d type: %s \n", i, get_type_name_ex(get_method_param_type(tp, i), &bad)); + fprintf(F, " param %d type: %s \n", i, get_type_name_ex(get_method_param_type(tp, i), &bad)); for (i = 0; i < get_method_n_ress(tp); ++i) - fprintf(F, " resul %d type: %s \n", i, get_type_name_ex(get_method_res_type(tp, i), &bad)); + fprintf(F, " resul %d type: %s \n", i, get_type_name_ex(get_method_res_type(tp, i), &bad)); } if (Call_has_callees(n)) { 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))); + fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(n, i))); } } } break; @@ -246,7 +252,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { if (Call_has_callees(call)) { fprintf(F, " possible callees: \n"); for (i = 0; i < get_Call_n_callees(call); i++) { - fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(call, i))); + fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(call, i))); } } } break; @@ -255,14 +261,14 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { } break; case iro_Return: { if (!get_interprocedural_view()) { - type *tp = get_entity_type(get_irg_entity(get_irn_irg(n))); + ir_type *tp = get_entity_type(get_irg_entity(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)); } } break; case iro_Const: { - type *tp = get_Const_type(n); + ir_type *tp = get_Const_type(n); assert(tp != firm_none_type); fprintf(F, " Const of type %s \n", get_type_name_ex(get_Const_type(n), &bad)); } break; @@ -354,7 +360,7 @@ int addr_is_alloc(ir_node *acc) { if (is_memop(acc)) { addr = get_memop_ptr(acc); } else { - assert(get_irn_op(acc) == op_Call); + assert(is_Call(acc)); addr = get_Call_ptr(acc); } @@ -432,9 +438,9 @@ static void dump_node_list(FILE *F, firm_kind *k, char *prefix, * "prefix" node8, ... node15,\n * "prefix" node16, node17\n */ -static void dump_type_list(FILE *F, type *tp, char *prefix, - int (*get_n_types)(type *tp), - type *(*get_type)(type *tp, int pos), +static void dump_type_list(FILE *F, ir_type *tp, char *prefix, + int (*get_n_types)(ir_type *tp), + ir_type *(*get_type)(ir_type *tp, int pos), char *name) { int i, n_nodes = get_n_types(tp); char *comma = ""; @@ -455,7 +461,7 @@ static void dump_type_list(FILE *F, type *tp, char *prefix, #define X(a) case a: fprintf(F, #a); break void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned verbosity) { int i, j; - type *owner, *type; + ir_type *owner, *type; assert(is_entity(ent)); owner = get_entity_owner(ent); @@ -473,42 +479,42 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned if (is_Class_type(get_entity_owner(ent))) { if (get_entity_n_overwrites(ent) > 0) { - fprintf(F, "%s overwrites:\n", prefix); - for (i = 0; i < get_entity_n_overwrites(ent); ++i) { - entity *ov = get_entity_overwrites(ent, i); - fprintf(F, "%s %d: %s of class %s\n", prefix, i, get_entity_name(ov), - get_type_name(get_entity_owner(ov))); - } + fprintf(F, "%s overwrites:\n", prefix); + for (i = 0; i < get_entity_n_overwrites(ent); ++i) { + entity *ov = get_entity_overwrites(ent, i); + fprintf(F, "%s %d: %s of class %s\n", prefix, i, get_entity_name(ov), + get_type_name(get_entity_owner(ov))); + } } else { - fprintf(F, "%s Does not overwrite other entities. \n", prefix); + fprintf(F, "%s Does not overwrite other entities. \n", prefix); } if (get_entity_n_overwrittenby(ent) > 0) { - fprintf(F, "%s overwritten by:\n", prefix); - for (i = 0; i < get_entity_n_overwrittenby(ent); ++i) { - entity *ov = get_entity_overwrittenby(ent, i); - fprintf(F, "%s %d: %s of class %s\n", prefix, i, get_entity_name(ov), - get_type_name(get_entity_owner(ov))); - } + fprintf(F, "%s overwritten by:\n", prefix); + for (i = 0; i < get_entity_n_overwrittenby(ent); ++i) { + entity *ov = get_entity_overwrittenby(ent, i); + fprintf(F, "%s %d: %s of class %s\n", prefix, i, get_entity_name(ov), + get_type_name(get_entity_owner(ov))); + } } else { - fprintf(F, "%s Is not overwritten by other entities. \n", prefix); + fprintf(F, "%s Is not overwritten by other entities. \n", prefix); } if (get_irp_inh_transitive_closure_state() != inh_transitive_closure_none) { - entity *ov; - fprintf(F, "%s transitive overwrites:\n", prefix); - for (ov = get_entity_trans_overwrites_first(ent); - ov; - ov = get_entity_trans_overwrites_next(ent)) { - fprintf(F, "%s : %s of class %s\n", prefix, get_entity_name(ov), - get_type_name(get_entity_owner(ov))); - } - fprintf(F, "%s transitive overwritten by:\n", prefix); - for (ov = get_entity_trans_overwrittenby_first(ent); - ov; - ov = get_entity_trans_overwrittenby_next(ent)) { - fprintf(F, "%s : %s of class %s\n", prefix, get_entity_name(ov), - get_type_name(get_entity_owner(ov))); - } + entity *ov; + fprintf(F, "%s transitive overwrites:\n", prefix); + for (ov = get_entity_trans_overwrites_first(ent); + ov; + ov = get_entity_trans_overwrites_next(ent)) { + fprintf(F, "%s : %s of class %s\n", prefix, get_entity_name(ov), + get_type_name(get_entity_owner(ov))); + } + fprintf(F, "%s transitive overwritten by:\n", prefix); + for (ov = get_entity_trans_overwrittenby_first(ent); + ov; + ov = get_entity_trans_overwrittenby_next(ent)) { + fprintf(F, "%s : %s of class %s\n", prefix, get_entity_name(ov), + get_type_name(get_entity_owner(ov))); + } } } @@ -534,6 +540,33 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned X(variability_part_constant); X(variability_constant); } + + if (is_Method_type(get_entity_type(ent))) { + unsigned mask = get_entity_additional_properties(ent); + unsigned cc = get_method_calling_convention(get_entity_type(ent)); + + 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, "); + } + fprintf(F, "\n%s calling convention: ", prefix); + if (cc & cc_reg_param) fprintf(F, "regparam, "); + if (cc & cc_this_call) fprintf(F, "thiscall, "); + if (IS_CDECL(cc)) + fprintf(F, "cdecl"); + else if (IS_STDCALL(cc)) + fprintf(F, "stdcall"); + 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"); + } + } + fprintf(F, "\n"); } else { /* no entattrs */ fprintf(F, "%s(%3d) %*s: %s", prefix, @@ -585,7 +618,7 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned fprintf(F, "\n%s peculiarity: %s", prefix, get_peculiarity_string(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", prefix, get_entity_offset_bits(ent)); + fprintf(F, "\n%s offset: %d bits, %d bytes", prefix, get_entity_offset_bits(ent), get_entity_offset_bytes(ent)); if (is_Method_type(get_entity_type(ent))) { if (get_entity_irg(ent)) /* can be null */ { fprintf(F, "\n%s irg = %ld", prefix, get_irg_graph_nr(get_entity_irg(ent))); @@ -639,21 +672,21 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned int depth = get_weighted_loop_depth(acc); assert(depth < max_depth); if ((get_irn_op(acc) == op_Load) || (get_irn_op(acc) == op_Call)) { - 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; - } + 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) { - S_freq[depth]++; - max_S_freq = (depth > max_S_freq) ? depth : max_S_freq; - if (addr_is_alloc(acc)) { - SA_freq[depth]++; - max_SA_freq = (depth > max_SA_freq) ? depth : max_SA_freq; - } + S_freq[depth]++; + max_S_freq = (depth > max_S_freq) ? depth : max_S_freq; + if (addr_is_alloc(acc)) { + SA_freq[depth]++; + max_SA_freq = (depth > max_SA_freq) ? depth : max_SA_freq; + } } else { - assert(0); + assert(0); } } @@ -662,11 +695,11 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned fprintf(F, "%s Load Stats", prefix); for (i = 0; i <= max_L_freq; ++i) { - if (L_freq[i]) - fprintf(F, "%c %d x L%d", comma, L_freq[i], i); - else - fprintf(F, " "); - comma = ','; + if (L_freq[i]) + fprintf(F, "%c %d x L%d", comma, L_freq[i], i); + else + fprintf(F, " "); + comma = ','; } fprintf(F, "\n"); } @@ -674,11 +707,11 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned //fprintf(F, "%s LoadA Stats", prefix); char comma = ':'; for (i = 0; i <= max_LA_freq; ++i) { - //if (LA_freq[i]) - //fprintf(F, "%c %d x LA%d", comma, LA_freq[i], i); - //else - //fprintf(F, " "); - comma = ','; + //if (LA_freq[i]) + //fprintf(F, "%c %d x LA%d", comma, LA_freq[i], i); + //else + //fprintf(F, " "); + comma = ','; } fprintf(F, "\n"); } @@ -687,11 +720,11 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned fprintf(F, "%s Store Stats", prefix); for (i = 0; i <= max_S_freq; ++i) { - if (S_freq[i]) - fprintf(F, "%c %d x S%d", comma, S_freq[i], i); - else - fprintf(F, " "); - comma = ','; + if (S_freq[i]) + fprintf(F, "%c %d x S%d", comma, S_freq[i], i); + else + fprintf(F, " "); + comma = ','; } fprintf(F, "\n"); } @@ -699,11 +732,11 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned //fprintf(F, "%s StoreAStats", prefix); char comma = ':'; for (i = 0; i <= max_SA_freq; ++i) { - //if (SA_freq[i]) - //fprintf(F, "%c %d x SA%d", comma, SA_freq[i], i); - //else - //fprintf(F, " "); - comma = ','; + //if (SA_freq[i]) + //fprintf(F, "%c %d x SA%d", comma, SA_freq[i], i); + //else + //fprintf(F, " "); + comma = ','; } fprintf(F, "\n"); } @@ -713,11 +746,11 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned #endif if (get_trouts_state() != outs_none) { if (is_Method_type(get_entity_type(ent))) { - fprintf(F, "%s Estimated #Calls: %lf\n", prefix, get_entity_estimated_n_calls(ent)); - fprintf(F, "%s Estimated #dynCalls: %lf\n", prefix, get_entity_estimated_n_calls(ent)); + fprintf(F, "%s Estimated #Calls: %lf\n", prefix, get_entity_estimated_n_calls(ent)); + fprintf(F, "%s Estimated #dynCalls: %lf\n", prefix, get_entity_estimated_n_calls(ent)); } else { - fprintf(F, "%s Estimated #Loads: %lf\n", prefix, get_entity_estimated_n_loads(ent)); - fprintf(F, "%s Estimated #Stores: %lf\n", prefix, get_entity_estimated_n_stores(ent)); + fprintf(F, "%s Estimated #Loads: %lf\n", prefix, get_entity_estimated_n_loads(ent)); + fprintf(F, "%s Estimated #Stores: %lf\n", prefix, get_entity_estimated_n_stores(ent)); } } } @@ -737,7 +770,7 @@ void dump_entity (entity *ent) { void dump_entitycsv_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned verbosity, int *max_disp, int disp[], const char *comma) { -#if 0 /* Outputs loop depth of all occurences. */ +#if 0 /* Outputs loop depth of all occurrences. */ int n_acc = get_entity_n_accesses(ent); int max_L_freq = -1; int max_S_freq = -1; @@ -770,22 +803,22 @@ void dump_entitycsv_to_file_prefix (FILE *F, entity *ent, char *prefix, unsig 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; + LA_freq[depth]++; + max_LA_freq = (depth > max_LA_freq) ? depth : max_LA_freq; } if (get_entity_allocation(ent) == allocation_static) { - disp[depth]++; - *max_disp = (depth > *max_disp) ? depth : *max_disp; + disp[depth]++; + *max_disp = (depth > *max_disp) ? depth : *max_disp; } } else if (get_irn_op(acc) == op_Store) { S_freq[depth]++; max_S_freq = (depth > max_S_freq) ? depth : max_S_freq; if (addr_is_alloc(acc)) { - SA_freq[depth]++; - max_SA_freq = (depth > max_SA_freq) ? depth : max_SA_freq; + SA_freq[depth]++; + max_SA_freq = (depth > max_SA_freq) ? depth : max_SA_freq; } if (get_entity_allocation(ent) == allocation_static) { - assert(0); + assert(0); } } else { assert(0); @@ -822,11 +855,11 @@ void dump_entitycsv_to_file_prefix (FILE *F, entity *ent, char *prefix, unsig if (get_trouts_state() != outs_none) { if (is_Method_type(get_entity_type(ent))) { - //fprintf(F, "%s Estimated #Calls: %lf\n", prefix, get_entity_estimated_n_calls(ent)); - //fprintf(F, "%s Estimated #dynCalls: %lf\n", prefix, get_entity_estimated_n_calls(ent)); + //fprintf(F, "%s Estimated #Calls: %lf\n", prefix, get_entity_estimated_n_calls(ent)); + //fprintf(F, "%s Estimated #dynCalls: %lf\n", prefix, get_entity_estimated_n_calls(ent)); } else { - fprintf(F, "%6.2lf ", get_entity_estimated_n_loads(ent)); - fprintf(F, "%6.2lf", get_entity_estimated_n_stores(ent)); + fprintf(F, "%6.2lf ", get_entity_estimated_n_loads(ent)); + fprintf(F, "%6.2lf", get_entity_estimated_n_stores(ent)); } } @@ -835,14 +868,14 @@ void dump_entitycsv_to_file_prefix (FILE *F, entity *ent, char *prefix, unsig } /* A fast hack to dump a csv. */ -void dump_typecsv_to_file(FILE *F, type *tp, dump_verbosity verbosity, const char *comma) { +void dump_typecsv_to_file(FILE *F, ir_type *tp, dump_verbosity verbosity, const char *comma) { int i; char buf[1024 + 10]; if (!is_Class_type(tp)) return; // we also want array types. Stupid, these are classes in java. if (verbosity & dump_verbosity_accessStats) { -#if 0 /* Outputs loop depth of all occurences. */ +#if 0 /* Outputs loop depth of all occurrences. */ int max_freq = -1; int max_disp = -1; int *freq, *disp; /* Accumulated accesses to static members: dispatch table. */ @@ -881,10 +914,10 @@ void dump_typecsv_to_file(FILE *F, type *tp, dump_verbosity verbosity, const cha for (i = 0; i < get_class_n_members(tp); ++i) { entity *mem = get_class_member(tp, i); if (((verbosity & dump_verbosity_methods) && is_Method_type(get_entity_type(mem))) || - ((verbosity & dump_verbosity_fields) && !is_Method_type(get_entity_type(mem))) ) { - if (!((verbosity & dump_verbosity_nostatic) && (get_entity_allocation(mem) == allocation_static))) { - dump_entitycsv_to_file_prefix(F, mem, " ", verbosity, &max_disp, disp, comma); - } + ((verbosity & dump_verbosity_fields) && !is_Method_type(get_entity_type(mem))) ) { + if (!((verbosity & dump_verbosity_nostatic) && (get_entity_allocation(mem) == allocation_static))) { + dump_entitycsv_to_file_prefix(F, mem, " ", verbosity, &max_disp, disp, comma); + } } } @@ -911,16 +944,16 @@ void dump_typecsv_to_file(FILE *F, type *tp, dump_verbosity verbosity, const cha for (i = 0; i < get_class_n_members(tp); ++i) { entity *mem = get_class_member(tp, i); if (((verbosity & dump_verbosity_methods) && is_Method_type(get_entity_type(mem))) || - ((verbosity & dump_verbosity_fields) && !is_Method_type(get_entity_type(mem))) ) { - if (!((verbosity & dump_verbosity_nostatic) && (get_entity_allocation(mem) == allocation_static))) { - dump_entitycsv_to_file_prefix(F, mem, " ", verbosity, NULL, 0, 0); - } + ((verbosity & dump_verbosity_fields) && !is_Method_type(get_entity_type(mem))) ) { + if (!((verbosity & dump_verbosity_nostatic) && (get_entity_allocation(mem) == allocation_static))) { + dump_entitycsv_to_file_prefix(F, mem, " ", verbosity, NULL, 0, 0); + } } } } } -void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { +void dump_type_to_file (FILE *F, ir_type *tp, dump_verbosity verbosity) { int i; if ((is_Class_type(tp)) && (verbosity & dump_verbosity_noClassTypes)) return; @@ -944,38 +977,38 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { for (i = 0; i < get_class_n_members(tp); ++i) { entity *mem = get_class_member(tp, i); if (((verbosity & dump_verbosity_methods) && is_Method_type(get_entity_type(mem))) || - ((verbosity & dump_verbosity_fields) && !is_Method_type(get_entity_type(mem))) ) { - if (!((verbosity & dump_verbosity_nostatic) && (get_entity_allocation(mem) == allocation_static))) { - dump_entity_to_file_prefix(F, mem, " ", verbosity); - } + ((verbosity & dump_verbosity_fields) && !is_Method_type(get_entity_type(mem))) ) { + if (!((verbosity & dump_verbosity_nostatic) && (get_entity_allocation(mem) == allocation_static))) { + dump_entity_to_file_prefix(F, mem, " ", verbosity); + } } } if (verbosity & dump_verbosity_typeattrs) { fprintf(F, " supertypes: "); for (i = 0; i < get_class_n_supertypes(tp); ++i) { - type *stp = get_class_supertype(tp, i); + ir_type *stp = get_class_supertype(tp, i); fprintf(F, "\n %s", get_type_name(stp)); } fprintf(F, "\n subtypes: "); for (i = 0; i < get_class_n_subtypes(tp); ++i) { - type *stp = get_class_subtype(tp, i); + ir_type *stp = get_class_subtype(tp, i); fprintf(F, "\n %s", get_type_name(stp)); } if (get_irp_inh_transitive_closure_state() != inh_transitive_closure_none) { - type *stp; - fprintf(F, "\n transitive supertypes: "); - for (stp = get_class_trans_supertype_first(tp); - stp; - stp = get_class_trans_supertype_next(tp)) { - fprintf(F, "\n %s", get_type_name(stp)); - } - fprintf(F, "\n transitive subtypes: "); - for (stp = get_class_trans_subtype_first(tp); - stp; - stp = get_class_trans_subtype_next(tp)) { - fprintf(F, "\n %s", get_type_name(stp)); - } + ir_type *stp; + fprintf(F, "\n transitive supertypes: "); + for (stp = get_class_trans_supertype_first(tp); + stp; + stp = get_class_trans_supertype_next(tp)) { + fprintf(F, "\n %s", get_type_name(stp)); + } + fprintf(F, "\n transitive subtypes: "); + for (stp = get_class_trans_subtype_first(tp); + stp; + stp = get_class_trans_subtype_next(tp)) { + fprintf(F, "\n %s", get_type_name(stp)); + } } fprintf(F, "\n peculiarity: %s\n", get_peculiarity_string(get_class_peculiarity(tp))); @@ -997,7 +1030,7 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { case tpo_array: if (verbosity & dump_verbosity_typeattrs) { int i, n_dim; - type *elem_tp = get_array_element_type(tp); + ir_type *elem_tp = get_array_element_type(tp); fprintf(F, "\n array "); @@ -1041,7 +1074,7 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { case tpo_pointer: if (verbosity & dump_verbosity_typeattrs) { - type *tt = get_pointer_points_to_type(tp); + ir_type *tt = get_pointer_points_to_type(tp); fprintf(F, "\n points to %s (%ld)\n", get_type_name(tt), get_type_nr(tt)); } break; @@ -1051,13 +1084,13 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { fprintf(F, "\n variadicity: %s", get_variadicity_name(get_method_variadicity(tp))); fprintf(F, "\n return types: %d", get_method_n_ress(tp)); for (i = 0; i < get_method_n_ress(tp); ++i) { - type *rtp = get_method_res_type(tp, i); + ir_type *rtp = get_method_res_type(tp, i); fprintf(F, "\n %s", get_type_name(rtp)); } fprintf(F, "\n parameter types: %d", get_method_n_params(tp)); for (i = 0; i < get_method_n_params(tp); ++i) { - type *ptp = get_method_param_type(tp, i); + ir_type *ptp = get_method_param_type(tp, i); fprintf(F, "\n %s", get_type_name(ptp)); } if (get_method_variadicity(tp)) { @@ -1086,7 +1119,6 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { fprintf(F, " alignment: %2d Bits,\n", get_type_alignment_bits(tp)); if (is_atomic_type(tp) || is_Method_type(tp)) fprintf(F, " mode: %s,\n", get_mode_name(get_type_mode(tp))); - fprintf(F, " dbg info: %p,\n", (void *)get_type_dbg_info(tp)); if (get_trouts_state()) { fprintf(F, "\n Type outs:\n"); @@ -1139,10 +1171,10 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { if (get_trouts_state() != outs_none) { fprintf(F, " Estimated #Instances: %lf\n", get_type_estimated_n_instances(tp)); if (is_Class_type(tp) && (get_irp_typeinfo_state() != ir_typeinfo_none)) { - fprintf(F, " Estimated #dyn Calls: %lf\n", get_class_estimated_n_dyncalls(tp)); - fprintf(F, " Estimated #Upcasts: %lf (#CastOps: %d)\n", get_class_estimated_n_upcasts(tp), get_class_n_upcasts(tp)); - fprintf(F, " Estimated #Downcasts: %lf (#CastOps: %d)\n", get_class_estimated_n_downcasts(tp), get_class_n_downcasts(tp)); - assert(get_class_n_upcasts(tp) + get_class_n_downcasts(tp) == get_type_n_casts(tp)); + fprintf(F, " Estimated #dyn Calls: %lf\n", get_class_estimated_n_dyncalls(tp)); + fprintf(F, " Estimated #Upcasts: %lf (#CastOps: %d)\n", get_class_estimated_n_upcasts(tp), get_class_n_upcasts(tp)); + fprintf(F, " Estimated #Downcasts: %lf (#CastOps: %d)\n", get_class_estimated_n_downcasts(tp), get_class_n_downcasts(tp)); + assert(get_class_n_upcasts(tp) + get_class_n_downcasts(tp) == get_type_n_casts(tp)); } } @@ -1151,7 +1183,7 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { fprintf(F, "\n\n"); } -void dump_type(type *tp) { +void dump_type(ir_type *tp) { dump_type_to_file (stdout, tp, dump_verbosity_max); } @@ -1170,7 +1202,7 @@ void dump_types_as_text(unsigned verbosity, const char *suffix) { } for (i = 0; i < n_types; ++i) { - type *t = get_irp_type(i); + ir_type *t = get_irp_type(i); //if (is_jack_rts_class(t)) continue; @@ -1188,7 +1220,7 @@ void dump_types_as_text(unsigned verbosity, const char *suffix) { void dump_globals_as_text(unsigned verbosity, const char *suffix) { const char *basename; FILE *F, *CSV = NULL; - type *g = get_glob_type(); + ir_type *g = get_glob_type(); int i, n_mems = get_class_n_members(g); basename = irp_prog_name_is_set() ? get_irp_prog_name() : "TextGlobals";