X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fir%2Firdump.c;h=48b9e4a17df8b55d69612f5688053555b3a379f5;hb=fc7e44183102c47e31152fc136a35034c1820873;hp=22b31a50d420010fa5dbc07e7956f501f2416cf7;hpb=c80c368f7ae4222880121ed11c78ecd4cc5dec18;p=libfirm diff --git a/ir/ir/irdump.c b/ir/ir/irdump.c index 22b31a50d..48b9e4a17 100644 --- a/ir/ir/irdump.c +++ b/ir/ir/irdump.c @@ -23,7 +23,7 @@ #include "entity_t.h" #include "irop_t.h" -#include "irdump.h" +#include "irdump_t.h" #include "irgwalk.h" #include "typewalk.h" @@ -49,87 +49,40 @@ typedef unsigned long SeqNo; SeqNo get_Block_seqno(ir_node *n); #endif -/* Attributes of nodes */ -#define PRINT_DEFAULT_NODE_ATTR -#define DEFAULT_NODE_ATTR " " -#define DEFAULT_TYPE_ATTRIBUTE " " -#define DEFAULT_ENUM_ITEM_ATTRIBUTE " " - -/* Attributes of edges between Firm nodes */ -#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 " - -/* Attributes of edges between Firm nodes and type/entity nodes */ -#define NODE2TYPE_EDGE_ATTR "class:2 priority:2 linestyle:dotted" - -/* Attributes of edges in type/entity graphs. */ -#define TYPE_METH_NODE_ATTR "color: lightyellow" -#define TYPE_CLASS_NODE_ATTR "color: green" -#define TYPE_DESCRIPTION_NODE_ATTR "color: lightgreen" -#define ENTITY_NODE_ATTR "color: yellow" -#define ENT_TYPE_EDGE_ATTR "class: 3 label: \"type\" color: red" -#define ENT_OWN_EDGE_ATTR "class: 4 label: \"owner\" color: black" -#define METH_PAR_EDGE_ATTR "class: 5 label: \"param %d\" color: green" -#define METH_RES_EDGE_ATTR "class: 6 label: \"res %d\" color: green" -#define TYPE_SUPER_EDGE_ATTR "class: 7 label: \"supertype\" color: red" -#define UNION_EDGE_ATTR "class: 8 label: \"component\" color: blue" -#define PTR_PTS_TO_EDGE_ATTR "class: 9 label: \"points to\" color:green" -#define ARR_ELT_TYPE_EDGE_ATTR "class: 10 label: \"arr elt tp\" color:green" -#define ARR_ENT_EDGE_ATTR "class: 10 label: \"arr ent\" color: green" -#define ENT_OVERWRITES_EDGE_ATTR "class: 11 label: \"overwrites\" color:red" -#define ENT_VALUE_EDGE_ATTR "label: \"value %d\"" -#define ENT_CORR_EDGE_ATTR "label: \"value %d corresponds to \" " -#define TYPE_MEMBER_EDGE_ATTR "class: 12 label: \"member\" color:blue" -#define ENUM_ITEM_NODE_ATTR "color: green" -#define CALLGRAPH_EDGE_ATTR "calls" - -#if DEBUG_libfirm && NODEID_AS_LABEL -#define PRINT_NODEID(X) fprintf(F, "n%ld", get_irn_node_nr(X)) -#define PRINT_TYPEID(X) fprintf(F, "\"t%ld\"", get_type_nr(X)) -#define PRINT_ENTID(X) fprintf(F, "e%ld", get_entity_nr(X)) -#define PRINT_IRGID(X) fprintf(F, "g%ld", get_irg_graph_nr(X)) -#define PRINT_CONSTID(X,Y) fprintf(F, "\"n%ldn%ld\"", get_irn_node_nr(X),get_irn_node_nr(Y)) -#define PRINT_LOOPID(X) fprintf(F, "l%d", get_loop_loop_nr(X)) -#define PRINT_ITEMID(X,Y) fprintf(F, "i%ldT%d", get_type_nr(X), (Y)) - -#else -#define PRINT_NODEID(X) fprintf(F, "n%p", (void *)(X)) -#define PRINT_TYPEID(X) fprintf(F, "\"t%p\"", (void *)(X)) -#define PRINT_ENTID(X) fprintf(F, "e%p", (void *)(X)) -#define PRINT_IRGID(X) fprintf(F, "g%p",(void *)(X)) -#define PRINT_CONSTID(X,Y) fprintf(F, "\"n%pn%p\"", (void*)(X), (void*)(Y)) -#define PRINT_LOOPID(X) fprintf(F, "l%p", (void *)(X)) -#define PRINT_ITEMID(X,Y) fprintf(F, "i%pT%d", (void *) (X), (Y)) -#endif - - /* basis for a color range for vcg */ static int n_colors = 0; static int base_color = 0; +#define ERROR_TXT "" + +/** + * returns the name of a mode or if mode is NOT a mode object. + * in the later case, sets bad + */ static const char *get_mode_name_ex(ir_mode *mode, int *bad) { if (is_mode(mode)) return get_mode_name(mode); *bad |= 1; - return ""; + return ERROR_TXT; } +/** + * returns the name of a type or if mode is NOT a mode object. + * in the later case, sets bad + */ static const char *get_type_name_ex(type *tp, int *bad) { if (is_type(tp)) return get_type_name(tp); *bad |= 1; - return ""; + return ERROR_TXT; } +/** + * prints the edge from a type S to a type T with additional info fmt, ... + * to the file F + */ static void print_type_type_edge(FILE *F, type *S, type *T, const char *fmt, ...) { va_list ap; @@ -142,6 +95,10 @@ static void print_type_type_edge(FILE *F, type *S, type *T, const char *fmt, ... va_end(ap); } +/** + * prints the edge from a type T to an entity E with additional info fmt, ... + * to the file F + */ static void print_type_ent_edge(FILE *F, type *T, entity *E, const char *fmt, ...) { va_list ap; @@ -154,6 +111,10 @@ static void print_type_ent_edge(FILE *F, type *T, entity *E, const char *fmt, .. va_end(ap); } +/** + * prints the edge from an entity E to an entity T with additional info fmt, ... + * to the file F + */ static void print_ent_ent_edge(FILE *F, entity *E, entity *T, int backedge, const char *fmt, ...) { va_list ap; @@ -170,6 +131,10 @@ static void print_ent_ent_edge(FILE *F, entity *E, entity *T, int backedge, cons va_end(ap); } +/** + * prints the edge from an entity E to a type T with additional info fmt, ... + * to the file F + */ static void print_ent_type_edge(FILE *F, entity *E, type *T, const char *fmt, ...) { va_list ap; @@ -182,6 +147,10 @@ static void print_ent_type_edge(FILE *F, entity *E, type *T, const char *fmt, .. va_end(ap); } +/** + * prints the edge from a node N to a type T with additional info fmt, ... + * to the file F + */ static void print_node_type_edge(FILE *F, const ir_node *N, type *T, const char *fmt, ...) { va_list ap; @@ -194,6 +163,10 @@ static void print_node_type_edge(FILE *F, const ir_node *N, type *T, const char va_end(ap); } +/** + * prints the edge from a node N to an entity E with additional info fmt, ... + * to the file F + */ static void print_node_ent_edge(FILE *F, const ir_node *N, entity *E, const char *fmt, ...) { va_list ap; @@ -207,6 +180,10 @@ static void print_node_ent_edge(FILE *F, const ir_node *N, entity *E, const char va_end(ap); } +/** + * prints the edge from an entity E to a node N with additional info fmt, ... + * to the file F + */ static void print_ent_node_edge(FILE *F, entity *E, const ir_node *N, const char *fmt, ...) { va_list ap; @@ -219,6 +196,10 @@ static void print_ent_node_edge(FILE *F, entity *E, const ir_node *N, const char va_end(ap); } +/** + * prints the edge from a type E to an enumeration item item with additional info fmt, ... + * to the file F + */ static void print_enum_item_edge(FILE *F, type *E, int item, const char *fmt, ...) { va_list ap; @@ -231,30 +212,34 @@ static void print_enum_item_edge(FILE *F, type *E, int item, const char *fmt, .. va_end(ap); } -/*******************************************************************/ +/*-----------------------------------------------------------------*/ /* global and ahead declarations */ -/*******************************************************************/ +/*-----------------------------------------------------------------*/ static void dump_whole_node(ir_node *n, void *env); static INLINE void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg); -/*******************************************************************/ +/*-----------------------------------------------------------------*/ /* Helper functions. */ -/*******************************************************************/ - -/* Use private link attr to be able to call dumper anywhere without - destroying link fields. */ +/*-----------------------------------------------------------------*/ +/** + * This map is used as a private link attr to be able to call dumper + * anywhere without destroying link fields. + */ static pmap *irdump_link_map = NULL; +/** Creates the link attribut map. */ static void init_irdump(void) { /* We need a new, empty map. */ if (irdump_link_map) pmap_destroy(irdump_link_map); irdump_link_map = pmap_create(); } - -void *ird_get_irn_link(ir_node *n) { +/** + * Returns the private link field. + */ +static void *ird_get_irn_link(ir_node *n) { void *res = NULL; if (!irdump_link_map) return NULL; @@ -263,12 +248,18 @@ void *ird_get_irn_link(ir_node *n) { return res; } -void ird_set_irn_link(ir_node *n, void *x) { +/** + * Sets the private link field. + */ +static void ird_set_irn_link(ir_node *n, void *x) { if (!irdump_link_map) init_irdump(); pmap_insert(irdump_link_map, (void *)n, x); } -void *ird_get_irg_link(ir_graph *irg) { +/** + * Gets the private link field of an irg. + */ +static void *ird_get_irg_link(ir_graph *irg) { void *res = NULL; if (!irdump_link_map) return NULL; @@ -277,40 +268,56 @@ void *ird_get_irg_link(ir_graph *irg) { return res; } -void ird_set_irg_link(ir_graph *irg, void *x) { +/** + * Sets the private link field of an irg. + */ +static void ird_set_irg_link(ir_graph *irg, void *x) { if (!irdump_link_map) init_irdump(); pmap_insert(irdump_link_map, (void *)irg, x); } +/** + * Walker, clears tzhe private link field + */ static void clear_link(ir_node * node, void * env) { ird_set_irn_link(node, NULL); } - +/** + * Returns non-zero if a node is in floating state. + */ static int node_floats(ir_node *n) { return ((get_irn_pinned(n) == op_pin_state_floats) && (get_irg_pinned(current_ir_graph) == op_pin_state_floats)); } -const char *get_ent_dump_name(entity *ent) { - if (! ent) +/** + * If the entity has a ld_name, returns it, else returns the name of the entity. + */ +static const char *get_ent_dump_name(entity *ent) { + if (!ent) return ""; /* Don't use get_entity_ld_ident (ent) as it computes the mangled name! */ if (ent->ld_name) return get_id_str(ent->ld_name); return get_id_str(ent->name); } +/* Returns the name of an IRG. */ const char *get_irg_dump_name(ir_graph *irg) { /* Don't use get_entity_ld_ident (ent) as it computes the mangled name! */ entity *ent = get_irg_entity(irg); return get_ent_dump_name(ent); } +/** + * Walker, allocates an array for all blocks and puts it's nodes non-floating nodes into this array. + */ static void collect_node(ir_node * node, void *env) { if (is_Block(node) || node_floats(node) || get_irn_op(node) == op_Bad - || get_irn_op(node) == op_Unknown) { + || get_irn_op(node) == op_Unknown + || get_irn_op(node) == op_NoMem) { ir_node ** arr = (ir_node **) ird_get_irg_link(get_irn_irg(node)); if (!arr) arr = NEW_ARR_F(ir_node *, 0); ARR_APP1(ir_node *, arr, node); @@ -325,10 +332,11 @@ static void collect_node(ir_node * node, void *env) { /** Construct lists to walk ir block-wise. * * Collects all blocks, nodes not op_pin_state_pinned, - * Bad and Unknown into a flexible array in link field of + * Bad, NoMem and Unknown into a flexible array in link field of * irg they belong to. Sets the irg link field to NULL in all * graphs not visited. - * Free the list with DEL_ARR_F. */ + * Free the list with DEL_ARR_F(). + */ static ir_node ** construct_block_lists(ir_graph *irg) { int i, rem_view = get_interprocedural_view(); ir_graph *rem = current_ir_graph; @@ -355,15 +363,16 @@ static ir_node ** construct_block_lists(ir_graph *irg) { /* flags to steer output */ /*******************************************************************/ +/** Dump only irgs with names start with this string */ const char *dump_file_filter = ""; -/* A compiler option to turn off edge labels */ -int edge_label = 1; -/* A compiler option to turn off dumping values of constant entities */ -int const_entities = 1; -/* A compiler option to dump the keep alive edges */ -int dump_keepalive = 0; -/* Compiler options to dump analysis information in dump_ir_graph */ +/** A compiler option to turn off edge labels */ +static int edge_label = 1; +/** A compiler option to turn off dumping values of constant entities */ +static int const_entities = 1; +/** A compiler option to dump the keep alive edges */ +static int dump_keepalive = 0; +/** Compiler options to dump analysis information in dump_ir_graph */ int dump_out_edge_flag = 0; int dump_dominator_information_flag = 0; int dump_loop_information_flag = 0; @@ -372,7 +381,16 @@ int dump_const_local = 0; bool opt_dump_analysed_type_info = 1; bool opt_dump_pointer_values_to_info = 0; /* default off: for test compares!! */ -char* overrule_nodecolor = NULL; +static const char *overrule_nodecolor = NULL; + +/** The vcg attribute hook. */ +static DUMP_NODE_VCGATTR_FUNC dump_node_vcgattr_hook = NULL; + +/* set the hook */ +void set_dump_node_vcgattr_hook(DUMP_NODE_VCGATTR_FUNC hook) +{ + dump_node_vcgattr_hook = hook; +} INLINE bool get_opt_dump_const_local(void) { if (!dump_out_edge_flag && !dump_loop_information_flag) @@ -444,7 +462,10 @@ void dump_pointer_values_to_info(bool b) { /* Routines to dump information about a single ir node. */ /*-----------------------------------------------------------------*/ -INLINE int +/* + * dump the name of a node n to the File F. + */ +int dump_node_opcode(FILE *F, ir_node *n) { int bad = 0; @@ -533,6 +554,10 @@ default_case: return bad; } +/** + * Dump the mode of a node n to a file F. + * Ignore modes that are "always known". + */ static INLINE int dump_node_mode(FILE *F, ir_node *n) { @@ -547,6 +572,7 @@ dump_node_mode(FILE *F, ir_node *n) case iro_Free: case iro_Sync: case iro_Jmp: + case iro_NoMem: break; default: { ir_mode *mode = get_irn_mode(n); @@ -560,6 +586,9 @@ dump_node_mode(FILE *F, ir_node *n) return bad; } +/** + * Dump the tpe of a node n to a file F if it's known. + */ static int dump_node_typeinfo(FILE *F, ir_node *n) { int bad = 0; @@ -576,6 +605,9 @@ static int dump_node_typeinfo(FILE *F, ir_node *n) { return bad; } +/** + * Dump addinional node attributes of some nodes to a file F. + */ static INLINE int dump_node_nodeattr(FILE *F, ir_node *n) { @@ -597,15 +629,15 @@ dump_node_nodeattr(FILE *F, ir_node *n) case iro_Filter: fprintf (F, "%ld", get_Filter_proj(n)); break; - case iro_Sel: { + case iro_Sel: fprintf (F, "%s", get_ent_dump_name(get_Sel_entity(n))); - } break; - case iro_Cast: { + break; + case iro_Cast: fprintf (F, "(%s)", get_type_name_ex(get_Cast_type(n), &bad)); - } break; - case iro_Confirm: { + break; + case iro_Confirm: fprintf (F, "%s", get_pnc_string(get_Confirm_cmp(n))); - } break; + break; default: ; @@ -614,12 +646,21 @@ dump_node_nodeattr(FILE *F, ir_node *n) return bad; } -static INLINE void dump_node_vcgattr(FILE *F, ir_node *n, int bad) +/** + * dumps the attributes of a node n into the file F. + * Currently this is only the color of a node. + */ +static void dump_node_vcgattr(FILE *F, ir_node *n, int bad) { if (bad) { fprintf(F, "color: red"); return; } + + if (dump_node_vcgattr_hook) + if (dump_node_vcgattr_hook(F, n)) + return; + switch (get_irn_opcode(n)) { case iro_Start: case iro_EndReg: @@ -648,6 +689,9 @@ static INLINE void dump_node_vcgattr(FILE *F, ir_node *n, int bad) if (overrule_nodecolor) fprintf(F, " color: %s", overrule_nodecolor); } +/** + * Dump the node information of a node n to a file F. + */ static INLINE int dump_node_info(FILE *F, ir_node *n) { int i, bad = 0; @@ -717,9 +761,9 @@ static INLINE int dump_node_info(FILE *F, ir_node *n) int i, n_cfgpreds = get_Block_cg_n_cfgpreds(sbl); fprintf(F, "graph has %d interprocedural predecessors:\n", n_cfgpreds); for (i = 0; i < n_cfgpreds; ++i) { - ir_node *cfgpred = get_Block_cg_cfgpred(sbl, i); - fprintf(F, " %d: Call %ld in graph %s\n", i, get_irn_node_nr(cfgpred), - get_irg_dump_name(get_irn_irg(cfgpred))); + ir_node *cfgpred = get_Block_cg_cfgpred(sbl, i); + fprintf(F, " %d: Call %ld in graph %s\n", i, get_irn_node_nr(cfgpred), + get_irg_dump_name(get_irn_irg(cfgpred))); } } } break; @@ -753,24 +797,17 @@ static INLINE int dump_node_info(FILE *F, 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))); - } + fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(n, i))); } } } break; case iro_CallBegin: { ir_node *call = get_CallBegin_call(n); + fprintf(F, "Call: %ld\n", get_irn_node_nr(call)); 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))); - } + fprintf(F, " %d: %s\n", i, get_ent_dump_name(get_Call_callee(call, i))); } } } break; @@ -842,15 +879,17 @@ static INLINE int dump_node_info(FILE *F, ir_node *n) return bad; } - +/** + * checks wheater a node is "constant-like", ie can be treated "block-less" + */ static INLINE bool is_constlike_node(ir_node *n) { ir_op *op = get_irn_op(n); - return (op == op_Const || op == op_Bad || op == op_SymConst || op == op_Unknown); + return (op == op_Const || op == op_Bad || op == op_NoMem || op == op_SymConst || op == op_Unknown); } -/* outputs the predecessors of n, that are constants, local. I.e., +/** outputs the predecessors of n, that are constants, local. I.e., generates a copy of the constant predecessors for each node called with. */ static void dump_const_node_local(FILE *F, ir_node *n) { int i; @@ -889,14 +928,20 @@ static void dump_const_node_local(FILE *F, ir_node *n) { } } -static void INLINE print_node_error(FILE *F, const char *p) +/** + * prints the error message of a node to a file F as info2. + */ +static void INLINE print_node_error(FILE *F, const char *err_msg) { - if (! p) + if (! err_msg) return; - fprintf (F, " info2: \"%s\"", p); + fprintf (F, " info2: \"%s\"", err_msg); } +/** + * Dump a node + */ static void dump_node(FILE *F, ir_node *n) { int bad = 0; @@ -925,7 +970,7 @@ static void dump_node(FILE *F, ir_node *n) #endif } -/* dump the edge to the block this node belongs to */ +/** dump the edge to the block this node belongs to */ static void dump_ir_block_edge(FILE *F, ir_node *n) { if (get_opt_dump_const_local() && is_constlike_node(n)) return; @@ -1245,7 +1290,7 @@ static void dump_graph(FILE *F, ir_graph *irg) { /* Basic type and entity nodes and edges. */ /*******************************************************************/ -/* dumps the edges between nodes and their type or entity attributes. */ +/** dumps the edges between nodes and their type or entity attributes. */ static void dump_node2type_edges(ir_node *n, void *env) { FILE *F = env; @@ -1695,8 +1740,7 @@ void dump_loop_nodes_into_graph(FILE *F, ir_graph *irg) { /** * dumps the VCG header */ -static INLINE void -dump_vcg_header(FILE *F, const char *name, const char *orientation) { +INLINE void dump_vcg_header(FILE *F, const char *name, const char *orientation) { char *label; if (edge_label) { @@ -1719,6 +1763,7 @@ dump_vcg_header(FILE *F, const char *name, const char *orientation) { "classname 16: \"interblock Data\"\n" "classname 2: \"Block\"\n" "classname 13: \"Control Flow\"\n" + "classname 18: \"Exception Control Flow for Interval Analysis\"\n" "classname 14: \"intrablock Memory\"\n" "classname 17: \"interblock Memory\"\n" "classname 15: \"Dominators\"\n" @@ -1779,7 +1824,7 @@ dump_vcg_header(FILE *F, const char *name, const char *orientation) { * @param suffix1 first filename suffix * @param suffix2 second filename suffix */ -static FILE *vcg_open (ir_graph *irg, const char * suffix1, const char *suffix2) { +FILE *vcg_open (ir_graph *irg, const char * suffix1, const char *suffix2) { FILE *F; const char *nm = get_irg_dump_name(irg); int len = strlen(nm), i, j; @@ -1863,8 +1908,7 @@ static INLINE void dump_vcg_footer (FILE *F) { /** * close the vcg file */ -static void -vcg_close (FILE *F) { +void vcg_close (FILE *F) { dump_vcg_footer(F); /* print footer */ fclose (F); /* close vcg file */ } @@ -2220,9 +2264,9 @@ void dump_all_cg_block_graph(const char *suffix) { set_interprocedural_view(rem_view); } -/***********************************************************************/ +/*---------------------------------------------------------------------*/ /* the following routines dumps type information without any ir nodes. */ -/***********************************************************************/ +/*---------------------------------------------------------------------*/ void dump_type_graph (ir_graph *irg, const char *suffix) @@ -2277,14 +2321,14 @@ dump_class_hierarchy (bool entities, const char *suffix) vcg_close(f); } -/***********************************************************************/ +/*---------------------------------------------------------------------*/ /* dumps all graphs with the graph-dumper passed. Possible dumpers: */ /* dump_ir_graph */ /* dump_ir_block_graph */ /* dump_cfg */ /* dump_type_graph */ /* dump_ir_graph_w_types */ -/***********************************************************************/ +/*---------------------------------------------------------------------*/ void dump_all_ir_graphs(dump_graph_func *dmp_grph, const char *suffix) { int i, n_irgs = get_irp_n_irgs(); @@ -2294,10 +2338,10 @@ void dump_all_ir_graphs(dump_graph_func *dmp_grph, const char *suffix) { } -/********************************************************************************** +/*--------------------------------------------------------------------------------* * Dumps a stand alone loop graph with firm nodes which belong to one loop node * * packed together in one subgraph/box * - **********************************************************************************/ + *--------------------------------------------------------------------------------*/ void dump_loops_standalone(FILE *F, ir_loop *loop) { int i = 0, loop_node_started = 0, son_number = 0, first = 0; @@ -2334,15 +2378,15 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) { 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; + /* 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"); + fprintf(F, "\n"); bad |= dump_node_opcode(F, n); bad |= dump_node_mode(F, n); @@ -2350,19 +2394,19 @@ void dump_loops_standalone(FILE *F, ir_loop *loop) { fprintf (F, " "); bad |= dump_node_nodeattr(F, n); fprintf (F, " %ld", get_irn_node_nr(n)); - if (is_Block(n)) fprintf (F, "\t ->%d", (int)get_irn_link(n)); + /* Causes indeterministic output: if (is_Block(n)) fprintf (F, "\t ->%d", (int)get_irn_link(n)); */ if (has_backedges(n)) fprintf(F, "\t loop head!"); } else { /* for callgraph loop tree */ assert(get_kind(son) == k_ir_graph); /* We are a loop node -> Collect firm graphs */ ir_graph *n = (ir_graph *)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; + /* 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"); @@ -2415,9 +2459,9 @@ void dump_callgraph_loop_tree(const char *suffix) { } -/*******************************************************************************/ +/*-----------------------------------------------------------------------------*/ /* Dumps the firm nodes in the loop tree to a graph along with the loop nodes. */ -/*******************************************************************************/ +/*-----------------------------------------------------------------------------*/ void collect_nodeloop(FILE *F, ir_loop *loop, eset *loopnodes) { int i, son_number = 0, node_number = 0;