Fix typo in recent hange from using bfd target name to using the flavour.

[deliverable/binutils-gdb.git] / gdb / paread.c

diff --git a/gdb/paread.c b/gdb/paread.c
index da3ee7d100bebee368ac73c1a825cfcc6342c539..63993780f2bd682c7221f4052b2beb2372b826b2 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"
@@ -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;
@@ -187,7 +188,8 @@ pa_symtab_read (abfd, addr, objfile)
                 cause problems if these special symbols have the
                 same value as real symbols.  So ignore them.  Also "LC$".  */
              if (*symname == 'L'
-                 && (symname[2] == '$' || symname[3] == '$'))
+                 && (symname[1] == '$' || symname[2] == '$' 
+                     || symname[3] == '$'))
                continue;
              break;
 
@@ -214,7 +216,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);
 
@@ -325,7 +327,7 @@ pa_symfile_read (objfile, section_offsets, mainline)
   do_cleanups (back_to);
 }
 
-/* This cleans up the objfile's sym_private pointer, and the chain of
+/* This cleans up the objfile's sym_stab_info pointer, and the chain of
    stab_section_info's, that might be dangling from it.  */
 
 static void
@@ -334,7 +336,7 @@ free_painfo (objp)
 {
   struct objfile *objfile = (struct objfile *)objp;
   struct dbx_symfile_info *dbxinfo = (struct dbx_symfile_info *)
-                                    objfile->sym_private;
+                                    objfile->sym_stab_info;
   struct stab_section_info *ssi, *nssi;
 
   ssi = dbxinfo->stab_section_info;
@@ -371,9 +373,9 @@ static void
 pa_symfile_finish (objfile)
      struct objfile *objfile;
 {
-  if (objfile -> sym_private != NULL)
+  if (objfile -> sym_stab_info != NULL)
     {
-      mfree (objfile -> md, objfile -> sym_private);
+      mfree (objfile -> md, objfile -> sym_stab_info);
     }
 }
 
@@ -401,10 +403,10 @@ pa_symfile_init (objfile)
   stringsect = bfd_get_section_by_name (sym_bfd, "$GDB_STRINGS$");
 
   /* Allocate struct to keep track of the symfile */
-  objfile->sym_private = (PTR)
+  objfile->sym_stab_info = (PTR)
     xmmalloc (objfile -> md, sizeof (struct dbx_symfile_info));
 
-  memset ((PTR) objfile->sym_private, 0, sizeof (struct dbx_symfile_info));
+  memset ((PTR) objfile->sym_stab_info, 0, sizeof (struct dbx_symfile_info));
 
   if (!stabsect)
     return;
@@ -486,26 +488,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 */