From a87029ef15e59af2cc0b27cb4024b0db313fa88e Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Wed, 7 Jul 1999 20:19:36 +0000 Subject: import gdb-1999-07-07 post reformat --- gdb/somread.c | 393 ++++++++++++++++++++++++++++++---------------------------- 1 file changed, 200 insertions(+), 193 deletions(-) (limited to 'gdb/somread.c') diff --git a/gdb/somread.c b/gdb/somread.c index 259835ff8e7..bbbaa98a7c0 100644 --- a/gdb/somread.c +++ b/gdb/somread.c @@ -2,21 +2,22 @@ Copyright 1991, 1992, 1996, 1999 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 2 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + 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. */ #include "defs.h" #include "bfd.h" @@ -52,7 +53,7 @@ som_symtab_read PARAMS ((bfd *, struct objfile *, struct section_offsets *)); static struct section_offsets * -som_symfile_offsets PARAMS ((struct objfile *, CORE_ADDR)); + som_symfile_offsets PARAMS ((struct objfile *, CORE_ADDR)); /* FIXME: These should really be in a common header somewhere */ @@ -70,22 +71,22 @@ do_pxdb PARAMS ((bfd *)); /* -LOCAL FUNCTION + LOCAL FUNCTION - som_symtab_read -- read the symbol table of a SOM file + som_symtab_read -- read the symbol table of a SOM file -SYNOPSIS + SYNOPSIS - void som_symtab_read (bfd *abfd, struct objfile *objfile, - struct section_offsets *section_offsets) + void som_symtab_read (bfd *abfd, struct objfile *objfile, + struct section_offsets *section_offsets) -DESCRIPTION + DESCRIPTION - 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, objfile, section_offsets) @@ -172,8 +173,8 @@ som_symtab_read (abfd, objfile, section_offsets) 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 @@ -224,21 +225,21 @@ som_symtab_read (abfd, objfile, section_offsets) 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 '$'. - - 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. */ + 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, "$PIC", 4) == 0)) continue; @@ -258,8 +259,8 @@ som_symtab_read (abfd, objfile, section_offsets) 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 @@ -291,24 +292,24 @@ som_symtab_read (abfd, objfile, section_offsets) } 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 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. */ + 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; + 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; @@ -320,7 +321,7 @@ som_symtab_read (abfd, objfile, section_offsets) error ("Invalid symbol data; bad HP string table offset: %d", bufp->name.n_strx); - prim_record_minimal_symbol (symname, bufp->symbol_value, ms_type, + prim_record_minimal_symbol (symname, bufp->symbol_value, ms_type, objfile); } } @@ -373,7 +374,7 @@ som_symfile_read (objfile, section_offsets, mainline) 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 */ +#if 0 /* Export symbols not used today 1997-08-05 */ init_export_symbols (objfile); #else objfile->export_list = NULL; @@ -384,13 +385,13 @@ som_symfile_read (objfile, section_offsets, mainline) 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, 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? */ + situation? */ stabsect_build_psymtabs (objfile, section_offsets, mainline, "$GDB_SYMBOLS$", "$GDB_STRINGS$", "$TEXT$"); @@ -435,9 +436,9 @@ static void som_symfile_finish (objfile) struct objfile *objfile; { - if (objfile -> sym_stab_info != NULL) + if (objfile->sym_stab_info != NULL) { - mfree (objfile -> md, objfile -> sym_stab_info); + mfree (objfile->md, objfile->sym_stab_info); } hpread_symfile_finish (objfile); } @@ -469,7 +470,7 @@ som_symfile_offsets (objfile, addr) objfile->num_sections = SECT_OFF_MAX; section_offsets = (struct section_offsets *) - obstack_alloc (&objfile -> psymbol_obstack, SIZEOF_SECTION_OFFSETS); + obstack_alloc (&objfile->psymbol_obstack, SIZEOF_SECTION_OFFSETS); /* First see if we're a shared library. If so, get the section offsets from the library, else get them from addr. */ @@ -489,11 +490,12 @@ som_symfile_offsets (objfile, addr) 1 => true, 0 => false This is used in hp_symtab_read.c to deal with static variables that are defined in a different shared library than the one - whose symbols are being processed. */ + whose symbols are being processed. */ -int is_in_import_list (name, objfile) - char * name; - struct objfile * objfile; +int +is_in_import_list (name, objfile) + char *name; + struct objfile *objfile; { register int i; @@ -502,9 +504,9 @@ int is_in_import_list (name, objfile) !*name) return 0; - for (i=0; i < objfile->import_list_size; i++) + for (i = 0; i < objfile->import_list_size; i++) if (objfile->import_list[i] && STREQ (name, objfile->import_list[i])) - return 1; + return 1; return 0; } @@ -517,110 +519,112 @@ int is_in_import_list (name, objfile) Return value = number of import symbols read in. */ int init_import_symbols (objfile) - struct objfile * objfile; + struct objfile *objfile; { unsigned int import_list; unsigned int import_list_size; unsigned int string_table; unsigned int string_table_size; - char * string_buffer; + 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 */ + 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) + 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 */ + 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 */ + /* 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 */ + 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 = dl_header[4]; import_list_size = dl_header[5]; if (!import_list_size) return 0; - string_table = dl_header[10]; + string_table = dl_header[10]; string_table_size = dl_header[11]; if (!string_table_size) return 0; - /* Suck in SOM string table */ + /* 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); + 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 */ + import list to be freed when the objfile is deallocated */ objfile->import_list = (ImportEntry *) obstack_alloc (&objfile->psymbol_obstack, - import_list_size * sizeof (ImportEntry)); + import_list_size * sizeof (ImportEntry)); - /* Read in the import entries, a bunch at a time */ - for (j=0, k=0; + /* 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; - - } + 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 */ + /* 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++) + 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 */ - } + { + 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[k] = NULL; } objfile->import_list_size = import_list_size; @@ -636,33 +640,35 @@ init_import_symbols (objfile) Return value = number of import symbols read in. */ int init_export_symbols (objfile) - struct objfile * objfile; + struct objfile *objfile; { unsigned int export_list; unsigned int export_list_size; unsigned int string_table; unsigned int string_table_size; - char * string_buffer; + 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 */ + 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) + 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 */ @@ -670,106 +676,107 @@ init_export_symbols (objfile) 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 */ + 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 */ + /* 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 */ + 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]; + + export_list = dl_header[8]; + export_list_size = dl_header[9]; if (!export_list_size) return 0; - string_table = dl_header[10]; + string_table = dl_header[10]; string_table_size = dl_header[11]; if (!string_table_size) return 0; - /* Suck in SOM string table */ + /* 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); + 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 */ + export list to be freed when the objfile is deallocated */ objfile->export_list - = (ExportEntry *) obstack_alloc (&objfile->psymbol_obstack, - export_list_size * sizeof (ExportEntry)); + = (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; + /* 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; - } - } + 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 */ + /* 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++) + 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; - } + { + 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[k].name = NULL; + objfile->export_list[k].address = 0; + } } objfile->export_list_size = export_list_size; free (string_buffer); return export_list_size; } + - /* Register that we are able to handle SOM object file formats. */ static 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, /* 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 */ }; void -- cgit v1.2.1