Changeset 609 for branches/GNU/src/binutils/bfd/stabs.c

Timestamp:

Aug 16, 2003, 6:59:22 PM (22 years ago)

Author:

bird

Message:

binutils v2.14 - offical sources.

File:

• branches/GNU/src/binutils/bfd/stabs.c (modified) (35 diffs, 1 prop)

branches/GNU/src/binutils/bfd/stabs.c

@@ -1 +1 @@
 /* Stabs in sections linking support.
-   Copyright 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+   Free Software Foundation, Inc.
    Written by Ian Lance Taylor, Cygnus Support.
 
@@ -26 +27 @@
 #include "libbfd.h"
 #include "aout/stab_gnu.h"
-
-#include <ctype.h>
+#include "safe-ctype.h"
 
 /* Stabs entries use a 12 byte format:
@@ -171 +171 @@
    pass of the linker.  */
 
-boolean
+bfd_boolean
 _bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
      bfd *abfd;
@@ -179 +179 @@
      PTR *psecinfo;
 {
-  boolean first;
+  bfd_boolean first;
   struct stab_info *sinfo;
-  bfd_size_type count;
+  bfd_size_type count, amt;
   struct stab_section_info *secinfo;
   bfd_byte *stabbuf = NULL;
@@ -193 +193 @@
     {
       /* This file does not contain stabs debugging information.  */
-      return true;
+      return TRUE;
     }
 
@@ -199 +199 @@
     {
       /* Something is wrong with the format of these stab symbols.
-         Don't try to optimize them.  */
-      return true;
+         Don't try to optimize them.  */
+      return TRUE;
     }
 
@@ -206 +206 @@
     {
       /* We shouldn't see relocations in the strings, and we aren't
-         prepared to handle them.  */
-      return true;
+         prepared to handle them.  */
+      return TRUE;
     }
 
@@ -216 +216 @@
     {
       /* At least one of the sections is being discarded from the
-         link, so we should just ignore them.  */
-      return true;
-    }
-
-  first = false;
+         link, so we should just ignore them.  */
+      return TRUE;
+    }
+
+  first = FALSE;
 
   if (*psinfo == NULL)
     {
       /* Initialize the stabs information we need to keep track of.  */
-      first = true;
-      *psinfo = (PTR) bfd_alloc (abfd, sizeof (struct stab_info));
+      first = TRUE;
+      amt = sizeof (struct stab_info);
+      *psinfo = (PTR) bfd_alloc (abfd, amt);
       if (*psinfo == NULL)
         goto error_return;
@@ -234 +235 @@
         goto error_return;
       /* Make sure the first byte is zero.  */
-      (void) _bfd_stringtab_add (sinfo->strings, "", true, true);
+      (void) _bfd_stringtab_add (sinfo->strings, "", TRUE, TRUE);
       if (! bfd_hash_table_init_n (&sinfo->includes.root,
                                    stab_link_includes_newfunc,
@@ -250 +251 @@
   count = stabsec->_raw_size / STABSIZE;
 
-  *psecinfo = bfd_alloc (abfd,
-                         (sizeof (struct stab_section_info)
-                          + (count - 1) * sizeof (bfd_size_type)));
+  amt = sizeof (struct stab_section_info);
+  amt += (count - 1) * sizeof (bfd_size_type);
+  *psecinfo = bfd_alloc (abfd, amt);
   if (*psecinfo == NULL)
     goto error_return;
@@ -259 +260 @@
   secinfo->excls = NULL;
   secinfo->cumulative_skips = NULL;
-  memset (secinfo->stridxs, 0, count * sizeof (bfd_size_type));
+  memset (secinfo->stridxs, 0, (size_t) count * sizeof (bfd_size_type));
 
   /* Read the stabs information from abfd.  */
@@ -268 +269 @@
     goto error_return;
 
-  if (! bfd_get_section_contents (abfd, stabsec, stabbuf, 0,
+  if (! bfd_get_section_contents (abfd, stabsec, stabbuf, (bfd_vma) 0,
                                   stabsec->_raw_size)
-      || ! bfd_get_section_contents (abfd, stabstrsec, stabstrbuf, 0,
+      || ! bfd_get_section_contents (abfd, stabstrsec, stabstrbuf, (bfd_vma) 0,
                                      stabstrsec->_raw_size))
     goto error_return;
@@ -286 +287 @@
        sym += STABSIZE, ++pstridx)
     {
+      bfd_size_type symstroff;
       int type;
       const char *string;
@@ -300 +302 @@
         {
           /* Special type 0 stabs indicate the offset to the next
-             string table.  We only copy the very first one.  */
+             string table.  We only copy the very first one.  */
           stroff = next_stroff;
           next_stroff += bfd_get_32 (abfd, sym + 8);
@@ -309 +311 @@
               continue;
             }
-          first = false;
+          first = FALSE;
         }
 
       /* Store the string in the hash table, and record the index.  */
-      string = ((char *) stabstrbuf
-                + stroff
-                + bfd_get_32 (abfd, sym + STRDXOFF));
-      *pstridx = _bfd_stringtab_add (sinfo->strings, string, true, true);
+      symstroff = stroff + bfd_get_32 (abfd, sym + STRDXOFF);
+      if (symstroff >= stabstrsec->_raw_size)
+        {
+          (*_bfd_error_handler)
+            (_("%s(%s+0x%lx): Stabs entry has invalid string index."),
+             bfd_archive_filename (abfd),
+             bfd_get_section_name (abfd, stabsec),
+             (long) (sym - stabbuf));
+          bfd_set_error (bfd_error_bad_value);
+          goto error_return;
+        }
+      string = (char *) stabstrbuf + symstroff;
+      *pstridx = _bfd_stringtab_add (sinfo->strings, string, TRUE, TRUE);
 
       /* An N_BINCL symbol indicates the start of the stabs entries
@@ -323 +334 @@
          symbol names, not including the file numbers in types (the
          first number after an open parenthesis).  */
-      if (type == N_BINCL)
+      if (type == (int) N_BINCL)
         {
           bfd_vma val;
@@ -343 +354 @@
               if (incl_type == 0)
                 break;
-              else if (incl_type == N_EINCL)
+              else if (incl_type == (int) N_EINCL)
                 {
                   if (nest == 0)
@@ -349 +360 @@
                   --nest;
                 }
-              else if (incl_type == N_BINCL)
+              else if (incl_type == (int) N_BINCL)
                 ++nest;
               else if (nest == 0)
@@ -365 +376 @@
                           /* Skip the file number.  */
                           ++str;
-                          while (isdigit ((unsigned char) *str))
+                          while (ISDIGIT (*str))
                             ++str;
                           --str;
@@ -376 +387 @@
              value, then replaced this one with an N_EXCL symbol.  */
           incl_entry = stab_link_includes_lookup (&sinfo->includes, string,
-                                                  true, true);
+                                                  TRUE, TRUE);
           if (incl_entry == NULL)
             goto error_return;
@@ -385 +396 @@
 
           /* Record this symbol, so that we can set the value
-             correctly.  */
-          ne = (struct stab_excl_list *) bfd_alloc (abfd, sizeof *ne);
+             correctly.  */
+          amt = sizeof *ne;
+          ne = (struct stab_excl_list *) bfd_alloc (abfd, amt);
           if (ne == NULL)
             goto error_return;
           ne->offset = sym - stabbuf;
           ne->val = val;
-          ne->type = N_BINCL;
+          ne->type = (int) N_BINCL;
           ne->next = secinfo->excls;
           secinfo->excls = ne;
@@ -413 +425 @@
               /* We have seen this header file before.  Tell the final
                  pass to change the type to N_EXCL.  */
-              ne->type = N_EXCL;
+              ne->type = (int) N_EXCL;
 
               /* Mark the skipped symbols.  */
@@ -426 +438 @@
                   incl_type = incl_sym[TYPEOFF];
 
-                  if (incl_type == N_EINCL)
+                  if (incl_type == (int) N_EINCL)
                     {
                       if (nest == 0)
@@ -436 +448 @@
                       --nest;
                     }
-                  else if (incl_type == N_BINCL)
+                  else if (incl_type == (int) N_BINCL)
                     ++nest;
                   else if (nest == 0)
@@ -474 +486 @@
       bfd_size_type *pskips;
 
-      secinfo->cumulative_skips =
-        (bfd_size_type *) bfd_alloc (abfd, count * sizeof (bfd_size_type));
+      amt = count * sizeof (bfd_size_type);
+      secinfo->cumulative_skips = (bfd_size_type *) bfd_alloc (abfd, amt);
       if (secinfo->cumulative_skips == NULL)
         goto error_return;
@@ -493 +505 @@
     }
 
-  return true;
+  return TRUE;
 
  error_return:
@@ -500 +512 @@
   if (stabstrbuf != NULL)
     free (stabstrbuf);
-  return false;
+  return FALSE;
+}
+
+
+
+/* This function is called for each input file before the stab
+   section is relocated.  It discards stab entries for discarded
+   functions and variables.  The function returns TRUE iff
+   any entries have been deleted.
+*/
+
+bfd_boolean
+_bfd_discard_section_stabs (abfd, stabsec, psecinfo,
+                            reloc_symbol_deleted_p, cookie)
+     bfd *abfd;
+     asection *stabsec;
+     PTR psecinfo;
+     bfd_boolean (*reloc_symbol_deleted_p) PARAMS ((bfd_vma, PTR));
+     PTR cookie;
+{
+  bfd_size_type count, amt;
+  struct stab_section_info *secinfo;
+  bfd_byte *stabbuf = NULL;
+  bfd_byte *sym, *symend;
+  bfd_size_type skip;
+  bfd_size_type *pstridx;
+  int deleting;
+
+  if (stabsec->_raw_size == 0)
+    {
+      /* This file does not contain stabs debugging information.  */
+      return FALSE;
+    }
+
+  if (stabsec->_raw_size % STABSIZE != 0)
+    {
+      /* Something is wrong with the format of these stab symbols.
+         Don't try to optimize them.  */
+      return FALSE;
+    }
+
+  if ((stabsec->output_section != NULL
+       && bfd_is_abs_section (stabsec->output_section)))
+    {
+      /* At least one of the sections is being discarded from the
+         link, so we should just ignore them.  */
+      return FALSE;
+    }
+
+  /* We should have initialized our data in _bfd_link_stab_sections.
+     If there was some bizarre error reading the string sections, though,
+     we might not have.  Bail rather than asserting.  */
+  if (psecinfo == NULL)
+    return FALSE;
+
+  count = stabsec->_raw_size / STABSIZE;
+  secinfo = (struct stab_section_info *) psecinfo;
+
+  /* Read the stabs information from abfd.  */
+
+  stabbuf = (bfd_byte *) bfd_malloc (stabsec->_raw_size);
+  if (stabbuf == NULL)
+    goto error_return;
+
+  if (! bfd_get_section_contents (abfd, stabsec, stabbuf, (bfd_vma) 0,
+                                  stabsec->_raw_size))
+    goto error_return;
+
+  /* Look through the stabs symbols and discard any information for
+     discarded functions.  */
+
+  skip = 0;
+  deleting = -1;
+
+  symend = stabbuf + stabsec->_raw_size;
+  for (sym = stabbuf, pstridx = secinfo->stridxs;
+       sym < symend;
+       sym += STABSIZE, ++pstridx)
+    {
+      int type;
+
+      if (*pstridx == (bfd_size_type) -1)
+        {
+          /* This stab was deleted in a previous pass.  */
+          continue;
+        }
+
+      type = sym[TYPEOFF];
+
+      if (type == (int) N_FUN)
+        {
+          int strx = bfd_get_32 (abfd, sym + STRDXOFF);
+
+          if (strx == 0)
+            {
+              if (deleting)
+                {
+                  skip++;
+                  *pstridx = -1;
+                }
+              deleting = -1;
+              continue;
+            }
+          deleting = 0;
+          if ((*reloc_symbol_deleted_p) (sym + VALOFF - stabbuf, cookie))
+            deleting = 1;
+        }
+
+      if (deleting == 1)
+        {
+          *pstridx = -1;
+          skip++;
+        }
+      else if (deleting == -1)
+        {
+          /* Outside of a function.  Check for deleted variables.  */
+          if (type == (int) N_STSYM || type == (int) N_LCSYM)
+            if ((*reloc_symbol_deleted_p) (sym + VALOFF - stabbuf, cookie))
+              {
+                *pstridx = -1;
+                skip ++;
+              }
+          /* We should also check for N_GSYM entries which reference a
+             deleted global, but those are less harmful to debuggers
+             and would require parsing the stab strings.  */
+        }
+    }
+
+  free (stabbuf);
+  stabbuf = NULL;
+
+  /* Shrink the stabsec as needed.  */
+  stabsec->_cooked_size -= skip * STABSIZE;
+  if (stabsec->_cooked_size == 0)
+    stabsec->flags |= SEC_EXCLUDE;
+
+  /* Recalculate the `cumulative_skips' array now that stabs have been
+     deleted for this section.  */
+
+  if (skip != 0)
+    {
+      bfd_size_type i, offset;
+      bfd_size_type *pskips;
+
+      if (secinfo->cumulative_skips == NULL)
+        {
+          amt = count * sizeof (bfd_size_type);
+          secinfo->cumulative_skips = (bfd_size_type *) bfd_alloc (abfd, amt);
+          if (secinfo->cumulative_skips == NULL)
+            goto error_return;
+        }
+
+      pskips = secinfo->cumulative_skips;
+      pstridx = secinfo->stridxs;
+      offset = 0;
+
+      for (i = 0; i < count; i++, pskips++, pstridx++)
+        {
+          *pskips = offset;
+          if (*pstridx == (bfd_size_type) -1)
+            offset += STABSIZE;
+        }
+
+      BFD_ASSERT (offset != 0);
+    }
+
+  return skip > 0;
+
+ error_return:
+  if (stabbuf != NULL)
+    free (stabbuf);
+  return FALSE;
 }
 
@@ -506 +689 @@
    contents.  */
 
-boolean
+bfd_boolean
 _bfd_write_section_stabs (output_bfd, psinfo, stabsec, psecinfo, contents)
      bfd *output_bfd;
@@ -525 +708 @@
   if (secinfo == NULL)
     return bfd_set_section_contents (output_bfd, stabsec->output_section,
-                                     contents, stabsec->output_offset,
+                                     contents,
+                                     (file_ptr) stabsec->output_offset,
                                      stabsec->_raw_size);
 
@@ -556 +740 @@
             {
               /* This is the header symbol for the stabs section.  We
-                 don't really need one, since we have merged all the
-                 input stabs sections into one, but we generate one
-                 for the benefit of readers which expect to see one.  */
+                 don't really need one, since we have merged all the
+                 input stabs sections into one, but we generate one
+                 for the benefit of readers which expect to see one.  */
               BFD_ASSERT (sym == contents);
               bfd_put_32 (output_bfd, _bfd_stringtab_size (sinfo->strings),
@@ -574 +758 @@
 
   return bfd_set_section_contents (output_bfd, stabsec->output_section,
-                                   contents, stabsec->output_offset,
+                                   contents, (file_ptr) stabsec->output_offset,
                                    stabsec->_cooked_size);
 }
@@ -580 +764 @@
 /* Write out the .stabstr section.  */
 
-boolean
+bfd_boolean
 _bfd_write_stab_strings (output_bfd, psinfo)
      bfd *output_bfd;
@@ -590 +774 @@
 
   if (sinfo == NULL)
-    return true;
+    return TRUE;
 
   if (bfd_is_abs_section (sinfo->stabstr->output_section))
     {
       /* The section was discarded from the link.  */
-      return true;
+      return TRUE;
     }
 
@@ -603 +787 @@
 
   if (bfd_seek (output_bfd,
-                (sinfo->stabstr->output_section->filepos
-                 + sinfo->stabstr->output_offset),
+                (file_ptr) (sinfo->stabstr->output_section->filepos
+                            + sinfo->stabstr->output_offset),
                 SEEK_SET) != 0)
-    return false;
+    return FALSE;
 
   if (! _bfd_stringtab_emit (output_bfd, sinfo->strings))
-    return false;
+    return FALSE;
 
   /* We no longer need the stabs information.  */
@@ -615 +799 @@
   bfd_hash_table_free (&sinfo->includes.root);
 
-  return true;
+  return TRUE;
 }