1999-09-06 Donn Terry <donn@interix.com>

[deliverable/binutils-gdb.git] / bfd / coffgen.c

diff --git a/bfd/coffgen.c b/bfd/coffgen.c
index 8495f3d7cef8ad045dc3182cb16e38f2a0999720..53aaf4fbc510f956fe877ac93e17e8b77f82db81 100644 (file)
--- a/bfd/coffgen.c
+++ b/bfd/coffgen.c
@@ -594,6 +594,7 @@ fixup_symbol_value (abfd, coff_symbol_ptr, syment)
       syment->n_scnum = N_UNDEF;
       syment->n_value = 0;
     }
+  /* FIXME: Do we need to handle the absolute section here?  */
   else
     {
       if (coff_symbol_ptr->symbol.section)
@@ -1746,19 +1747,25 @@ coff_get_normalized_symtab (abfd)
            }
          else
            {
-             /* ordinary short filename, put into memory anyway */
+             /* Ordinary short filename, put into memory anyway.  The
+                 Microsoft PE tools sometimes store a filename in
+                 multiple AUX entries.  */
              if (internal_ptr->u.syment.n_numaux > 1
                  && coff_data (abfd)->pe)
                {
-                 internal_ptr->u.syment._n._n_n._n_offset = (long)
-                   copy_name (abfd, (internal_ptr + 1)->u.auxent.x_file.x_fname,
-                              internal_ptr->u.syment.n_numaux * symesz);
+                 internal_ptr->u.syment._n._n_n._n_offset =
+                   ((long)
+                    copy_name (abfd,
+                               (internal_ptr + 1)->u.auxent.x_file.x_fname,
+                               internal_ptr->u.syment.n_numaux * symesz));
                }
              else
                {
-                 internal_ptr->u.syment._n._n_n._n_offset = (long)
-                   copy_name (abfd, (internal_ptr + 1)->u.auxent.x_file.x_fname,
-                              FILNMLEN);
+                 internal_ptr->u.syment._n._n_n._n_offset =
+                   ((long)
+                    copy_name (abfd,
+                               (internal_ptr + 1)->u.auxent.x_file.x_fname,
+                               FILNMLEN));
                }
            }
        }
@@ -2200,9 +2207,11 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
                }
            }
 
+         /* We use <= MAXDIFF here so that if we get a zero length
+             file, we actually use the next file entry.  */
          if (p2 < pend
              && offset + sec_vma >= (bfd_vma) p2->u.syment.n_value
-             && offset + sec_vma - (bfd_vma) p2->u.syment.n_value < maxdiff)
+             && offset + sec_vma - (bfd_vma) p2->u.syment.n_value <= maxdiff)
            {
              *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;
              maxdiff = offset + sec_vma - p2->u.syment.n_value;
@@ -2239,6 +2248,8 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
 
   if (section->lineno != NULL)
     {
+      bfd_vma last_value = 0;
+
       l = &section->lineno[i];
 
       for (; i < section->lineno_count; i++)
@@ -2250,6 +2261,7 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
              if (coff->symbol.value > offset)
                break;
              *functionname_ptr = coff->symbol.name;
+             last_value = coff->symbol.value;
              if (coff->native)
                {
                  combined_entry_type *s = coff->native;
@@ -2278,6 +2290,20 @@ coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
            }
          l++;
        }
+
+      /* If we fell off the end of the loop, then assume that this
+        symbol has no line number info.  Otherwise, symbols with no
+        line number info get reported with the line number of the
+        last line of the last symbol which does have line number
+        info.  We use 0x100 as a slop to account for cases where the
+        last line has executable code.  */
+      if (i >= section->lineno_count
+         && last_value != 0
+         && offset - last_value > 0x100)
+       {
+         *functionname_ptr = NULL;
+         *line_ptr = 0;
+       }
     }
 
   /* Cache the results for the next call.  */