X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fsomread.c;h=e621cba9ff26ae45a58533364b4e0def36fdd22a;hb=2755f698e14dabda211bc592a414ee21e0421a2d;hp=d99101910dd94944e7734481b546fb24a60392ba;hpb=8e3ff8235415e2ae6bb56e21b020ac585616993a;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/somread.c b/gdb/somread.c index d99101910d..e621cba9ff 100644 --- a/gdb/somread.c +++ b/gdb/somread.c @@ -1,27 +1,25 @@ /* Read HP PA/Risc object files for GDB. - Copyright 1991, 1992 Free Software Foundation, Inc. + Copyright (C) 1991-1992, 1994-1996, 1998-2002, 2004, 2007-2012 Free + Software Foundation, Inc. Written by Fred Fish at Cygnus Support. -This file is part of GDB. + 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 -(at your option) any later version. + 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 3 of the License, or + (at your option) any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #include "defs.h" #include "bfd.h" -#include "som.h" -#include "libhppa.h" #include #include "symtab.h" #include "symfile.h" @@ -30,78 +28,26 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #include "stabsread.h" #include "gdb-stabs.h" #include "complaints.h" -#include +#include "gdb_string.h" #include "demangle.h" -#include - -/* Size of n_value and n_strx fields in a stab symbol. */ -#define BYTES_IN_WORD 4 - -#if 0 -#include "aout/aout64.h" -#endif - -/* Various things we might complain about... */ - -static void -som_symfile_init PARAMS ((struct objfile *)); - -static void -som_new_init PARAMS ((struct objfile *)); - -static void -som_symfile_read PARAMS ((struct objfile *, struct section_offsets *, int)); - -static void -som_symfile_finish PARAMS ((struct objfile *)); - -static void -som_symtab_read PARAMS ((bfd *, CORE_ADDR, struct objfile *)); - -static struct section_offsets * -som_symfile_offsets PARAMS ((struct objfile *, CORE_ADDR)); - -static void -record_minimal_symbol PARAMS ((char *, CORE_ADDR, - enum minimal_symbol_type, - struct objfile *)); - -static void -record_minimal_symbol (name, address, ms_type, objfile) - char *name; - CORE_ADDR address; - enum minimal_symbol_type ms_type; - struct objfile *objfile; -{ - name = obsavestring (name, strlen (name), &objfile -> symbol_obstack); - prim_record_minimal_symbol (name, address, ms_type, objfile); -} - -/* - -LOCAL FUNCTION - - som_symtab_read -- read the symbol table of a SOM file - -SYNOPSIS +#include "som.h" +#include "libhppa.h" +#include "psymtab.h" - void som_symtab_read (bfd *abfd, CORE_ADDR addr, - struct objfile *objfile) +#include "solib-som.h" -DESCRIPTION +/* Read the symbol table of a SOM file. - Given an open bfd, a base address to relocate symbols to, and a - flag that specifies whether or not this bfd is for an executable - or not (may be shared library for example), add all the global - function and data symbols to the minimal symbol table. -*/ + Given an open bfd, a base address to relocate symbols to, and a + flag that specifies whether or not this bfd is for an executable + or not (may be shared library for example), add all the global + function and data symbols to the minimal symbol table. */ static void -som_symtab_read (abfd, addr, objfile) - bfd *abfd; - CORE_ADDR addr; - struct objfile *objfile; +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; @@ -109,32 +55,47 @@ som_symtab_read (abfd, addr, objfile) 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); - buf = alloca (symsize * number_of_symbols); - bfd_seek (abfd, obj_som_sym_filepos (abfd), L_SET); - val = bfd_read (buf, symsize * number_of_symbols, 1, abfd); + /* 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_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)); - bfd_seek (abfd, obj_som_str_filepos (abfd), L_SET); - val = bfd_read (stringtab, obj_som_stringtab_size (abfd), 1, 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_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 - 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; + 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; for (bufp = buf; bufp < endbufp; ++bufp) @@ -159,35 +120,36 @@ som_symtab_read (abfd, addr, objfile) case ST_MILLICODE: symname = bufp->name.n_strx + stringtab; ms_type = mst_text; -#ifdef SMASH_TEXT_ADDRESS - SMASH_TEXT_ADDRESS (bufp->symbol_value); -#endif + bufp->symbol_value += text_offset; + 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. */ + 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 + bufp->symbol_value += text_offset; + 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; -#ifdef SMASH_TEXT_ADDRESS - SMASH_TEXT_ADDRESS (bufp->symbol_value); -#endif + bufp->symbol_value += text_offset; + bufp->symbol_value = gdbarch_smash_text_address + (gdbarch, bufp->symbol_value); break; case ST_DATA: symname = bufp->name.n_strx + stringtab; + bufp->symbol_value += data_offset; ms_type = mst_data; break; default: @@ -209,23 +171,30 @@ som_symtab_read (abfd, addr, objfile) case ST_CODE: symname = bufp->name.n_strx + stringtab; ms_type = mst_file_text; -#ifdef SMASH_TEXT_ADDRESS - SMASH_TEXT_ADDRESS (bufp->symbol_value); -#endif + bufp->symbol_value += text_offset; + 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 - 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 '$'. */ + 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 '$'. + + 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, "L0\001", 3) == 0) + || (strncmp (symname, "$PIC", 4) == 0)) continue; break; @@ -234,36 +203,35 @@ som_symtab_read (abfd, addr, objfile) case ST_MILLICODE: symname = bufp->name.n_strx + stringtab; ms_type = mst_file_text; -#ifdef SMASH_TEXT_ADDRESS - SMASH_TEXT_ADDRESS (bufp->symbol_value); -#endif + bufp->symbol_value += text_offset; + 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; -#ifdef SMASH_TEXT_ADDRESS - SMASH_TEXT_ADDRESS (bufp->symbol_value); -#endif + /* 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; + 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; -#ifdef SMASH_TEXT_ADDRESS - SMASH_TEXT_ADDRESS (bufp->symbol_value); -#endif + bufp->symbol_value += text_offset; + bufp->symbol_value = gdbarch_smash_text_address + (gdbarch, bufp->symbol_value); break; case ST_DATA: symname = bufp->name.n_strx + stringtab; + bufp->symbol_value += data_offset; ms_type = mst_file_data; goto check_strange_names; @@ -272,17 +240,37 @@ som_symtab_read (abfd, addr, objfile) } break; + /* This can happen for common symbols when -E is passed to the + final link. No idea _why_ that would make the linker force + common symbols to have an SS_UNSAT scope, but it does. + + This also happens for weak symbols, but their type is + ST_DATA. */ + case SS_UNSAT: + switch (bufp->symbol_type) + { + case ST_STORAGE: + case ST_DATA: + symname = bufp->name.n_strx + stringtab; + bufp->symbol_value += data_offset; + ms_type = mst_data; + break; + + default: + continue; + } + break; + default: continue; } 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); - record_minimal_symbol (symname, - bufp->symbol_value, ms_type, - objfile); + prim_record_minimal_symbol (symname, bufp->symbol_value, ms_type, + objfile); } } @@ -293,9 +281,6 @@ som_symtab_read (abfd, addr, objfile) SECTION_OFFSETS is a set of offsets to apply to relocate the symbols in each section. This is ignored, as it isn't needed for SOM. - MAINLINE is true if we are reading the main symbol - table (as opposed to a shared lib or dynamically loaded file). - This function only does the minimum work necessary for letting the user "name" things symbolically; it does not read the entire symtab. Instead, it reads the external and static symbols and puts them in partial @@ -316,35 +301,33 @@ som_symtab_read (abfd, addr, objfile) capability even for files compiled without -g. */ static void -som_symfile_read (objfile, section_offsets, mainline) - struct objfile *objfile; - struct section_offsets *section_offsets; - int mainline; +som_symfile_read (struct objfile *objfile, int symfile_flags) { bfd *abfd = objfile->obfd; struct cleanup *back_to; - CORE_ADDR offset; init_minimal_symbol_collection (); - back_to = make_cleanup (discard_minimal_symbols, 0); - - /* FIXME, should take a section_offsets param, not just an offset. */ - - offset = ANOFFSET (section_offsets, 0); + back_to = make_cleanup_discard_minimal_symbols (); - /* Process the normal SOM symbol table first. */ + /* 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 + table and thus build up a "minimal symbol table". */ - som_symtab_read (abfd, offset, objfile); - - /* Now read information from the debugging sections. */ - stabsect_build_psymtabs (objfile, section_offsets, mainline, - "$GDB_SYMBOLS$", "$GDB_STRINGS$", "$TEXT$"); + som_symtab_read (abfd, objfile, objfile->section_offsets); /* Install any minimal symbols that have been collected as the current - minimal symbols for this objfile. */ + 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); - do_cleanups (back_to); + + /* Now read information from the stabs debug sections. + This is emitted by gcc. */ + stabsect_build_psymtabs (objfile, + "$GDB_SYMBOLS$", "$GDB_STRINGS$", "$TEXT$"); } /* Initialize anything that needs initializing when a completely new symbol @@ -354,76 +337,101 @@ som_symfile_read (objfile, section_offsets, mainline) We reinitialize buildsym, since we may be reading stabs from a SOM file. */ static void -som_new_init (ignore) - struct objfile *ignore; +som_new_init (struct objfile *ignore) { stabsread_new_init (); buildsym_new_init (); } /* Perform any local cleanups required when we are done with a particular - objfile. I.E, we are in the process of discarding all symbol information + objfile. I.e, we are in the process of discarding all symbol information for an objfile, freeing up all memory held for it, and unlinking the - objfile struct from the global list of known objfiles. */ + objfile struct from the global list of known objfiles. */ static void -som_symfile_finish (objfile) - struct objfile *objfile; +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); } } -/* SOM specific initialization routine for reading symbols. +/* SOM specific initialization routine for reading symbols. */ - Nothing SOM specific left to do anymore. */ static void -som_symfile_init (ignore) - struct objfile *ignore; +som_symfile_init (struct objfile *objfile) { + /* SOM objects may be reordered, so set OBJF_REORDERED. If we + 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; } /* SOM specific parsing routine for section offsets. Plain and simple for now. */ -static struct section_offsets * -som_symfile_offsets (objfile, addr) - struct objfile *objfile; - CORE_ADDR addr; +static void +som_symfile_offsets (struct objfile *objfile, struct section_addr_info *addrs) { - struct section_offsets *section_offsets; int i; + CORE_ADDR text_addr; + + objfile->num_sections = bfd_count_sections (objfile->obfd); + objfile->section_offsets = (struct 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 + SET_OFF_* from bfd. (See default_symfile_offsets()). But I don't + know the correspondence between SOM sections and GDB's idea of + section names. So for now we default to what is was before these + changes. */ + objfile->sect_index_text = 0; + objfile->sect_index_data = 1; + objfile->sect_index_bss = 2; + objfile->sect_index_rodata = 3; + + /* First see if we're a shared library. If so, get the section + offsets from the library, else get them from addrs. */ + if (!som_solib_section_offsets (objfile, objfile->section_offsets)) + { + /* 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 < addrs->num_sections && addrs->other[i].name; i++) + if (strcmp (addrs->other[i].name, ".text") == 0) + break; + text_addr = addrs->other[i].addr; - 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)); - - for (i = 0; i < SECT_OFF_MAX; i++) - ANOFFSET (section_offsets, i) = addr; - - return section_offsets; + for (i = 0; i < objfile->num_sections; i++) + (objfile->section_offsets)->offsets[i] = text_addr; + } } + + /* Register that we are able to handle SOM object file formats. */ -static struct sym_fns som_sym_fns = +static const struct sym_fns som_sym_fns = { bfd_target_som_flavour, - som_new_init, /* sym_new_init: init anything gbl to entire symtab */ - som_symfile_init, /* sym_init: read initial info, setup for sym_read() */ - 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 */ - NULL /* next: pointer to next struct sym_fns */ + som_new_init, /* init anything gbl to entire symtab */ + som_symfile_init, /* read initial info, setup for sym_read() */ + som_symfile_read, /* read a symbol file into symtab */ + NULL, /* sym_read_psymbols */ + som_symfile_finish, /* finished with file, cleanup */ + som_symfile_offsets, /* Translate ext. to int. relocation */ + default_symfile_segments, /* Get segment information from a file. */ + NULL, + default_symfile_relocate, /* Relocate a debug section. */ + &psym_functions }; void -_initialize_somread () +_initialize_somread (void) { add_symtab_fns (&som_sym_fns); }