X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=gcc%2Ftree-dump.c;h=8e911ab93eaf5d904f32419df47a2e413bc2e968;hp=a76486c715382252d545ac2c6e2fea7436b7fe4c;hb=46412a373a530ead8448abe35705577d223ff1a5;hpb=55d6e7cdb772110d47094c1ffd1a4a2e7c55b3ea diff --git a/gcc/tree-dump.c b/gcc/tree-dump.c index a76486c7153..8e911ab93ea 100644 --- a/gcc/tree-dump.c +++ b/gcc/tree-dump.c @@ -1,5 +1,5 @@ /* Tree-dumping functionality for intermediate representation. - Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005 + Copyright (C) 1999, 2000, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. Written by Mark Mitchell @@ -7,7 +7,7 @@ This file is part of GCC. GCC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later +Software Foundation; either version 3, or (at your option) any later version. GCC is distributed in the hope that it will be useful, but WITHOUT ANY @@ -16,9 +16,8 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 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, 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301, USA. */ +along with GCC; see the file COPYING3. If not see +. */ #include "config.h" #include "system.h" @@ -32,19 +31,20 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA #include "tree-pass.h" #include "langhooks.h" #include "tree-iterator.h" +#include "real.h" +#include "fixed-value.h" -static unsigned int queue (dump_info_p, tree, int); +static unsigned int queue (dump_info_p, const_tree, int); static void dump_index (dump_info_p, unsigned int); static void dequeue_and_dump (dump_info_p); static void dump_new_line (dump_info_p); static void dump_maybe_newline (dump_info_p); -static int dump_enable_all (int, int); /* Add T to the end of the queue of nodes to dump. Returns the index assigned to T. */ static unsigned int -queue (dump_info_p di, tree t, int flags) +queue (dump_info_p di, const_tree t, int flags) { dump_queue_p dq; dump_node_info_p dni; @@ -60,10 +60,10 @@ queue (dump_info_p di, tree t, int flags) di->free_list = dq->next; } else - dq = xmalloc (sizeof (struct dump_queue)); + dq = XNEW (struct dump_queue); /* Create a new entry in the splay-tree. */ - dni = xmalloc (sizeof (struct dump_node_info)); + dni = XNEW (struct dump_node_info); dni->index = index; dni->binfo_p = ((flags & DUMP_BINFO) != 0); dq->node = splay_tree_insert (di->nodes, (splay_tree_key) t, @@ -93,7 +93,7 @@ dump_index (dump_info_p di, unsigned int index) index of T is printed. */ void -queue_and_dump_index (dump_info_p di, const char *field, tree t, int flags) +queue_and_dump_index (dump_info_p di, const char *field, const_tree t, int flags) { unsigned int index; splay_tree_node n; @@ -121,7 +121,7 @@ queue_and_dump_index (dump_info_p di, const char *field, tree t, int flags) /* Dump the type of T. */ void -queue_and_dump_type (dump_info_p di, tree t) +queue_and_dump_type (dump_info_p di, const_tree t) { queue_and_dump_index (di, "type", TREE_TYPE (t), DUMP_NONE); } @@ -165,7 +165,7 @@ void dump_pointer (dump_info_p di, const char *field, void *ptr) { dump_maybe_newline (di); - fprintf (di->stream, "%-4s: %-8lx ", field, (long) ptr); + fprintf (di->stream, "%-4s: %-8lx ", field, (unsigned long) ptr); di->column += 15; } @@ -179,6 +179,31 @@ dump_int (dump_info_p di, const char *field, int i) di->column += 14; } +/* Dump the floating point value R, using FIELD to identify it. */ + +static void +dump_real (dump_info_p di, const char *field, const REAL_VALUE_TYPE *r) +{ + char buf[32]; + real_to_decimal (buf, r, sizeof (buf), 0, true); + dump_maybe_newline (di); + fprintf (di->stream, "%-4s: %s ", field, buf); + di->column += strlen (buf) + 7; +} + +/* Dump the fixed-point value F, using FIELD to identify it. */ + +static void +dump_fixed (dump_info_p di, const char *field, const FIXED_VALUE_TYPE *f) +{ + char buf[32]; + fixed_to_decimal (buf, f, sizeof (buf)); + dump_maybe_newline (di); + fprintf (di->stream, "%-4s: %s ", field, buf); + di->column += strlen (buf) + 7; +} + + /* Dump the string S. */ void @@ -305,6 +330,7 @@ dequeue_and_dump (dump_info_p di) case tcc_expression: case tcc_reference: case tcc_statement: + case tcc_vl_exp: /* These nodes are handled explicitly below. */ break; @@ -439,6 +465,13 @@ dequeue_and_dump (dump_info_p di) dump_int (di, "prec", TYPE_PRECISION (t)); break; + case FIXED_POINT_TYPE: + dump_int (di, "prec", TYPE_PRECISION (t)); + dump_string_field (di, "sign", TYPE_UNSIGNED (t) ? "unsigned": "signed"); + dump_string_field (di, "saturating", + TYPE_SATURATING (t) ? "saturating": "non-saturating"); + break; + case POINTER_TYPE: dump_child ("ptd", TREE_TYPE (t)); break; @@ -478,9 +511,8 @@ dequeue_and_dump (dump_info_p di) dump_child ("cnst", DECL_INITIAL (t)); break; - case TYPE_MEMORY_TAG: + case SYMBOL_MEMORY_TAG: case NAME_MEMORY_TAG: - case STRUCT_FIELD_TAG: break; case VAR_DECL: @@ -516,7 +548,7 @@ dequeue_and_dump (dump_info_p di) dump_string_field (di, "link", "extern"); else dump_string_field (di, "link", "static"); - if (DECL_LANG_SPECIFIC (t) && !dump_flag (di, TDF_SLIM, t)) + if (DECL_SAVED_TREE (t) && !dump_flag (di, TDF_SLIM, t)) dump_child ("body", DECL_SAVED_TREE (t)); break; @@ -531,6 +563,14 @@ dequeue_and_dump (dump_info_p di) dump_int (di, "lngt", TREE_STRING_LENGTH (t)); break; + case REAL_CST: + dump_real (di, "valu", TREE_REAL_CST_PTR (t)); + break; + + case FIXED_CST: + dump_fixed (di, "valu", TREE_FIXED_CST_PTR (t)); + break; + case TRUTH_NOT_EXPR: case ADDR_EXPR: case INDIRECT_REF: @@ -558,6 +598,11 @@ dequeue_and_dump (dump_info_p di) dump_child ("op 1", TREE_OPERAND (t, 1)); break; + case GIMPLE_MODIFY_STMT: + dump_child ("op 0", GIMPLE_STMT_OPERAND (t, 0)); + dump_child ("op 1", GIMPLE_STMT_OPERAND (t, 1)); + break; + case COMPONENT_REF: dump_child ("op 0", TREE_OPERAND (t, 0)); dump_child ("op 1", TREE_OPERAND (t, 1)); @@ -584,8 +629,19 @@ dequeue_and_dump (dump_info_p di) break; case CALL_EXPR: - dump_child ("fn", TREE_OPERAND (t, 0)); - dump_child ("args", TREE_OPERAND (t, 1)); + { + int i = 0; + tree arg; + call_expr_arg_iterator iter; + dump_child ("fn", CALL_EXPR_FN (t)); + FOR_EACH_CALL_EXPR_ARG (arg, iter, t) + { + char buffer[32]; + sprintf (buffer, "%u", i); + dump_child (buffer, arg); + i++; + } + } break; case CONSTRUCTOR: @@ -632,12 +688,12 @@ dequeue_and_dump (dump_info_p di) case CASE_LABEL_EXPR: dump_child ("name", CASE_LABEL (t)); - if (CASE_LOW (t)) { - dump_child ("low ", CASE_LOW (t)); - if (CASE_HIGH (t)) { - dump_child ("high", CASE_HIGH (t)); + if (CASE_LOW (t)) + { + dump_child ("low ", CASE_LOW (t)); + if (CASE_HIGH (t)) + dump_child ("high", CASE_HIGH (t)); } - } break; case LABEL_EXPR: dump_child ("name", TREE_OPERAND (t,0)); @@ -677,7 +733,7 @@ dequeue_and_dump (dump_info_p di) /* Return nonzero if FLAG has been specified for the dump, and NODE is not the root node of the dump. */ -int dump_flag (dump_info_p di, int flag, tree node) +int dump_flag (dump_info_p di, int flag, const_tree node) { return (di->flags & flag) && (node != di->node); } @@ -685,7 +741,7 @@ int dump_flag (dump_info_p di, int flag, tree node) /* Dump T, and all its children, on STREAM. */ void -dump_node (tree t, int flags, FILE *stream) +dump_node (const_tree t, int flags, FILE *stream) { struct dump_info di; dump_queue_p dq; @@ -721,22 +777,22 @@ dump_node (tree t, int flags, FILE *stream) /* Table of tree dump switches. This must be consistent with the - TREE_DUMP_INDEX enumeration in tree.h */ + tree_dump_index enumeration in tree-pass.h. */ static struct dump_file_info dump_files[TDI_end] = { - {NULL, NULL, NULL, 0, 0, 0, 0}, - {".tu", "translation-unit", NULL, TDF_TREE, 0, 0, 0}, - {".class", "class-hierarchy", NULL, TDF_TREE, 0, 1, 0}, - {".original", "tree-original", NULL, TDF_TREE, 0, 2, 0}, - {".gimple", "tree-gimple", NULL, TDF_TREE, 0, 3, 0}, - {".nested", "tree-nested", NULL, TDF_TREE, 0, 4, 0}, - {".inlined", "tree-inlined", NULL, TDF_TREE, 0, 5, 0}, - {".vcg", "tree-vcg", NULL, TDF_TREE, 0, 6, 0}, - {NULL, "tree-all", NULL, TDF_TREE, 0, 0, 0}, - {NULL, "rtl-all", NULL, TDF_RTL, 0, 0, 0}, - {NULL, "ipa-all", NULL, TDF_IPA, 0, 0, 0}, - - { ".cgraph", "ipa-cgraph", NULL, TDF_IPA, 0, 0, 0}, + {NULL, NULL, NULL, 0, 0, 0}, + {".cgraph", "ipa-cgraph", NULL, TDF_IPA, 0, 0}, + {".tu", "translation-unit", NULL, TDF_TREE, 0, 1}, + {".class", "class-hierarchy", NULL, TDF_TREE, 0, 2}, + {".original", "tree-original", NULL, TDF_TREE, 0, 3}, + {".gimple", "tree-gimple", NULL, TDF_TREE, 0, 4}, + {".nested", "tree-nested", NULL, TDF_TREE, 0, 5}, + {".vcg", "tree-vcg", NULL, TDF_TREE, 0, 6}, +#define FIRST_AUTO_NUMBERED_DUMP 7 + + {NULL, "tree-all", NULL, TDF_TREE, 0, 0}, + {NULL, "rtl-all", NULL, TDF_RTL, 0, 0}, + {NULL, "ipa-all", NULL, TDF_IPA, 0, 0}, }; /* Dynamically registered tree dump files and switches. */ @@ -765,15 +821,20 @@ static const struct dump_option_value_info dump_options[] = {"lineno", TDF_LINENO}, {"uid", TDF_UID}, {"stmtaddr", TDF_STMTADDR}, + {"memsyms", TDF_MEMSYMS}, + {"verbose", TDF_VERBOSE}, {"all", ~(TDF_RAW | TDF_SLIM | TDF_LINENO | TDF_TREE | TDF_RTL | TDF_IPA - | TDF_STMTADDR | TDF_GRAPH)}, + | TDF_STMTADDR | TDF_GRAPH | TDF_DIAGNOSTIC | TDF_VERBOSE)}, {NULL, 0} }; unsigned int dump_register (const char *suffix, const char *swtch, const char *glob, - int flags, unsigned int num, int letter) + int flags) { + static int next_dump = FIRST_AUTO_NUMBERED_DUMP; + int num = next_dump++; + size_t this = extra_dump_files_in_use++; if (this >= extra_dump_files_alloced) @@ -793,7 +854,6 @@ dump_register (const char *suffix, const char *swtch, const char *glob, extra_dump_files[this].glob = glob; extra_dump_files[this].flags = flags; extra_dump_files[this].num = num; - extra_dump_files[this].letter = letter; return this + TDI_end; } @@ -819,7 +879,7 @@ get_dump_file_info (enum tree_dump_index phase) char * get_dump_file_name (enum tree_dump_index phase) { - char dump_id[7]; + char dump_id[10]; struct dump_file_info *dfi; if (phase == TDI_none) @@ -833,15 +893,15 @@ get_dump_file_name (enum tree_dump_index phase) dump_id[0] = '\0'; else { - const char *template; + char suffix; if (dfi->flags & TDF_TREE) - template = ".t%02d"; + suffix = 't'; else if (dfi->flags & TDF_IPA) - template = ".i%02d"; + suffix = 'i'; else - template = ".%02d"; + suffix = 'r'; - if (snprintf (dump_id, sizeof (dump_id), template, dfi->num) < 0) + if (snprintf (dump_id, sizeof (dump_id), ".%03d%c", dfi->num, suffix) < 0) dump_id[0] = '\0'; } @@ -932,15 +992,14 @@ dump_end (enum tree_dump_index phase ATTRIBUTE_UNUSED, FILE *stream) /* Enable all tree dumps. Return number of enabled tree dumps. */ static int -dump_enable_all (int flags, int letter) +dump_enable_all (int flags) { - int ir_type = (flags & (TDF_TREE | TDF_RTL | TDF_IPA)); + int ir_dump_type = (flags & (TDF_TREE | TDF_RTL | TDF_IPA)); int n = 0; size_t i; for (i = TDI_none + 1; i < (size_t) TDI_end; i++) - if ((dump_files[i].flags & ir_type) - && (letter == 0 || letter == dump_files[i].letter)) + if ((dump_files[i].flags & ir_dump_type)) { dump_files[i].state = -1; dump_files[i].flags |= flags; @@ -948,8 +1007,7 @@ dump_enable_all (int flags, int letter) } for (i = 0; i < extra_dump_files_in_use; i++) - if ((extra_dump_files[i].flags & ir_type) - && (letter == 0 || letter == extra_dump_files[i].letter)) + if ((extra_dump_files[i].flags & ir_dump_type)) { extra_dump_files[i].state = -1; extra_dump_files[i].flags |= flags; @@ -976,6 +1034,9 @@ dump_switch_p_1 (const char *arg, struct dump_file_info *dfi, bool doglob) if (!option_value) return 0; + if (*option_value && *option_value != '-') + return 0; + ptr = option_value; flags = 0; @@ -1011,7 +1072,7 @@ dump_switch_p_1 (const char *arg, struct dump_file_info *dfi, bool doglob) /* Process -fdump-tree-all and -fdump-rtl-all, by enabling all the known dumps. */ if (dfi->suffix == NULL) - dump_enable_all (dfi->flags, 0); + dump_enable_all (dfi->flags); return 1; } @@ -1058,12 +1119,9 @@ dump_function (enum tree_dump_index phase, tree fn) } bool -enable_rtl_dump_file (int letter) +enable_rtl_dump_file (void) { - if (letter == 'a') - letter = 0; - - return dump_enable_all (TDF_RTL, letter) > 0; + return dump_enable_all (TDF_RTL | TDF_DETAILS | TDF_BLOCKS) > 0; }