#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 "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
-som__symfile_init PARAMS ((struct objfile *));
+som_symfile_init PARAMS ((struct objfile *));
static void
som_new_init PARAMS ((struct objfile *));
som_symfile_finish PARAMS ((struct objfile *));
static void
-som_symtab_read PARAMS ((bfd *, CORE_ADDR, struct objfile *));
-
-static void
-free_sominfo PARAMS ((PTR));
+som_symtab_read PARAMS ((bfd *, struct objfile *,
+ struct section_offsets *));
static struct section_offsets *
som_symfile_offsets PARAMS ((struct objfile *, CORE_ADDR));
SYNOPSIS
- void som_symtab_read (bfd *abfd, CORE_ADDR addr,
- struct objfile *objfile)
+ void som_symtab_read (bfd *abfd, struct objfile *objfile,
+ struct section_offsets *section_offsets)
DESCRIPTION
*/
static void
-som_symtab_read (abfd, addr, objfile)
+som_symtab_read (abfd, objfile, section_offsets)
bfd *abfd;
- CORE_ADDR addr;
struct objfile *objfile;
+ struct section_offsets *section_offsets;
{
unsigned int number_of_symbols;
- unsigned int i;
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);
+ CORE_ADDR text_offset, data_offset;
+
+
+ text_offset = ANOFFSET (section_offsets, 0);
+ data_offset = ANOFFSET (section_offsets, 1);
number_of_symbols = bfd_get_symcount (abfd);
case ST_MILLICODE:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_text;
+ bufp->symbol_value += text_offset;
#ifdef SMASH_TEXT_ADDRESS
SMASH_TEXT_ADDRESS (bufp->symbol_value);
#endif
ms_type = mst_solib_trampoline;
else
ms_type = mst_text;
+ bufp->symbol_value += text_offset;
#ifdef SMASH_TEXT_ADDRESS
SMASH_TEXT_ADDRESS (bufp->symbol_value);
#endif
case ST_STUB:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_solib_trampoline;
+ bufp->symbol_value += text_offset;
#ifdef SMASH_TEXT_ADDRESS
SMASH_TEXT_ADDRESS (bufp->symbol_value);
#endif
case ST_DATA:
symname = bufp->name.n_strx + stringtab;
+ bufp->symbol_value += data_offset;
ms_type = mst_data;
break;
default:
case ST_CODE:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_file_text;
+ bufp->symbol_value += text_offset;
#ifdef SMASH_TEXT_ADDRESS
SMASH_TEXT_ADDRESS (bufp->symbol_value);
#endif
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 '$'. */
+ being '$'.
+
+ And finally, the newer HP compilers emit crud like $PIC_foo$N
+ in some circumstance (PIC code I guess). It's also claimed
+ that they emit D$ symbols too. What stupidity. */
if ((symname[0] == 'L' && symname[1] == '$')
- || (symname[0] == '$' && symname[strlen(symname) - 1] == '$'))
+ || (symname[0] == '$' && symname[strlen(symname) - 1] == '$')
+ || (symname[0] == 'D' && symname[1] == '$')
+ || (strncmp (symname, "$PIC", 4) == 0))
continue;
break;
case ST_MILLICODE:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_file_text;
+ bufp->symbol_value += text_offset;
#ifdef SMASH_TEXT_ADDRESS
SMASH_TEXT_ADDRESS (bufp->symbol_value);
#endif
ms_type = mst_solib_trampoline;
else
ms_type = mst_file_text;
+ bufp->symbol_value += text_offset;
#ifdef SMASH_TEXT_ADDRESS
SMASH_TEXT_ADDRESS (bufp->symbol_value);
#endif
case ST_STUB:
symname = bufp->name.n_strx + stringtab;
ms_type = mst_solib_trampoline;
+ bufp->symbol_value += text_offset;
#ifdef SMASH_TEXT_ADDRESS
SMASH_TEXT_ADDRESS (bufp->symbol_value);
#endif
case ST_DATA:
symname = bufp->name.n_strx + stringtab;
+ bufp->symbol_value += data_offset;
ms_type = mst_file_data;
goto check_strange_names;
bufp->symbol_value, ms_type,
objfile);
}
-
- install_minimal_symbols (objfile);
}
/* Scan and build partial symbols for a symbol file.
{
bfd *abfd = objfile->obfd;
struct cleanup *back_to;
- CORE_ADDR offset;
init_minimal_symbol_collection ();
back_to = make_cleanup (discard_minimal_symbols, 0);
- make_cleanup (free_sominfo, (PTR) objfile);
-
/* Process the normal SOM symbol table first. */
- /* FIXME, should take a section_offsets param, not just an offset. */
+ som_symtab_read (abfd, objfile, section_offsets);
- offset = ANOFFSET (section_offsets, 0);
- som_symtab_read (abfd, offset, objfile);
+ /* Now read information from the stabs debug sections. */
+ stabsect_build_psymtabs (objfile, section_offsets, mainline,
+ "$GDB_SYMBOLS$", "$GDB_STRINGS$", "$TEXT$");
- /* Now process debugging information, which is contained in
- special SOM sections. */
+ /* Now read the native debug information. */
+ hpread_build_psymtabs (objfile, section_offsets, mainline);
- somstab_build_psymtabs (objfile, section_offsets, mainline);
+ /* Install any minimal symbols that have been collected as the current
+ minimal symbols for this objfile. */
+ install_minimal_symbols (objfile);
+ /* Force hppa-tdep.c to re-read the unwind descriptors. */
+ objfile->obj_private = NULL;
do_cleanups (back_to);
}
-/* 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
-free_sominfo (objp)
- PTR objp;
-{
- struct objfile *objfile = (struct objfile *)objp;
- struct dbx_symfile_info *dbxinfo = (struct dbx_symfile_info *)
- objfile->sym_stab_info;
- struct stab_section_info *ssi, *nssi;
-
- ssi = dbxinfo->stab_section_info;
- while (ssi)
- {
- nssi = ssi->next;
- mfree (objfile->md, ssi);
- ssi = nssi;
- }
-
- dbxinfo->stab_section_info = 0; /* Just say No mo info about this. */
-}
-
/* Initialize anything that needs initializing when a completely new symbol
file is specified (not just adding some symbols from another file, e.g. a
shared library).
{
mfree (objfile -> md, objfile -> sym_stab_info);
}
+ hpread_symfile_finish (objfile);
}
/* SOM specific initialization routine for reading symbols.
- It is passed a pointer to 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 can fill with goodies.
-
- This routine is almost a complete ripoff of dbx_symfile_init. The
- common parts of these routines should be extracted and used instead of
- duplicating this code. FIXME. */
-
+ Nothing SOM specific left to do anymore. */
static void
som_symfile_init (objfile)
struct objfile *objfile;
{
- int val;
- bfd *sym_bfd = objfile->obfd;
- char *name = bfd_get_filename (sym_bfd);
- asection *stabsect; /* Section containing symbol table entries */
- asection *stringsect; /* Section containing symbol name strings */
-
- stabsect = bfd_get_section_by_name (sym_bfd, "$GDB_SYMBOLS$");
- stringsect = bfd_get_section_by_name (sym_bfd, "$GDB_STRINGS$");
-
- /* Allocate struct to keep track of the symfile */
- objfile->sym_stab_info = (PTR)
- xmmalloc (objfile -> md, sizeof (struct dbx_symfile_info));
-
- memset ((PTR) objfile->sym_stab_info, 0, sizeof (struct dbx_symfile_info));
-
-
- /* FIXME POKING INSIDE BFD DATA STRUCTURES */
-#define STRING_TABLE_OFFSET (stringsect->filepos)
-#define SYMBOL_TABLE_OFFSET (stabsect->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$");
- if (!DBX_TEXT_SECT (objfile))
- 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);
- DBX_SYMTAB_OFFSET (objfile) = SYMBOL_TABLE_OFFSET;
-
- /* Read the string table and stash it away in the psymbol_obstack. It is
- only needed as long as we need to expand psymbols into full symbols,
- so when we blow away the psymbol the string table goes away as well.
- Note that gdb used to use the results of attempting to malloc the
- string table, based on the size it read, as a form of sanity check
- for botched byte swapping, on the theory that a byte swapped string
- table size would be so totally bogus that the malloc would fail. Now
- that we put in on the psymbol_obstack, we can't do this since gdb gets
- a fatal error (out of virtual memory) if the size is bogus. We can
- however at least check to see if the size is zero or some negative
- value. */
-
- DBX_STRINGTAB_SIZE (objfile) = bfd_section_size (sym_bfd, stringsect);
-
- if (DBX_SYMCOUNT (objfile) == 0
- || DBX_STRINGTAB_SIZE (objfile) == 0)
- return;
-
- if (DBX_STRINGTAB_SIZE (objfile) <= 0
- || DBX_STRINGTAB_SIZE (objfile) > bfd_get_size (sym_bfd))
- error ("ridiculous string table size (%d bytes).",
- DBX_STRINGTAB_SIZE (objfile));
-
- DBX_STRINGTAB (objfile) =
- (char *) obstack_alloc (&objfile -> psymbol_obstack,
- DBX_STRINGTAB_SIZE (objfile));
-
- /* Now read in the string table in one big gulp. */
-
- val = bfd_seek (sym_bfd, STRING_TABLE_OFFSET, L_SET);
- if (val < 0)
- perror_with_name (name);
- val = bfd_read (DBX_STRINGTAB (objfile), DBX_STRINGTAB_SIZE (objfile), 1,
- sym_bfd);
- if (val == 0)
- error ("End of file reading string table");
- else if (val < 0)
- /* It's possible bfd_read should be setting bfd_error, and we should be
- checking that. But currently it doesn't set bfd_error. */
- perror_with_name (name);
- else if (val != DBX_STRINGTAB_SIZE (objfile))
- error ("Short read reading string table");
+ hpread_symfile_init (objfile);
}
/* SOM specific parsing routine for section offsets.
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;
+ /* First see if we're a shared library. If so, get the section
+ offsets from the library, else get them from addr. */
+ if (!som_solib_section_offsets (objfile, section_offsets))
+ {
+ for (i = 0; i < SECT_OFF_MAX; i++)
+ ANOFFSET (section_offsets, i) = addr;
+ }
return section_offsets;
}
projects / binutils-gdb.git / blobdiff