X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fsomread.c;h=36a2b28d428a6e01403d19355c663e1c4bfc30ff;hb=81b9222220c55933198d7d1db7d618d9baf75550;hp=be41501fa09926cbe5f2d65352509d48605e5de3;hpb=b6ba6518e9254bc25f88088228e93ac966ebccd1;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/somread.c b/gdb/somread.c index be41501fa0..36a2b28d42 100644 --- a/gdb/somread.c +++ b/gdb/somread.c @@ -1,13 +1,13 @@ /* Read HP PA/Risc object files for GDB. - Copyright 1991, 1992, 1994, 1995, 1996, 1998, 1999, 2000 - Free Software Foundation, Inc. + Copyright (C) 1991, 1992, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, + 2004, 2007, 2008, 2009 Free Software Foundation, Inc. Written by Fred Fish at Cygnus Support. This file is part of GDB. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -16,9 +16,7 @@ GNU General Public License for more details. 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "bfd.h" @@ -35,31 +33,7 @@ #include "som.h" #include "libhppa.h" -/* Various things we might complain about... */ - -static void som_symfile_init (struct objfile *); - -static void som_new_init (struct objfile *); - -static void som_symfile_read (struct objfile *, int); - -static void som_symfile_finish (struct objfile *); - -static void -som_symtab_read (bfd *, struct objfile *, struct section_offsets *); - -static void -som_symfile_offsets (struct objfile *, struct section_addr_info *); - -/* FIXME: These should really be in a common header somewhere */ - -extern void hpread_build_psymtabs (struct objfile *, int); - -extern void hpread_symfile_finish (struct objfile *); - -extern void hpread_symfile_init (struct objfile *); - -extern void do_pxdb (bfd *); +#include "solib-som.h" /* @@ -84,6 +58,7 @@ static void som_symtab_read (bfd *abfd, struct objfile *objfile, struct section_offsets *section_offsets) { + struct gdbarch *gdbarch = get_objfile_arch (objfile); unsigned int number_of_symbols; int val, dynamic; char *stringtab; @@ -99,36 +74,38 @@ som_symtab_read (bfd *abfd, struct objfile *objfile, number_of_symbols = bfd_get_symcount (abfd); - buf = alloca (symsize * number_of_symbols); + /* Allocate a buffer to read in the debug info. + We avoid using alloca because the memory size could be so large + that we could hit the stack size limit. */ + buf = xmalloc (symsize * number_of_symbols); + make_cleanup (xfree, buf); bfd_seek (abfd, obj_som_sym_filepos (abfd), SEEK_SET); - val = bfd_read (buf, symsize * number_of_symbols, 1, abfd); + val = bfd_bread (buf, symsize * number_of_symbols, abfd); if (val != symsize * number_of_symbols) - error ("Couldn't read symbol dictionary!"); - - stringtab = alloca (obj_som_stringtab_size (abfd)); + error (_("Couldn't read symbol dictionary!")); + + /* Allocate a buffer to read in the som stringtab section of + the debugging info. Again, we avoid using alloca because + the data could be so large that we could potentially hit + the stack size limitat. */ + stringtab = xmalloc (obj_som_stringtab_size (abfd)); + make_cleanup (xfree, stringtab); bfd_seek (abfd, obj_som_str_filepos (abfd), SEEK_SET); - val = bfd_read (stringtab, obj_som_stringtab_size (abfd), 1, abfd); + val = bfd_bread (stringtab, obj_som_stringtab_size (abfd), abfd); if (val != obj_som_stringtab_size (abfd)) - error ("Can't read in HP string table."); + 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 - existence of a $SHLIB_INFO$ section with a non-zero size. */ - /* The code below is not a reliable way to check whether an - * executable is dynamic, so I commented it out - RT - * 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; - */ - /* I replaced the code with a simple check for text offset not being - * zero. Still not 100% reliable, but a more reliable way of asking - * "is this a dynamic executable?" than the above. RT - */ + this. + + This code used to rely upon the existence of a $SHLIB_INFO$ + section to make this determination. HP claims that it is + more accurate to check for a nonzero text offset, but they + have not provided any information about why that test is + more accurate. */ dynamic = (text_offset != 0); endbufp = buf + number_of_symbols; @@ -155,9 +132,8 @@ som_symtab_read (bfd *abfd, struct objfile *objfile, 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 + bufp->symbol_value = gdbarch_smash_text_address + (gdbarch, bufp->symbol_value); break; case ST_ENTRY: @@ -170,18 +146,16 @@ som_symtab_read (bfd *abfd, struct objfile *objfile, else ms_type = mst_text; bufp->symbol_value += text_offset; -#ifdef SMASH_TEXT_ADDRESS - SMASH_TEXT_ADDRESS (bufp->symbol_value); -#endif + bufp->symbol_value = gdbarch_smash_text_address + (gdbarch, bufp->symbol_value); break; 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 + bufp->symbol_value = gdbarch_smash_text_address + (gdbarch, bufp->symbol_value); break; case ST_DATA: @@ -209,9 +183,8 @@ som_symtab_read (bfd *abfd, struct objfile *objfile, 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 + bufp->symbol_value = gdbarch_smash_text_address + (gdbarch, bufp->symbol_value); check_strange_names: /* Utah GCC 2.5, FSF GCC 2.6 and later generate correct local @@ -231,6 +204,7 @@ som_symtab_read (bfd *abfd, struct objfile *objfile, if ((symname[0] == 'L' && symname[1] == '$') || (symname[0] == '$' && symname[strlen (symname) - 1] == '$') || (symname[0] == 'D' && symname[1] == '$') + || (strncmp (symname, "L0\001", 3) == 0) || (strncmp (symname, "$PIC", 4) == 0)) continue; break; @@ -241,33 +215,28 @@ som_symtab_read (bfd *abfd, struct objfile *objfile, 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 + bufp->symbol_value = gdbarch_smash_text_address + (gdbarch, bufp->symbol_value); 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; + /* SS_LOCAL symbols in a shared library do not have + export stubs, so we do not have to worry about + using mst_file_text vs mst_solib_trampoline here like + we do for SS_UNIVERSAL and SS_EXTERNAL symbols above. */ + ms_type = mst_file_text; bufp->symbol_value += text_offset; -#ifdef SMASH_TEXT_ADDRESS - SMASH_TEXT_ADDRESS (bufp->symbol_value); -#endif + bufp->symbol_value = gdbarch_smash_text_address + (gdbarch, bufp->symbol_value); break; 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 + bufp->symbol_value = gdbarch_smash_text_address + (gdbarch, bufp->symbol_value); break; @@ -308,7 +277,7 @@ som_symtab_read (bfd *abfd, struct objfile *objfile, } if (bufp->name.n_strx > obj_som_stringtab_size (abfd)) - error ("Invalid symbol data; bad HP string table offset: %d", + error (_("Invalid symbol data; bad HP string table offset: %d"), bufp->name.n_strx); prim_record_minimal_symbol (symname, bufp->symbol_value, ms_type, @@ -351,23 +320,9 @@ som_symfile_read (struct objfile *objfile, int mainline) bfd *abfd = objfile->obfd; struct cleanup *back_to; - do_pxdb (symfile_bfd_open (objfile->name)); - init_minimal_symbol_collection (); back_to = make_cleanup_discard_minimal_symbols (); - /* Read in the import list and the export list. Currently - the export list isn't used; the import list is used in - hp-symtab-read.c to handle static vars declared in other - shared libraries. */ - init_import_symbols (objfile); -#if 0 /* Export symbols not used today 1997-08-05 */ - init_export_symbols (objfile); -#else - objfile->export_list = NULL; - objfile->export_list_size = 0; -#endif - /* Process the normal SOM symbol table first. This reads in the DNTT and string table, but doesn't actually scan the DNTT. It does scan the linker symbol @@ -375,29 +330,18 @@ som_symfile_read (struct objfile *objfile, int mainline) som_symtab_read (abfd, objfile, objfile->section_offsets); - /* Now read information from the stabs debug sections. - This is a no-op for SOM. - Perhaps it is intended for some kind of mixed STABS/SOM - situation? */ - stabsect_build_psymtabs (objfile, mainline, - "$GDB_SYMBOLS$", "$GDB_STRINGS$", "$TEXT$"); - - /* Now read the native debug information. - This builds the psymtab. This used to be done via a scan of - the DNTT, but is now done via the PXDB-built quick-lookup tables - together with a scan of the GNTT. See hp-psymtab-read.c. */ - hpread_build_psymtabs (objfile, mainline); - /* Install any minimal symbols that have been collected as the current minimal symbols for this objfile. Further symbol-reading is done incrementally, file-by-file, in a step known as "psymtab-to-symtab" expansion. hp-symtab-read.c contains the code to do the actual DNTT scanning and symtab building. */ install_minimal_symbols (objfile); - - /* Force hppa-tdep.c to re-read the unwind descriptors. */ - objfile->obj_private = NULL; do_cleanups (back_to); + + /* Now read information from the stabs debug sections. + This is emitted by gcc. */ + stabsect_build_psymtabs (objfile, mainline, + "$GDB_SYMBOLS$", "$GDB_STRINGS$", "$TEXT$"); } /* Initialize anything that needs initializing when a completely new symbol @@ -421,11 +365,10 @@ som_new_init (struct objfile *ignore) static void som_symfile_finish (struct objfile *objfile) { - if (objfile->sym_stab_info != NULL) + if (objfile->deprecated_sym_stab_info != NULL) { - mfree (objfile->md, objfile->sym_stab_info); + xfree (objfile->deprecated_sym_stab_info); } - hpread_symfile_finish (objfile); } /* SOM specific initialization routine for reading symbols. */ @@ -437,7 +380,6 @@ som_symfile_init (struct objfile *objfile) find this causes a significant slowdown in gdb then we could set it in the debug symbol readers only when necessary. */ objfile->flags |= OBJF_REORDERED; - hpread_symfile_init (objfile); } /* SOM specific parsing routine for section offsets. @@ -450,9 +392,10 @@ som_symfile_offsets (struct objfile *objfile, struct section_addr_info *addrs) int i; CORE_ADDR text_addr; - objfile->num_sections = SECT_OFF_MAX; + objfile->num_sections = bfd_count_sections (objfile->obfd); objfile->section_offsets = (struct section_offsets *) - obstack_alloc (&objfile->psymbol_obstack, SIZEOF_SECTION_OFFSETS); + obstack_alloc (&objfile->objfile_obstack, + SIZEOF_N_SECTION_OFFSETS (objfile->num_sections)); /* FIXME: ezannoni 2000-04-20 The section names in SOM are not .text, .data, etc, but $TEXT$, $DATA$,... We should initialize @@ -472,266 +415,15 @@ som_symfile_offsets (struct objfile *objfile, struct section_addr_info *addrs) /* Note: Here is OK to compare with ".text" because this is the name that gdb itself gives to that section, not the SOM name. */ - for (i = 0; i < SECT_OFF_MAX && addrs->other[i].name; i++) + for (i = 0; i < addrs->num_sections && addrs->other[i].name; i++) if (strcmp (addrs->other[i].name, ".text") == 0) break; text_addr = addrs->other[i].addr; - for (i = 0; i < SECT_OFF_MAX; i++) + for (i = 0; i < objfile->num_sections; i++) (objfile->section_offsets)->offsets[i] = text_addr; } } - -/* Read in and initialize the SOM import list which is present - for all executables and shared libraries. The import list - consists of the symbols that are referenced in OBJFILE but - not defined there. (Variables that are imported are dealt - with as "loc_indirect" vars.) - Return value = number of import symbols read in. */ -int -init_import_symbols (struct objfile *objfile) -{ - unsigned int import_list; - unsigned int import_list_size; - unsigned int string_table; - unsigned int string_table_size; - char *string_buffer; - register int i; - register int j; - register int k; - asection *text_section; /* section handle */ - unsigned int dl_header[12]; /* SOM executable header */ - - /* A struct for an entry in the SOM import list */ - typedef struct - { - int name; /* index into the string table */ - short dont_care1; /* we don't use this */ - unsigned char type; /* 0 = NULL, 2 = Data, 3 = Code, 7 = Storage, 13 = Plabel */ - unsigned int reserved2:8; /* not used */ - } - SomImportEntry; - - /* We read 100 entries in at a time from the disk file. */ -#define SOM_READ_IMPORTS_NUM 100 -#define SOM_READ_IMPORTS_CHUNK_SIZE (sizeof (SomImportEntry) * SOM_READ_IMPORTS_NUM) - SomImportEntry buffer[SOM_READ_IMPORTS_NUM]; - - /* Initialize in case we error out */ - objfile->import_list = NULL; - objfile->import_list_size = 0; - - /* It doesn't work, for some reason, to read in space $TEXT$; - the subspace $SHLIB_INFO$ has to be used. Some BFD quirk? pai/1997-08-05 */ - text_section = bfd_get_section_by_name (objfile->obfd, "$SHLIB_INFO$"); - if (!text_section) - return 0; - /* Get the SOM executable header */ - bfd_get_section_contents (objfile->obfd, text_section, dl_header, 0, 12 * sizeof (int)); - - /* Check header version number for 10.x HP-UX */ - /* Currently we deal only with 10.x systems; on 9.x the version # is 89060912. - FIXME: Change for future HP-UX releases and mods to the SOM executable format */ - if (dl_header[0] != 93092112) - return 0; - - import_list = dl_header[4]; - import_list_size = dl_header[5]; - if (!import_list_size) - return 0; - string_table = dl_header[10]; - string_table_size = dl_header[11]; - if (!string_table_size) - return 0; - - /* Suck in SOM string table */ - string_buffer = (char *) xmalloc (string_table_size); - bfd_get_section_contents (objfile->obfd, text_section, string_buffer, - string_table, string_table_size); - - /* Allocate import list in the psymbol obstack; this has nothing - to do with psymbols, just a matter of convenience. We want the - import list to be freed when the objfile is deallocated */ - objfile->import_list - = (ImportEntry *) obstack_alloc (&objfile->psymbol_obstack, - import_list_size * sizeof (ImportEntry)); - - /* Read in the import entries, a bunch at a time */ - for (j = 0, k = 0; - j < (import_list_size / SOM_READ_IMPORTS_NUM); - j++) - { - bfd_get_section_contents (objfile->obfd, text_section, buffer, - import_list + j * SOM_READ_IMPORTS_CHUNK_SIZE, - SOM_READ_IMPORTS_CHUNK_SIZE); - for (i = 0; i < SOM_READ_IMPORTS_NUM; i++, k++) - { - if (buffer[i].type != (unsigned char) 0) - { - objfile->import_list[k] - = (char *) obstack_alloc (&objfile->psymbol_obstack, strlen (string_buffer + buffer[i].name) + 1); - strcpy (objfile->import_list[k], string_buffer + buffer[i].name); - /* Some day we might want to record the type and other information too */ - } - else /* null type */ - objfile->import_list[k] = NULL; - - } - } - - /* Get the leftovers */ - if (k < import_list_size) - bfd_get_section_contents (objfile->obfd, text_section, buffer, - import_list + k * sizeof (SomImportEntry), - (import_list_size - k) * sizeof (SomImportEntry)); - for (i = 0; k < import_list_size; i++, k++) - { - if (buffer[i].type != (unsigned char) 0) - { - objfile->import_list[k] - = (char *) obstack_alloc (&objfile->psymbol_obstack, strlen (string_buffer + buffer[i].name) + 1); - strcpy (objfile->import_list[k], string_buffer + buffer[i].name); - /* Some day we might want to record the type and other information too */ - } - else - objfile->import_list[k] = NULL; - } - - objfile->import_list_size = import_list_size; - xfree (string_buffer); - return import_list_size; -} - -/* Read in and initialize the SOM export list which is present - for all executables and shared libraries. The import list - consists of the symbols that are referenced in OBJFILE but - not defined there. (Variables that are imported are dealt - with as "loc_indirect" vars.) - Return value = number of import symbols read in. */ -int -init_export_symbols (struct objfile *objfile) -{ - unsigned int export_list; - unsigned int export_list_size; - unsigned int string_table; - unsigned int string_table_size; - char *string_buffer; - register int i; - register int j; - register int k; - asection *text_section; /* section handle */ - unsigned int dl_header[12]; /* SOM executable header */ - - /* A struct for an entry in the SOM export list */ - typedef struct - { - int next; /* for hash table use -- we don't use this */ - int name; /* index into string table */ - int value; /* offset or plabel */ - int dont_care1; /* not used */ - unsigned char type; /* 0 = NULL, 2 = Data, 3 = Code, 7 = Storage, 13 = Plabel */ - char dont_care2; /* not used */ - short dont_care3; /* not used */ - } - SomExportEntry; - - /* We read 100 entries in at a time from the disk file. */ -#define SOM_READ_EXPORTS_NUM 100 -#define SOM_READ_EXPORTS_CHUNK_SIZE (sizeof (SomExportEntry) * SOM_READ_EXPORTS_NUM) - SomExportEntry buffer[SOM_READ_EXPORTS_NUM]; - - /* Initialize in case we error out */ - objfile->export_list = NULL; - objfile->export_list_size = 0; - - /* It doesn't work, for some reason, to read in space $TEXT$; - the subspace $SHLIB_INFO$ has to be used. Some BFD quirk? pai/1997-08-05 */ - text_section = bfd_get_section_by_name (objfile->obfd, "$SHLIB_INFO$"); - if (!text_section) - return 0; - /* Get the SOM executable header */ - bfd_get_section_contents (objfile->obfd, text_section, dl_header, 0, 12 * sizeof (int)); - - /* Check header version number for 10.x HP-UX */ - /* Currently we deal only with 10.x systems; on 9.x the version # is 89060912. - FIXME: Change for future HP-UX releases and mods to the SOM executable format */ - if (dl_header[0] != 93092112) - return 0; - - export_list = dl_header[8]; - export_list_size = dl_header[9]; - if (!export_list_size) - return 0; - string_table = dl_header[10]; - string_table_size = dl_header[11]; - if (!string_table_size) - return 0; - - /* Suck in SOM string table */ - string_buffer = (char *) xmalloc (string_table_size); - bfd_get_section_contents (objfile->obfd, text_section, string_buffer, - string_table, string_table_size); - - /* Allocate export list in the psymbol obstack; this has nothing - to do with psymbols, just a matter of convenience. We want the - export list to be freed when the objfile is deallocated */ - objfile->export_list - = (ExportEntry *) obstack_alloc (&objfile->psymbol_obstack, - export_list_size * sizeof (ExportEntry)); - - /* Read in the export entries, a bunch at a time */ - for (j = 0, k = 0; - j < (export_list_size / SOM_READ_EXPORTS_NUM); - j++) - { - bfd_get_section_contents (objfile->obfd, text_section, buffer, - export_list + j * SOM_READ_EXPORTS_CHUNK_SIZE, - SOM_READ_EXPORTS_CHUNK_SIZE); - for (i = 0; i < SOM_READ_EXPORTS_NUM; i++, k++) - { - if (buffer[i].type != (unsigned char) 0) - { - objfile->export_list[k].name - = (char *) obstack_alloc (&objfile->psymbol_obstack, strlen (string_buffer + buffer[i].name) + 1); - strcpy (objfile->export_list[k].name, string_buffer + buffer[i].name); - objfile->export_list[k].address = buffer[i].value; - /* Some day we might want to record the type and other information too */ - } - else - /* null type */ - { - objfile->export_list[k].name = NULL; - objfile->export_list[k].address = 0; - } - } - } - - /* Get the leftovers */ - if (k < export_list_size) - bfd_get_section_contents (objfile->obfd, text_section, buffer, - export_list + k * sizeof (SomExportEntry), - (export_list_size - k) * sizeof (SomExportEntry)); - for (i = 0; k < export_list_size; i++, k++) - { - if (buffer[i].type != (unsigned char) 0) - { - objfile->export_list[k].name - = (char *) obstack_alloc (&objfile->psymbol_obstack, strlen (string_buffer + buffer[i].name) + 1); - strcpy (objfile->export_list[k].name, string_buffer + buffer[i].name); - /* Some day we might want to record the type and other information too */ - objfile->export_list[k].address = buffer[i].value; - } - else - { - objfile->export_list[k].name = NULL; - objfile->export_list[k].address = 0; - } - } - - objfile->export_list_size = export_list_size; - xfree (string_buffer); - return export_list_size; -} @@ -745,6 +437,9 @@ static struct sym_fns som_sym_fns = som_symfile_read, /* sym_read: read a symbol file into symtab */ som_symfile_finish, /* sym_finish: finished with file, cleanup */ som_symfile_offsets, /* sym_offsets: Translate ext. to int. relocation */ + default_symfile_segments, /* sym_segments: Get segment information from + a file. */ + NULL, /* sym_read_linetable */ NULL /* next: pointer to next struct sym_fns */ };