X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgraph.c;h=5e1627d8e43b7abb2306d46c0a2ba711fd908410;hb=27fed2d042a0c6676496cccf5fe9946cc1f20423;hp=483cc7e35a1d4b20fcc48170a0760171f07eca76;hpb=0051c76acf69e4b8a5e9f2fadc6af1bd27399c0c;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/graph.c b/gcc/graph.c index 483cc7e35a1..5e1627d8e43 100644 --- a/gcc/graph.c +++ b/gcc/graph.c @@ -1,5 +1,6 @@ /* Output routines for graphical representation. - Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004 + Free Software Foundation, Inc. Contributed by Ulrich Drepper , 1998. This file is part of GCC. @@ -16,21 +17,19 @@ for more details. You should have received a copy of the GNU General Public License along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ +Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA +02110-1301, USA. */ #include #include "system.h" #include "coretypes.h" #include "tm.h" - #include "rtl.h" -#include "tree.h" #include "flags.h" #include "output.h" #include "function.h" -#include "langhooks.h" #include "hard-reg-set.h" +#include "obstack.h" #include "basic-block.h" #include "toplev.h" #include "graph.h" @@ -57,8 +56,7 @@ start_fct (FILE *fp) case vcg: fprintf (fp, "\ graph: { title: \"%s\"\nfolding: 1\nhidden: 2\nnode: { title: \"%s.0\" }\n", - (*lang_hooks.decl_printable_name) (current_function_decl, 2), - (*lang_hooks.decl_printable_name) (current_function_decl, 2)); + current_function_name (), current_function_name ()); break; case no_graph: break; @@ -68,14 +66,17 @@ graph: { title: \"%s\"\nfolding: 1\nhidden: 2\nnode: { title: \"%s.0\" }\n", static void start_bb (FILE *fp, int bb) { +#if 0 + reg_set_iterator rsi; +#endif + switch (graph_dump_format) { case vcg: fprintf (fp, "\ graph: {\ntitle: \"%s.BB%d\"\nfolding: 1\ncolor: lightblue\n\ label: \"basic block %d", - (*lang_hooks.decl_printable_name) (current_function_decl, 2), - bb, bb); + current_function_name (), bb, bb); break; case no_graph: break; @@ -86,13 +87,12 @@ label: \"basic block %d", /* Print the live-at-start register list. */ fputc ('\n', fp); - EXECUTE_IF_SET_IN_REG_SET (basic_block_live_at_start[bb], 0, i, - { - fprintf (fp, " %d", i); - if (i < FIRST_PSEUDO_REGISTER) - fprintf (fp, " [%s]", - reg_names[i]); - }); + EXECUTE_IF_SET_IN_REG_SET (basic_block_live_at_start[bb], 0, i, rsi) + { + fprintf (fp, " %d", i); + if (i < FIRST_PSEUDO_REGISTER) + fprintf (fp, " [%s]", reg_names[i]); + } #endif switch (graph_dump_format) @@ -117,9 +117,8 @@ node_data (FILE *fp, rtx tmp_rtx) case vcg: fprintf (fp, "\ edge: { sourcename: \"%s.0\" targetname: \"%s.%d\" }\n", - (*lang_hooks.decl_printable_name) (current_function_decl, 2), - (*lang_hooks.decl_printable_name) (current_function_decl, 2), - XINT (tmp_rtx, 0)); + current_function_name (), + current_function_name (), XINT (tmp_rtx, 0)); break; case no_graph: break; @@ -131,13 +130,12 @@ edge: { sourcename: \"%s.0\" targetname: \"%s.%d\" }\n", case vcg: fprintf (fp, "node: {\n title: \"%s.%d\"\n color: %s\n \ label: \"%s %d\n", - (*lang_hooks.decl_printable_name) (current_function_decl, 2), - XINT (tmp_rtx, 0), - GET_CODE (tmp_rtx) == NOTE ? "lightgrey" - : GET_CODE (tmp_rtx) == INSN ? "green" - : GET_CODE (tmp_rtx) == JUMP_INSN ? "darkgreen" - : GET_CODE (tmp_rtx) == CALL_INSN ? "darkgreen" - : GET_CODE (tmp_rtx) == CODE_LABEL ? "\ + current_function_name (), XINT (tmp_rtx, 0), + NOTE_P (tmp_rtx) ? "lightgrey" + : NONJUMP_INSN_P (tmp_rtx) ? "green" + : JUMP_P (tmp_rtx) ? "darkgreen" + : CALL_P (tmp_rtx) ? "darkgreen" + : LABEL_P (tmp_rtx) ? "\ darkgrey\n shape: ellipse" : "white", GET_RTX_NAME (GET_CODE (tmp_rtx)), XINT (tmp_rtx, 0)); break; @@ -146,7 +144,7 @@ darkgrey\n shape: ellipse" : "white", } /* Print the RTL. */ - if (GET_CODE (tmp_rtx) == NOTE) + if (NOTE_P (tmp_rtx)) { const char *name = ""; if (NOTE_LINE_NUMBER (tmp_rtx) < 0) @@ -184,11 +182,8 @@ draw_edge (FILE *fp, int from, int to, int bb_edge, int class) color = "color: green "; fprintf (fp, "edge: { sourcename: \"%s.%d\" targetname: \"%s.%d\" %s", - (*lang_hooks.decl_printable_name) (current_function_decl, 2), - from, - (*lang_hooks.decl_printable_name) (current_function_decl, 2), - to, - color); + current_function_name (), from, + current_function_name (), to, color); if (class) fprintf (fp, "class: %d ", class); fputs ("}\n", fp); @@ -218,7 +213,7 @@ end_fct (FILE *fp) { case vcg: fprintf (fp, "node: { title: \"%s.999999\" label: \"END\" }\n}\n", - (*lang_hooks.decl_printable_name) (current_function_decl, 2)); + current_function_name ()); break; case no_graph: break; @@ -228,21 +223,19 @@ end_fct (FILE *fp) /* Like print_rtl, but also print out live information for the start of each basic block. */ void -print_rtl_graph_with_bb (const char *base, const char *suffix, rtx rtx_first) +print_rtl_graph_with_bb (const char *base, rtx rtx_first) { rtx tmp_rtx; size_t namelen = strlen (base); - size_t suffixlen = strlen (suffix); size_t extlen = strlen (graph_ext[graph_dump_format]) + 1; - char *buf = alloca (namelen + suffixlen + extlen); + char *buf = alloca (namelen + extlen); FILE *fp; if (basic_block_info == NULL) return; memcpy (buf, base, namelen); - memcpy (buf + namelen, suffix, suffixlen); - memcpy (buf + namelen + suffixlen, graph_ext[graph_dump_format], extlen); + memcpy (buf + namelen, graph_ext[graph_dump_format], extlen); fp = fopen (buf, "a"); if (fp == NULL) @@ -254,9 +247,9 @@ print_rtl_graph_with_bb (const char *base, const char *suffix, rtx rtx_first) { enum bb_state { NOT_IN_BB, IN_ONE_BB, IN_MULTIPLE_BB }; int max_uid = get_max_uid (); - int *start = xmalloc (max_uid * sizeof (int)); - int *end = xmalloc (max_uid * sizeof (int)); - enum bb_state *in_bb_p = xmalloc (max_uid * sizeof (enum bb_state)); + int *start = XNEWVEC (int, max_uid); + int *end = XNEWVEC (int, max_uid); + enum bb_state *in_bb_p = XNEWVEC (enum bb_state, max_uid); basic_block bb; int i; @@ -295,9 +288,9 @@ print_rtl_graph_with_bb (const char *base, const char *suffix, rtx rtx_first) if (start[INSN_UID (tmp_rtx)] < 0 && end[INSN_UID (tmp_rtx)] < 0) { - if (GET_CODE (tmp_rtx) == BARRIER) + if (BARRIER_P (tmp_rtx)) continue; - if (GET_CODE (tmp_rtx) == NOTE + if (NOTE_P (tmp_rtx) && (1 || in_bb_p[INSN_UID (tmp_rtx)] == NOT_IN_BB)) continue; } @@ -318,6 +311,7 @@ print_rtl_graph_with_bb (const char *base, const char *suffix, rtx rtx_first) if ((i = end[INSN_UID (tmp_rtx)]) >= 0) { edge e; + edge_iterator ei; bb = BASIC_BLOCK (i); @@ -326,7 +320,7 @@ print_rtl_graph_with_bb (const char *base, const char *suffix, rtx rtx_first) /* Now specify the edges to all the successors of this basic block. */ - for (e = bb->succ; e ; e = e->succ_next) + FOR_EACH_EDGE (e, ei, bb->succs) { if (e->dest != EXIT_BLOCK_PTR) { @@ -356,7 +350,7 @@ print_rtl_graph_with_bb (const char *base, const char *suffix, rtx rtx_first) { /* Don't print edges to barriers. */ if (next_insn == 0 - || GET_CODE (next_insn) != BARRIER) + || !BARRIER_P (next_insn)) draw_edge (fp, XINT (tmp_rtx, 0), next_insn ? INSN_UID (next_insn) : 999999, 0, 0); else @@ -367,8 +361,8 @@ print_rtl_graph_with_bb (const char *base, const char *suffix, rtx rtx_first) do next_insn = NEXT_INSN (next_insn); while (next_insn - && (GET_CODE (next_insn) == NOTE - || GET_CODE (next_insn) == BARRIER)); + && (NOTE_P (next_insn) + || BARRIER_P (next_insn))); draw_edge (fp, XINT (tmp_rtx, 0), next_insn ? INSN_UID (next_insn) : 999999, 0, 3); @@ -393,31 +387,23 @@ print_rtl_graph_with_bb (const char *base, const char *suffix, rtx rtx_first) /* Similar as clean_dump_file, but this time for graph output files. */ void -clean_graph_dump_file (const char *base, const char *suffix) +clean_graph_dump_file (const char *base) { size_t namelen = strlen (base); - size_t suffixlen = strlen (suffix); size_t extlen = strlen (graph_ext[graph_dump_format]) + 1; - char *buf = alloca (namelen + extlen + suffixlen); + char *buf = alloca (namelen + extlen); FILE *fp; memcpy (buf, base, namelen); - memcpy (buf + namelen, suffix, suffixlen); - memcpy (buf + namelen + suffixlen, graph_ext[graph_dump_format], extlen); + memcpy (buf + namelen, graph_ext[graph_dump_format], extlen); fp = fopen (buf, "w"); if (fp == NULL) fatal_error ("can't open %s: %m", buf); - switch (graph_dump_format) - { - case vcg: - fputs ("graph: {\nport_sharing: no\n", fp); - break; - case no_graph: - abort (); - } + gcc_assert (graph_dump_format == vcg); + fputs ("graph: {\nport_sharing: no\n", fp); fclose (fp); } @@ -425,30 +411,21 @@ clean_graph_dump_file (const char *base, const char *suffix) /* Do final work on the graph output file. */ void -finish_graph_dump_file (const char *base, const char *suffix) +finish_graph_dump_file (const char *base) { size_t namelen = strlen (base); - size_t suffixlen = strlen (suffix); size_t extlen = strlen (graph_ext[graph_dump_format]) + 1; - char *buf = alloca (namelen + suffixlen + extlen); + char *buf = alloca (namelen + extlen); FILE *fp; memcpy (buf, base, namelen); - memcpy (buf + namelen, suffix, suffixlen); - memcpy (buf + namelen + suffixlen, graph_ext[graph_dump_format], extlen); + memcpy (buf + namelen, graph_ext[graph_dump_format], extlen); fp = fopen (buf, "a"); if (fp != NULL) { - switch (graph_dump_format) - { - case vcg: - fputs ("}\n", fp); - break; - case no_graph: - abort (); - } - + gcc_assert (graph_dump_format == vcg); + fputs ("}\n", fp); fclose (fp); } }