* app.c (do_scrub_next_char): Another attempt to fix bugs

[binutils.git] / gdb / paread.c

diff --git a/gdb/paread.c b/gdb/paread.c
index d21aa54d26d9fd1277279d1550cf2f476eafe067..7c24fdd80c6902135a623a03ee143d166dd9134c 100644 (file)
--- a/gdb/paread.c
+++ b/gdb/paread.c
@@ -24,6 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <sys/types.h> /* For time_t, if not in time.h.  */
 #include "libbfd.h"
 #include "som.h"
+#include "libhppa.h"
 #include <syms.h>
 #include "symtab.h"
 #include "symfile.h"
@@ -80,7 +81,7 @@ record_minimal_symbol (name, address, ms_type, objfile)
      struct objfile *objfile;
 {
   name = obsavestring (name, strlen (name), &objfile -> symbol_obstack);
-  prim_record_minimal_symbol (name, address, ms_type);
+  prim_record_minimal_symbol (name, address, ms_type, objfile);
 }
 
 /*
@@ -119,15 +120,15 @@ pa_symtab_read (abfd, addr, objfile)
   number_of_symbols = bfd_get_symcount (abfd);
 
   buf = alloca (symsize * number_of_symbols);
-  bfd_seek (abfd, obj_sym_filepos (abfd), L_SET);
+  bfd_seek (abfd, obj_som_sym_filepos (abfd), L_SET);
   val = bfd_read (buf, symsize * number_of_symbols, 1, abfd);
   if (val != symsize * number_of_symbols)
     error ("Couldn't read symbol dictionary!");
 
-  stringtab = alloca (obj_stringtab_size (abfd));
-  bfd_seek (abfd, obj_str_filepos (abfd), L_SET);
-  val = bfd_read (stringtab, obj_stringtab_size (abfd), 1, abfd);
-  if (val != obj_stringtab_size (abfd))
+  stringtab = alloca (obj_som_stringtab_size (abfd));
+  bfd_seek (abfd, obj_som_str_filepos (abfd), L_SET);
+  val = bfd_read (stringtab, obj_som_stringtab_size (abfd), 1, abfd);
+  if (val != obj_som_stringtab_size (abfd))
     error ("Can't read in HP string table.");
 
   endbufp = buf + number_of_symbols;
@@ -181,13 +182,18 @@ pa_symtab_read (abfd, addr, objfile)
              bufp->symbol_value &= ~0x3; /* clear out permission bits */
 
            check_strange_names:
-             /* GAS leaves symbols with the prefixes "LS$", "LBB$",
-                and "LBE$" in .o files after assembling.  And thus
-                they appear in the final executable.  This can
-                cause problems if these special symbols have the
-                same value as real symbols.  So ignore them.  Also "LC$".  */
+             /* GAS leaves labels in .o files after assembling.  At
+                least labels starting with "LS$", "LBB$", "LBE$",
+                "LC$", and "L$" can happen.  This should be fixed in
+                the assembler and/or compiler, to save space in the
+                executable (and because having GDB make gross
+                distinctions based on the name is kind of ugly), but
+                until then, just ignore them.  ("L$" at least, has something
+                to do with getting relocation correct, so that one might
+                be hard to fix).  */
              if (*symname == 'L'
-                 && (symname[2] == '$' || symname[3] == '$'))
+                 && (symname[1] == '$' || symname[2] == '$' 
+                     || symname[3] == '$'))
                continue;
              break;
 
@@ -214,7 +220,7 @@ pa_symtab_read (abfd, addr, objfile)
          continue;
        }
 
-      if (bufp->name.n_strx > obj_stringtab_size (abfd))
+      if (bufp->name.n_strx > obj_som_stringtab_size (abfd))
        error ("Invalid symbol data; bad HP string table offset: %d",
               bufp->name.n_strx);
 
@@ -406,11 +412,6 @@ pa_symfile_init (objfile)
 
   memset ((PTR) objfile->sym_stab_info, 0, sizeof (struct dbx_symfile_info));
 
-  if (!stabsect)
-    return;
-
-  if (!stringsect)
-    error ("Found stabs, but not string section");
 
   /* FIXME POKING INSIDE BFD DATA STRUCTURES */
 #define        STRING_TABLE_OFFSET     (stringsect->filepos)
@@ -419,10 +420,16 @@ pa_symfile_init (objfile)
   /* FIXME POKING INSIDE BFD DATA STRUCTURES */
 
   DBX_SYMFILE_INFO (objfile)->stab_section_info = NULL;
-  DBX_TEXT_SECT (objfile) = bfd_get_section_by_name (sym_bfd, ".text");
+  DBX_TEXT_SECT (objfile) = bfd_get_section_by_name (sym_bfd, "$TEXT$");
   if (!DBX_TEXT_SECT (objfile))
-    error ("Can't find .text section in symbol file");
+    error ("Can't find $TEXT$ section in symbol file");
+
+  if (!stabsect)
+    return;
 
+  if (!stringsect)
+    error ("Found stabs, but not string section");
+  
   /* FIXME: I suspect this should be external_nlist.  The size of host
      types like long and bfd_vma should not affect how we read the
      file.  */
@@ -486,26 +493,24 @@ pa_symfile_offsets (objfile, addr)
 {
   struct section_offsets *section_offsets;
   int i;
- 
+
+  objfile->num_sections = SECT_OFF_MAX;
   section_offsets = (struct section_offsets *)
     obstack_alloc (&objfile -> psymbol_obstack,
-                  sizeof (struct section_offsets) +
-                         sizeof (section_offsets->offsets) * (SECT_OFF_MAX-1));
+                  sizeof (struct section_offsets)
+                  + sizeof (section_offsets->offsets) * (SECT_OFF_MAX-1));
 
   for (i = 0; i < SECT_OFF_MAX; i++)
     ANOFFSET (section_offsets, i) = addr;
-  
+
   return section_offsets;
 }
 \f
-/*  Register that we are able to handle PA object file formats. */
+/* Register that we are able to handle SOM object file formats.  */
 
-/* This is probably a mistake.  FIXME.  Why can't the HP's use an ordinary
-   file format name with an -hppa suffix?  */
 static struct sym_fns pa_sym_fns =
 {
-  "hppa",              /* sym_name: name or name prefix of BFD target type */
-  4,                   /* sym_namelen: number of significant sym_name chars */
+  bfd_target_som_flavour,
   pa_new_init,         /* sym_new_init: init anything gbl to entire symtab */
   pa_symfile_init,     /* sym_init: read initial info, setup for sym_read() */
   pa_symfile_read,     /* sym_read: read a symbol file into symtab */