* tree.h (TREE_ADDRESSABLE): Adjust comment to say that

[pf3gnuchains/gcc-fork.git] / gcc / sdbout.c

diff --git a/gcc/sdbout.c b/gcc/sdbout.c
index 8dd6026..6a771f4 100644 (file)
--- a/gcc/sdbout.c
+++ b/gcc/sdbout.c
@@ -1,12 +1,13 @@
 /* Output sdb-format symbol table information from GNU compiler.
    Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
 /* Output sdb-format symbol table information from GNU compiler.
    Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,

-   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009
+   Free Software Foundation, Inc.

 
 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
 
 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
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,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
 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
+<http://www.gnu.org/licenses/>.  */

 
 /*  mike@tredysvr.Tredydev.Unisys.COM says:
 I modified the struct.c example and have a nm of a .o resulting from the
 
 /*  mike@tredysvr.Tredydev.Unisys.COM says:
 I modified the struct.c example and have a nm of a .o resulting from the


@@ -48,7 +48,7 @@ AT&T C compiler.  From the example below I would conclude the following:
 #include "debug.h"
 #include "tree.h"
 #include "ggc.h"
 #include "debug.h"
 #include "tree.h"
 #include "ggc.h"

-#include "varray.h"
+#include "vec.h"

 
 static GTY(()) tree anonymous_types;
 
 
 static GTY(()) tree anonymous_types;
 


@@ -58,7 +58,7 @@ static GTY(()) int unnamed_struct_number;
 
 /* Declarations whose debug info was deferred till end of compilation.  */
 
 
 /* Declarations whose debug info was deferred till end of compilation.  */
 

-static GTY(()) varray_type deferred_global_decls;
+static GTY(()) VEC(tree,gc) *deferred_global_decls;

 
 /* The C front end may call sdbout_symbol before sdbout_init runs.
    We save all such decls in this list and output them when we get
 
 /* The C front end may call sdbout_symbol before sdbout_init runs.
    We save all such decls in this list and output them when we get


@@ -117,7 +117,7 @@ static void sdbout_start_source_file        (unsigned int, const char *);
 static void sdbout_end_source_file     (unsigned int);
 static void sdbout_begin_block         (unsigned int, unsigned int);
 static void sdbout_end_block           (unsigned int, unsigned int);
 static void sdbout_end_source_file     (unsigned int);
 static void sdbout_begin_block         (unsigned int, unsigned int);
 static void sdbout_end_block           (unsigned int, unsigned int);

-static void sdbout_source_line         (unsigned int, const char *);
+static void sdbout_source_line         (unsigned int, const char *, int, bool);

 static void sdbout_end_epilogue                (unsigned int, const char *);
 static void sdbout_global_decl         (tree);
 #ifndef MIPS_DEBUGGING_INFO
 static void sdbout_end_epilogue                (unsigned int, const char *);
 static void sdbout_global_decl         (tree);
 #ifndef MIPS_DEBUGGING_INFO


@@ -260,7 +260,7 @@ do { fprintf (asm_out_file, "\t.tag\t");    \
 /* Set the sdb tag identifier string for TYPE to NAME.  */
 
 #define SET_KNOWN_TYPE_TAG(TYPE, NAME) \
 /* Set the sdb tag identifier string for TYPE to NAME.  */
 
 #define SET_KNOWN_TYPE_TAG(TYPE, NAME) \

-  TYPE_SYMTAB_POINTER (TYPE) = (char *)(NAME)
+  TYPE_SYMTAB_POINTER (TYPE) = (const char *)(NAME)

 
 /* Return the name (a string) of the struct, union or enum tag
    described by the TREE_LIST node LINK.  This is 0 for an anonymous one.  */
 
 /* Return the name (a string) of the struct, union or enum tag
    described by the TREE_LIST node LINK.  This is 0 for an anonymous one.  */


@@ -307,13 +307,14 @@ const struct gcc_debug_hooks sdb_debug_hooks =
 {
   sdbout_init,                          /* init */
   sdbout_finish,                        /* finish */
 {
   sdbout_init,                          /* init */
   sdbout_finish,                        /* finish */

+  debug_nothing_void,                   /* assembly_start */

   debug_nothing_int_charstar,           /* define */
   debug_nothing_int_charstar,           /* undef */
   sdbout_start_source_file,             /* start_source_file */
   sdbout_end_source_file,               /* end_source_file */
   sdbout_begin_block,                   /* begin_block */
   sdbout_end_block,                     /* end_block */
   debug_nothing_int_charstar,           /* define */
   debug_nothing_int_charstar,           /* undef */
   sdbout_start_source_file,             /* start_source_file */
   sdbout_end_source_file,               /* end_source_file */
   sdbout_begin_block,                   /* begin_block */
   sdbout_end_block,                     /* end_block */

-  debug_true_tree,                      /* ignore_block */
+  debug_true_const_tree,                /* ignore_block */

   sdbout_source_line,                   /* source_line */
 #ifdef MIPS_DEBUGGING_INFO
   /* Defer on MIPS systems so that parameter descriptions follow
   sdbout_source_line,                   /* source_line */
 #ifdef MIPS_DEBUGGING_INFO
   /* Defer on MIPS systems so that parameter descriptions follow


@@ -330,13 +331,18 @@ const struct gcc_debug_hooks sdb_debug_hooks =
   debug_nothing_tree,                   /* function_decl */
   sdbout_global_decl,                   /* global_decl */
   sdbout_symbol,                        /* type_decl */
   debug_nothing_tree,                   /* function_decl */
   sdbout_global_decl,                   /* global_decl */
   sdbout_symbol,                        /* type_decl */

-  debug_nothing_tree_tree,               /* imported_module_or_decl */
+  debug_nothing_tree_tree_tree_bool,    /* imported_module_or_decl */

   debug_nothing_tree,                   /* deferred_inline_function */
   debug_nothing_tree,                   /* outlining_inline_function */
   sdbout_label,                                 /* label */
   debug_nothing_int,                    /* handle_pch */
   debug_nothing_rtx,                    /* var_location */
   debug_nothing_void,                    /* switch_text_section */
   debug_nothing_tree,                   /* deferred_inline_function */
   debug_nothing_tree,                   /* outlining_inline_function */
   sdbout_label,                                 /* label */
   debug_nothing_int,                    /* handle_pch */
   debug_nothing_rtx,                    /* var_location */
   debug_nothing_void,                    /* switch_text_section */

+  debug_nothing_tree,                   /* direct_call */
+  debug_nothing_tree_int,               /* virtual_call_token */
+  debug_nothing_rtx_rtx,                /* copy_call_info */
+  debug_nothing_uid,                    /* virtual_call */
+  debug_nothing_tree_tree,              /* set_name */

   0                                      /* start_end_main_source_file */
 };
 
   0                                      /* start_end_main_source_file */
 };
 


@@ -487,6 +493,7 @@ plain_type_1 (tree type, int level)
   switch (TREE_CODE (type))
     {
     case VOID_TYPE:
   switch (TREE_CODE (type))
     {
     case VOID_TYPE:

+    case NULLPTR_TYPE:

       return T_VOID;
     case BOOLEAN_TYPE:
     case INTEGER_TYPE:
       return T_VOID;
     case BOOLEAN_TYPE:
     case INTEGER_TYPE:


@@ -581,7 +588,7 @@ plain_type_1 (tree type, int level)
     case QUAL_UNION_TYPE:
     case ENUMERAL_TYPE:
       {
     case QUAL_UNION_TYPE:
     case ENUMERAL_TYPE:
       {

-       char *tag;
+       const char *tag;

 #ifdef SDB_ALLOW_FORWARD_REFERENCES
        sdbout_record_type_name (type);
 #endif
 #ifdef SDB_ALLOW_FORWARD_REFERENCES
        sdbout_record_type_name (type);
 #endif


@@ -770,7 +777,7 @@ sdbout_symbol (tree decl, int local)
        return;
 
       SET_DECL_RTL (decl,
        return;
 
       SET_DECL_RTL (decl,

-                   eliminate_regs (DECL_RTL (decl), 0, NULL_RTX));
+                   eliminate_regs (DECL_RTL (decl), VOIDmode, NULL_RTX));

 #ifdef LEAF_REG_REMAP
       if (current_function_uses_only_leaf_regs)
        leaf_renumber_regs_insn (DECL_RTL (decl));
 #ifdef LEAF_REG_REMAP
       if (current_function_uses_only_leaf_regs)
        leaf_renumber_regs_insn (DECL_RTL (decl));


@@ -897,7 +904,7 @@ sdbout_symbol (tree decl, int local)
       else if (MEM_P (value)
               && ((GET_CODE (XEXP (value, 0)) == PLUS
                    && REG_P (XEXP (XEXP (value, 0), 0))
       else if (MEM_P (value)
               && ((GET_CODE (XEXP (value, 0)) == PLUS
                    && REG_P (XEXP (XEXP (value, 0), 0))

-                   && GET_CODE (XEXP (XEXP (value, 0), 1)) == CONST_INT)
+                   && CONST_INT_P (XEXP (XEXP (value, 0), 1)))

                   /* This is for variables which are at offset zero from
                      the frame pointer.  This happens on the Alpha.
                      Non-frame pointer registers are excluded above.  */
                   /* This is for variables which are at offset zero from
                      the frame pointer.  This happens on the Alpha.
                      Non-frame pointer registers are excluded above.  */


@@ -1050,7 +1057,7 @@ sdbout_one_type (tree type)
       && DECL_SECTION_NAME (current_function_decl) != NULL_TREE)
     ; /* Don't change section amid function.  */
   else
       && DECL_SECTION_NAME (current_function_decl) != NULL_TREE)
     ; /* Don't change section amid function.  */
   else

-    text_section ();
+    switch_to_section (text_section);

 
   switch (TREE_CODE (type))
     {
 
   switch (TREE_CODE (type))
     {


@@ -1150,7 +1157,7 @@ sdbout_one_type (tree type)
              {
                tree child_type = BINFO_TYPE (child);
                tree child_type_name;
              {
                tree child_type = BINFO_TYPE (child);
                tree child_type_name;

-               
+

                if (TYPE_NAME (child_type) == 0)
                  continue;
                if (TREE_CODE (TYPE_NAME (child_type)) == IDENTIFIER_NODE)
                if (TYPE_NAME (child_type) == 0)
                  continue;
                if (TREE_CODE (TYPE_NAME (child_type)) == IDENTIFIER_NODE)


@@ -1178,14 +1185,21 @@ sdbout_one_type (tree type)
        if (TREE_CODE (type) == ENUMERAL_TYPE)
          {
            for (tem = TYPE_VALUES (type); tem; tem = TREE_CHAIN (tem))
        if (TREE_CODE (type) == ENUMERAL_TYPE)
          {
            for (tem = TYPE_VALUES (type); tem; tem = TREE_CHAIN (tem))

-             if (host_integerp (TREE_VALUE (tem), 0))
-               {
-                 PUT_SDB_DEF (IDENTIFIER_POINTER (TREE_PURPOSE (tem)));
-                 PUT_SDB_INT_VAL (tree_low_cst (TREE_VALUE (tem), 0));
-                 PUT_SDB_SCL (C_MOE);
-                 PUT_SDB_TYPE (T_MOE);
-                 PUT_SDB_ENDEF;
-               }
+             {
+               tree value = TREE_VALUE (tem);
+
+               if (TREE_CODE (value) == CONST_DECL)
+                 value = DECL_INITIAL (value);
+
+               if (host_integerp (value, 0))
+                 {
+                   PUT_SDB_DEF (IDENTIFIER_POINTER (TREE_PURPOSE (tem)));
+                   PUT_SDB_INT_VAL (tree_low_cst (value, 0));
+                   PUT_SDB_SCL (C_MOE);
+                   PUT_SDB_TYPE (T_MOE);
+                   PUT_SDB_ENDEF;
+                 }
+             }

          }
        else                    /* record or union type */
          for (tem = TYPE_FIELDS (type); tem; tem = TREE_CHAIN (tem))
          }
        else                    /* record or union type */
          for (tem = TYPE_FIELDS (type); tem; tem = TREE_CHAIN (tem))


@@ -1229,10 +1243,10 @@ sdbout_one_type (tree type)
        PUT_SDB_SIZE (size);
        PUT_SDB_ENDEF;
        break;
        PUT_SDB_SIZE (size);
        PUT_SDB_ENDEF;
        break;

-
-      default:
-       break;

       }
       }

+
+    default:
+      break;

     }
 }
 
     }
 }
 


@@ -1263,9 +1277,9 @@ sdbout_parms (tree parms)
        /* Perform any necessary register eliminations on the parameter's rtl,
           so that the debugging output will be accurate.  */
        DECL_INCOMING_RTL (parms)
        /* Perform any necessary register eliminations on the parameter's rtl,
           so that the debugging output will be accurate.  */
        DECL_INCOMING_RTL (parms)

-         = eliminate_regs (DECL_INCOMING_RTL (parms), 0, NULL_RTX);
+         = eliminate_regs (DECL_INCOMING_RTL (parms), VOIDmode, NULL_RTX);

        SET_DECL_RTL (parms,
        SET_DECL_RTL (parms,

-                     eliminate_regs (DECL_RTL (parms), 0, NULL_RTX));
+                     eliminate_regs (DECL_RTL (parms), VOIDmode, NULL_RTX));

 
        if (PARM_PASSED_IN_MEMORY (parms))
          {
 
        if (PARM_PASSED_IN_MEMORY (parms))
          {


@@ -1277,7 +1291,7 @@ sdbout_parms (tree parms)
               If that is not true, we produce meaningless results,
               but do not crash.  */
            if (GET_CODE (addr) == PLUS
               If that is not true, we produce meaningless results,
               but do not crash.  */
            if (GET_CODE (addr) == PLUS

-               && GET_CODE (XEXP (addr, 1)) == CONST_INT)
+               && CONST_INT_P (XEXP (addr, 1)))

              current_sym_value = INTVAL (XEXP (addr, 1));
            else
              current_sym_value = 0;
              current_sym_value = INTVAL (XEXP (addr, 1));
            else
              current_sym_value = 0;


@@ -1405,7 +1419,7 @@ sdbout_reg_parms (tree parms)
        /* Report parms that live in memory but not where they were passed.  */
        else if (MEM_P (DECL_RTL (parms))
                 && GET_CODE (XEXP (DECL_RTL (parms), 0)) == PLUS
        /* Report parms that live in memory but not where they were passed.  */
        else if (MEM_P (DECL_RTL (parms))
                 && GET_CODE (XEXP (DECL_RTL (parms), 0)) == PLUS

-                && GET_CODE (XEXP (XEXP (DECL_RTL (parms), 0), 1)) == CONST_INT
+                && CONST_INT_P (XEXP (XEXP (DECL_RTL (parms), 0), 1))

                 && PARM_PASSED_IN_MEMORY (parms)
                 && ! rtx_equal_p (DECL_RTL (parms), DECL_INCOMING_RTL (parms)))
          {
                 && PARM_PASSED_IN_MEMORY (parms)
                 && ! rtx_equal_p (DECL_RTL (parms), DECL_INCOMING_RTL (parms)))
          {


@@ -1451,7 +1465,7 @@ sdbout_global_decl (tree decl)
       if (!DECL_INITIAL (decl) || !TREE_PUBLIC (decl))
        sdbout_symbol (decl, 0);
       else
       if (!DECL_INITIAL (decl) || !TREE_PUBLIC (decl))
        sdbout_symbol (decl, 0);
       else

-       VARRAY_PUSH_TREE (deferred_global_decls, decl);
+       VEC_safe_push (tree, gc, deferred_global_decls, decl);

 
       /* Output COFF information for non-global file-scope initialized
         variables.  */
 
       /* Output COFF information for non-global file-scope initialized
         variables.  */


@@ -1467,9 +1481,10 @@ static void
 sdbout_finish (const char *main_filename ATTRIBUTE_UNUSED)
 {
   size_t i;
 sdbout_finish (const char *main_filename ATTRIBUTE_UNUSED)
 {
   size_t i;

+  tree decl;

 
 

-  for (i = 0; i < VARRAY_ACTIVE_SIZE (deferred_global_decls); i++)
-    sdbout_symbol (VARRAY_TREE (deferred_global_decls, i), 0);
+  for (i = 0; VEC_iterate (tree, deferred_global_decls, i, decl); i++)
+    sdbout_symbol (decl, 0);

 }
 
 /* Describe the beginning of an internal block within a function.
 }
 
 /* Describe the beginning of an internal block within a function.


@@ -1533,7 +1548,9 @@ sdbout_end_block (unsigned int line, unsigned int n ATTRIBUTE_UNUSED)
    number LINE.  */
 
 static void
    number LINE.  */
 
 static void

-sdbout_source_line (unsigned int line, const char *filename ATTRIBUTE_UNUSED)
+sdbout_source_line (unsigned int line, const char *filename ATTRIBUTE_UNUSED,
+                    int discriminator ATTRIBUTE_UNUSED,
+                    bool is_stmt ATTRIBUTE_UNUSED)

 {
   /* COFF relative line numbers must be positive.  */
   if ((int) line > sdb_begin_function_line)
 {
   /* COFF relative line numbers must be positive.  */
   if ((int) line > sdb_begin_function_line)


@@ -1637,7 +1654,7 @@ sdbout_start_source_file (unsigned int line ATTRIBUTE_UNUSED,
                          const char *filename ATTRIBUTE_UNUSED)
 {
 #ifdef MIPS_DEBUGGING_INFO
                          const char *filename ATTRIBUTE_UNUSED)
 {
 #ifdef MIPS_DEBUGGING_INFO

-  struct sdb_file *n = xmalloc (sizeof *n);
+  struct sdb_file *n = XNEW (struct sdb_file);

 
   n->next = current_file;
   n->name = filename;
 
   n->next = current_file;
   n->name = filename;


@@ -1669,12 +1686,12 @@ sdbout_init (const char *input_file_name ATTRIBUTE_UNUSED)
   tree t;
 
 #ifdef MIPS_DEBUGGING_INFO
   tree t;
 
 #ifdef MIPS_DEBUGGING_INFO

-  current_file = xmalloc (sizeof *current_file);
+  current_file = XNEW (struct sdb_file);

   current_file->next = NULL;
   current_file->name = input_file_name;
 #endif
 
   current_file->next = NULL;
   current_file->name = input_file_name;
 #endif
 

-  VARRAY_TREE_INIT (deferred_global_decls, 12, "deferred_global_decls");
+  deferred_global_decls = VEC_alloc (tree, gc, 12);

 
   /* Emit debug information which was queued by sdbout_symbol before
      we got here.  */
 
   /* Emit debug information which was queued by sdbout_symbol before
      we got here.  */


@@ -1688,7 +1705,42 @@ sdbout_init (const char *input_file_name ATTRIBUTE_UNUSED)
 #else  /* SDB_DEBUGGING_INFO */
 
 /* This should never be used, but its address is needed for comparisons.  */
 #else  /* SDB_DEBUGGING_INFO */
 
 /* This should never be used, but its address is needed for comparisons.  */

-const struct gcc_debug_hooks sdb_debug_hooks;
+const struct gcc_debug_hooks sdb_debug_hooks =
+{
+  0,           /* init */
+  0,           /* finish */
+  0,           /* assembly_start */
+  0,           /* define */
+  0,           /* undef */
+  0,           /* start_source_file */
+  0,           /* end_source_file */
+  0,           /* begin_block */
+  0,           /* end_block */
+  0,           /* ignore_block */
+  0,           /* source_line */
+  0,           /* begin_prologue */
+  0,           /* end_prologue */
+  0,           /* end_epilogue */
+  0,           /* begin_function */
+  0,           /* end_function */
+  0,           /* function_decl */
+  0,           /* global_decl */
+  0,           /* type_decl */
+  0,           /* imported_module_or_decl */
+  0,           /* deferred_inline_function */
+  0,           /* outlining_inline_function */
+  0,           /* label */
+  0,           /* handle_pch */
+  0,           /* var_location */
+  0,           /* switch_text_section */
+  0,           /* direct_call */
+  0,           /* virtual_call_token */
+  0,           /* copy_call_info */
+  0,           /* virtual_call */
+  0,           /* set_name */
+  0            /* start_end_main_source_file */
+};
+

 
 #endif /* SDB_DEBUGGING_INFO */
 
 
 #endif /* SDB_DEBUGGING_INFO */