* cse.c (cse_reg_info_free_list, cse_reg_info_used_list,

[pf3gnuchains/gcc-fork.git] / gcc / print-tree.c

diff --git a/gcc/print-tree.c b/gcc/print-tree.c
index 482f67c..8d8cbff 100644 (file)
--- a/gcc/print-tree.c
+++ b/gcc/print-tree.c
@@ -61,7 +61,7 @@ debug_tree (tree node)
 void
 print_node_brief (FILE *file, const char *prefix, tree node, int indent)
 {
-  char class;
+  enum tree_code_class class;
 
   if (node == 0)
     return;
@@ -75,12 +75,12 @@ print_node_brief (FILE *file, const char *prefix, tree node, int indent)
   fprintf (file, "%s <%s " HOST_PTR_PRINTF,
           prefix, tree_code_name[(int) TREE_CODE (node)], (char *) node);
 
-  if (class == 'd')
+  if (class == tcc_declaration)
     {
       if (DECL_NAME (node))
        fprintf (file, " %s", IDENTIFIER_POINTER (DECL_NAME (node)));
     }
-  else if (class == 't')
+  else if (class == tcc_type)
     {
       if (TYPE_NAME (node))
        {
@@ -156,9 +156,8 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
   int hash;
   struct bucket *b;
   enum machine_mode mode;
-  char class;
+  enum tree_code_class class;
   int len;
-  int first_rtl;
   int i;
   expanded_location xloc;
 
@@ -177,7 +176,7 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
       return;
     }
 
-  if (indent > 8 && (class == 't' || class == 'd'))
+  if (indent > 8 && (class == tcc_type || class == tcc_declaration))
     {
       print_node_brief (file, prefix, node, indent);
       return;
@@ -214,12 +213,12 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
           prefix, tree_code_name[(int) TREE_CODE (node)], (void *) node);
 
   /* Print the name, if any.  */
-  if (class == 'd')
+  if (class == tcc_declaration)
     {
       if (DECL_NAME (node))
        fprintf (file, " %s", IDENTIFIER_POINTER (DECL_NAME (node)));
     }
-  else if (class == 't')
+  else if (class == tcc_type)
     {
       if (TYPE_NAME (node))
        {
@@ -296,7 +295,7 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
 
   switch (TREE_CODE_CLASS (TREE_CODE (node)))
     {
-    case 'd':
+    case tcc_declaration:
       mode = DECL_MODE (node);
 
       if (DECL_UNSIGNED (node))
@@ -353,6 +352,9 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
       if (DECL_DEFER_OUTPUT (node))
        fputs (" defer-output", file);
 
+      if (DECL_PRESERVE_P (node))
+       fputs (" preserve", file);
+
       if (DECL_LANG_FLAG_0 (node))
        fputs (" decl_0", file);
       if (DECL_LANG_FLAG_1 (node))
@@ -458,7 +460,7 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
        print_node_brief (file, "chain", TREE_CHAIN (node), indent + 4);
       break;
 
-    case 't':
+    case tcc_type:
       if (TYPE_UNSIGNED (node))
        fputs (" unsigned", file);
 
@@ -535,8 +537,10 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
 
       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)
+      else if (TREE_CODE (node) == ARRAY_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)
@@ -568,12 +572,12 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
       print_node_brief (file, "chain", TREE_CHAIN (node), indent + 4);
       break;
 
-    case 'e':
-    case '<':
-    case '1':
-    case '2':
-    case 'r':
-    case 's':
+    case tcc_expression:
+    case tcc_comparison:
+    case tcc_unary:
+    case tcc_binary:
+    case tcc_reference:
+    case tcc_statement:
       if (TREE_CODE (node) == BIT_FIELD_REF && BIT_FIELD_REF_UNSIGNED (node))
        fputs (" unsigned", file);
       if (TREE_CODE (node) == BIND_EXPR)
@@ -586,36 +590,19 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
 
       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)
-           {
-             indent_to (file, indent + 4);
-             fprintf (file, "rtl %d ", i);
-             if (TREE_OPERAND (node, i))
-               print_rtl (file, (rtx) TREE_OPERAND (node, i));
-             else
-               fprintf (file, "(nil)");
-             fprintf (file, "\n");
-           }
-         else
-           {
-             char temp[10];
+         char temp[10];
 
-             sprintf (temp, "arg %d", i);
-             print_node (file, temp, TREE_OPERAND (node, i), indent + 4);
-           }
+         sprintf (temp, "arg %d", i);
+         print_node (file, temp, TREE_OPERAND (node, i), indent + 4);
        }
 
       print_node (file, "chain", TREE_CHAIN (node), indent + 4);
       break;
 
-    case 'c':
-    case 'x':
+    case tcc_constant:
+    case tcc_exceptional:
       switch (TREE_CODE (node))
        {
        case INTEGER_CST:
@@ -749,16 +736,18 @@ print_node (FILE *file, const char *prefix, tree node, int indent)
            {
              indent_to (file, indent + 3);
              if (SSA_NAME_PTR_INFO (node))
-               fprintf (file, " ptr-info %p", 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", 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')
+         if (EXCEPTIONAL_CLASS_P (node))
            lang_hooks.print_xnode (file, node, indent);
          break;
        }