#include "defs.h"
#include "bfd.h"
+#include <time.h> /* For time_t in libbfd.h. */
+#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"
#include <string.h>
#include "demangle.h"
#include <sys/file.h>
+
+/* Size of n_value and n_strx fields in a stab symbol. */
+#define BYTES_IN_WORD 4
+
#include "aout/aout64.h"
/* Various things we might complain about... */
static void
pa_new_init PARAMS ((struct objfile *));
-static void
-read_unwind_info PARAMS ((struct objfile *));
-
static void
pa_symfile_read PARAMS ((struct objfile *, struct section_offsets *, int));
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);
}
/*
{
unsigned int number_of_symbols;
unsigned int i;
- int val;
+ int val, dynamic;
char *stringtab;
+ asection *shlib_info;
struct symbol_dictionary_record *buf, *bufp, *endbufp;
char *symname;
CONST int symsize = sizeof (struct symbol_dictionary_record);
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.");
+ /* We need to determine if objfile is a dynamic executable (so we
+ can do the right thing for ST_ENTRY vs ST_CODE symbols).
+
+ There's nothing in the header which easily allows us to do
+ this. The only reliable way I know of is to check for the
+ existance of a $SHLIB_INFO$ section with a non-zero size. */
+ shlib_info = bfd_get_section_by_name (objfile->obfd, "$SHLIB_INFO$");
+ if (shlib_info)
+ dynamic = (bfd_section_size (objfile->obfd, shlib_info) != 0);
+ else
+ dynamic = 0;
+
endbufp = buf + number_of_symbols;
for (bufp = buf; bufp < endbufp; ++bufp)
{
switch (bufp->symbol_scope)
{
case SS_UNIVERSAL:
+ case SS_EXTERNAL:
switch (bufp->symbol_type)
{
case ST_SYM_EXT:
case ST_CODE:
case ST_PRI_PROG:
case ST_SEC_PROG:
- case ST_ENTRY:
case ST_MILLICODE:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_text;
- bufp->symbol_value &= ~0x3; /* clear out permission bits */
+#ifdef SMASH_TEXT_ADDRESS
+ SMASH_TEXT_ADDRESS (bufp->symbol_value);
+#endif
+ break;
+
+ case ST_ENTRY:
+ symname = bufp->name.n_strx + stringtab;
+ /* For a dynamic executable, ST_ENTRY symbols are
+ the stubs, while the ST_CODE symbol is the real
+ function. */
+ if (dynamic)
+ ms_type = mst_solib_trampoline;
+ else
+ ms_type = mst_text;
+#ifdef SMASH_TEXT_ADDRESS
+ SMASH_TEXT_ADDRESS (bufp->symbol_value);
+#endif
break;
+
+ case ST_STUB:
+ symname = bufp->name.n_strx + stringtab;
+ ms_type = mst_solib_trampoline;
+#ifdef SMASH_TEXT_ADDRESS
+ SMASH_TEXT_ADDRESS (bufp->symbol_value);
+#endif
+ break;
+
case ST_DATA:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_data;
case ST_CODE:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_file_text;
- bufp->symbol_value &= ~0x3; /* clear out permission bits */
+#ifdef SMASH_TEXT_ADDRESS
+ SMASH_TEXT_ADDRESS (bufp->symbol_value);
+#endif
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$". */
- if (*symname == 'L'
- && (symname[2] == '$' || symname[3] == '$'))
+ /* Utah GCC 2.5, FSF GCC 2.6 and later generate correct local
+ label prefixes for stabs, constant data, etc. So we need
+ only filter out L$ symbols which are left in due to
+ limitations in how GAS generates SOM relocations.
+
+ When linking in the HPUX C-library the HP linker has
+ the nasty habit of placing section symbols from the literal
+ subspaces in the middle of the program's text. Filter
+ those out as best we can. Check for first and last character
+ being '$'. */
+ if ((symname[0] == 'L' && symname[1] == '$')
+ || (symname[0] == '$' && symname[strlen(symname) - 1] == '$'))
continue;
break;
case ST_PRI_PROG:
case ST_SEC_PROG:
- case ST_ENTRY:
case ST_MILLICODE:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_file_text;
- bufp->symbol_value &= ~0x3; /* clear out permission bits */
+#ifdef SMASH_TEXT_ADDRESS
+ SMASH_TEXT_ADDRESS (bufp->symbol_value);
+#endif
+ break;
+
+ case ST_ENTRY:
+ symname = bufp->name.n_strx + stringtab;
+ /* For a dynamic executable, ST_ENTRY symbols are
+ the stubs, while the ST_CODE symbol is the real
+ function. */
+ if (dynamic)
+ ms_type = mst_solib_trampoline;
+ else
+ ms_type = mst_file_text;
+#ifdef SMASH_TEXT_ADDRESS
+ SMASH_TEXT_ADDRESS (bufp->symbol_value);
+#endif
+ break;
+
+ case ST_STUB:
+ symname = bufp->name.n_strx + stringtab;
+ ms_type = mst_solib_trampoline;
+#ifdef SMASH_TEXT_ADDRESS
+ SMASH_TEXT_ADDRESS (bufp->symbol_value);
+#endif
break;
+
case ST_DATA:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_file_data;
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);
install_minimal_symbols (objfile);
}
-/* Read in the backtrace information stored in the `$UNWIND_START$' section of
- the object file. This info is used mainly by find_unwind_entry() to find
- out the stack frame size and frame pointer used by procedures. We put
- everything on the psymbol obstack in the objfile so that it automatically
- gets freed when the objfile is destroyed. */
-
-static void
-read_unwind_info (objfile)
- struct objfile *objfile;
-{
- asection *unwind_sec;
- struct obj_unwind_info *ui;
-
- ui = obstack_alloc (&objfile->psymbol_obstack,
- sizeof (struct obj_unwind_info));
-
- ui->table = NULL;
- ui->cache = NULL;
- ui->last = -1;
-
- unwind_sec = bfd_get_section_by_name (objfile->obfd,
- "$UNWIND_START$");
- if (unwind_sec)
- {
- int size;
- int i, *ip;
-
- size = bfd_section_size (objfile->obfd, unwind_sec);
- ui->table = obstack_alloc (&objfile->psymbol_obstack, size);
- ui->last = size / sizeof (struct unwind_table_entry) - 1;
-
- bfd_get_section_contents (objfile->obfd, unwind_sec, ui->table,
- 0, size);
-
- OBJ_UNWIND_INFO (objfile) = ui;
- }
-}
-
/* Scan and build partial symbols for a symbol file.
We have been initialized by a call to pa_symfile_init, which
currently does nothing.
pastab_build_psymtabs (objfile, section_offsets, mainline);
- read_unwind_info(objfile);
-
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
{
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;
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);
}
}
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));
-
- if (!stabsect)
- return;
+ memset ((PTR) objfile->sym_stab_info, 0, sizeof (struct dbx_symfile_info));
- if (!stringsect)
- error ("Found stabs, but not string section");
/* FIXME POKING INSIDE BFD DATA STRUCTURES */
#define STRING_TABLE_OFFSET (stringsect->filepos)
/* 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. */
DBX_SYMBOL_SIZE (objfile) = sizeof (struct internal_nlist);
DBX_SYMCOUNT (objfile) = bfd_section_size (sym_bfd, stabsect)
/ DBX_SYMBOL_SIZE (objfile);
{
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 */