* rs6000-core.c: Add .ldinfo section.

[binutils.git] / gdb / xcoffread.c

diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 3513fe15fc19d2b66863230a6ce83bd83755ce34..147b45f59eda03d5a2f9a165f0e69054630d74de 100644 (file)
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -1,5 +1,6 @@
-/* Read AIXcoff symbol tables and convert to internal format, for GDB.
-   Copyright (C) 1986-1991 Free Software Foundation, Inc.
+/* Read AIX xcoff symbol tables and convert to internal format, for GDB.
+   Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993
+            Free Software Foundation, Inc.

    Derived from coffread.c, dbxread.c, and a lot of hacking.
    Contributed by IBM Corporation.
 
    Derived from coffread.c, dbxread.c, and a lot of hacking.
    Contributed by IBM Corporation.
 


@@ -19,13 +20,16 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 along with this program; if not, write to the Free Software
 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 

+/* Native only:  Need struct tbtable in <sys/debug.h> from host, and 
+                need xcoff_add_toc_to_loadinfo in rs6000-tdep.c from target.
+                need xcoff_init_loadinfo ditto.  
+   However, if you grab <sys/debug.h> and make it available on your
+   host, and define FAKING_RS6000, then this code will compile.  */
+

 #include "defs.h"
 #include "bfd.h"
 
 #include "defs.h"
 #include "bfd.h"
 

-#ifdef IBM6000_HOST
-/* Native only:  Need struct tbtable in <sys/debug.h>. */
-
-/* AIX COFF names have a preceeding dot `.' */
+/* AIX XCOFF names have a preceeding dot `.' */

 #define NAMES_HAVE_DOT 1
 
 #include <sys/types.h>
 #define NAMES_HAVE_DOT 1
 
 #include <sys/types.h>


@@ -45,6 +49,9 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include "symfile.h"
 #include "objfiles.h"
 #include "buildsym.h"
 #include "symfile.h"
 #include "objfiles.h"
 #include "buildsym.h"

+#include "stabsread.h"
+#include "gdb-stabs.h"
+#include "complaints.h"

 
 #include "coff/internal.h"     /* FIXME, internal data from BFD */
 #include "libcoff.h"           /* FIXME, internal data from BFD */
 
 #include "coff/internal.h"     /* FIXME, internal data from BFD */
 #include "libcoff.h"           /* FIXME, internal data from BFD */


@@ -113,9 +120,6 @@ static char *symtbl;
 
 #define        INITIAL_STABVECTOR_LENGTH       40
 
 
 #define        INITIAL_STABVECTOR_LENGTH       40
 

-struct pending_stabs *global_stabs;
-
-

 /* Nonzero if within a function (so symbols should be local,
    if nothing says specifically).  */
 
 /* Nonzero if within a function (so symbols should be local,
    if nothing says specifically).  */
 


@@ -142,25 +146,19 @@ static unsigned   local_n_tmask;
 
 static unsigned        local_symesz;
 
 
 static unsigned        local_symesz;
 

-
-/* coff_symfile_init()
-   is the coff-specific initialization routine for reading symbols.
-   It is passed a struct sym_fns which contains, among other things,
-   the BFD for the file whose symbols are being read, and a slot for
-   a pointer to "private data" which we fill with cookies and other
-   treats for coff_symfile_read().
- 
-   We will only be called if this is a COFF or COFF-like file.
-   BFD handles figuring out the format of the file, and code in symtab.c
-   uses BFD's determination to vector to us.
- 
-   The ultimate result is a new symtab (or, FIXME, eventually a psymtab).  */
-

 struct coff_symfile_info {
   file_ptr min_lineno_offset;          /* Where in file lowest line#s are */
   file_ptr max_lineno_offset;          /* 1+last byte of line#s in file */
 };
 
 struct coff_symfile_info {
   file_ptr min_lineno_offset;          /* Where in file lowest line#s are */
   file_ptr max_lineno_offset;          /* 1+last byte of line#s in file */
 };
 

+static struct complaint rsym_complaint = 
+  {"Non-stab C_RSYM `%s' needs special handling", 0, 0};
+
+static struct complaint storclass_complaint =
+  {"Unexpected storage class: %d", 0, 0};
+
+static struct complaint bf_notfound_complaint =
+  {"line numbers off, `.bf' symbol not found", 0, 0};

 
 static void
 enter_line_range PARAMS ((struct subfile *, unsigned, unsigned,
 
 static void
 enter_line_range PARAMS ((struct subfile *, unsigned, unsigned,


@@ -173,22 +171,29 @@ static int
 init_debugsection PARAMS ((bfd *));
 
 static int
 init_debugsection PARAMS ((bfd *));
 
 static int

-init_stringtab PARAMS ((bfd *, long, struct objfile *));
+init_stringtab PARAMS ((bfd *, file_ptr, struct objfile *));

 
 static void
 
 static void

-aixcoff_symfile_init PARAMS ((struct objfile *));
+xcoff_symfile_init PARAMS ((struct objfile *));

 
 static void
 
 static void

-aixcoff_new_init PARAMS ((struct objfile *));
+xcoff_new_init PARAMS ((struct objfile *));
+
+#ifdef __STDC__
+struct section_offset;
+#endif

 
 static void
 
 static void

-aixcoff_symfile_read PARAMS ((struct sym_fns *, CORE_ADDR, int));
+xcoff_symfile_read PARAMS ((struct objfile *, struct section_offset *, int));

 
 static void
 
 static void

-aixcoff_symfile_finish PARAMS ((struct objfile *));
+xcoff_symfile_finish PARAMS ((struct objfile *));
+
+static struct section_offsets *
+xcoff_symfile_offsets PARAMS ((struct objfile *, CORE_ADDR));

 
 static int
 
 static int

-init_lineno PARAMS ((bfd *, long, int));
+init_lineno PARAMS ((bfd *, file_ptr, int));

 
 static void
 find_linenos PARAMS ((bfd *, sec_ptr, PTR));
 
 static void
 find_linenos PARAMS ((bfd *, sec_ptr, PTR));


@@ -225,7 +230,7 @@ compare_symbols (s1p, s2p)
   /* Names that are less should come first.  */
   register struct symbol **s1 = (struct symbol **) s1p;
   register struct symbol **s2 = (struct symbol **) s2p;
   /* Names that are less should come first.  */
   register struct symbol **s1 = (struct symbol **) s1p;
   register struct symbol **s2 = (struct symbol **) s2p;

-  register int namediff = strcmp (SYMBOL_NAME (*s1), SYMBOL_NAME (*s2));
+  register int namediff = STRCMP (SYMBOL_NAME (*s1), SYMBOL_NAME (*s2));

   if (namediff != 0) 
     return namediff;
 
   if (namediff != 0) 
     return namediff;
 


@@ -322,7 +327,7 @@ struct pending_stabs *stabs;
       pp += 2;
 
       if (*(pp-1) == 'F' || *(pp-1) == 'f')
       pp += 2;
 
       if (*(pp-1) == 'F' || *(pp-1) == 'f')

-       SYMBOL_TYPE (sym) = lookup_function_type (read_type (&pp));
+       SYMBOL_TYPE (sym) = lookup_function_type (read_type (&pp, objfile));

       else
        SYMBOL_TYPE (sym) = read_type (&pp, objfile);
     }
       else
        SYMBOL_TYPE (sym) = read_type (&pp, objfile);
     }


@@ -449,11 +454,11 @@ static void
 record_include_begin (cs)
 struct coff_symbol *cs;
 {
 record_include_begin (cs)
 struct coff_symbol *cs;
 {

-  /* In aixcoff, we assume include files cannot be nested (not in .c files
+  /* In xcoff, we assume include files cannot be nested (not in .c files

      of course, but in corresponding .s files.) */
 
   if (inclDepth)
      of course, but in corresponding .s files.) */
 
   if (inclDepth)

-    fatal ("aix internal: pending include file exists.");
+    fatal ("xcoff internal: pending include file exists.");

 
   ++inclDepth;
 
 
   ++inclDepth;
 


@@ -485,7 +490,7 @@ struct coff_symbol *cs;
   InclTable *pTbl;  
 
   if (inclDepth == 0)
   InclTable *pTbl;  
 
   if (inclDepth == 0)

-    fatal ("aix internal: Mismatch C_BINCL/C_EINCL pair found.");
+    fatal ("xcoff internal: Mismatch C_BINCL/C_EINCL pair found.");

 
   pTbl = &inclTable [inclIndx];
   pTbl->end = cs->c_value;
 
   pTbl = &inclTable [inclIndx];
   pTbl->end = cs->c_value;


@@ -625,9 +630,8 @@ process_linenos (start, end)
 
 /*     start_subfile (inclTable[ii].name, (char*)0);  */
        start_subfile (" ?", (char*)0);
 
 /*     start_subfile (inclTable[ii].name, (char*)0);  */
        start_subfile (" ?", (char*)0);

-       current_subfile->name = 
-               obsavestring (inclTable[ii].name, strlen (inclTable[ii].name),
-                             &current_objfile->symbol_obstack);
+       free (current_subfile->name);
+       current_subfile->name = strdup (inclTable[ii].name);

 
         if (lv == lineTb) {
          current_subfile->line_vector = (struct linetable *)
 
         if (lv == lineTb) {
          current_subfile->line_vector = (struct linetable *)


@@ -951,16 +955,11 @@ retrieve_traceback (abfd, textsec, cs, size)
 }
 
 
 }
 
 

-/* A parameter template, used by ADD_PARM_TO_PENDING. */
+/* A parameter template, used by ADD_PARM_TO_PENDING.  It is initialized
+   in our initializer function at the bottom of the file, to avoid
+   dependencies on the exact "struct symbol" format.  */

 
 

-static struct symbol parmsym = {               /* default parameter symbol */
-       "",                                     /* name */
-       VAR_NAMESPACE,                          /* namespace */
-       LOC_ARG,                                /* class */
-       NULL,                                   /* type */
-       0,                                      /* line number */
-       0,                                      /* value */
-};
+static struct symbol parmsym;

 
 /* Add a parameter to a given pending symbol list. */ 
 
 
 /* Add a parameter to a given pending symbol list. */ 
 


@@ -975,7 +974,7 @@ static struct symbol parmsym = {            /* default parameter symbol */
 }
 
 
 }
 
 

-/* aixcoff has static blocks marked in `.bs', `.es' pairs. They cannot be
+/* xcoff has static blocks marked in `.bs', `.es' pairs. They cannot be

    nested. At any given time, a symbol can only be in one static block.
    This is the base address of current static block, zero if non exists. */
    
    nested. At any given time, a symbol can only be in one static block.
    This is the base address of current static block, zero if non exists. */
    


@@ -1034,11 +1033,12 @@ read_xcoff_symtab (objfile, nsyms)
   N_BTSHFT = coff_data (abfd)->local_n_btshft;
   local_symesz = coff_data (abfd)->local_symesz;
 
   N_BTSHFT = coff_data (abfd)->local_n_btshft;
   local_symesz = coff_data (abfd)->local_symesz;
 

-  last_source_file = 0;
+  last_source_file = NULL;

   last_csect_name = 0;
   last_csect_val = 0;
   misc_func_recorded = 0;
 
   last_csect_name = 0;
   last_csect_val = 0;
   misc_func_recorded = 0;
 

+  start_stabs ();

   start_symtab (filestring, (char *)NULL, file_start_addr);
   symnum = 0;
   first_object_file_end = 0;
   start_symtab (filestring, (char *)NULL, file_start_addr);
   symnum = 0;
   first_object_file_end = 0;


@@ -1068,7 +1068,7 @@ read_xcoff_symtab (objfile, nsyms)
     /* READ_ONE_SYMBOL (symbol, cs, symname_alloced); */
     /* read one symbol into `cs' structure. After processing the whole symbol
        table, only string table will be kept in memory, symbol table and debug
     /* READ_ONE_SYMBOL (symbol, cs, symname_alloced); */
     /* read one symbol into `cs' structure. After processing the whole symbol
        table, only string table will be kept in memory, symbol table and debug

-       section of aixcoff will be freed. Thus we can mark symbols with names
+       section of xcoff will be freed. Thus we can mark symbols with names

        in string table as `alloced'. */
     {
       int ii;
        in string table as `alloced'. */
     {
       int ii;


@@ -1120,8 +1120,12 @@ read_xcoff_symtab (objfile, nsyms)
 
     if (cs->c_symnum == next_file_symnum && cs->c_sclass != C_FILE) {
       if (last_source_file)
 
     if (cs->c_symnum == next_file_symnum && cs->c_sclass != C_FILE) {
       if (last_source_file)

-       end_symtab (cur_src_end_addr, 1, 0, objfile);
+       {
+         end_symtab (cur_src_end_addr, 1, 0, objfile);
+         end_stabs ();
+       }

 
 

+      start_stabs ();

       start_symtab ("_globals_", (char *)NULL, (CORE_ADDR)0);
       cur_src_end_addr = first_object_file_end;
       /* done with all files, everything from here on is globals */
       start_symtab ("_globals_", (char *)NULL, (CORE_ADDR)0);
       cur_src_end_addr = first_object_file_end;
       /* done with all files, everything from here on is globals */


@@ -1185,6 +1189,8 @@ read_xcoff_symtab (objfile, nsyms)
                  complete_symtab (filestring, file_start_addr);
                  cur_src_end_addr = file_end_addr;
                  end_symtab (file_end_addr, 1, 0, objfile);
                  complete_symtab (filestring, file_start_addr);
                  cur_src_end_addr = file_end_addr;
                  end_symtab (file_end_addr, 1, 0, objfile);

+                 end_stabs ();
+                 start_stabs ();

                  start_symtab ((char *)NULL, (char *)NULL, (CORE_ADDR)0);
                }
 
                  start_symtab ((char *)NULL, (char *)NULL, (CORE_ADDR)0);
                }
 


@@ -1318,7 +1324,8 @@ function_entry_point:
            /* Recording this entry is necessary. Single stepping relies on
               this vector to get an idea about function address boundaries. */
 
            /* Recording this entry is necessary. Single stepping relies on
               this vector to get an idea about function address boundaries. */
 

-           prim_record_minimal_symbol (0, cs->c_value, mst_unknown);
+           prim_record_minimal_symbol ("<trampoline>", cs->c_value,
+                                       mst_unknown);

 #else
 
            /* record trampoline code entries as mst_unknown symbol. When we
 #else
 
            /* record trampoline code entries as mst_unknown symbol. When we


@@ -1360,13 +1367,15 @@ function_entry_point:
       /* complete symbol table for last object file containing
         debugging information. */
 
       /* complete symbol table for last object file containing
         debugging information. */
 

-      /* Whether or not there was a csect in the previous file, we have 
-        to call `end_symtab' and `start_symtab' to reset type_vector, 
+      /* Whether or not there was a csect in the previous file, we have to call
+        `end_stabs' and `start_stabs' to reset type_vector, 

         line_vector, etc. structures. */
 
       complete_symtab (filestring, file_start_addr);
       cur_src_end_addr = file_end_addr;
       end_symtab (file_end_addr, 1, 0, objfile);
         line_vector, etc. structures. */
 
       complete_symtab (filestring, file_start_addr);
       cur_src_end_addr = file_end_addr;
       end_symtab (file_end_addr, 1, 0, objfile);

+      end_stabs ();
+      start_stabs ();

       start_symtab (cs->c_name, (char *)NULL, (CORE_ADDR)0);
       last_csect_name = 0;
 
       start_symtab (cs->c_name, (char *)NULL, (CORE_ADDR)0);
       last_csect_name = 0;
 


@@ -1402,7 +1411,7 @@ function_entry_point:
     
 
     case C_FCN:
     
 
     case C_FCN:

-      if (strcmp (cs->c_name, ".bf") == 0) {
+      if (STREQ (cs->c_name, ".bf")) {

 
         bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
                              main_aux);
 
         bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
                              main_aux);


@@ -1486,7 +1495,7 @@ function_entry_point:
                (fcn_cs_saved.c_value, fcn_stab_saved.c_name, 0, 0, objfile);
 #endif
       }
                (fcn_cs_saved.c_value, fcn_stab_saved.c_name, 0, 0, objfile);
 #endif
       }

-      else if (strcmp (cs->c_name, ".ef") == 0) {
+      else if (STREQ (cs->c_name, ".ef")) {

 
         bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
                              main_aux);
 
         bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass,
                              main_aux);


@@ -1548,11 +1557,11 @@ function_entry_point:
        break;
 
     case C_BLOCK       :
        break;
 
     case C_BLOCK       :

-      if (strcmp (cs->c_name, ".bb") == 0) {
+      if (STREQ (cs->c_name, ".bb")) {

        depth++;
        new = push_context (depth, cs->c_value);
       }
        depth++;
        new = push_context (depth, cs->c_value);
       }

-      else if (strcmp (cs->c_name, ".eb") == 0) {
+      else if (STREQ (cs->c_name, ".eb")) {

        new = pop_context ();
        if (depth != new->depth)
          error ("Invalid symbol data: .bb/.eb symbol mismatch at symbol %d.",
        new = pop_context ();
        if (depth != new->depth)
          error ("Invalid symbol data: .bb/.eb symbol mismatch at symbol %d.",


@@ -1569,14 +1578,17 @@ function_entry_point:
       break;
 
     default            :
       break;
 
     default            :

-      (void) process_xcoff_symbol (cs, objfile);
+      process_xcoff_symbol (cs, objfile);

       break;
     }
 
   } /* while */
 
   if (last_source_file)
       break;
     }
 
   } /* while */
 
   if (last_source_file)

-    end_symtab (cur_src_end_addr, 1, 0, objfile);
+    {
+      end_symtab (cur_src_end_addr, 1, 0, objfile);
+      end_stabs ();
+    }

 
   free (symtbl);
   current_objfile = NULL;
 
   free (symtbl);
   current_objfile = NULL;


@@ -1585,7 +1597,9 @@ function_entry_point:
      If no XMC_TC0 is found, toc_offset should be zero. Another place to obtain
      this information would be file auxiliary header. */
 
      If no XMC_TC0 is found, toc_offset should be zero. Another place to obtain
      this information would be file auxiliary header. */
 

+#ifndef FAKING_RS6000

   xcoff_add_toc_to_loadinfo (toc_offset);
   xcoff_add_toc_to_loadinfo (toc_offset);

+#endif

 }
 
 #define        SYMBOL_DUP(SYMBOL1, SYMBOL2)    \
 }
 
 #define        SYMBOL_DUP(SYMBOL1, SYMBOL2)    \


@@ -1687,7 +1701,7 @@ process_xcoff_symbol (cs, objfile)
                                obsavestring (name, qq-name,
                                              &objfile->symbol_obstack);
        }
                                obsavestring (name, qq-name,
                                              &objfile->symbol_obstack);
        }

-       ttype = SYMBOL_TYPE (sym) = read_type (&pp);
+       ttype = SYMBOL_TYPE (sym) = read_type (&pp, objfile);

 
        /* if there is no name for this typedef, you don't have to keep its
           symbol, since nobody could ask for it. Otherwise, build a symbol
 
        /* if there is no name for this typedef, you don't have to keep its
           symbol, since nobody could ask for it. Otherwise, build a symbol


@@ -1864,9 +1878,8 @@ process_xcoff_symbol (cs, objfile)
       break;
 
     case C_RSYM:
       break;
 
     case C_RSYM:

-
-#ifdef NO_DEFINE_SYMBOL

        pp = (char*) strchr (name, ':');
        pp = (char*) strchr (name, ':');

+#ifdef NO_DEFINE_SYMBOL

        SYMBOL_CLASS (sym) = LOC_REGISTER;
        SYMBOL_VALUE (sym) = STAB_REG_TO_REGNUM (cs->c_value);
        if (pp) {
        SYMBOL_CLASS (sym) = LOC_REGISTER;
        SYMBOL_VALUE (sym) = STAB_REG_TO_REGNUM (cs->c_value);
        if (pp) {


@@ -1892,13 +1905,13 @@ process_xcoff_symbol (cs, objfile)
          return sym;
        }
        else {
          return sym;
        }
        else {

-         warning ("A non-stab C_RSYM needs special handling.");
+         complain (&rsym_complaint, name);

          return NULL;
        }
 #endif
 
     default    :
          return NULL;
        }
 #endif
 
     default    :

-      warning ("Unexpected storage class: %d.", cs->c_sclass);
+      complain (&storclass_complaint, cs->c_sclass);

       return NULL;
     }
   }
       return NULL;
     }
   }


@@ -1931,12 +1944,12 @@ read_symbol_lineno (symtable, symno)
   for (ii = 0; ii < 50; ii++) {
     bfd_coff_swap_sym_in (symfile_bfd,
                             symtable + (symno*local_symesz), symbol);
   for (ii = 0; ii < 50; ii++) {
     bfd_coff_swap_sym_in (symfile_bfd,
                             symtable + (symno*local_symesz), symbol);

-    if (symbol->n_sclass == C_FCN && 0 == strcmp (symbol->n_name, ".bf"))
+    if (symbol->n_sclass == C_FCN && STREQ (symbol->n_name, ".bf"))

       goto gotit;
     symno += symbol->n_numaux+1;
   }
 
       goto gotit;
     symno += symbol->n_numaux+1;
   }
 

-  printf ("GDB Error: `.bf' not found.\n");
+  complain (&bf_notfound_complaint);

   return 0;
 
 gotit:
   return 0;
 
 gotit:


@@ -1966,7 +1979,7 @@ PTR vpinfo;
 
   count = asect->lineno_count;
 
 
   count = asect->lineno_count;
 

-  if (strcmp (asect->name, ".text") || count == 0)
+  if (!STREQ (asect->name, ".text") || count == 0)

     return;
 
   size   = count * coff_data (symfile_bfd)->local_linesz;
     return;
 
   size   = count * coff_data (symfile_bfd)->local_linesz;


@@ -1989,12 +2002,12 @@ PTR vpinfo;
 static int
 init_lineno (abfd, offset, size)
      bfd *abfd;
 static int
 init_lineno (abfd, offset, size)
      bfd *abfd;

-     long offset;
+     file_ptr offset;

      int size;
 {
   int val;
 
      int size;
 {
   int val;
 

-  if (bfd_seek(abfd, offset, 0) < 0)
+  if (bfd_seek(abfd, offset, L_SET) < 0)

     return -1;
 
   linetab = (char *) xmalloc(size);
     return -1;
 
   linetab = (char *) xmalloc(size);


@@ -2014,112 +2027,35 @@ init_lineno (abfd, offset, size)
    (a \ at the end of the text of a name)
    call this function to get the continuation.  */
 /* So far, I haven't seen this happenning xlc output. I doubt we'll need this
    (a \ at the end of the text of a name)
    call this function to get the continuation.  */
 /* So far, I haven't seen this happenning xlc output. I doubt we'll need this

-   for aixcoff. */
+   for xcoff. */

 
 #undef next_symbol_text
 #define        next_symbol_text() \
   printf ("Gdb Error: symbol names on multiple lines not implemented.\n")
 
 
 
 #undef next_symbol_text
 #define        next_symbol_text() \
   printf ("Gdb Error: symbol names on multiple lines not implemented.\n")
 
 

-/* xlc/dbx combination uses a set of builtin types, starting from -1. return
-   the proper type node fora given builtin type #. */
-
-struct type *
-builtin_type (pp)
-char **pp;
-{
-  int typenums[2];
-
-  if (**pp != '-') {
-    printf ("ERROR!, unknown built-in type!\n");
-    return NULL;
-  }
-  *pp += 1;
-  read_type_number (pp, typenums);
-
-  /* default types are defined in dbxstclass.h. */
-  switch ( typenums[1] ) {
-  case 1: 
-    return lookup_fundamental_type (current_objfile, FT_INTEGER);
-  case 2: 
-    return lookup_fundamental_type (current_objfile, FT_CHAR);
-  case 3: 
-    return lookup_fundamental_type (current_objfile, FT_SHORT);
-  case 4: 
-    return lookup_fundamental_type (current_objfile, FT_LONG);
-  case 5: 
-    return lookup_fundamental_type (current_objfile, FT_UNSIGNED_CHAR);
-  case 6: 
-    return lookup_fundamental_type (current_objfile, FT_SIGNED_CHAR);
-  case 7: 
-    return lookup_fundamental_type (current_objfile, FT_UNSIGNED_SHORT);
-  case 8: 
-    return lookup_fundamental_type (current_objfile, FT_UNSIGNED_INTEGER);
-  case 9: 
-    return lookup_fundamental_type (current_objfile, FT_UNSIGNED_INTEGER);
-  case 10: 
-    return lookup_fundamental_type (current_objfile, FT_UNSIGNED_LONG);
-  case 11: 
-    return lookup_fundamental_type (current_objfile, FT_VOID);
-  case 12: 
-    return lookup_fundamental_type (current_objfile, FT_FLOAT);
-  case 13: 
-    return lookup_fundamental_type (current_objfile, FT_DBL_PREC_FLOAT);
-  case 14: 
-    return lookup_fundamental_type (current_objfile, FT_EXT_PREC_FLOAT);
-  case 15: 
-    /* requires a builtin `integer' */
-    return lookup_fundamental_type (current_objfile, FT_INTEGER);
-  case 16: 
-    return lookup_fundamental_type (current_objfile, FT_BOOLEAN);
-  case 17: 
-    /* requires builtin `short real' */
-    return lookup_fundamental_type (current_objfile, FT_FLOAT);
-  case 18: 
-    /* requires builtin `real' */
-    return lookup_fundamental_type (current_objfile, FT_FLOAT);
-  default :
-    printf ("ERROR! Unknown builtin type -%d\n", typenums[1]);
-    return NULL;
-  }
-}
-
-#if 0  /* Seems to be unused, don't bother converting from old misc function
-          vector usage to new minimal symbol tables.  FIXME:  Delete this? */
-
-/* if we now nothing about a function but its address, make a function symbol
-   out of it with the limited knowladge you have. This will be used when
-   somebody refers to a function, which doesn't exist in the symbol table,
-   but is in the minimal symbol table. */
-
-struct symbol *
-build_function_symbol (ind, objfile)
-     int ind;
+static void
+xcoff_new_init (objfile)

      struct objfile *objfile;
 {
      struct objfile *objfile;
 {

-  struct symbol *sym =
-  (struct symbol *) obstack_alloc (&objfile->symbol_obstack, sizeof (struct symbol));
-  SYMBOL_NAME (sym) = misc_function_vector[ind].name;
-  /*   SYMBOL_VALUE (sym) = misc_function_vector[ind].address; */
-  SYMBOL_NAMESPACE (sym) = VAR_NAMESPACE;
-  SYMBOL_CLASS (sym) = LOC_BLOCK;
-  SYMBOL_TYPE (sym) = lookup_function_type (lookup_fundamental_type (current_objfile, FT_INTEGER));
-  SYMBOL_BLOCK_VALUE (sym) = (struct block *)
-      obstack_alloc (&objfile->symbol_obstack, sizeof (struct block));
-  BLOCK_START (SYMBOL_BLOCK_VALUE (sym)) = misc_function_vector[ind].address;
-  return sym;

 }
 
 }
 

-#endif

 
 

-static void
-aixcoff_new_init (objfile)
-     struct objfile *objfile;
-{
-}
+/* xcoff_symfile_init()
+   is the xcoff-specific initialization routine for reading symbols.
+   It is passed an objfile which contains, among other things,
+   the BFD for the file whose symbols are being read, and a slot for
+   a pointer to "private data" which we fill with cookies and other
+   treats for xcoff_symfile_read().
+ 
+   We will only be called if this is an XCOFF or XCOFF-like file.
+   BFD handles figuring out the format of the file, and code in symfile.c
+   uses BFD's determination to vector to us.
+ 
+   The ultimate result is a new symtab (or, FIXME, eventually a psymtab).  */

 
 static void
 
 static void

-aixcoff_symfile_init (objfile)
+xcoff_symfile_init (objfile)

   struct objfile *objfile;
 {
   bfd *abfd = objfile->obfd;
   struct objfile *objfile;
 {
   bfd *abfd = objfile->obfd;


@@ -2136,7 +2072,7 @@ aixcoff_symfile_init (objfile)
    objfile struct from the global list of known objfiles. */
 
 static void
    objfile struct from the global list of known objfiles. */
 
 static void

-aixcoff_symfile_finish (objfile)
+xcoff_symfile_finish (objfile)

      struct objfile *objfile;
 {
   if (objfile -> sym_private != NULL)
      struct objfile *objfile;
 {
   if (objfile -> sym_private != NULL)


@@ -2158,14 +2094,14 @@ aixcoff_symfile_finish (objfile)
 static int
 init_stringtab(abfd, offset, objfile)
      bfd *abfd;
 static int
 init_stringtab(abfd, offset, objfile)
      bfd *abfd;

-     long offset;
+     file_ptr offset;

      struct objfile *objfile;
 {
   long length;
   int val;
   unsigned char lengthbuf[4];
 
      struct objfile *objfile;
 {
   long length;
   int val;
   unsigned char lengthbuf[4];
 

-  if (bfd_seek(abfd, offset, 0) < 0)
+  if (bfd_seek(abfd, offset, L_SET) < 0)

     return -1;
 
   val    = bfd_read((char *)lengthbuf, 1, sizeof lengthbuf, abfd);
     return -1;
 
   val    = bfd_read((char *)lengthbuf, 1, sizeof lengthbuf, abfd);


@@ -2235,17 +2171,17 @@ free_debugsection()
 }
 
 
 }
 
 

-/* aixcoff version of symbol file read. */
+/* xcoff version of symbol file read. */

 
 static void
 
 static void

-aixcoff_symfile_read (objfile, addr, mainline)
+xcoff_symfile_read (objfile, section_offset, mainline)

   struct objfile *objfile;
   struct objfile *objfile;

-  CORE_ADDR addr;
+  struct section_offset *section_offset;

   int mainline;
 {
   int mainline;
 {

-  int num_symbols;                             /* # of symbols */
-  int symtab_offset;                           /* symbol table and */
-  int stringtab_offset;                                /* string table file offsets */
+  int num_symbols;                     /* # of symbols */
+  file_ptr symtab_offset;              /* symbol table and */
+  file_ptr stringtab_offset;           /* string table file offsets */

   int val;
   bfd *abfd;
   struct coff_symfile_info *info;
   int val;
   bfd *abfd;
   struct coff_symfile_info *info;


@@ -2270,7 +2206,7 @@ aixcoff_symfile_read (objfile, addr, mainline)
 
     /* only read in the line # table if one exists */
     val = init_lineno(abfd, info->min_lineno_offset,
 
     /* only read in the line # table if one exists */
     val = init_lineno(abfd, info->min_lineno_offset,

-       info->max_lineno_offset - info->min_lineno_offset);
+       (int) (info->max_lineno_offset - info->min_lineno_offset));

 
     if (val < 0)
       error("\"%s\": error reading line numbers\n", name);
 
     if (val < 0)
       error("\"%s\": error reading line numbers\n", name);


@@ -2286,7 +2222,7 @@ aixcoff_symfile_read (objfile, addr, mainline)
   }
 
   /* Position to read the symbol table.  Do not read it all at once. */
   }
 
   /* Position to read the symbol table.  Do not read it all at once. */

-  val = bfd_seek(abfd, (long)symtab_offset, 0);
+  val = bfd_seek(abfd, symtab_offset, L_SET);

   if (val < 0)
     perror_with_name(name);
 
   if (val < 0)
     perror_with_name(name);
 


@@ -2296,9 +2232,11 @@ aixcoff_symfile_read (objfile, addr, mainline)
   init_minimal_symbol_collection ();
   make_cleanup (discard_minimal_symbols, 0);
 
   init_minimal_symbol_collection ();
   make_cleanup (discard_minimal_symbols, 0);
 

+#ifndef FAKING_RS6000

   /* Initialize load info structure. */
   if (mainline)
     xcoff_init_loadinfo ();
   /* Initialize load info structure. */
   if (mainline)
     xcoff_init_loadinfo ();

+#endif

 
   /* Now that the executable file is positioned at symbol table,
      process it and define symbols accordingly. */
 
   /* Now that the executable file is positioned at symbol table,
      process it and define symbols accordingly. */


@@ -2320,30 +2258,51 @@ aixcoff_symfile_read (objfile, addr, mainline)
   select_source_symtab (0);
 }
 
   select_source_symtab (0);
 }
 

-/* Register our ability to parse symbols for aixcoff BFD files. */
+/* XCOFF-specific parsing routine for section offsets.
+   Plain and simple for now.  */

 
 

-static struct sym_fns aixcoff_sym_fns =
+static
+struct section_offsets *
+xcoff_symfile_offsets (objfile, addr)
+     struct objfile *objfile;
+     CORE_ADDR addr;
+{
+  struct section_offsets *section_offsets;
+  int i;
+ 
+  section_offsets = (struct section_offsets *)
+    obstack_alloc (&objfile -> psymbol_obstack,
+                  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;
+}
+/* Register our ability to parse symbols for xcoff BFD files. */
+
+static struct sym_fns xcoff_sym_fns =

 {
   "aixcoff-rs6000",    /* sym_name: name or name prefix of BFD target type */
   15,                  /* sym_namelen: number of significant sym_name chars */
 {
   "aixcoff-rs6000",    /* sym_name: name or name prefix of BFD target type */
   15,                  /* sym_namelen: number of significant sym_name chars */

-  aixcoff_new_init,    /* sym_new_init: init anything gbl to entire symtab */
-  aixcoff_symfile_init,        /* sym_init: read initial info, setup for sym_read() */
-  aixcoff_symfile_read,        /* sym_read: read a symbol file into symtab */
-  aixcoff_symfile_finish, /* sym_finish: finished with file, cleanup */
+  xcoff_new_init,      /* sym_new_init: init anything gbl to entire symtab */
+  xcoff_symfile_init,  /* sym_init: read initial info, setup for sym_read() */
+  xcoff_symfile_read,  /* sym_read: read a symbol file into symtab */
+  xcoff_symfile_finish, /* sym_finish: finished with file, cleanup */
+  xcoff_symfile_offsets, /* sym_offsets: xlate offsets ext->int form */

   NULL                 /* next: pointer to next struct sym_fns */
 };
 
 void
 _initialize_xcoffread ()
 {
   NULL                 /* next: pointer to next struct sym_fns */
 };
 
 void
 _initialize_xcoffread ()
 {

-  add_symtab_fns(&aixcoff_sym_fns);
-}
-
-#else /* IBM6000_HOST */
-struct type *
-builtin_type (ignore)
-char **ignore;
-{
-    fatal ("GDB internal eror: builtin_type called on non-RS/6000!");
+  add_symtab_fns(&xcoff_sym_fns);
+
+  /* Initialize symbol template later used for arguments.  */
+  SYMBOL_NAME (&parmsym) = "";
+  SYMBOL_INIT_LANGUAGE_SPECIFIC (&parmsym, language_c);
+  SYMBOL_NAMESPACE (&parmsym) = VAR_NAMESPACE;
+  SYMBOL_CLASS (&parmsym) = LOC_ARG;
+  /* Its other fields are zero, or are filled in later.  */

 }
 }

-#endif /* IBM6000_HOST */