X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;ds=sidebyside;f=gcc%2Fprint-tree.c;h=829e2c9f3026651904ebd1177d4020856632fe32;hb=9c08427a470bf0244808f4dcb633490d43f1fb8b;hp=51e2ce967e1fb2115f694609bfbee97cbf9ec34e;hpb=5b379086b4667d1a9deab9d2f7683d95bb0d5239;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 51e2ce967e1..829e2c9f302 100644
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -1,28 +1,33 @@
-/* Prints out tree in human readable form - GNU C-compiler
-   Copyright (C) 1990, 91, 93-98, 1999 Free Software Foundation, Inc.
+/* Prints out tree in human readable form - GCC
+   Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
+   2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-This file is part of GNU CC.
+This file is part of GCC.
 
-GNU CC 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 version.
+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
+version.
 
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+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.  */
 
 
 #include "config.h"
 #include "system.h"
+#include "coretypes.h"
+#include "tm.h"
 #include "tree.h"
+#include "real.h"
 #include "ggc.h"
+#include "langhooks.h"
 
 /* Define the hash table of nodes already seen.
    Such nodes are not repeated; brief cross-references are used.  */
@@ -42,27 +47,19 @@ static struct bucket **table;
    down to a depth of six.  */
 
 void
-debug_tree (node)
-     tree node;
+debug_tree (tree node)
 {
-  char *object = (char *) oballoc (0);
-
-  table = (struct bucket **) oballoc (HASH_SIZE * sizeof (struct bucket *));
-  bzero ((char *) table, HASH_SIZE * sizeof (struct bucket *));
+  table = xcalloc (HASH_SIZE, sizeof (struct bucket *));
   print_node (stderr, "", node, 0);
+  free (table);
   table = 0;
-  obfree (object);
-  fprintf (stderr, "\n");
+  putc ('\n', stderr);
 }
 
 /* Print a node in brief fashion, with just the code, address and name.  */
 
 void
-print_node_brief (file, prefix, node, indent)
-     FILE *file;
-     const char *prefix;
-     tree node;
-     int indent;
+print_node_brief (FILE *file, const char *prefix, tree node, int indent)
 {
   char class;
 
@@ -75,8 +72,8 @@ print_node_brief (file, prefix, node, indent)
      name if any.  */
   if (indent > 0)
     fprintf (file, " ");
-  fprintf (file, "%s <%s ", prefix, tree_code_name[(int) TREE_CODE (node)]);
-  fprintf (file, HOST_PTR_PRINTF, (char *) node);
+  fprintf (file, "%s <%s " HOST_PTR_PRINTF,
+	   prefix, tree_code_name[(int) TREE_CODE (node)], (char *) node);
 
   if (class == 'd')
     {
@@ -97,7 +94,8 @@ print_node_brief (file, prefix, node, indent)
     }
   if (TREE_CODE (node) == IDENTIFIER_NODE)
     fprintf (file, " %s", IDENTIFIER_POINTER (node));
-  /* We might as well always print the value of an integer.  */
+
+  /* We might as well always print the value of an integer or real.  */
   if (TREE_CODE (node) == INTEGER_CST)
     {
       if (TREE_CONSTANT_OVERFLOW (node))
@@ -108,11 +106,8 @@ print_node_brief (file, prefix, node, indent)
 	fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED, TREE_INT_CST_LOW (node));
       else if (TREE_INT_CST_HIGH (node) == -1
 	       && TREE_INT_CST_LOW (node) != 0)
-	{
-	  fprintf (file, "-");
-	  fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED,
+	fprintf (file, "-" HOST_WIDE_INT_PRINT_UNSIGNED,
 		 -TREE_INT_CST_LOW (node));
-	}
       else
 	fprintf (file, HOST_WIDE_INT_PRINT_DOUBLE_HEX,
 		 TREE_INT_CST_HIGH (node), TREE_INT_CST_LOW (node));
@@ -124,7 +119,6 @@ print_node_brief (file, prefix, node, indent)
       if (TREE_OVERFLOW (node))
 	fprintf (file, " overflow");
 
-#if !defined(REAL_IS_NOT_DOUBLE) || defined(REAL_ARITHMETIC)
       d = TREE_REAL_CST (node);
       if (REAL_VALUE_ISINF (d))
 	fprintf (file, " Inf");
@@ -132,30 +126,17 @@ print_node_brief (file, prefix, node, indent)
 	fprintf (file, " Nan");
       else
 	{
-	  char string[100];
-
-	  REAL_VALUE_TO_DECIMAL (d, "%e", string);
+	  char string[60];
+	  real_to_decimal (string, &d, sizeof (string), 0, 1);
 	  fprintf (file, " %s", string);
 	}
-#else
-      {
-	int i;
-	unsigned char *p = (unsigned char *) &TREE_REAL_CST (node);
-	fprintf (file, " 0x");
-	for (i = 0; i < sizeof TREE_REAL_CST (node); i++)
-	  fprintf (file, "%02x", *p++);
-	fprintf (file, "");
-      }
-#endif
     }
 
   fprintf (file, ">");
 }
 
 void
-indent_to (file, column)
-     FILE *file;
-     int column;
+indent_to (FILE *file, int column)
 {
   int i;
 
@@ -170,11 +151,7 @@ indent_to (file, column)
    starting in column INDENT.  */
 
 void
-print_node (file, prefix, node, indent)
-     FILE *file;
-     const char *prefix;
-     tree node;
-     int indent;
+print_node (FILE *file, const char *prefix, tree node, int indent)
 {
   int hash;
   struct bucket *b;
@@ -183,6 +160,7 @@ print_node (file, prefix, node, indent)
   int len;
   int first_rtl;
   int i;
+  expanded_location xloc;
 
   if (node == 0)
     return;
@@ -205,7 +183,7 @@ print_node (file, prefix, node, indent)
       return;
     }
 
-  /* It is unsafe to look at any other filds of an ERROR_MARK node.  */
+  /* It is unsafe to look at any other fields of an ERROR_MARK node.  */
   if (TREE_CODE (node) == ERROR_MARK)
     {
       print_node_brief (file, prefix, node, indent);
@@ -223,7 +201,7 @@ print_node (file, prefix, node, indent)
       }
 
   /* Add this node to the table.  */
-  b = (struct bucket *) oballoc (sizeof (struct bucket));
+  b = xmalloc (sizeof (struct bucket));
   b->node = node;
   b->next = table[hash];
   table[hash] = b;
@@ -232,8 +210,8 @@ print_node (file, prefix, node, indent)
   indent_to (file, indent);
 
   /* Print the slot this node is in, and its code, and address.  */
-  fprintf (file, "%s <%s ", prefix, tree_code_name[(int) TREE_CODE (node)]);
-  fprintf (file, HOST_PTR_PRINTF, (char *) node);
+  fprintf (file, "%s <%s " HOST_PTR_PRINTF,
+	   prefix, tree_code_name[(int) TREE_CODE (node)], (void *) node);
 
   /* Print the name, if any.  */
   if (class == 'd')
@@ -266,46 +244,39 @@ print_node (file, prefix, node, indent)
       print_node (file, "type", TREE_TYPE (node), indent + 4);
       if (TREE_TYPE (node))
 	indent_to (file, indent + 3);
-
-      if (!ggc_p)
-	print_obstack_name ((char *) node, file, "");
-      indent_to (file, indent + 3);
-    }
-
-  /* If a permanent object is in the wrong obstack, or the reverse, warn.  */
-  if (!ggc_p && object_permanent_p (node) != TREE_PERMANENT (node))
-    {
-      if (TREE_PERMANENT (node))
-	fputs (" !!permanent object in non-permanent obstack!!", file);
-      else
-	fputs (" !!non-permanent object in permanent obstack!!", file);
-      indent_to (file, indent + 3);
     }
 
-  if (TREE_SIDE_EFFECTS (node))
+  if (!TYPE_P (node) && TREE_SIDE_EFFECTS (node))
     fputs (" side-effects", file);
-  if (TREE_READONLY (node))
+
+  if (TYPE_P (node) ? TYPE_READONLY (node) : TREE_READONLY (node))
     fputs (" readonly", file);
-  if (TREE_CONSTANT (node))
+  if (!TYPE_P (node) && TREE_CONSTANT (node))
     fputs (" constant", file);
+  if (TREE_INVARIANT (node))
+    fputs (" invariant", file);
   if (TREE_ADDRESSABLE (node))
     fputs (" addressable", file);
   if (TREE_THIS_VOLATILE (node))
     fputs (" volatile", file);
-  if (TREE_UNSIGNED (node))
-    fputs (" unsigned", file);
   if (TREE_ASM_WRITTEN (node))
     fputs (" asm_written", file);
   if (TREE_USED (node))
     fputs (" used", file);
-  if (TREE_RAISES (node))
-    fputs (" raises", file);
-  if (TREE_PERMANENT (node))
-    fputs (" permanent", file);
+  if (TREE_NOTHROW (node))
+    fputs (TYPE_P (node) ? " align-ok" : " nothrow", file);
   if (TREE_PUBLIC (node))
     fputs (" public", file);
+  if (TREE_PRIVATE (node))
+    fputs (" private", file);
+  if (TREE_PROTECTED (node))
+    fputs (" protected", file);
   if (TREE_STATIC (node))
     fputs (" static", file);
+  if (TREE_DEPRECATED (node))
+    fputs (" deprecated", file);
+  if (TREE_VISITED (node))
+    fputs (" visited", file);
   if (TREE_LANG_FLAG_0 (node))
     fputs (" tree_0", file);
   if (TREE_LANG_FLAG_1 (node))
@@ -328,6 +299,8 @@ print_node (file, prefix, node, indent)
     case 'd':
       mode = DECL_MODE (node);
 
+      if (DECL_UNSIGNED (node))
+	fputs (" unsigned", file);
       if (DECL_IGNORED_P (node))
 	fputs (" ignored", file);
       if (DECL_ABSTRACT (node))
@@ -338,36 +311,50 @@ print_node (file, prefix, node, indent)
 	fputs (" common", file);
       if (DECL_EXTERNAL (node))
 	fputs (" external", file);
-      if (DECL_REGISTER (node))
+      if (DECL_WEAK (node))
+	fputs (" weak", file);
+      if (DECL_REGISTER (node) && TREE_CODE (node) != FIELD_DECL
+	  && TREE_CODE (node) != FUNCTION_DECL
+	  && TREE_CODE (node) != LABEL_DECL)
 	fputs (" regdecl", file);
-      if (DECL_PACKED (node))
-	fputs (" packed", file);
       if (DECL_NONLOCAL (node))
 	fputs (" nonlocal", file);
-      if (DECL_INLINE (node))
-	fputs (" inline", file);
 
       if (TREE_CODE (node) == TYPE_DECL && TYPE_DECL_SUPPRESS_DEBUG (node))
 	fputs (" suppress-debug", file);
 
+      if (TREE_CODE (node) == FUNCTION_DECL && DECL_INLINE (node))
+	fputs (DECL_DECLARED_INLINE_P (node) ? " inline" : " autoinline", file);
       if (TREE_CODE (node) == FUNCTION_DECL && DECL_BUILT_IN (node))
 	fputs (" built-in", file);
-      if (TREE_CODE (node) == FUNCTION_DECL && DECL_BUILT_IN_NONANSI (node))
-	fputs (" built-in-nonansi", file);
+      if (TREE_CODE (node) == FUNCTION_DECL && DECL_NO_STATIC_CHAIN (node))
+	fputs (" no-static-chain", file);
 
+      if (TREE_CODE (node) == FIELD_DECL && DECL_PACKED (node))
+	fputs (" packed", file);
       if (TREE_CODE (node) == FIELD_DECL && DECL_BIT_FIELD (node))
 	fputs (" bit-field", file);
-      if (TREE_CODE (node) == LABEL_DECL && DECL_TOO_LATE (node))
-	fputs (" too-late", file);
+      if (TREE_CODE (node) == FIELD_DECL && DECL_NONADDRESSABLE_P (node))
+	fputs (" nonaddressable", file);
+
+      if (TREE_CODE (node) == LABEL_DECL && DECL_ERROR_ISSUED (node))
+	fputs (" error-issued", file);
+
       if (TREE_CODE (node) == VAR_DECL && DECL_IN_TEXT_SECTION (node))
 	fputs (" in-text-section", file);
+      if (TREE_CODE (node) == VAR_DECL && DECL_THREAD_LOCAL (node))
+	fputs (" thread-local", file);
+
+      if (TREE_CODE (node) == PARM_DECL && DECL_TRANSPARENT_UNION (node))
+	fputs (" transparent-union", file);
 
       if (DECL_VIRTUAL_P (node))
 	fputs (" virtual", file);
       if (DECL_DEFER_OUTPUT (node))
 	fputs (" defer-output", file);
-      if (DECL_TRANSPARENT_UNION (node))
-	fputs (" transparent-union", file);
+
+      if (DECL_PRESERVE_P (node))
+	fputs (" preserve", file);
 
       if (DECL_LANG_FLAG_0 (node))
 	fputs (" decl_0", file);
@@ -386,54 +373,85 @@ print_node (file, prefix, node, indent)
       if (DECL_LANG_FLAG_7 (node))
 	fputs (" decl_7", file);
 
-      fprintf (file, " %s", GET_MODE_NAME(mode));
-
-      fprintf (file, " file %s line %d",
-	       DECL_SOURCE_FILE (node), DECL_SOURCE_LINE (node));
+      fprintf (file, " %s", GET_MODE_NAME (mode));
+      xloc = expand_location (DECL_SOURCE_LOCATION (node));
+      fprintf (file, " file %s line %d", xloc.file, xloc.line);
 
       print_node (file, "size", DECL_SIZE (node), indent + 4);
-      indent_to (file, indent + 3);
+      print_node (file, "unit size", DECL_SIZE_UNIT (node), indent + 4);
+
+      if (TREE_CODE (node) != FUNCTION_DECL
+	  || DECL_INLINE (node) || DECL_BUILT_IN (node))
+	indent_to (file, indent + 3);
+
       if (TREE_CODE (node) != FUNCTION_DECL)
-	fprintf (file, " align %d", DECL_ALIGN (node));
-      else if (DECL_INLINE (node))
-	fprintf (file, " frame_size %d", DECL_FRAME_SIZE (node));
+	{
+	  if (DECL_USER_ALIGN (node))
+	    fprintf (file, " user");
+
+	  fprintf (file, " align %d", DECL_ALIGN (node));
+	  if (TREE_CODE (node) == FIELD_DECL)
+	    fprintf (file, " offset_align " HOST_WIDE_INT_PRINT_UNSIGNED,
+		     DECL_OFFSET_ALIGN (node));
+	}
       else if (DECL_BUILT_IN (node))
-	fprintf (file, " built-in code %d", DECL_FUNCTION_CODE (node));
-      if (TREE_CODE (node) == FIELD_DECL)
-	print_node (file, "bitpos", DECL_FIELD_BITPOS (node), indent + 4);
+	{
+	  if (DECL_BUILT_IN_CLASS (node) == BUILT_IN_MD)
+	    fprintf (file, " built-in BUILT_IN_MD %d", DECL_FUNCTION_CODE (node));
+	  else
+	    fprintf (file, " built-in %s:%s",
+		     built_in_class_names[(int) DECL_BUILT_IN_CLASS (node)],
+		     built_in_names[(int) DECL_FUNCTION_CODE (node)]);
+	}
+
       if (DECL_POINTER_ALIAS_SET_KNOWN_P (node))
-	fprintf (file, " alias set %d", DECL_POINTER_ALIAS_SET (node));
+	fprintf (file, " alias set " HOST_WIDE_INT_PRINT_DEC,
+		 DECL_POINTER_ALIAS_SET (node));
+
+      if (TREE_CODE (node) == FIELD_DECL)
+	{
+	  print_node (file, "offset", DECL_FIELD_OFFSET (node), indent + 4);
+	  print_node (file, "bit offset", DECL_FIELD_BIT_OFFSET (node),
+		      indent + 4);
+	}
+
       print_node_brief (file, "context", DECL_CONTEXT (node), indent + 4);
-      print_node_brief (file, "machine_attributes", DECL_MACHINE_ATTRIBUTES (node), indent + 4);
+      print_node_brief (file, "attributes",
+			DECL_ATTRIBUTES (node), indent + 4);
       print_node_brief (file, "abstract_origin",
 			DECL_ABSTRACT_ORIGIN (node), indent + 4);
 
       print_node (file, "arguments", DECL_ARGUMENTS (node), indent + 4);
-      print_node (file, "result", DECL_RESULT (node), indent + 4);
+      print_node (file, "result", DECL_RESULT_FLD (node), indent + 4);
       print_node_brief (file, "initial", DECL_INITIAL (node), indent + 4);
 
-      print_lang_decl (file, node, indent);
+      lang_hooks.print_decl (file, node, indent);
 
-      if (DECL_RTL (node) != 0)
+      if (DECL_RTL_SET_P (node))
 	{
 	  indent_to (file, indent + 4);
 	  print_rtl (file, DECL_RTL (node));
 	}
 
-      if (DECL_SAVED_INSNS (node) != 0)
+      if (TREE_CODE (node) == PARM_DECL)
 	{
-	  indent_to (file, indent + 4);
-	  if (TREE_CODE (node) == PARM_DECL)
+	  print_node (file, "arg-type", DECL_ARG_TYPE (node), indent + 4);
+	  print_node (file, "arg-type-as-written",
+		      DECL_ARG_TYPE_AS_WRITTEN (node), indent + 4);
+
+	  if (DECL_INCOMING_RTL (node) != 0)
 	    {
+	      indent_to (file, indent + 4);
 	      fprintf (file, "incoming-rtl ");
 	      print_rtl (file, DECL_INCOMING_RTL (node));
 	    }
-	  else if (TREE_CODE (node) == FUNCTION_DECL)
-	    {
-	      fprintf (file, "saved-insns ");
-	      fprintf (file, HOST_PTR_PRINTF,
- 		       (char *) DECL_SAVED_INSNS (node));
-	    }
+	}
+      else if (TREE_CODE (node) == FUNCTION_DECL
+	       && DECL_STRUCT_FUNCTION (node) != 0)
+	{
+	  indent_to (file, indent + 4);
+	  fprintf (file, "saved-insns " HOST_PTR_PRINTF,
+		   (void *) DECL_STRUCT_FUNCTION (node));
 	}
 
       /* Print the decl chain only if decl is at second level.  */
@@ -444,17 +462,42 @@ print_node (file, prefix, node, indent)
       break;
 
     case 't':
-      if (TYPE_NO_FORCE_BLK (node))
+      if (TYPE_UNSIGNED (node))
+	fputs (" unsigned", file);
+
+      /* The no-force-blk flag is used for different things in
+	 different types.  */
+      if ((TREE_CODE (node) == RECORD_TYPE
+	   || TREE_CODE (node) == UNION_TYPE
+	   || TREE_CODE (node) == QUAL_UNION_TYPE)
+	  && TYPE_NO_FORCE_BLK (node))
 	fputs (" no-force-blk", file);
+      else if (TREE_CODE (node) == INTEGER_TYPE
+	       && TYPE_IS_SIZETYPE (node))
+	fputs (" sizetype", file);
+      else if (TREE_CODE (node) == FUNCTION_TYPE
+	       && TYPE_RETURNS_STACK_DEPRESSED (node))
+	fputs (" returns-stack-depressed", file);
+
       if (TYPE_STRING_FLAG (node))
 	fputs (" string-flag", file);
       if (TYPE_NEEDS_CONSTRUCTING (node))
 	fputs (" needs-constructing", file);
-      if (TYPE_TRANSPARENT_UNION (node))
+
+      /* The transparent-union flag is used for different things in
+	 different nodes.  */
+      if (TREE_CODE (node) == UNION_TYPE && TYPE_TRANSPARENT_UNION (node))
 	fputs (" transparent-union", file);
+      else if (TREE_CODE (node) == ARRAY_TYPE
+	       && TYPE_NONALIASED_COMPONENT (node))
+	fputs (" nonaliased-component", file);
+
       if (TYPE_PACKED (node))
 	fputs (" packed", file);
 
+      if (TYPE_RESTRICT (node))
+	fputs (" restrict", file);
+
       if (TYPE_LANG_FLAG_0 (node))
 	fputs (" type_0", file);
       if (TYPE_LANG_FLAG_1 (node))
@@ -471,69 +514,63 @@ print_node (file, prefix, node, indent)
 	fputs (" type_6", file);
 
       mode = TYPE_MODE (node);
-      fprintf (file, " %s", GET_MODE_NAME(mode));
+      fprintf (file, " %s", GET_MODE_NAME (mode));
 
       print_node (file, "size", TYPE_SIZE (node), indent + 4);
+      print_node (file, "unit size", TYPE_SIZE_UNIT (node), indent + 4);
       indent_to (file, indent + 3);
 
-      fprintf (file, " align %d", TYPE_ALIGN (node));
-      fprintf (file, " symtab %d", TYPE_SYMTAB_ADDRESS (node));
-      fprintf (file, " alias set %d", TYPE_ALIAS_SET (node));
+      if (TYPE_USER_ALIGN (node))
+	fprintf (file, " user");
+
+      fprintf (file, " align %d symtab %d alias set " HOST_WIDE_INT_PRINT_DEC,
+	       TYPE_ALIGN (node), TYPE_SYMTAB_ADDRESS (node),
+	       TYPE_ALIAS_SET (node));
 
       print_node (file, "attributes", TYPE_ATTRIBUTES (node), indent + 4);
 
-      if (TREE_CODE (node) == ARRAY_TYPE || TREE_CODE (node) == SET_TYPE)
-	print_node (file, "domain", TYPE_DOMAIN (node), indent + 4);
-      else if (TREE_CODE (node) == INTEGER_TYPE
-	       || TREE_CODE (node) == BOOLEAN_TYPE
-	       || TREE_CODE (node) == CHAR_TYPE)
-	{
-	  fprintf (file, " precision %d", TYPE_PRECISION (node));
-	  print_node (file, "min", TYPE_MIN_VALUE (node), indent + 4);
-	  print_node (file, "max", TYPE_MAX_VALUE (node), indent + 4);
-	}
-      else if (TREE_CODE (node) == ENUMERAL_TYPE)
+      if (INTEGRAL_TYPE_P (node) || TREE_CODE (node) == REAL_TYPE)
 	{
 	  fprintf (file, " precision %d", TYPE_PRECISION (node));
-	  print_node (file, "min", TYPE_MIN_VALUE (node), indent + 4);
-	  print_node (file, "max", TYPE_MAX_VALUE (node), indent + 4);
-	  print_node (file, "values", TYPE_VALUES (node), indent + 4);
+	  print_node_brief (file, "min", TYPE_MIN_VALUE (node), indent + 4);
+	  print_node_brief (file, "max", TYPE_MAX_VALUE (node), indent + 4);
 	}
-      else if (TREE_CODE (node) == REAL_TYPE)
-	fprintf (file, " precision %d", TYPE_PRECISION (node));
+
+      if (TREE_CODE (node) == ENUMERAL_TYPE)
+	print_node (file, "values", TYPE_VALUES (node), indent + 4);
+      else if (TREE_CODE (node) == ARRAY_TYPE || TREE_CODE (node) == SET_TYPE)
+	print_node (file, "domain", TYPE_DOMAIN (node), indent + 4);
+      else if (TREE_CODE (node) == VECTOR_TYPE)
+	fprintf (file, " nunits %d", (int) TYPE_VECTOR_SUBPARTS (node));
       else if (TREE_CODE (node) == RECORD_TYPE
 	       || TREE_CODE (node) == UNION_TYPE
 	       || TREE_CODE (node) == QUAL_UNION_TYPE)
 	print_node (file, "fields", TYPE_FIELDS (node), indent + 4);
-      else if (TREE_CODE (node) == FUNCTION_TYPE || TREE_CODE (node) == METHOD_TYPE)
+      else if (TREE_CODE (node) == FUNCTION_TYPE
+	       || TREE_CODE (node) == METHOD_TYPE)
 	{
 	  if (TYPE_METHOD_BASETYPE (node))
-	    print_node_brief (file, "method basetype", TYPE_METHOD_BASETYPE (node), indent + 4);
+	    print_node_brief (file, "method basetype",
+			      TYPE_METHOD_BASETYPE (node), indent + 4);
 	  print_node (file, "arg-types", TYPE_ARG_TYPES (node), indent + 4);
 	}
       else if (TREE_CODE (node) == OFFSET_TYPE)
 	print_node_brief (file, "basetype", TYPE_OFFSET_BASETYPE (node),
 			  indent + 4);
+
       if (TYPE_CONTEXT (node))
 	print_node_brief (file, "context", TYPE_CONTEXT (node), indent + 4);
 
-      print_lang_type (file, node, indent);
+      lang_hooks.print_type (file, node, indent);
 
       if (TYPE_POINTER_TO (node) || TREE_CHAIN (node))
 	indent_to (file, indent + 3);
-      print_node_brief (file, "pointer_to_this", TYPE_POINTER_TO (node), indent + 4);
-      print_node_brief (file, "reference_to_this", TYPE_REFERENCE_TO (node), indent + 4);
-      print_node_brief (file, "chain", TREE_CHAIN (node), indent + 4);
-      break;
 
-    case 'b':
-      print_node (file, "vars", BLOCK_VARS (node), indent + 4);
-      print_node (file, "tags", BLOCK_TYPE_TAGS (node), indent + 4);
-      print_node (file, "supercontext", BLOCK_SUPERCONTEXT (node), indent + 4);
-      print_node (file, "subblocks", BLOCK_SUBBLOCKS (node), indent + 4);
-      print_node (file, "chain", BLOCK_CHAIN (node), indent + 4);
-      print_node (file, "abstract_origin",
-		  BLOCK_ABSTRACT_ORIGIN (node), indent + 4);
+      print_node_brief (file, "pointer_to_this", TYPE_POINTER_TO (node),
+			indent + 4);
+      print_node_brief (file, "reference_to_this", TYPE_REFERENCE_TO (node),
+			indent + 4);
+      print_node_brief (file, "chain", TREE_CHAIN (node), indent + 4);
       break;
 
     case 'e':
@@ -542,6 +579,8 @@ print_node (file, prefix, node, indent)
     case '2':
     case 'r':
     case 's':
+      if (TREE_CODE (node) == BIT_FIELD_REF && BIT_FIELD_REF_UNSIGNED (node))
+	fputs (" unsigned", file);
       if (TREE_CODE (node) == BIND_EXPR)
 	{
 	  print_node (file, "vars", TREE_OPERAND (node, 0), indent + 4);
@@ -550,10 +589,12 @@ print_node (file, prefix, node, indent)
 	  break;
 	}
 
-      len = tree_code_length[(int) TREE_CODE (node)];
+      len = TREE_CODE_LENGTH (TREE_CODE (node));
+
       /* Some nodes contain rtx's, not trees,
 	 after a certain point.  Print the rtx's as rtx's.  */
       first_rtl = first_rtl_op (TREE_CODE (node));
+
       for (i = 0; i < len; i++)
 	{
 	  if (i >= first_rtl)
@@ -561,7 +602,7 @@ print_node (file, prefix, node, indent)
 	      indent_to (file, indent + 4);
 	      fprintf (file, "rtl %d ", i);
 	      if (TREE_OPERAND (node, i))
-		print_rtl (file, (struct rtx_def *) TREE_OPERAND (node, i));
+		print_rtl (file, (rtx) TREE_OPERAND (node, i));
 	      else
 		fprintf (file, "(nil)");
 	      fprintf (file, "\n");
@@ -575,14 +616,7 @@ print_node (file, prefix, node, indent)
 	    }
 	}
 
-      if (TREE_CODE (node) == EXPR_WITH_FILE_LOCATION)
-	{
-	  indent_to (file, indent+4);
-          fprintf (file, "%s:%d:%d", 
-		   (EXPR_WFL_FILENAME_NODE (node ) ?
-		    EXPR_WFL_FILENAME (node) : "(no file info)"),
-		   EXPR_WFL_LINENO (node), EXPR_WFL_COLNO (node));
-	}
+      print_node (file, "chain", TREE_CHAIN (node), indent + 4);
       break;
 
     case 'c':
@@ -599,11 +633,8 @@ print_node (file, prefix, node, indent)
 		     TREE_INT_CST_LOW (node));
 	  else if (TREE_INT_CST_HIGH (node) == -1
 		   && TREE_INT_CST_LOW (node) != 0)
-	    {
-	      fprintf (file, "-");
-	      fprintf (file, HOST_WIDE_INT_PRINT_UNSIGNED,
-		       -TREE_INT_CST_LOW (node));
-	    }
+	    fprintf (file, "-" HOST_WIDE_INT_PRINT_UNSIGNED,
+		     -TREE_INT_CST_LOW (node));
 	  else
 	    fprintf (file, HOST_WIDE_INT_PRINT_DOUBLE_HEX,
 		     TREE_INT_CST_HIGH (node), TREE_INT_CST_LOW (node));
@@ -616,7 +647,6 @@ print_node (file, prefix, node, indent)
 	    if (TREE_OVERFLOW (node))
 	      fprintf (file, " overflow");
 
-#if !defined(REAL_IS_NOT_DOUBLE) || defined(REAL_ARITHMETIC)
 	    d = TREE_REAL_CST (node);
 	    if (REAL_VALUE_ISINF (d))
 	      fprintf (file, " Inf");
@@ -624,21 +654,26 @@ print_node (file, prefix, node, indent)
 	      fprintf (file, " Nan");
 	    else
 	      {
-		char string[100];
-
-		REAL_VALUE_TO_DECIMAL (d, "%e", string);
+		char string[64];
+		real_to_decimal (string, &d, sizeof (string), 0, 1);
 		fprintf (file, " %s", string);
 	      }
-#else
-	    {
-	      int i;
-	      unsigned char *p = (unsigned char *) &TREE_REAL_CST (node);
-	      fprintf (file, " 0x");
-	      for (i = 0; i < sizeof TREE_REAL_CST (node); i++)
-		fprintf (file, "%02x", *p++);
-	      fprintf (file, "");
-	    }
-#endif
+	  }
+	  break;
+
+	case VECTOR_CST:
+	  {
+	    tree vals = TREE_VECTOR_CST_ELTS (node);
+	    char buf[10];
+	    tree link;
+	    int i;
+
+	    i = 0;
+	    for (link = vals; link; link = TREE_CHAIN (link), ++i)
+	      {
+		sprintf (buf, "elt%d: ", i);
+		print_node (file, buf, TREE_VALUE (link), indent + 4);
+	      }
 	  }
 	  break;
 
@@ -648,7 +683,20 @@ print_node (file, prefix, node, indent)
 	  break;
 
 	case STRING_CST:
-	  fprintf (file, " \"%s\"", TREE_STRING_POINTER (node));
+	  {
+	    const char *p = TREE_STRING_POINTER (node);
+	    int i = TREE_STRING_LENGTH (node);
+	    fputs (" \"", file);
+	    while (--i >= 0)
+	      {
+		char ch = *p++;
+		if (ch >= ' ' && ch < 127)
+		  putc (ch, file);
+		else
+		  fprintf(file, "\\%03o", ch & 0xFF);
+	      }
+	    fputc ('\"', file);
+	  }
 	  /* Print the chain at second level.  */
 	  if (indent == 4)
 	    print_node (file, "chain", TREE_CHAIN (node), indent + 4);
@@ -657,7 +705,7 @@ print_node (file, prefix, node, indent)
 	  break;
 
 	case IDENTIFIER_NODE:
-	  print_lang_identifier (file, node, indent);
+	  lang_hooks.print_identifier (file, node, indent);
 	  break;
 
 	case TREE_LIST:
@@ -678,19 +726,59 @@ print_node (file, prefix, node, indent)
 	      }
 	  break;
 
-	case OP_IDENTIFIER:
-	  print_node (file, "op1", TREE_PURPOSE (node), indent + 4);
-	  print_node (file, "op2", TREE_VALUE (node), indent + 4);
+	case BLOCK:
+	  print_node (file, "vars", BLOCK_VARS (node), indent + 4);
+	  print_node (file, "supercontext", BLOCK_SUPERCONTEXT (node),
+		      indent + 4);
+	  print_node (file, "subblocks", BLOCK_SUBBLOCKS (node), indent + 4);
+	  print_node (file, "chain", BLOCK_CHAIN (node), indent + 4);
+	  print_node (file, "abstract_origin",
+		      BLOCK_ABSTRACT_ORIGIN (node), indent + 4);
+	  break;
+
+	case SSA_NAME:
+	  print_node_brief (file, "var", SSA_NAME_VAR (node), indent + 4);
+	  print_node_brief (file, "def_stmt",
+			    SSA_NAME_DEF_STMT (node), indent + 4);
+
+	  indent_to (file, indent + 4);
+	  fprintf (file, "version %u", SSA_NAME_VERSION (node));
+	  if (SSA_NAME_OCCURS_IN_ABNORMAL_PHI (node))
+	    fprintf (file, " in-abnormal-phi");
+	  if (SSA_NAME_IN_FREE_LIST (node))
+	    fprintf (file, " in-free-list");
+
+	  if (SSA_NAME_PTR_INFO (node)
+	      || SSA_NAME_VALUE (node)
+	      || SSA_NAME_AUX (node))
+	    {
+	      indent_to (file, indent + 3);
+	      if (SSA_NAME_PTR_INFO (node))
+		fprintf (file, " ptr-info %p",
+			 (void *) SSA_NAME_PTR_INFO (node));
+	      if (SSA_NAME_VALUE (node))
+		fprintf (file, " value %p",
+			 (void *) SSA_NAME_VALUE (node));
+	      if (SSA_NAME_AUX (node))
+		fprintf (file, " aux %p", SSA_NAME_AUX (node));
+	    }
 	  break;
 
 	default:
 	  if (TREE_CODE_CLASS (TREE_CODE (node)) == 'x')
-	    lang_print_xnode (file, node, indent);
+	    lang_hooks.print_xnode (file, node, indent);
 	  break;
 	}
 
       break;
     }
 
+  if (EXPR_HAS_LOCATION (node))
+    {
+      expanded_location xloc = expand_location (EXPR_LOCATION (node));
+      indent_to (file, indent+4);
+      fprintf (file, "%s:%d", xloc.file, xloc.line);
+    }
+
   fprintf (file, ">");
 }