X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdumptxt.c;h=6d2bceae440fe63ea6257af98c8dc46b16cb52b9;hb=94ad692c1439dc0b3f48e1d2de3bf662916d7343;hp=15eae46dfd46c4f3d4af5631beb4aa6de45de678;hpb=f9d25133f86594ca2b1f33fb0b41a591ecc9b914;p=libfirm diff --git a/ir/ir/irdumptxt.c b/ir/ir/irdumptxt.c index 15eae46df..6d2bceae4 100644 --- a/ir/ir/irdumptxt.c +++ b/ir/ir/irdumptxt.c @@ -1,13 +1,27 @@ /* - * Project: libFIRM - * File name: ir/ir/irdumptxt.c - * Purpose: Write vcg representation of firm to file. - * Author: Martin Trapp, Christian Schaefer - * Modified by: Goetz Lindenmaier, Hubert Schmidt - * Created: - * CVS-ID: $Id$ - * Copyright: (c) 1998-2003 Universität Karlsruhe - * Licence: This file protected by GPL - GNU GENERAL PUBLIC LICENSE. + * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * + * This file is part of libFirm. + * + * This file may be distributed and/or modified under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation and appearing in the file LICENSE.GPL included in the + * packaging of this file. + * + * Licensees holding valid libFirm Professional Edition licenses may use + * this file in accordance with the libFirm Commercial License. + * Agreement provided with the Software. + * + * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. + */ + +/** + * @file + * @brief Write vcg representation of firm to file. + * @author Martin Trapp, Christian Schaefer, Goetz Lindenmaier, Hubert Schmidt + * @version $Id$ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -38,15 +52,17 @@ #define MY_SIZE 1024 /* Size of an array that actually should be computed. */ -/* Just opens a file, mangling a file name. +/** + * Just opens a file, mangling a file name. * - * The name consists of the following parts: - * - * @arg basename The basis of the name telling about the content. - * @arg + * The file name results from the concatenation of the following parts: * + * @param basename The basis of the name telling about the content. + * @param suffix1 The first suffix. + * @param suffix2 The second suffix. + * @param suffix3 The third suffix. */ -static FILE *text_open (const char *basename, const char * suffix1, const char *suffix2, const char *suffix3) { +static FILE *text_open(const char *basename, const char * suffix1, const char *suffix2, const char *suffix3) { FILE *F; int len = strlen(basename), i, j; char *fname; /* filename to put the vcg information in */ @@ -57,7 +73,7 @@ static FILE *text_open (const char *basename, const char * suffix1, const char * if (!suffix3) suffix3 = ".txt"; /* open file for vcg graph */ - fname = malloc (strlen(basename)*2 + strlen(suffix1) + strlen(suffix2) + 5); /* *2: space for excapes. */ + fname = xmalloc(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 @. */ @@ -70,12 +86,13 @@ static FILE *text_open (const char *basename, const char * suffix1, const char * } } fname[j] = '\0'; - strcat (fname, suffix1); /* append file suffix */ - strcat (fname, suffix2); /* append file suffix */ - strcat (fname, suffix3); /* append the .txt suffix */ + strcat(fname, suffix1); /* append file suffix */ + strcat(fname, suffix2); /* append file suffix */ + strcat(fname, suffix3); /* append the .txt suffix */ - F = fopen (fname, "w"); /* open file for writing */ + F = fopen(fname, "w"); /* open file for writing */ if (!F) { + perror(fname); assert(0); } free(fname); @@ -92,6 +109,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { dump_node_opcode(F, n); fprintf(F, " %ld\n", get_irn_node_nr(n)); + fprintf(F, " index: %u\n", get_irn_idx(n)); 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))); @@ -189,7 +207,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { /* 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)); @@ -219,7 +237,7 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { 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); + ir_entity *ent = get_Sel_entity(n); if (ent) { 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)); @@ -231,7 +249,7 @@ 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) @@ -261,14 +279,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; @@ -283,16 +301,30 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { fprintf(F, " entity: "); dump_entity_to_file(F, get_SymConst_entity(n), dump_verbosity_onlynames); break; + case symconst_ofs_ent: + fprintf(F, " kind: offset\n"); + fprintf(F, " entity: "); + dump_entity_to_file(F, get_SymConst_entity(n), dump_verbosity_onlynames); + break; case symconst_type_tag: fprintf(F, " kind: type_tag\n"); fprintf(F, " type: "); dump_type_to_file(F, get_SymConst_type(n), dump_verbosity_onlynames); break; - case symconst_size: + case symconst_type_size: fprintf(F, " kind: size\n"); fprintf(F, " type: "); dump_type_to_file(F, get_SymConst_type(n), dump_verbosity_onlynames); break; + case symconst_type_align: + fprintf(F, " kind: alignment\n"); + fprintf(F, " type: "); + dump_type_to_file(F, get_SymConst_type(n), dump_verbosity_onlynames); + break; + case symconst_enum_const: + fprintf(F, " kind: enumeration\n"); + fprintf(F, " name: %s\n", get_enumeration_name(get_SymConst_enum(n))); + break; } fprintf(F, " type of value: %s \n", get_type_name_ex(get_SymConst_value_type(n), &bad)); } break; @@ -306,6 +338,9 @@ int dump_irnode_to_file(FILE *F, ir_node *n) { case iro_Confirm: fprintf(F, " compare operation: %s\n", get_pnc_string(get_Confirm_cmp(n))); break; + case iro_ASM: + fprintf(F, " assembler text: %s\n", get_ASM_text(n)); + break; default: ; } @@ -356,11 +391,11 @@ void dump_graph_as_text(ir_graph *irg, const char *suffix) { int addr_is_alloc(ir_node *acc) { ir_node *addr = NULL; - opcode addr_op; + ir_opcode addr_op; 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); } @@ -418,7 +453,7 @@ static void dump_node_list(FILE *F, firm_kind *k, char *prefix, fprintf(F, "%s %s (%d):", prefix, name, n_nodes); for (i = 0; i < n_nodes; ++i) { int rem; - if (i > 7 && !(i & 7)) { /* line break every eigth node. */ + if (i > 7 && !(i & 7)) { /* line break every eight node. */ fprintf(F, ",\n%s ", prefix); comma = ""; } @@ -438,16 +473,16 @@ 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 = ""; fprintf(F, "%s %s (%d):", prefix, name, n_nodes); for (i = 0; i < n_nodes; ++i) { - if (i > 7 && !(i & 7)) { /* line break every eigth node. */ + if (i > 7 && !(i & 7)) { /* line break every eight node. */ fprintf(F, ",\n%s ", prefix); comma = ""; } @@ -458,10 +493,9 @@ static void dump_type_list(FILE *F, type *tp, char *prefix, fprintf(F, "\n"); } -#define X(a) case a: fprintf(F, #a); break -void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned verbosity) { +void dump_entity_to_file_prefix (FILE *F, ir_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); @@ -481,7 +515,7 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned 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); + ir_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))); } @@ -491,7 +525,7 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned 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); + ir_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))); } @@ -500,7 +534,7 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned } if (get_irp_inh_transitive_closure_state() != inh_transitive_closure_none) { - entity *ov; + ir_entity *ov; fprintf(F, "%s transitive overwrites:\n", prefix); for (ov = get_entity_trans_overwrites_first(ent); ov; @@ -518,59 +552,48 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned } } - fprintf(F, "%s allocation: ", prefix); - switch (get_entity_allocation(ent)) { - X(allocation_dynamic); - X(allocation_automatic); - X(allocation_static); - X(allocation_parameter); - } - - fprintf(F, "\n%s visibility: ", prefix); - switch (get_entity_visibility(ent)) { - X(visibility_local); - X(visibility_external_visible); - X(visibility_external_allocated); - } - - fprintf(F, "\n%s variability: ", prefix); - switch (get_entity_variability(ent)) { - X(variability_uninitialized); - X(variability_initialized); - X(variability_part_constant); - X(variability_constant); - } + fprintf(F, "%s allocation: %s", prefix, get_allocation_name(get_entity_allocation(ent))); + fprintf(F, "\n%s visibility: %s", prefix, get_visibility_name(get_entity_visibility(ent))); + fprintf(F, "\n%s variability: %s", prefix, get_variability_name(get_entity_variability(ent))); if (is_Method_type(get_entity_type(ent))) { unsigned mask = get_entity_additional_properties(ent); - unsigned cc = get_entity_calling_convention(ent); + unsigned cc = get_method_calling_convention(get_entity_type(ent)); + ir_graph *irg = get_entity_irg(ent); + + if (irg) { + fprintf(F, "\n%s estimated node count: %u", prefix, get_irg_estimated_node_cnt(irg)); + fprintf(F, "\n%s maximum node index: %u", prefix, get_irg_last_idx(irg)); + } if (mask) { fprintf(F, "\n%s additional prop: ", prefix); - if (mask & irg_const_function) fprintf(F, "const_function, "); - if (mask & irg_pure_function) fprintf(F, "pure_function, "); - if (mask & irg_noreturn_function) fprintf(F, "noreturn_function, "); - if (mask & irg_nothrow_function) fprintf(F, "nothrow_function, "); - if (mask & irg_naked_function) fprintf(F, "naked_function, "); + 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 & irg_cc_reg_param) fprintf(F, "regparam, "); - if (cc & irg_cc_this_call) fprintf(F, "thiscall, "); - if ((cc & (irg_cc_last_on_top|irg_cc_callee_clear_stk)) == 0) + 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 ((cc & (irg_cc_last_on_top|irg_cc_callee_clear_stk)) == (irg_cc_last_on_top|irg_cc_callee_clear_stk)) + else if (IS_STDCALL(cc)) fprintf(F, "stdcall"); else { - fprintf(F, (cc & irg_cc_last_on_top) ? "last param on top, " : "first param on top, "); - fprintf(F, (cc & irg_cc_callee_clear_stk) ? "callee clear stack" : "caller clear stack"); + 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%s vtable number: %u", prefix, get_entity_vtable_number(ent)); } fprintf(F, "\n"); } else { /* no entattrs */ - fprintf(F, "%s(%3d) %*s: %s", prefix, - get_entity_offset_bits(ent), -40, get_type_name(get_entity_type(ent)), get_entity_name(ent)); + 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 (verbosity & dump_verbosity_accessStats) { @@ -590,13 +613,13 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned fprintf(F, "%s compound values:", prefix); for (i = 0; i < get_compound_ent_n_values(ent); ++i) { compound_graph_path *path = get_compound_ent_value_path(ent, i); - entity *ent0 = get_compound_graph_path_node(path, 0); - fprintf(F, "\n%s %3d ", prefix, get_entity_offset_bits(ent0)); + 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, "(%3d) ", get_compound_ent_value_offset_bits(ent, i)); + fprintf(F, "(%3d:%d) ", 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) { - entity *node = get_compound_graph_path_node(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, "[%d]", get_compound_graph_path_array_index(path, j)); @@ -610,15 +633,10 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned } if (verbosity & dump_verbosity_entattrs) { - fprintf(F, "%s volatility: ", prefix); - switch (get_entity_volatility(ent)) { - X(volatility_non_volatile); - X(volatility_is_volatile); - } - - fprintf(F, "\n%s peculiarity: %s", prefix, get_peculiarity_string(get_entity_peculiarity(ent))); + fprintf(F, "%s volatility: %s", prefix, get_volatility_name(get_entity_volatility(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 bits, %d bytes", prefix, get_entity_offset_bits(ent), get_entity_offset_bytes(ent)); + fprintf(F, "\n%s offset: %d bytes, %d rem bits", prefix, get_entity_offset(ent), get_entity_offset_bits_remainder(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))); @@ -756,18 +774,17 @@ void dump_entity_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned } } -#undef X -void dump_entity_to_file (FILE *F, entity *ent, unsigned verbosity) { +void dump_entity_to_file (FILE *F, ir_entity *ent, unsigned verbosity) { dump_entity_to_file_prefix (F, ent, "", verbosity); fprintf(F, "\n"); } -void dump_entity (entity *ent) { +void dump_entity (ir_entity *ent) { dump_entity_to_file(stdout, ent, dump_verbosity_max); } -void dump_entitycsv_to_file_prefix (FILE *F, entity *ent, char *prefix, unsigned verbosity, +void dump_entitycsv_to_file_prefix (FILE *F, ir_entity *ent, char *prefix, unsigned verbosity, int *max_disp, int disp[], const char *comma) { #if 0 /* Outputs loop depth of all occurrences. */ @@ -867,8 +884,8 @@ 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) { +/* A fast hack to dump a CSV-file. */ +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. @@ -912,7 +929,7 @@ void dump_typecsv_to_file(FILE *F, type *tp, dump_verbosity verbosity, const cha fprintf(F, "\n"); for (i = 0; i < get_class_n_members(tp); ++i) { - entity *mem = get_class_member(tp, i); + ir_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))) { @@ -942,7 +959,7 @@ 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); + ir_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))) { @@ -953,7 +970,7 @@ void dump_typecsv_to_file(FILE *F, type *tp, dump_verbosity verbosity, const cha } } -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; @@ -975,7 +992,7 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { fprintf(F, "\n members: \n"); } for (i = 0; i < get_class_n_members(tp); ++i) { - entity *mem = get_class_member(tp, i); + ir_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))) { @@ -986,17 +1003,17 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity 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); - fprintf(F, "\n %s", get_type_name(stp)); + ir_type *stp = get_class_supertype(tp, i); + fprintf(F, "\n %d %s", i, 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); - fprintf(F, "\n %s", get_type_name(stp)); + ir_type *stp = get_class_subtype(tp, i); + fprintf(F, "\n %d %s", i, get_type_name(stp)); } if (get_irp_inh_transitive_closure_state() != inh_transitive_closure_none) { - type *stp; + ir_type *stp; fprintf(F, "\n transitive supertypes: "); for (stp = get_class_trans_supertype_first(tp); stp; @@ -1011,8 +1028,15 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { } } - fprintf(F, "\n peculiarity: %s\n", get_peculiarity_string(get_class_peculiarity(tp))); - + fprintf(F, "\n peculiarity: %s\n", get_peculiarity_name(get_class_peculiarity(tp))); + fprintf(F, "\n flags: "); + if (is_class_final(tp)) + fprintf(F, "final, "); + if (is_class_interface(tp)) + fprintf(F, "interface, "); + if (is_class_abstract(tp)) + fprintf(F, "abstract, "); + fprintf(F, "\n"); } break; @@ -1020,7 +1044,7 @@ void dump_type_to_file (FILE *F, type *tp, dump_verbosity verbosity) { case tpo_struct: if (verbosity & dump_verbosity_fields) fprintf(F, "\n members: "); for (i = 0; i < get_compound_n_members(tp); ++i) { - entity *mem = get_compound_member(tp, i); + ir_entity *mem = get_compound_member(tp, i); if (verbosity & dump_verbosity_fields) { dump_entity_to_file_prefix(F, mem, " ", verbosity); } @@ -1030,7 +1054,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 "); @@ -1074,7 +1098,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; @@ -1084,13 +1108,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)) { @@ -1183,7 +1207,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); } @@ -1194,15 +1218,15 @@ void dump_types_as_text(unsigned verbosity, const char *suffix) { int i, n_types = get_irp_n_types(); basename = irp_prog_name_is_set() ? get_irp_prog_name() : "TextTypes"; - F = text_open (basename, suffix, "-types", ".txt"); + F = text_open(basename, suffix, "-types", ".txt"); if (verbosity & dump_verbosity_csv) { - CSV = text_open (basename, suffix, "-types", ".csv"); + CSV = text_open(basename, suffix, "-types", ".csv"); //fprintf(CSV, "Class, Field, Operation, L0, L1, L2, L3\n"); } 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; @@ -1212,15 +1236,15 @@ void dump_types_as_text(unsigned verbosity, const char *suffix) { } } - fclose (F); - if (CSV) fclose (CSV); + fclose(F); + if (CSV) fclose(CSV); } 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"; @@ -1232,7 +1256,7 @@ void dump_globals_as_text(unsigned verbosity, const char *suffix) { } for (i = 0; i < n_mems; ++i) { - entity *e = get_class_member(g, i); + ir_entity *e = get_class_member(g, i); dump_entity_to_file(F, e, verbosity); if (CSV) {