X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fxcoffread.c;h=4ecd0a266813310e39fac65fafc1977ed16addf4;hb=3919e12ce57a6ea9e5647f4707c5dce4382a7356;hp=53e546958f878dbe04db5ea1900a498574f7a8e5;hpb=fba45db2faf619e71856ee38ec63949c0ef6903e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index 53e546958f..4ecd0a2668 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -1,5 +1,6 @@ /* Read AIX xcoff symbol tables and convert to internal format, for GDB. - Copyright 1986, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 1997 + Copyright 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, + 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. Derived from coffread.c, dbxread.c, and a lot of hacking. Contributed by IBM Corporation. @@ -30,23 +31,25 @@ #include "gdb_string.h" #include -#ifndef NO_SYS_FILE +#ifdef HAVE_SYS_FILE_H #include #endif #include "gdb_stat.h" #include "coff/internal.h" #include "libcoff.h" /* FIXME, internal data from BFD */ +#include "coff/xcoff.h" +#include "libxcoff.h" #include "coff/rs6000.h" #include "symtab.h" #include "gdbtypes.h" +/* FIXME: ezannoni/2004-02-13 Verify if the include below is really needed. */ #include "symfile.h" #include "objfiles.h" #include "buildsym.h" #include "stabsread.h" #include "expression.h" -#include "language.h" /* Needed inside partial-stab.h */ #include "complaints.h" #include "gdb-stabs.h" @@ -54,41 +57,6 @@ /* For interface with stabsread.c. */ #include "aout/stab_gnu.h" -/* For interface with partial-stab.h. */ -#define N_UNDF 0 /* Undefined symbol */ -#undef N_ABS -#define N_ABS 2 -#define N_TEXT 4 /* Text sym -- defined at offset in text seg */ -#define N_DATA 6 /* Data sym -- defined at offset in data seg */ -#define N_BSS 8 /* BSS sym -- defined at offset in zero'd seg */ -#define N_COMM 0x12 /* Common symbol (visible after shared lib dynlink) */ -#define N_FN 0x1f /* File name of .o file */ -#define N_FN_SEQ 0x0C /* N_FN from Sequent compilers (sigh) */ -/* Note: N_EXT can only be usefully OR-ed with N_UNDF, N_ABS, N_TEXT, - N_DATA, or N_BSS. When the low-order bit of other types is set, - (e.g. N_WARNING versus N_FN), they are two different types. */ -#define N_EXT 1 /* External symbol (as opposed to local-to-this-file) */ -#define N_INDR 0x0a - -/* The following symbols refer to set elements. - All the N_SET[ATDB] symbols with the same name form one set. - Space is allocated for the set in the text section, and each set - elements value is stored into one word of the space. - The first word of the space is the length of the set (number of elements). - - The address of the set is made into an N_SETV symbol - whose name is the same as the name of the set. - This symbol acts like a N_DATA global symbol - in that it can satisfy undefined external references. */ - -/* These appear as input to LD, in a .o file. */ -#define N_SETA 0x14 /* Absolute set element symbol */ -#define N_SETT 0x16 /* Text set element symbol */ -#define N_SETD 0x18 /* Data set element symbol */ -#define N_SETB 0x1A /* Bss set element symbol */ - -/* This is output from LD. */ -#define N_SETV 0x1C /* Pointer to set vector in data area. */ /* We put a pointer to this structure in the read_symtab_private field of the psymtab. */ @@ -183,17 +151,25 @@ struct coff_symfile_info CORE_ADDR toc_offset; }; -static struct complaint storclass_complaint = -{"Unexpected storage class: %d", 0, 0}; - -static struct complaint bf_notfound_complaint = -{"line numbers off, `.bf' symbol not found", 0, 0}; +static void +bf_notfound_complaint (void) +{ + complaint (&symfile_complaints, "line numbers off, `.bf' symbol not found"); +} -static struct complaint ef_complaint = -{"Mismatched .ef symbol ignored starting at symnum %d", 0, 0}; +static void +ef_complaint (int arg1) +{ + complaint (&symfile_complaints, + "Mismatched .ef symbol ignored starting at symnum %d", arg1); +} -static struct complaint eb_complaint = -{"Mismatched .eb symbol ignored starting at symnum %d", 0, 0}; +static void +eb_complaint (int arg1) +{ + complaint (&symfile_complaints, + "Mismatched .eb symbol ignored starting at symnum %d", arg1); +} static void xcoff_initial_scan (struct objfile *, int); @@ -215,10 +191,8 @@ static void xcoff_new_init (struct objfile *); static void xcoff_symfile_finish (struct objfile *); -static void -xcoff_symfile_offsets (struct objfile *, struct section_addr_info *addrs); - -static void find_linenos (bfd *, sec_ptr, PTR); +static void xcoff_symfile_offsets (struct objfile *, + struct section_addr_info *addrs); static char *coff_getfilename (union internal_auxent *, struct objfile *); @@ -262,7 +236,7 @@ struct find_targ_sec_arg static void find_targ_sec (bfd *, asection *, void *); static void -find_targ_sec (bfd *abfd, asection *sect, PTR obj) +find_targ_sec (bfd *abfd, asection *sect, void *obj) { struct find_targ_sec_arg *args = (struct find_targ_sec_arg *) obj; struct objfile *objfile = args->objfile; @@ -274,7 +248,7 @@ find_targ_sec (bfd *abfd, asection *sect, PTR obj) else if (bfd_get_section_flags (abfd, sect) & SEC_LOAD) *args->resultp = SECT_OFF_DATA (objfile); else - *args->resultp = SECT_OFF_BSS (objfile); + *args->resultp = sect->index; *args->bfd_sect = sect; } } @@ -408,8 +382,7 @@ compare_lte (const void *lte1p, const void *lte2p) sort_linevec = 1 to end_symtab. */ static struct linetable * -arrange_linetable (oldLineTb) - struct linetable *oldLineTb; /* old linetable */ +arrange_linetable (struct linetable *oldLineTb) { int ii, jj, newline, /* new line count */ function_count; /* # of functions */ @@ -444,7 +417,7 @@ arrange_linetable (oldLineTb) if (function_count == 0) { - free (fentry); + xfree (fentry); return oldLineTb; } else if (function_count > 1) @@ -474,7 +447,7 @@ arrange_linetable (oldLineTb) ++jj, ++newline) newLineTb->item[newline] = oldLineTb->item[jj]; } - free (fentry); + xfree (fentry); newLineTb->nitems = oldLineTb->nitems - function_count; return newLineTb; } @@ -517,9 +490,7 @@ record_include_begin (struct coff_symbol *cs) /* This can happen with old versions of GCC. GCC 2.3.3-930426 does not exhibit this on a test case which a user said produced the message for him. */ - static struct complaint msg = - {"Nested C_BINCL symbols", 0, 0}; - complain (&msg); + complaint (&symfile_complaints, "Nested C_BINCL symbols"); } ++inclDepth; @@ -536,9 +507,7 @@ record_include_end (struct coff_symbol *cs) if (inclDepth == 0) { - static struct complaint msg = - {"Mismatched C_BINCL/C_EINCL pair", 0, 0}; - complain (&msg); + complaint (&symfile_complaints, "Mismatched C_BINCL/C_EINCL pair"); } allocate_include_entry (); @@ -584,7 +553,7 @@ process_linenos (CORE_ADDR start, CORE_ADDR end) { int offset, ii; file_ptr max_offset = - ((struct coff_symfile_info *) this_symtab_psymtab->objfile->sym_private) + ((struct coff_symfile_info *) this_symtab_psymtab->objfile->deprecated_sym_private) ->max_lineno_offset; /* subfile structure for the main compilation unit. */ @@ -676,7 +645,7 @@ process_linenos (CORE_ADDR start, CORE_ADDR end) } else { - free (lv); + xfree (lv); current_subfile->line_vector = lineTb; } @@ -726,7 +695,7 @@ process_linenos (CORE_ADDR start, CORE_ADDR end) if (fakename == NULL) fakename = " ?"; start_subfile (fakename, (char *) 0); - free (current_subfile->name); + xfree (current_subfile->name); } current_subfile->name = xstrdup (inclTable[ii].name); #endif @@ -741,7 +710,7 @@ process_linenos (CORE_ADDR start, CORE_ADDR end) } else { - free (lv); + xfree (lv); current_subfile->line_vector = lineTb; } @@ -793,16 +762,15 @@ enter_line_range (struct subfile *subfile, unsigned beginoffset, unsigned endoff return; curoffset = beginoffset; limit_offset = - ((struct coff_symfile_info *) this_symtab_psymtab->objfile->sym_private) + ((struct coff_symfile_info *) this_symtab_psymtab->objfile->deprecated_sym_private) ->max_lineno_offset; if (endoffset != 0) { if (endoffset >= limit_offset) { - static struct complaint msg = - {"Bad line table offset in C_EINCL directive", 0, 0}; - complain (&msg); + complaint (&symfile_complaints, + "Bad line table offset in C_EINCL directive"); return; } limit_offset = endoffset; @@ -817,7 +785,7 @@ enter_line_range (struct subfile *subfile, unsigned beginoffset, unsigned endoff while (curoffset <= limit_offset) { bfd_seek (abfd, curoffset, SEEK_SET); - bfd_read (ext_lnno, linesz, 1, abfd); + bfd_bread (ext_lnno, linesz, abfd); bfd_coff_swap_lineno_in (abfd, ext_lnno, &int_lnno); /* Find the address this line represents. */ @@ -898,8 +866,6 @@ static char * xcoff_next_symbol_text (struct objfile *objfile) { struct internal_syment symbol; - static struct complaint msg = - {"Unexpected symbol continuation", 0, 0}; char *retval; /* FIXME: is this the same as the passed arg? */ objfile = this_symtab_psymtab->objfile; @@ -907,7 +873,7 @@ xcoff_next_symbol_text (struct objfile *objfile) bfd_coff_swap_sym_in (objfile->obfd, raw_symbol, &symbol); if (symbol.n_zeroes) { - complain (&msg); + complaint (&symfile_complaints, "Unexpected symbol continuation"); /* Return something which points to '\0' and hope the symbol reading code does something reasonable. */ @@ -916,7 +882,7 @@ xcoff_next_symbol_text (struct objfile *objfile) else if (symbol.n_sclass & 0x80) { retval = - ((struct coff_symfile_info *) objfile->sym_private)->debugsec + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->debugsec + symbol.n_offset; raw_symbol += coff_data (objfile->obfd)->local_symesz; @@ -924,7 +890,7 @@ xcoff_next_symbol_text (struct objfile *objfile) } else { - complain (&msg); + complaint (&symfile_complaints, "Unexpected symbol continuation"); /* Return something which points to '\0' and hope the symbol reading code does something reasonable. */ @@ -941,10 +907,10 @@ read_xcoff_symtab (struct partial_symtab *pst) struct objfile *objfile = pst->objfile; bfd *abfd = objfile->obfd; char *raw_auxptr; /* Pointer to first raw aux entry for sym */ - char *strtbl = ((struct coff_symfile_info *) objfile->sym_private)->strtbl; + char *strtbl = ((struct coff_symfile_info *) objfile->deprecated_sym_private)->strtbl; char *debugsec = - ((struct coff_symfile_info *) objfile->sym_private)->debugsec; - char *debugfmt = xcoff_data (abfd)->xcoff64 ? "XCOFF64" : "XCOFF"; + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->debugsec; + char *debugfmt = bfd_xcoff_is_xcoff64 (abfd) ? "XCOFF64" : "XCOFF"; struct internal_syment symbol[1]; union internal_auxent main_aux; @@ -989,7 +955,7 @@ read_xcoff_symtab (struct partial_symtab *pst) first_object_file_end = 0; raw_symbol = - ((struct coff_symfile_info *) objfile->sym_private)->symtbl + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->symtbl + symnum * local_symesz; while (symnum < max_symnum) @@ -1023,7 +989,7 @@ read_xcoff_symtab (struct partial_symtab *pst) if (cs->c_name[E_SYMNMLEN - 1] != '\0') { char *p; - p = obstack_alloc (&objfile->symbol_obstack, E_SYMNMLEN + 1); + p = obstack_alloc (&objfile->objfile_obstack, E_SYMNMLEN + 1); strncpy (p, cs->c_name, E_SYMNMLEN); p[E_SYMNMLEN] = '\0'; cs->c_name = p; @@ -1081,14 +1047,6 @@ read_xcoff_symtab (struct partial_symtab *pst) /* done with all files, everything from here on is globals */ } - /* if explicitly specified as a function, treat is as one. */ - if (ISFCN (cs->c_type) && cs->c_sclass != C_TPDEF) - { - bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass, - 0, cs->c_naux, &main_aux); - goto function_entry_point; - } - if ((cs->c_sclass == C_EXT || cs->c_sclass == C_HIDEXT) && cs->c_naux == 1) { @@ -1158,7 +1116,8 @@ read_xcoff_symtab (struct partial_symtab *pst) SECT_OFF_TEXT (objfile)); file_end_addr = file_start_addr + CSECT_LEN (&main_aux); - if (cs->c_name && cs->c_name[0] == '.') + if (cs->c_name && (cs->c_name[0] == '.' + || cs->c_name[0] == '@')) { last_csect_name = cs->c_name; last_csect_val = cs->c_value; @@ -1232,6 +1191,16 @@ read_xcoff_symtab (struct partial_symtab *pst) } } + /* If explicitly specified as a function, treat is as one. This check + evaluates to true for @FIX* bigtoc CSECT symbols, so it must occur + after the above CSECT check. */ + if (ISFCN (cs->c_type) && cs->c_sclass != C_TPDEF) + { + bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass, + 0, cs->c_naux, &main_aux); + goto function_entry_point; + } + switch (cs->c_sclass) { @@ -1283,7 +1252,7 @@ read_xcoff_symtab (struct partial_symtab *pst) break; case C_FCN: - if (STREQ (cs->c_name, ".bf")) + if (DEPRECATED_STREQ (cs->c_name, ".bf")) { CORE_ADDR off = ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); @@ -1300,7 +1269,7 @@ read_xcoff_symtab (struct partial_symtab *pst) if (new->name != NULL) SYMBOL_SECTION (new->name) = SECT_OFF_TEXT (objfile); } - else if (STREQ (cs->c_name, ".ef")) + else if (DEPRECATED_STREQ (cs->c_name, ".ef")) { bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass, @@ -1313,7 +1282,7 @@ read_xcoff_symtab (struct partial_symtab *pst) if (context_stack_depth <= 0) { /* We attempted to pop an empty context stack */ - complain (&ef_complaint, cs->c_symnum); + ef_complaint (cs->c_symnum); within_function = 0; break; } @@ -1321,7 +1290,7 @@ read_xcoff_symtab (struct partial_symtab *pst) /* Stack must be empty now. */ if (context_stack_depth > 0 || new == NULL) { - complain (&ef_complaint, cs->c_symnum); + ef_complaint (cs->c_symnum); within_function = 0; break; } @@ -1363,9 +1332,8 @@ read_xcoff_symtab (struct partial_symtab *pst) case C_UNTAG: case C_ENTAG: { - static struct complaint msg = - {"Unrecognized storage class %d.", 0, 0}; - complain (&msg, cs->c_sclass); + complaint (&symfile_complaints, "Unrecognized storage class %d.", + cs->c_sclass); } break; @@ -1395,7 +1363,7 @@ read_xcoff_symtab (struct partial_symtab *pst) break; case C_BLOCK: - if (STREQ (cs->c_name, ".bb")) + if (DEPRECATED_STREQ (cs->c_name, ".bb")) { depth++; new = push_context (depth, @@ -1403,17 +1371,17 @@ read_xcoff_symtab (struct partial_symtab *pst) + ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)))); } - else if (STREQ (cs->c_name, ".eb")) + else if (DEPRECATED_STREQ (cs->c_name, ".eb")) { if (context_stack_depth <= 0) { /* We attempted to pop an empty context stack */ - complain (&eb_complaint, cs->c_symnum); + eb_complaint (cs->c_symnum); break; } new = pop_context (); if (depth-- != new->depth) { - complain (&eb_complaint, cs->c_symnum); + eb_complaint (cs->c_symnum); break; } if (local_symbols && context_stack_depth > 0) @@ -1455,12 +1423,12 @@ read_xcoff_symtab (struct partial_symtab *pst) #define SYMBOL_DUP(SYMBOL1, SYMBOL2) \ (SYMBOL2) = (struct symbol *) \ - obstack_alloc (&objfile->symbol_obstack, sizeof (struct symbol)); \ + obstack_alloc (&objfile->objfile_obstack, sizeof (struct symbol)); \ *(SYMBOL2) = *(SYMBOL1); #define SYMNAME_ALLOC(NAME, ALLOCED) \ - (ALLOCED) ? (NAME) : obsavestring ((NAME), strlen (NAME), &objfile->symbol_obstack); + (ALLOCED) ? (NAME) : obsavestring ((NAME), strlen (NAME), &objfile->objfile_obstack); static struct type *func_symbol_type; @@ -1469,10 +1437,10 @@ static struct type *var_symbol_type; /* process one xcoff symbol. */ static struct symbol * -process_xcoff_symbol (register struct coff_symbol *cs, struct objfile *objfile) +process_xcoff_symbol (struct coff_symbol *cs, struct objfile *objfile) { struct symbol onesymbol; - register struct symbol *sym = &onesymbol; + struct symbol *sym = &onesymbol; struct symbol *sym2 = NULL; char *name, *pp; @@ -1500,7 +1468,7 @@ process_xcoff_symbol (register struct coff_symbol *cs, struct objfile *objfile) /* default assumptions */ SYMBOL_VALUE_ADDRESS (sym) = cs->c_value + off; - SYMBOL_NAMESPACE (sym) = VAR_NAMESPACE; + SYMBOL_DOMAIN (sym) = VAR_DOMAIN; SYMBOL_SECTION (sym) = secnum_to_section (cs->c_secnum, objfile); if (ISFCN (cs->c_type)) @@ -1509,7 +1477,7 @@ process_xcoff_symbol (register struct coff_symbol *cs, struct objfile *objfile) will be patched with the type from its stab entry later on in patch_block_stabs (), unless the file was compiled without -g. */ - SYMBOL_NAME (sym) = SYMNAME_ALLOC (name, symname_alloced); + DEPRECATED_SYMBOL_NAME (sym) = SYMNAME_ALLOC (name, symname_alloced); SYMBOL_TYPE (sym) = func_symbol_type; SYMBOL_CLASS (sym) = LOC_BLOCK; @@ -1551,7 +1519,8 @@ process_xcoff_symbol (register struct coff_symbol *cs, struct objfile *objfile) break; default: - complain (&storclass_complaint, cs->c_sclass); + complaint (&symfile_complaints, "Unexpected storage class: %d", + cs->c_sclass); /* FALLTHROUGH */ case C_DECL: @@ -1612,7 +1581,7 @@ coff_getfilename (union internal_auxent *aux_entry, struct objfile *objfile) if (aux_entry->x_file.x_n.x_zeroes == 0) strcpy (buffer, - ((struct coff_symfile_info *) objfile->sym_private)->strtbl + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->strtbl + aux_entry->x_file.x_n.x_offset); else { @@ -1627,16 +1596,12 @@ static void read_symbol (struct internal_syment *symbol, int symno) { int nsyms = - ((struct coff_symfile_info *) this_symtab_psymtab->objfile->sym_private) - ->symtbl_num_syms; + ((struct coff_symfile_info *) this_symtab_psymtab->objfile->deprecated_sym_private)->symtbl_num_syms; char *stbl = - ((struct coff_symfile_info *) this_symtab_psymtab->objfile->sym_private) - ->symtbl; + ((struct coff_symfile_info *) this_symtab_psymtab->objfile->deprecated_sym_private)->symtbl; if (symno < 0 || symno >= nsyms) { - static struct complaint msg = - {"Invalid symbol offset", 0, 0}; - complain (&msg); + complaint (&symfile_complaints, "Invalid symbol offset"); symbol->n_value = 0; symbol->n_scnum = -1; return; @@ -1665,10 +1630,10 @@ static int read_symbol_lineno (int symno) { struct objfile *objfile = this_symtab_psymtab->objfile; - boolean xcoff64 = xcoff_data (objfile->obfd)->xcoff64; + int xcoff64 = bfd_xcoff_is_xcoff64 (objfile->obfd); struct coff_symfile_info *info = - (struct coff_symfile_info *)objfile->sym_private; + (struct coff_symfile_info *)objfile->deprecated_sym_private; int nsyms = info->symtbl_num_syms; char *stbl = info->symtbl; char *strtbl = info->strtbl; @@ -1678,7 +1643,7 @@ read_symbol_lineno (int symno) if (symno < 0) { - complain (&bf_notfound_complaint); + bf_notfound_complaint (); return 0; } @@ -1705,13 +1670,13 @@ read_symbol_lineno (int symno) if (symbol->n_sclass == C_FCN) { char *name = xcoff64 ? strtbl + symbol->n_offset : symbol->n_name; - if (STREQ (name, ".bf")) + if (DEPRECATED_STREQ (name, ".bf")) goto gotit; } symno += symbol->n_numaux + 1; } - complain (&bf_notfound_complaint); + bf_notfound_complaint (); return 0; gotit: @@ -1731,7 +1696,7 @@ gotit: * mainline code can read the whole thing for efficiency. */ static void -find_linenos (bfd *abfd, sec_ptr asect, PTR vpinfo) +find_linenos (struct bfd *abfd, struct bfd_section *asect, void *vpinfo) { struct coff_symfile_info *info; int size, count; @@ -1739,7 +1704,7 @@ find_linenos (bfd *abfd, sec_ptr asect, PTR vpinfo) count = asect->lineno_count; - if (!STREQ (asect->name, ".text") || count == 0) + if (!DEPRECATED_STREQ (asect->name, ".text") || count == 0) return; size = count * coff_data (abfd)->local_linesz; @@ -1799,7 +1764,6 @@ xcoff_psymtab_to_symtab_1 (struct partial_symtab *pst) old_chain = make_cleanup (really_free_pendings, 0); read_xcoff_symtab (pst); - sort_symtab_syms (pst->symtab); do_cleanups (old_chain); } @@ -1872,8 +1836,7 @@ static void xcoff_symfile_init (struct objfile *objfile) { /* Allocate struct to keep track of the symfile */ - objfile->sym_private = xmmalloc (objfile->md, - sizeof (struct coff_symfile_info)); + objfile->deprecated_sym_private = xmalloc (sizeof (struct coff_symfile_info)); /* XCOFF objects may be reordered, so set OBJF_REORDERED. If we find this causes a significant slowdown in gdb then we could @@ -1891,15 +1854,15 @@ xcoff_symfile_init (struct objfile *objfile) static void xcoff_symfile_finish (struct objfile *objfile) { - if (objfile->sym_private != NULL) + if (objfile->deprecated_sym_private != NULL) { - mfree (objfile->md, objfile->sym_private); + xfree (objfile->deprecated_sym_private); } /* Start with a fresh include table for the next objfile. */ if (inclTable) { - free (inclTable); + xfree (inclTable); inclTable = NULL; } inclIndx = inclLength = inclDepth = 0; @@ -1914,13 +1877,13 @@ init_stringtab (bfd *abfd, file_ptr offset, struct objfile *objfile) unsigned char lengthbuf[4]; char *strtbl; - ((struct coff_symfile_info *) objfile->sym_private)->strtbl = NULL; + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->strtbl = NULL; if (bfd_seek (abfd, offset, SEEK_SET) < 0) error ("cannot seek to string table in %s: %s", bfd_get_filename (abfd), bfd_errmsg (bfd_get_error ())); - val = bfd_read ((char *) lengthbuf, 1, sizeof lengthbuf, abfd); + val = bfd_bread ((char *) lengthbuf, sizeof lengthbuf, abfd); length = bfd_h_get_32 (abfd, lengthbuf); /* If no string table is needed, then the file may end immediately @@ -1929,11 +1892,11 @@ init_stringtab (bfd *abfd, file_ptr offset, struct objfile *objfile) if (val != sizeof lengthbuf || length < sizeof lengthbuf) return; - /* Allocate string table from symbol_obstack. We will need this table + /* Allocate string table from objfile_obstack. We will need this table as long as we have its symbol table around. */ - strtbl = (char *) obstack_alloc (&objfile->symbol_obstack, length); - ((struct coff_symfile_info *) objfile->sym_private)->strtbl = strtbl; + strtbl = (char *) obstack_alloc (&objfile->objfile_obstack, length); + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->strtbl = strtbl; /* Copy length buffer, the first byte is usually zero and is used for stabs with a name length of zero. */ @@ -1941,8 +1904,7 @@ init_stringtab (bfd *abfd, file_ptr offset, struct objfile *objfile) if (length == sizeof lengthbuf) return; - val = bfd_read (strtbl + sizeof lengthbuf, 1, length - sizeof lengthbuf, - abfd); + val = bfd_bread (strtbl + sizeof lengthbuf, length - sizeof lengthbuf, abfd); if (val != length - sizeof lengthbuf) error ("cannot read string table from %s: %s", @@ -1982,7 +1944,7 @@ xcoff_start_psymtab (struct objfile *objfile, char *filename, int first_symnum, global_syms, static_syms); result->read_symtab_private = (char *) - obstack_alloc (&objfile->psymbol_obstack, sizeof (struct symloc)); + obstack_alloc (&objfile->objfile_obstack, sizeof (struct symloc)); ((struct symloc *) result->read_symtab_private)->first_symnum = first_symnum; result->read_symtab = xcoff_psymtab_to_symtab; @@ -2029,7 +1991,7 @@ xcoff_end_psymtab (struct partial_symtab *pst, char **include_list, if (number_dependencies) { pst->dependencies = (struct partial_symtab **) - obstack_alloc (&objfile->psymbol_obstack, + obstack_alloc (&objfile->objfile_obstack, number_dependencies * sizeof (struct partial_symtab *)); memcpy (pst->dependencies, dependency_list, number_dependencies * sizeof (struct partial_symtab *)); @@ -2044,7 +2006,7 @@ xcoff_end_psymtab (struct partial_symtab *pst, char **include_list, subpst->section_offsets = pst->section_offsets; subpst->read_symtab_private = - (char *) obstack_alloc (&objfile->psymbol_obstack, + (char *) obstack_alloc (&objfile->objfile_obstack, sizeof (struct symloc)); ((struct symloc *) subpst->read_symtab_private)->first_symnum = 0; ((struct symloc *) subpst->read_symtab_private)->numsyms = 0; @@ -2054,7 +2016,7 @@ xcoff_end_psymtab (struct partial_symtab *pst, char **include_list, /* We could save slight bits of space by only making one of these, shared by the entire set of include files. FIXME-someday. */ subpst->dependencies = (struct partial_symtab **) - obstack_alloc (&objfile->psymbol_obstack, + obstack_alloc (&objfile->objfile_obstack, sizeof (struct partial_symtab *)); subpst->dependencies[0] = pst; subpst->number_of_dependencies = 1; @@ -2117,7 +2079,7 @@ swap_sym (struct internal_syment *symbol, union internal_auxent *aux, /* FIXME: wastes memory for symbols which we don't end up putting into the minimal symbols. */ char *p; - p = obstack_alloc (&objfile->psymbol_obstack, E_SYMNMLEN + 1); + p = obstack_alloc (&objfile->objfile_obstack, E_SYMNMLEN + 1); strncpy (p, symbol->n_name, E_SYMNMLEN); p[E_SYMNMLEN] = '\0'; *name = p; @@ -2129,12 +2091,12 @@ swap_sym (struct internal_syment *symbol, union internal_auxent *aux, } else if (symbol->n_sclass & 0x80) { - *name = ((struct coff_symfile_info *) objfile->sym_private)->debugsec + *name = ((struct coff_symfile_info *) objfile->deprecated_sym_private)->debugsec + symbol->n_offset; } else { - *name = ((struct coff_symfile_info *) objfile->sym_private)->strtbl + *name = ((struct coff_symfile_info *) objfile->deprecated_sym_private)->strtbl + symbol->n_offset; } ++*symnump; @@ -2149,6 +2111,14 @@ swap_sym (struct internal_syment *symbol, union internal_auxent *aux, } } +static void +function_outside_compilation_unit_complaint (const char *arg1) +{ + complaint (&symfile_complaints, + "function `%s' appears to be defined outside of all compilation units", + arg1); +} + static void scan_xcoff_symtab (struct objfile *objfile) { @@ -2201,17 +2171,12 @@ scan_xcoff_symtab (struct objfile *objfile) abfd = objfile->obfd; - sraw_symbol = ((struct coff_symfile_info *) objfile->sym_private)->symtbl; - nsyms = ((struct coff_symfile_info *) objfile->sym_private)->symtbl_num_syms; + sraw_symbol = ((struct coff_symfile_info *) objfile->deprecated_sym_private)->symtbl; + nsyms = ((struct coff_symfile_info *) objfile->deprecated_sym_private)->symtbl_num_syms; ssymnum = 0; while (ssymnum < nsyms) { int sclass; - /* This is the type we pass to partial-stab.h. A less kludgy solution - would be to break out partial-stab.h into its various parts--shuffle - off the DBXREAD_ONLY stuff to dbxread.c, and make separate - pstab-norm.h (for most types), pstab-sol.h (for N_SOL), etc. */ - int stype; QUIT; @@ -2290,7 +2255,11 @@ scan_xcoff_symtab (struct objfile *objfile) objfile->static_psymbols.next); } } - if (namestring && namestring[0] == '.') + /* Activate the misc_func_recorded mechanism for + compiler- and linker-generated CSECTs like ".strcmp" + and "@FIX1". */ + if (namestring && (namestring[0] == '.' + || namestring[0] == '@')) { last_csect_name = namestring; last_csect_val = symbol.n_value; @@ -2310,6 +2279,7 @@ scan_xcoff_symtab (struct objfile *objfile) break; case XMC_RW: + case XMC_TD: /* Data variables are recorded in the minimal symbol table, except for section symbols. */ if (*namestring != '.') @@ -2474,9 +2444,8 @@ scan_xcoff_symtab (struct objfile *objfile) default: { - static struct complaint msg = - {"Storage class %d not recognized during scan", 0, 0}; - complain (&msg, sclass); + complaint (&symfile_complaints, + "Storage class %d not recognized during scan", sclass); } /* FALLTHROUGH */ @@ -2532,9 +2501,59 @@ scan_xcoff_symtab (struct objfile *objfile) break; case C_BINCL: - stype = N_SOL; - goto pstab; + { + /* Mark down an include file in the current psymtab */ + enum language tmp_language; + swap_sym (&symbol, &main_aux[0], &namestring, &sraw_symbol, + &ssymnum, objfile); + + tmp_language = deduce_language_from_filename (namestring); + + /* Only change the psymtab's language if we've learned + something useful (eg. tmp_language is not language_unknown). + In addition, to match what start_subfile does, never change + from C++ to C. */ + if (tmp_language != language_unknown + && (tmp_language != language_c + || psymtab_language != language_cplus)) + psymtab_language = tmp_language; + + /* In C++, one may expect the same filename to come round many + times, when code is coming alternately from the main file + and from inline functions in other files. So I check to see + if this is a file we've seen before -- either the main + source file, or a previously included file. + + This seems to be a lot of time to be spending on N_SOL, but + things like "break c-exp.y:435" need to work (I + suppose the psymtab_include_list could be hashed or put + in a binary tree, if profiling shows this is a major hog). */ + if (pst && DEPRECATED_STREQ (namestring, pst->filename)) + continue; + { + int i; + for (i = 0; i < includes_used; i++) + if (DEPRECATED_STREQ (namestring, psymtab_include_list[i])) + { + i = -1; + break; + } + if (i == -1) + continue; + } + psymtab_include_list[includes_used++] = namestring; + if (includes_used >= includes_allocated) + { + char **orig = psymtab_include_list; + psymtab_include_list = (char **) + alloca ((includes_allocated *= 2) * + sizeof (char *)); + memcpy (psymtab_include_list, orig, + includes_used * sizeof (char *)); + } + continue; + } case C_FUN: /* The value of the C_FUN is not the address of the function (it appears to be the address before linking), but as long as it @@ -2545,23 +2564,249 @@ scan_xcoff_symtab (struct objfile *objfile) case C_ECOML: case C_DECL: case C_STSYM: - stype = N_LSYM; - pstab: - swap_sym (&symbol, &main_aux[0], &namestring, &sraw_symbol, - &ssymnum, objfile); -#define CUR_SYMBOL_TYPE stype -#define CUR_SYMBOL_VALUE symbol.n_value - -/* START_PSYMTAB and END_PSYMTAB are never used, because they are only - called from DBXREAD_ONLY or N_SO code. Likewise for the symnum - variable. */ -#define START_PSYMTAB(ofile,fname,low,symoff,global_syms,static_syms) 0 -#define END_PSYMTAB(pst,ilist,ninc,c_off,c_text,dep_list,n_deps,textlow_not_set)\ - do {} while (0) -/* We have already set the namestring. */ -#define SET_NAMESTRING() /* */ - -#include "partial-stab.h" + { + char *p; + swap_sym (&symbol, &main_aux[0], &namestring, &sraw_symbol, + &ssymnum, objfile); + + p = (char *) strchr (namestring, ':'); + if (!p) + continue; /* Not a debugging symbol. */ + + /* Main processing section for debugging symbols which + the initial read through the symbol tables needs to worry + about. If we reach this point, the symbol which we are + considering is definitely one we are interested in. + p must also contain the (valid) index into the namestring + which indicates the debugging type symbol. */ + + switch (p[1]) + { + case 'S': + symbol.n_value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); +#ifdef STATIC_TRANSFORM_NAME + namestring = STATIC_TRANSFORM_NAME (namestring); +#endif + add_psymbol_to_list (namestring, p - namestring, + VAR_DOMAIN, LOC_STATIC, + &objfile->static_psymbols, + 0, symbol.n_value, + psymtab_language, objfile); + continue; + + case 'G': + symbol.n_value += ANOFFSET (objfile->section_offsets, SECT_OFF_DATA (objfile)); + /* The addresses in these entries are reported to be + wrong. See the code that reads 'G's for symtabs. */ + add_psymbol_to_list (namestring, p - namestring, + VAR_DOMAIN, LOC_STATIC, + &objfile->global_psymbols, + 0, symbol.n_value, + psymtab_language, objfile); + continue; + + case 'T': + /* When a 'T' entry is defining an anonymous enum, it + may have a name which is the empty string, or a + single space. Since they're not really defining a + symbol, those shouldn't go in the partial symbol + table. We do pick up the elements of such enums at + 'check_enum:', below. */ + if (p >= namestring + 2 + || (p == namestring + 1 + && namestring[0] != ' ')) + { + add_psymbol_to_list (namestring, p - namestring, + STRUCT_DOMAIN, LOC_TYPEDEF, + &objfile->static_psymbols, + symbol.n_value, 0, + psymtab_language, objfile); + if (p[2] == 't') + { + /* Also a typedef with the same name. */ + add_psymbol_to_list (namestring, p - namestring, + VAR_DOMAIN, LOC_TYPEDEF, + &objfile->static_psymbols, + symbol.n_value, 0, + psymtab_language, objfile); + p += 1; + } + } + goto check_enum; + + case 't': + if (p != namestring) /* a name is there, not just :T... */ + { + add_psymbol_to_list (namestring, p - namestring, + VAR_DOMAIN, LOC_TYPEDEF, + &objfile->static_psymbols, + symbol.n_value, 0, + psymtab_language, objfile); + } + check_enum: + /* If this is an enumerated type, we need to + add all the enum constants to the partial symbol + table. This does not cover enums without names, e.g. + "enum {a, b} c;" in C, but fortunately those are + rare. There is no way for GDB to find those from the + enum type without spending too much time on it. Thus + to solve this problem, the compiler needs to put out the + enum in a nameless type. GCC2 does this. */ + + /* We are looking for something of the form + ":" ("t" | "T") [ "="] "e" + { ":" ","} ";". */ + + /* Skip over the colon and the 't' or 'T'. */ + p += 2; + /* This type may be given a number. Also, numbers can come + in pairs like (0,26). Skip over it. */ + while ((*p >= '0' && *p <= '9') + || *p == '(' || *p == ',' || *p == ')' + || *p == '=') + p++; + + if (*p++ == 'e') + { + /* The aix4 compiler emits extra crud before the members. */ + if (*p == '-') + { + /* Skip over the type (?). */ + while (*p != ':') + p++; + + /* Skip over the colon. */ + p++; + } + + /* We have found an enumerated type. */ + /* According to comments in read_enum_type + a comma could end it instead of a semicolon. + I don't know where that happens. + Accept either. */ + while (*p && *p != ';' && *p != ',') + { + char *q; + + /* Check for and handle cretinous dbx symbol name + continuation! */ + if (*p == '\\' || (*p == '?' && p[1] == '\0')) + p = next_symbol_text (objfile); + + /* Point to the character after the name + of the enum constant. */ + for (q = p; *q && *q != ':'; q++) + ; + /* Note that the value doesn't matter for + enum constants in psymtabs, just in symtabs. */ + add_psymbol_to_list (p, q - p, + VAR_DOMAIN, LOC_CONST, + &objfile->static_psymbols, 0, + 0, psymtab_language, objfile); + /* Point past the name. */ + p = q; + /* Skip over the value. */ + while (*p && *p != ',') + p++; + /* Advance past the comma. */ + if (*p) + p++; + } + } + continue; + + case 'c': + /* Constant, e.g. from "const" in Pascal. */ + add_psymbol_to_list (namestring, p - namestring, + VAR_DOMAIN, LOC_CONST, + &objfile->static_psymbols, symbol.n_value, + 0, psymtab_language, objfile); + continue; + + case 'f': + if (! pst) + { + int name_len = p - namestring; + char *name = xmalloc (name_len + 1); + memcpy (name, namestring, name_len); + name[name_len] = '\0'; + function_outside_compilation_unit_complaint (name); + xfree (name); + } + symbol.n_value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + add_psymbol_to_list (namestring, p - namestring, + VAR_DOMAIN, LOC_BLOCK, + &objfile->static_psymbols, + 0, symbol.n_value, + psymtab_language, objfile); + continue; + + /* Global functions were ignored here, but now they + are put into the global psymtab like one would expect. + They're also in the minimal symbol table. */ + case 'F': + if (! pst) + { + int name_len = p - namestring; + char *name = xmalloc (name_len + 1); + memcpy (name, namestring, name_len); + name[name_len] = '\0'; + function_outside_compilation_unit_complaint (name); + xfree (name); + } + symbol.n_value += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + add_psymbol_to_list (namestring, p - namestring, + VAR_DOMAIN, LOC_BLOCK, + &objfile->global_psymbols, + 0, symbol.n_value, + psymtab_language, objfile); + continue; + + /* Two things show up here (hopefully); static symbols of + local scope (static used inside braces) or extensions + of structure symbols. We can ignore both. */ + case 'V': + case '(': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '-': + case '#': /* for symbol identification (used in live ranges) */ + continue; + + case ':': + /* It is a C++ nested symbol. We don't need to record it + (I don't think); if we try to look up foo::bar::baz, + then symbols for the symtab containing foo should get + read in, I think. */ + /* Someone says sun cc puts out symbols like + /foo/baz/maclib::/usr/local/bin/maclib, + which would get here with a symbol type of ':'. */ + continue; + + default: + /* Unexpected symbol descriptor. The second and subsequent stabs + of a continued stab can show up here. The question is + whether they ever can mimic a normal stab--it would be + nice if not, since we certainly don't want to spend the + time searching to the end of every string looking for + a backslash. */ + + complaint (&symfile_complaints, + "unknown symbol descriptor `%c'", p[1]); + + /* Ignore it; perhaps it is an extension that we don't + know about. */ + continue; + } + } } } @@ -2576,7 +2821,7 @@ scan_xcoff_symtab (struct objfile *objfile) If no XMC_TC0 is found, toc_offset should be zero. Another place to obtain this information would be file auxiliary header. */ - ((struct coff_symfile_info *) objfile->sym_private)->toc_offset = toc_offset; + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->toc_offset = toc_offset; } /* Return the toc offset value for a given objfile. */ @@ -2585,7 +2830,7 @@ CORE_ADDR get_toc_offset (struct objfile *objfile) { if (objfile) - return ((struct coff_symfile_info *) objfile->sym_private)->toc_offset; + return ((struct coff_symfile_info *) objfile->deprecated_sym_private)->toc_offset; return 0; } @@ -2600,9 +2845,7 @@ get_toc_offset (struct objfile *objfile) table (as opposed to a shared lib or dynamically loaded file). */ static void -xcoff_initial_scan (objfile, mainline) - struct objfile *objfile; - int mainline; /* FIXME comments above */ +xcoff_initial_scan (struct objfile *objfile, int mainline) { bfd *abfd; int val; @@ -2614,7 +2857,7 @@ xcoff_initial_scan (objfile, mainline) char *name; unsigned int size; - info = (struct coff_symfile_info *) objfile->sym_private; + info = (struct coff_symfile_info *) objfile->deprecated_sym_private; symfile_bfd = abfd = objfile->obfd; name = objfile->name; @@ -2634,7 +2877,7 @@ xcoff_initial_scan (objfile, mainline) /* Read the .debug section, if present. */ { - sec_ptr secp; + struct bfd_section *secp; bfd_size_type length; char *debugsec = NULL; @@ -2645,7 +2888,7 @@ xcoff_initial_scan (objfile, mainline) if (length) { debugsec = - (char *) obstack_alloc (&objfile->symbol_obstack, length); + (char *) obstack_alloc (&objfile->objfile_obstack, length); if (!bfd_get_section_contents (abfd, secp, debugsec, (file_ptr) 0, length)) @@ -2655,7 +2898,7 @@ xcoff_initial_scan (objfile, mainline) } } } - ((struct coff_symfile_info *) objfile->sym_private)->debugsec = + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->debugsec = debugsec; } } @@ -2667,20 +2910,20 @@ xcoff_initial_scan (objfile, mainline) error ("Error reading symbols from %s: %s", name, bfd_errmsg (bfd_get_error ())); size = coff_data (abfd)->local_symesz * num_symbols; - ((struct coff_symfile_info *) objfile->sym_private)->symtbl = - obstack_alloc (&objfile->symbol_obstack, size); - ((struct coff_symfile_info *) objfile->sym_private)->symtbl_num_syms = + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->symtbl = + obstack_alloc (&objfile->objfile_obstack, size); + ((struct coff_symfile_info *) objfile->deprecated_sym_private)->symtbl_num_syms = num_symbols; - val = bfd_read (((struct coff_symfile_info *) objfile->sym_private)->symtbl, - size, 1, abfd); + val = bfd_bread (((struct coff_symfile_info *) objfile->deprecated_sym_private)->symtbl, + size, abfd); if (val != size) perror_with_name ("reading symbol table"); /* If we are reinitializing, or if we have never loaded syms yet, init */ if (mainline - || objfile->global_psymbols.size == 0 - || objfile->static_psymbols.size == 0) + || (objfile->global_psymbols.size == 0 + && objfile->static_psymbols.size == 0)) /* I'm not sure how how good num_symbols is; the rule of thumb in init_psymbol_list was developed for a.out. On the one hand, num_symbols includes auxents. On the other hand, it doesn't @@ -2712,9 +2955,10 @@ xcoff_symfile_offsets (struct objfile *objfile, struct section_addr_info *addrs) asection *sect = NULL; int i; - 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)); /* Initialize the section indexes for future use. */ sect = bfd_get_section_by_name (objfile->obfd, ".text"); @@ -2744,7 +2988,7 @@ xcoff_symfile_offsets (struct objfile *objfile, struct section_addr_info *addrs) sensibly), so just ignore the addr parameter and use 0. rs6000-nat.c will set the correct section offsets via objfile_relocate. */ - ANOFFSET (objfile->section_offsets, i) = 0; + (objfile->section_offsets)->offsets[i] = 0; } }