X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fdbxread.c;h=1d0043259bbcd094829e68f8379d49870ac1b2d8;hb=0e1862bb401f47716446aef143b2bf7a4563f541;hp=0c5dc027fdf5fc01fca4e3b8f921756c7c13535d;hpb=dd707e8e619a4ef27a2a11fc25dbe166d29b742d;p=binutils-gdb.git diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 0c5dc027fdf..1d0043259bb 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -1,7 +1,5 @@ /* Read dbx symbol tables and convert to internal format, for GDB. - Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, - 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2009, 2010, 2011. - Free Software Foundation, Inc. + Copyright (C) 1986-2015 Free Software Foundation, Inc. This file is part of GDB. @@ -33,15 +31,13 @@ for real. dbx_psymtab_to_symtab() is the function that does this */ #include "defs.h" -#include "gdb_string.h" - #if defined(__CYGNUSCLIB__) #include #include #endif #include "gdb_obstack.h" -#include "gdb_stat.h" +#include #include "symtab.h" #include "breakpoint.h" #include "target.h" @@ -57,15 +53,17 @@ #include "cp-abi.h" #include "cp-support.h" #include "psympriv.h" - -#include "gdb_assert.h" -#include "gdb_string.h" +#include "block.h" #include "aout/aout64.h" #include "aout/stab_gnu.h" /* We always use GNU stabs, not native, now. */ +/* Key for dbx-associated data. */ + +const struct objfile_data *dbx_objfile_data_key; + /* We put a pointer to this structure in the read_symtab_private field of the psymtab. */ @@ -160,7 +158,7 @@ static int block_address_function_relative = 0; static CORE_ADDR lowest_text_address; /* Non-zero if there is any line number info in the objfile. Prevents - end_psymtab from discarding an otherwise empty psymtab. */ + dbx_end_psymtab from discarding an otherwise empty psymtab. */ static int has_line_numbers; @@ -257,11 +255,12 @@ static int bincls_allocated; extern void _initialize_dbxread (void); -static void read_ofile_symtab (struct partial_symtab *); +static void read_ofile_symtab (struct objfile *, struct partial_symtab *); -static void dbx_psymtab_to_symtab (struct partial_symtab *); +static void dbx_read_symtab (struct partial_symtab *self, + struct objfile *objfile); -static void dbx_psymtab_to_symtab_1 (struct partial_symtab *); +static void dbx_psymtab_to_symtab_1 (struct objfile *, struct partial_symtab *); static void read_dbx_dynamic_symtab (struct objfile *objfile); @@ -287,7 +286,8 @@ static void dbx_symfile_read (struct objfile *, int); static void dbx_symfile_finish (struct objfile *); -static void record_minimal_symbol (char *, CORE_ADDR, int, struct objfile *); +static void record_minimal_symbol (const char *, CORE_ADDR, int, + struct objfile *); static void add_new_header_file (char *, int); @@ -431,40 +431,34 @@ explicit_lookup_type (int real_filenum, int index) #endif static void -record_minimal_symbol (char *name, CORE_ADDR address, int type, +record_minimal_symbol (const char *name, CORE_ADDR address, int type, struct objfile *objfile) { enum minimal_symbol_type ms_type; int section; - asection *bfd_section; switch (type) { case N_TEXT | N_EXT: ms_type = mst_text; section = SECT_OFF_TEXT (objfile); - bfd_section = DBX_TEXT_SECTION (objfile); break; case N_DATA | N_EXT: ms_type = mst_data; section = SECT_OFF_DATA (objfile); - bfd_section = DBX_DATA_SECTION (objfile); break; case N_BSS | N_EXT: ms_type = mst_bss; section = SECT_OFF_BSS (objfile); - bfd_section = DBX_BSS_SECTION (objfile); break; case N_ABS | N_EXT: ms_type = mst_abs; section = -1; - bfd_section = NULL; break; #ifdef N_SETV case N_SETV | N_EXT: ms_type = mst_data; section = SECT_OFF_DATA (objfile); - bfd_section = DBX_DATA_SECTION (objfile); break; case N_SETV: /* I don't think this type actually exists; since a N_SETV is the result @@ -472,7 +466,6 @@ record_minimal_symbol (char *name, CORE_ADDR address, int type, file local. */ ms_type = mst_file_data; section = SECT_OFF_DATA (objfile); - bfd_section = DBX_DATA_SECTION (objfile); break; #endif case N_TEXT: @@ -481,7 +474,6 @@ record_minimal_symbol (char *name, CORE_ADDR address, int type, case N_FN_SEQ: ms_type = mst_file_text; section = SECT_OFF_TEXT (objfile); - bfd_section = DBX_TEXT_SECTION (objfile); break; case N_DATA: ms_type = mst_file_data; @@ -495,7 +487,7 @@ record_minimal_symbol (char *name, CORE_ADDR address, int type, /* Same with virtual function tables, both global and static. */ { - char *tempstring = name; + const char *tempstring = name; if (tempstring[0] == bfd_get_symbol_leading_char (objfile->obfd)) ++tempstring; @@ -503,17 +495,14 @@ record_minimal_symbol (char *name, CORE_ADDR address, int type, ms_type = mst_data; } section = SECT_OFF_DATA (objfile); - bfd_section = DBX_DATA_SECTION (objfile); break; case N_BSS: ms_type = mst_file_bss; section = SECT_OFF_BSS (objfile); - bfd_section = DBX_BSS_SECTION (objfile); break; default: ms_type = mst_unknown; section = -1; - bfd_section = NULL; break; } @@ -522,7 +511,7 @@ record_minimal_symbol (char *name, CORE_ADDR address, int type, lowest_text_address = address; prim_record_minimal_symbol_and_info - (name, address, ms_type, section, bfd_section, objfile); + (name, address, ms_type, section, objfile); } /* Scan and build partial symbols for a symbol file. @@ -550,16 +539,16 @@ dbx_symfile_read (struct objfile *objfile, int symfile_flags) differently from Solaris), and false for SunOS4 and other a.out file formats. */ block_address_function_relative = - ((0 == strncmp (bfd_get_target (sym_bfd), "elf", 3)) - || (0 == strncmp (bfd_get_target (sym_bfd), "som", 3)) - || (0 == strncmp (bfd_get_target (sym_bfd), "coff", 4)) - || (0 == strncmp (bfd_get_target (sym_bfd), "pe", 2)) - || (0 == strncmp (bfd_get_target (sym_bfd), "epoc-pe", 7)) - || (0 == strncmp (bfd_get_target (sym_bfd), "nlm", 3))); + ((startswith (bfd_get_target (sym_bfd), "elf")) + || (startswith (bfd_get_target (sym_bfd), "som")) + || (startswith (bfd_get_target (sym_bfd), "coff")) + || (startswith (bfd_get_target (sym_bfd), "pe")) + || (startswith (bfd_get_target (sym_bfd), "epoc-pe")) + || (startswith (bfd_get_target (sym_bfd), "nlm"))); val = bfd_seek (sym_bfd, DBX_SYMTAB_OFFSET (objfile), SEEK_SET); if (val < 0) - perror_with_name (objfile->name); + perror_with_name (objfile_name (objfile)); /* Size the symbol table. */ if (objfile->global_psymbols.size == 0 && objfile->static_psymbols.size == 0) @@ -626,12 +615,11 @@ dbx_symfile_init (struct objfile *objfile) char *name = bfd_get_filename (sym_bfd); asection *text_sect; unsigned char size_temp[DBX_STRINGTAB_SIZE_SIZE]; + struct dbx_symfile_info *dbx; /* Allocate struct to keep track of the symfile. */ - objfile->deprecated_sym_stab_info = (struct dbx_symfile_info *) - xmalloc (sizeof (struct dbx_symfile_info)); - memset (objfile->deprecated_sym_stab_info, 0, - sizeof (struct dbx_symfile_info)); + dbx = XCNEW (struct dbx_symfile_info); + set_objfile_data (objfile, dbx_objfile_data_key, dbx); DBX_TEXT_SECTION (objfile) = bfd_get_section_by_name (sym_bfd, ".text"); DBX_DATA_SECTION (objfile) = bfd_get_section_by_name (sym_bfd, ".data"); @@ -643,8 +631,6 @@ dbx_symfile_init (struct objfile *objfile) /* FIXME POKING INSIDE BFD DATA STRUCTURES. */ - DBX_SYMFILE_INFO (objfile)->stab_section_info = NULL; - text_sect = bfd_get_section_by_name (sym_bfd, ".text"); if (!text_sect) error (_("Can't find .text section in symbol file")); @@ -739,24 +725,30 @@ dbx_symfile_init (struct objfile *objfile) static void dbx_symfile_finish (struct objfile *objfile) { - if (objfile->deprecated_sym_stab_info != NULL) + free_header_files (); +} + +static void +dbx_free_symfile_info (struct objfile *objfile, void *arg) +{ + struct dbx_symfile_info *dbx = arg; + + if (dbx->header_files != NULL) { - if (HEADER_FILES (objfile) != NULL) - { - int i = N_HEADER_FILES (objfile); - struct header_file *hfiles = HEADER_FILES (objfile); + int i = dbx->n_header_files; + struct header_file *hfiles = dbx->header_files; - while (--i >= 0) - { - xfree (hfiles[i].name); - xfree (hfiles[i].vector); - } - xfree (hfiles); + while (--i >= 0) + { + xfree (hfiles[i].name); + xfree (hfiles[i].vector); } - xfree (objfile->deprecated_sym_stab_info); + xfree (hfiles); } - free_header_files (); + + xfree (dbx); } + /* Buffer for reading the symbol table entries. */ @@ -1003,7 +995,7 @@ read_dbx_dynamic_symtab (struct objfile *objfile) long dynrel_count; arelent **dynrels; CORE_ADDR sym_value; - char *name; + const char *name; /* Check that the symbol file has dynamic symbols that we know about. bfd_arch_unknown can happen if we are reading a sun3 symbol file @@ -1047,20 +1039,14 @@ read_dbx_dynamic_symtab (struct objfile *objfile) if (bfd_get_section_flags (abfd, sec) & SEC_CODE) { - sym_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); type = N_TEXT; } else if (bfd_get_section_flags (abfd, sec) & SEC_DATA) { - sym_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_DATA (objfile)); type = N_DATA; } else if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC) { - sym_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_BSS (objfile)); type = N_BSS; } else @@ -1069,7 +1055,7 @@ read_dbx_dynamic_symtab (struct objfile *objfile) if (sym->flags & BSF_GLOBAL) type |= N_EXT; - record_minimal_symbol ((char *) bfd_asymbol_name (sym), sym_value, + record_minimal_symbol (bfd_asymbol_name (sym), sym_value, type, objfile); } } @@ -1100,9 +1086,7 @@ read_dbx_dynamic_symtab (struct objfile *objfile) counter++, relptr++) { arelent *rel = *relptr; - CORE_ADDR address = - rel->address + ANOFFSET (objfile->section_offsets, - SECT_OFF_DATA (objfile)); + CORE_ADDR address = rel->address; switch (bfd_get_arch (abfd)) { @@ -1123,7 +1107,7 @@ read_dbx_dynamic_symtab (struct objfile *objfile) continue; } - name = (char *) bfd_asymbol_name (*rel->sym_ptr_ptr); + name = bfd_asymbol_name (*rel->sym_ptr_ptr); prim_record_minimal_symbol (name, address, mst_solib_trampoline, objfile); } @@ -1135,7 +1119,7 @@ static CORE_ADDR find_stab_function_addr (char *namestring, const char *filename, struct objfile *objfile) { - struct minimal_symbol *msym; + struct bound_minimal_symbol msym; char *p; int n; @@ -1148,7 +1132,7 @@ find_stab_function_addr (char *namestring, const char *filename, p[n] = 0; msym = lookup_minimal_symbol (p, filename, objfile); - if (msym == NULL) + if (msym.minsym == NULL) { /* Sun Fortran appends an underscore to the minimal symbol name, try again with an appended underscore if the minimal symbol @@ -1158,13 +1142,13 @@ find_stab_function_addr (char *namestring, const char *filename, msym = lookup_minimal_symbol (p, filename, objfile); } - if (msym == NULL && filename != NULL) + if (msym.minsym == NULL && filename != NULL) { /* Try again without the filename. */ p[n] = 0; msym = lookup_minimal_symbol (p, NULL, objfile); } - if (msym == NULL && filename != NULL) + if (msym.minsym == NULL && filename != NULL) { /* And try again for Sun Fortran, but without the filename. */ p[n] = '_'; @@ -1172,7 +1156,7 @@ find_stab_function_addr (char *namestring, const char *filename, msym = lookup_minimal_symbol (p, NULL, objfile); } - return msym == NULL ? 0 : SYMBOL_VALUE_ADDRESS (msym); + return msym.minsym == NULL ? 0 : BMSYMBOL_VALUE_ADDRESS (msym); } static void @@ -1201,7 +1185,6 @@ read_dbx_symtab (struct objfile *objfile) char *namestring; int nsl; int past_first_source_file = 0; - CORE_ADDR last_o_file_start = 0; CORE_ADDR last_function_start = 0; struct cleanup *back_to; bfd *abfd; @@ -1212,7 +1195,7 @@ read_dbx_symtab (struct objfile *objfile) struct partial_symtab *pst; /* List of current psymtab's include files. */ - char **psymtab_include_list; + const char **psymtab_include_list; int includes_allocated; int includes_used; @@ -1234,8 +1217,8 @@ read_dbx_symtab (struct objfile *objfile) includes_allocated = 30; includes_used = 0; - psymtab_include_list = (char **) alloca (includes_allocated * - sizeof (char *)); + psymtab_include_list = (const char **) alloca (includes_allocated * + sizeof (const char *)); dependencies_allocated = 30; dependencies_used = 0; @@ -1247,7 +1230,7 @@ read_dbx_symtab (struct objfile *objfile) init_bincl_list (20, objfile); back_to = make_cleanup_free_bincl_list (objfile); - last_source_file = NULL; + set_last_source_file (NULL); lowest_text_address = (CORE_ADDR) -1; @@ -1329,29 +1312,22 @@ read_dbx_symtab (struct objfile *objfile) case N_TEXT | N_EXT: case N_NBTEXT | N_EXT: - nlist.n_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); goto record_it; case N_DATA | N_EXT: case N_NBDATA | N_EXT: - nlist.n_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_DATA (objfile)); goto record_it; case N_BSS: case N_BSS | N_EXT: case N_NBBSS | N_EXT: case N_SETV | N_EXT: /* FIXME, is this in BSS? */ - nlist.n_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_BSS (objfile)); goto record_it; case N_ABS | N_EXT: record_it: namestring = set_namestring (objfile, &nlist); - bss_ext_symbol: record_minimal_symbol (namestring, nlist.n_value, nlist.n_type, objfile); /* Always */ continue; @@ -1368,25 +1344,26 @@ read_dbx_symtab (struct objfile *objfile) case N_FN: case N_FN_SEQ: case N_TEXT: - nlist.n_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); namestring = set_namestring (objfile, &nlist); if ((namestring[0] == '-' && namestring[1] == 'l') || (namestring[(nsl = strlen (namestring)) - 1] == 'o' && namestring[nsl - 2] == '.')) { + nlist.n_value += ANOFFSET (objfile->section_offsets, + SECT_OFF_TEXT (objfile)); + if (past_first_source_file && pst /* The gould NP1 uses low values for .o and -l symbols which are not the address. */ && nlist.n_value >= pst->textlow) { - end_psymtab (pst, psymtab_include_list, includes_used, - symnum * symbol_size, - nlist.n_value > pst->texthigh - ? nlist.n_value : pst->texthigh, - dependency_list, dependencies_used, - textlow_not_set); + dbx_end_psymtab (objfile, pst, psymtab_include_list, + includes_used, symnum * symbol_size, + nlist.n_value > pst->texthigh + ? nlist.n_value : pst->texthigh, + dependency_list, dependencies_used, + textlow_not_set); pst = (struct partial_symtab *) 0; includes_used = 0; dependencies_used = 0; @@ -1394,15 +1371,12 @@ read_dbx_symtab (struct objfile *objfile) } else past_first_source_file = 1; - last_o_file_start = nlist.n_value; } else goto record_it; continue; case N_DATA: - nlist.n_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_DATA (objfile)); goto record_it; case N_UNDF | N_EXT: @@ -1480,7 +1454,7 @@ read_dbx_symtab (struct objfile *objfile) prev_textlow_not_set = textlow_not_set; /* A zero value is probably an indication for the SunPRO 3.0 - compiler. end_psymtab explicitly tests for zero, so + compiler. dbx_end_psymtab explicitly tests for zero, so don't relocate it. */ if (nlist.n_value == 0 @@ -1500,11 +1474,12 @@ read_dbx_symtab (struct objfile *objfile) if (pst) { - end_psymtab (pst, psymtab_include_list, includes_used, - symnum * symbol_size, - valu > pst->texthigh ? valu : pst->texthigh, - dependency_list, dependencies_used, - prev_textlow_not_set); + dbx_end_psymtab (objfile, pst, psymtab_include_list, + includes_used, symnum * symbol_size, + valu > pst->texthigh + ? valu : pst->texthigh, + dependency_list, dependencies_used, + prev_textlow_not_set); pst = (struct partial_symtab *) 0; includes_used = 0; dependencies_used = 0; @@ -1637,12 +1612,12 @@ read_dbx_symtab (struct objfile *objfile) psymtab_include_list[includes_used++] = namestring; if (includes_used >= includes_allocated) { - char **orig = psymtab_include_list; + const char **orig = psymtab_include_list; - psymtab_include_list = (char **) - alloca ((includes_allocated *= 2) * sizeof (char *)); + psymtab_include_list = (const char **) + alloca ((includes_allocated *= 2) * sizeof (const char *)); memcpy (psymtab_include_list, orig, - includes_used * sizeof (char *)); + includes_used * sizeof (const char *)); } continue; } @@ -1698,8 +1673,8 @@ read_dbx_symtab (struct objfile *objfile) if (new_name != NULL) { sym_len = strlen (new_name); - sym_name = obsavestring (new_name, sym_len, - &objfile->objfile_obstack); + sym_name = obstack_copy0 (&objfile->objfile_obstack, + new_name, sym_len); xfree (new_name); } xfree (name); @@ -1730,8 +1705,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_STATIC, &objfile->static_psymbols, - 0, nlist.n_value, - psymtab_language, objfile); + nlist.n_value, psymtab_language, objfile); continue; case 'G': @@ -1742,8 +1716,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_STATIC, &objfile->global_psymbols, - 0, nlist.n_value, - psymtab_language, objfile); + nlist.n_value, psymtab_language, objfile); continue; case 'T': @@ -1760,16 +1733,14 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, STRUCT_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - nlist.n_value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); if (p[2] == 't') { /* Also a typedef with the same name. */ add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - nlist.n_value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); p += 1; } } @@ -1781,8 +1752,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_TYPEDEF, &objfile->static_psymbols, - nlist.n_value, 0, - psymtab_language, objfile); + 0, psymtab_language, objfile); } check_enum: /* If this is an enumerated type, we need to @@ -1843,7 +1813,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (p, q - p, 1, VAR_DOMAIN, LOC_CONST, &objfile->static_psymbols, 0, - 0, psymtab_language, objfile); + psymtab_language, objfile); /* Point past the name. */ p = q; /* Skip over the value. */ @@ -1860,8 +1830,8 @@ read_dbx_symtab (struct objfile *objfile) /* Constant, e.g. from "const" in Pascal. */ add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_CONST, - &objfile->static_psymbols, nlist.n_value, - 0, psymtab_language, objfile); + &objfile->static_psymbols, 0, + psymtab_language, objfile); continue; case 'f': @@ -1927,8 +1897,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->static_psymbols, - 0, nlist.n_value, - psymtab_language, objfile); + nlist.n_value, psymtab_language, objfile); continue; /* Global functions were ignored here, but now they @@ -1997,8 +1966,7 @@ read_dbx_symtab (struct objfile *objfile) add_psymbol_to_list (sym_name, sym_len, 1, VAR_DOMAIN, LOC_BLOCK, &objfile->global_psymbols, - 0, nlist.n_value, - psymtab_language, objfile); + nlist.n_value, psymtab_language, objfile); continue; /* Two things show up here (hopefully); static symbols of @@ -2106,15 +2074,16 @@ read_dbx_symtab (struct objfile *objfile) case N_ENDM: /* Solaris 2 end of module, finish current partial symbol table. - end_psymtab will set pst->texthigh to the proper value, which + dbx_end_psymtab will set pst->texthigh to the proper value, which is necessary if a module compiled without debugging info follows this module. */ if (pst && gdbarch_sofun_address_maybe_missing (gdbarch)) { - end_psymtab (pst, psymtab_include_list, includes_used, - symnum * symbol_size, - (CORE_ADDR) 0, dependency_list, - dependencies_used, textlow_not_set); + dbx_end_psymtab (objfile, pst, + psymtab_include_list, includes_used, + symnum * symbol_size, + (CORE_ADDR) 0, dependency_list, + dependencies_used, textlow_not_set); pst = (struct partial_symtab *) 0; includes_used = 0; dependencies_used = 0; @@ -2144,6 +2113,8 @@ read_dbx_symtab (struct objfile *objfile) case N_SLINE: case N_RSYM: case N_PSYM: + case N_BNSYM: + case N_ENSYM: case N_LBRAC: case N_NSYMS: /* Ultrix 4.0: symbol count */ case N_DEFD: /* GNU Modula-2 */ @@ -2174,10 +2145,10 @@ read_dbx_symtab (struct objfile *objfile) : lowest_text_address) + text_size; - end_psymtab (pst, psymtab_include_list, includes_used, - symnum * symbol_size, - text_end > pst->texthigh ? text_end : pst->texthigh, - dependency_list, dependencies_used, textlow_not_set); + dbx_end_psymtab (objfile, pst, psymtab_include_list, includes_used, + symnum * symbol_size, + text_end > pst->texthigh ? text_end : pst->texthigh, + dependency_list, dependencies_used, textlow_not_set); } do_cleanups (back_to); @@ -2196,26 +2167,18 @@ start_psymtab (struct objfile *objfile, char *filename, CORE_ADDR textlow, struct partial_symbol **static_syms) { struct partial_symtab *result = - start_psymtab_common (objfile, objfile->section_offsets, - filename, textlow, global_syms, static_syms); + start_psymtab_common (objfile, filename, textlow, + global_syms, static_syms); result->read_symtab_private = obstack_alloc (&objfile->objfile_obstack, sizeof (struct symloc)); LDSYMOFF (result) = ldsymoff; - result->read_symtab = dbx_psymtab_to_symtab; + result->read_symtab = dbx_read_symtab; SYMBOL_SIZE (result) = symbol_size; SYMBOL_OFFSET (result) = symbol_table_offset; STRING_OFFSET (result) = string_table_offset; FILE_STRING_OFFSET (result) = file_string_table_offset; -#ifdef HAVE_ELF - /* If we're handling an ELF file, drag some section-relocation info - for this source file out of the ELF symbol table, to compensate for - Sun brain death. This replaces the section_offsets in this psymtab, - if successful. */ - elfstab_offset_sections (objfile, result); -#endif - /* Deduce the source language from the filename for this psymtab. */ psymtab_language = deduce_language_from_filename (filename); @@ -2228,13 +2191,14 @@ start_psymtab (struct objfile *objfile, char *filename, CORE_ADDR textlow, FIXME: List variables and peculiarities of same. */ struct partial_symtab * -end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes, - int capping_symbol_offset, CORE_ADDR capping_text, - struct partial_symtab **dependency_list, int number_dependencies, - int textlow_not_set) +dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, + const char **include_list, int num_includes, + int capping_symbol_offset, CORE_ADDR capping_text, + struct partial_symtab **dependency_list, + int number_dependencies, + int textlow_not_set) { int i; - struct objfile *objfile = pst->objfile; struct gdbarch *gdbarch = get_objfile_arch (objfile); if (capping_symbol_offset != -1) @@ -2261,7 +2225,7 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes, { char *p; int n; - struct minimal_symbol *minsym; + struct bound_minimal_symbol minsym; p = strchr (last_function_name, ':'); if (p == NULL) @@ -2272,7 +2236,7 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes, p[n] = 0; minsym = lookup_minimal_symbol (p, pst->filename, objfile); - if (minsym == NULL) + if (minsym.minsym == NULL) { /* Sun Fortran appends an underscore to the minimal symbol name, try again with an appended underscore if the minimal symbol @@ -2282,8 +2246,9 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes, minsym = lookup_minimal_symbol (p, pst->filename, objfile); } - if (minsym) - pst->texthigh = SYMBOL_VALUE_ADDRESS (minsym) + MSYMBOL_SIZE (minsym); + if (minsym.minsym) + pst->texthigh = (BMSYMBOL_VALUE_ADDRESS (minsym) + + MSYMBOL_SIZE (minsym.minsym)); last_function_name = NULL; } @@ -2318,12 +2283,7 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes, /* End of kludge for patching Solaris textlow and texthigh. */ - pst->n_global_syms = - objfile->global_psymbols.next - (objfile->global_psymbols.list - + pst->globals_offset); - pst->n_static_syms = - objfile->static_psymbols.next - (objfile->static_psymbols.list - + pst->statics_offset); + end_psymtab_common (objfile, pst); pst->number_of_dependencies = number_dependencies; if (number_dependencies) @@ -2342,8 +2302,6 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes, struct partial_symtab *subpst = allocate_psymtab (include_list[i], objfile); - /* Copy the sesction_offsets array from the main psymtab. */ - subpst->section_offsets = pst->section_offsets; subpst->read_symtab_private = obstack_alloc (&objfile->objfile_obstack, sizeof (struct symloc)); LDSYMOFF (subpst) = @@ -2365,12 +2323,10 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes, subpst->n_static_syms = 0; subpst->readin = 0; - subpst->symtab = 0; + subpst->compunit_symtab = 0; subpst->read_symtab = pst->read_symtab; } - sort_pst_symbols (pst); - if (num_includes == 0 && number_dependencies == 0 && pst->n_global_syms == 0 @@ -2385,7 +2341,7 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes, is not empty, but we don't realize that. Fixing that without slowing things down might be tricky. */ - discard_psymtab (pst); + discard_psymtab (objfile, pst); /* Indicate that psymtab was thrown away. */ pst = (struct partial_symtab *) NULL; @@ -2394,14 +2350,11 @@ end_psymtab (struct partial_symtab *pst, char **include_list, int num_includes, } static void -dbx_psymtab_to_symtab_1 (struct partial_symtab *pst) +dbx_psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *pst) { struct cleanup *old_chain; int i; - if (!pst) - return; - if (pst->readin) { fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. " @@ -2425,7 +2378,7 @@ dbx_psymtab_to_symtab_1 (struct partial_symtab *pst) wrap_here (""); /* Flush output. */ gdb_flush (gdb_stdout); } - dbx_psymtab_to_symtab_1 (pst->dependencies[i]); + dbx_psymtab_to_symtab_1 (objfile, pst->dependencies[i]); } if (LDSYMLEN (pst)) /* Otherwise it's a dummy. */ @@ -2438,8 +2391,8 @@ dbx_psymtab_to_symtab_1 (struct partial_symtab *pst) symbol_size = SYMBOL_SIZE (pst); /* Read in this file's symbols. */ - bfd_seek (pst->objfile->obfd, SYMBOL_OFFSET (pst), SEEK_SET); - read_ofile_symtab (pst); + bfd_seek (objfile->obfd, SYMBOL_OFFSET (pst), SEEK_SET); + read_ofile_symtab (objfile, pst); do_cleanups (old_chain); } @@ -2448,59 +2401,57 @@ dbx_psymtab_to_symtab_1 (struct partial_symtab *pst) } /* Read in all of the symbols for a given psymtab for real. - Be verbose about it if the user wants that. */ + Be verbose about it if the user wants that. SELF is not NULL. */ static void -dbx_psymtab_to_symtab (struct partial_symtab *pst) +dbx_read_symtab (struct partial_symtab *self, struct objfile *objfile) { bfd *sym_bfd; - struct cleanup *back_to = NULL; - - if (!pst) - return; - if (pst->readin) + if (self->readin) { fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. " "Shouldn't happen.\n", - pst->filename); + self->filename); return; } - if (LDSYMLEN (pst) || pst->number_of_dependencies) + if (LDSYMLEN (self) || self->number_of_dependencies) { + struct cleanup *back_to; + /* Print the message now, before reading the string table, to avoid disconcerting pauses. */ if (info_verbose) { - printf_filtered ("Reading in symbols for %s...", pst->filename); + printf_filtered ("Reading in symbols for %s...", self->filename); gdb_flush (gdb_stdout); } - sym_bfd = pst->objfile->obfd; + sym_bfd = objfile->obfd; next_symbol_text_func = dbx_next_symbol_text; - if (DBX_STAB_SECTION (pst->objfile)) + back_to = make_cleanup (null_cleanup, NULL); + + if (DBX_STAB_SECTION (objfile)) { stabs_data - = symfile_relocate_debug_section (pst->objfile, - DBX_STAB_SECTION (pst->objfile), + = symfile_relocate_debug_section (objfile, + DBX_STAB_SECTION (objfile), NULL); if (stabs_data) - back_to = make_cleanup (free_current_contents, - (void *) &stabs_data); + make_cleanup (free_current_contents, (void *) &stabs_data); } - dbx_psymtab_to_symtab_1 (pst); + dbx_psymtab_to_symtab_1 (objfile, self); - if (back_to) - do_cleanups (back_to); + do_cleanups (back_to); /* Match with global symbols. This only needs to be done once, after all of the symtabs and dependencies have been read in. */ - scan_file_globals (pst->objfile); + scan_file_globals (objfile); /* Finish up the debug error message. */ if (info_verbose) @@ -2511,7 +2462,7 @@ dbx_psymtab_to_symtab (struct partial_symtab *pst) /* Read in a defined section of a specific object file's symbols. */ static void -read_ofile_symtab (struct partial_symtab *pst) +read_ofile_symtab (struct objfile *objfile, struct partial_symtab *pst) { char *namestring; struct external_nlist *bufp; @@ -2519,29 +2470,22 @@ read_ofile_symtab (struct partial_symtab *pst) unsigned char type; unsigned max_symnum; bfd *abfd; - struct objfile *objfile; int sym_offset; /* Offset to start of symbols to read */ int sym_size; /* Size of symbols to read */ CORE_ADDR text_offset; /* Start of text segment for symbols */ int text_size; /* Size of text segment for symbols */ struct section_offsets *section_offsets; - objfile = pst->objfile; sym_offset = LDSYMOFF (pst); sym_size = LDSYMLEN (pst); text_offset = pst->textlow; text_size = pst->texthigh - pst->textlow; - /* This cannot be simply objfile->section_offsets because of - elfstab_offset_sections() which initializes the psymtab section - offsets information in a special way, and that is different from - objfile->section_offsets. */ - section_offsets = pst->section_offsets; + section_offsets = objfile->section_offsets; dbxread_objfile = objfile; - subfile_stack = NULL; stringtab_global = DBX_STRINGTAB (objfile); - last_source_file = NULL; + set_last_source_file (NULL); abfd = objfile->obfd; symfile_bfd = objfile->obfd; /* Implicit param to next_text_symbol. */ @@ -2576,24 +2520,9 @@ read_ofile_symtab (struct partial_symtab *pst) processing_gcc_compilation = 2; if (tempstring[0] == bfd_get_symbol_leading_char (symfile_bfd)) ++tempstring; - if (strncmp (tempstring, "__gnu_compiled", 14) == 0) + if (startswith (tempstring, "__gnu_compiled")) processing_gcc_compilation = 2; } - - /* Try to select a C++ demangling based on the compilation unit - producer. */ - -#if 0 - /* For now, stay with AUTO_DEMANGLING for g++ output, as we don't - know whether it will use the old style or v3 mangling. */ - if (processing_gcc_compilation) - { - if (AUTO_DEMANGLING) - { - set_demangling_style (GNU_DEMANGLING_STYLE_STRING); - } - } -#endif } else { @@ -2659,15 +2588,6 @@ read_ofile_symtab (struct partial_symtab *pst) processing_gcc_compilation = 1; else if (strcmp (namestring, GCC2_COMPILED_FLAG_SYMBOL) == 0) processing_gcc_compilation = 2; - -#if 0 - /* For now, stay with AUTO_DEMANGLING for g++ output, as we don't - know whether it will use the old style or v3 mangling. */ - if (AUTO_DEMANGLING) - { - set_demangling_style (GNU_DEMANGLING_STYLE_STRING); - } -#endif } else if (type & N_EXT || type == (unsigned char) N_TEXT || type == (unsigned char) N_NBTEXT) @@ -2697,8 +2617,8 @@ read_ofile_symtab (struct partial_symtab *pst) if (last_source_start_addr > text_offset) last_source_start_addr = text_offset; - pst->symtab = end_symtab (text_offset + text_size, objfile, - SECT_OFF_TEXT (objfile)); + pst->compunit_symtab = end_symtab (text_offset + text_size, + SECT_OFF_TEXT (objfile)); end_stabs (); @@ -2706,6 +2626,34 @@ read_ofile_symtab (struct partial_symtab *pst) } +/* Record the namespace that the function defined by SYMBOL was + defined in, if necessary. BLOCK is the associated block; use + OBSTACK for allocation. */ + +static void +cp_set_block_scope (const struct symbol *symbol, + struct block *block, + struct obstack *obstack) +{ + if (SYMBOL_DEMANGLED_NAME (symbol) != NULL) + { + /* Try to figure out the appropriate namespace from the + demangled name. */ + + /* FIXME: carlton/2003-04-15: If the function in question is + a method of a class, the name will actually include the + name of the class as well. This should be harmless, but + is a little unfortunate. */ + + const char *name = SYMBOL_DEMANGLED_NAME (symbol); + unsigned int prefix_len = cp_entire_prefix_len (name); + + block_set_scope (block, + obstack_copy0 (obstack, name, prefix_len), + obstack); + } +} + /* This handles a single symbol from the symbol-file, building symbols into a GDB symtab. It takes these arguments and an implicit argument. @@ -2723,11 +2671,11 @@ read_ofile_symtab (struct partial_symtab *pst) void process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, - struct section_offsets *section_offsets, + const struct section_offsets *section_offsets, struct objfile *objfile) { struct gdbarch *gdbarch = get_objfile_arch (objfile); - struct context_stack *new; + struct context_stack *newobj; /* This remembers the address of the start of a function. It is used because in Solaris 2, N_LBRAC, N_RBRAC, and N_SLINE entries are relative to the current function's start address. On systems @@ -2765,7 +2713,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, /* Something is wrong if we see real data before seeing a source file name. */ - if (last_source_file == NULL && type != (unsigned char) N_SO) + if (get_last_source_file () == NULL && type != (unsigned char) N_SO) { /* Ignore any symbols which appear before an N_SO symbol. Currently no one puts symbols there, but we should deal @@ -2804,17 +2752,16 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, } within_function = 0; - new = pop_context (); + newobj = pop_context (); /* Make a block for the local symbols within. */ - block = finish_block (new->name, &local_symbols, new->old_blocks, - new->start_addr, new->start_addr + valu, - objfile); + block = finish_block (newobj->name, &local_symbols, + newobj->old_blocks, + newobj->start_addr, newobj->start_addr + valu); /* For C++, set the block's scope. */ - if (SYMBOL_LANGUAGE (new->name) == language_cplus) - cp_set_block_scope (new->name, block, &objfile->objfile_obstack, - "", 0); + if (SYMBOL_LANGUAGE (newobj->name) == language_cplus) + cp_set_block_scope (newobj->name, block, &objfile->objfile_obstack); /* May be switching to an assembler file which may not be using block relative stabs, so reset the offset. */ @@ -2828,7 +2775,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, /* Relocate for dynamic loading. */ valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); - valu = gdbarch_smash_text_address (gdbarch, valu); + valu = gdbarch_addr_bits_remove (gdbarch, valu); last_function_start = valu; goto define_a_symbol; @@ -2874,8 +2821,8 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, break; } - new = pop_context (); - if (desc != new->depth) + newobj = pop_context (); + if (desc != newobj->depth) lbrac_mismatch_complaint (symnum); if (local_symbols != NULL) @@ -2888,7 +2835,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, _("misplaced N_LBRAC entry; discarding local " "symbols which have no enclosing block")); } - local_symbols = new->locals; + local_symbols = newobj->locals; if (context_stack_depth > 1) { @@ -2903,15 +2850,15 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, /* Muzzle a compiler bug that makes end < start. ??? Which compilers? Is this ever harmful?. */ - if (new->start_addr > valu) + if (newobj->start_addr > valu) { complaint (&symfile_complaints, _("block start larger than block end")); - new->start_addr = valu; + newobj->start_addr = valu; } /* Make a block for the local symbols within. */ - finish_block (0, &local_symbols, new->old_blocks, - new->start_addr, valu, objfile); + finish_block (0, &local_symbols, newobj->old_blocks, + newobj->start_addr, valu); } } else @@ -2941,7 +2888,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, n_opt_found = 0; - if (last_source_file) + if (get_last_source_file ()) { /* Check if previous symbol was also an N_SO (with some sanity checks). If so, that one was actually the @@ -2952,7 +2899,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, patch_subfile_names (current_subfile, name); break; /* Ignore repeated SOs. */ } - end_symtab (valu, objfile, SECT_OFF_TEXT (objfile)); + end_symtab (valu, SECT_OFF_TEXT (objfile)); end_stabs (); } @@ -2965,7 +2912,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, function_start_offset = 0; start_stabs (); - start_symtab (name, NULL, valu); + start_symtab (objfile, name, NULL, valu); record_debugformat ("stabs"); break; @@ -2975,17 +2922,17 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, in the compilation of the main source file (whose name was given in the N_SO symbol). Relocate for dynamic loading. */ valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); - start_subfile (name, current_subfile->dirname); + start_subfile (name); break; case N_BINCL: push_subfile (); add_new_header_file (name, valu); - start_subfile (name, current_subfile->dirname); + start_subfile (name); break; case N_EINCL: - start_subfile (pop_subfile (), current_subfile->dirname); + start_subfile (pop_subfile ()); break; case N_EXCL: @@ -3068,17 +3015,12 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, p = strchr (name, ':'); if (p != 0 && p[1] == 'S') { - /* The linker relocated it. We don't want to add an - elfstab_offset_sections-type offset, but we *do* + /* The linker relocated it. We don't want to add a + Sun-stabs Tfoo.foo-like offset, but we *do* want to add whatever solib.c passed to symbol_file_add as addr (this is known to affect - SunOS 4, and I suspect ELF too). Since - elfstab_offset_sections currently does not muck - with the text offset (there is no Ttext.text - symbol), we can get addr from the text offset. If - elfstab_offset_sections ever starts dealing with - the text offset, and we still need to do this, we - need to invent a SECT_OFF_ADDR_KLUDGE or something. */ + SunOS 4, and I suspect ELF too). Since there is no + Ttext.text symbol, we can get addr from the text offset. */ valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); goto define_a_symbol; } @@ -3174,7 +3116,8 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, && gdbarch_sofun_address_maybe_missing (gdbarch)) { CORE_ADDR minsym_valu = - find_stab_function_addr (name, last_source_file, objfile); + find_stab_function_addr (name, get_last_source_file (), + objfile); /* The function find_stab_function_addr will return 0 if the minimal symbol wasn't found. @@ -3209,21 +3152,20 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, { struct block *block; - new = pop_context (); + newobj = pop_context (); /* Make a block for the local symbols within. */ - block = finish_block (new->name, &local_symbols, - new->old_blocks, new->start_addr, - valu, objfile); + block = finish_block (newobj->name, &local_symbols, + newobj->old_blocks, newobj->start_addr, + valu); /* For C++, set the block's scope. */ - if (SYMBOL_LANGUAGE (new->name) == language_cplus) - cp_set_block_scope (new->name, block, - &objfile->objfile_obstack, - "", 0); + if (SYMBOL_LANGUAGE (newobj->name) == language_cplus) + cp_set_block_scope (newobj->name, block, + &objfile->objfile_obstack); } - new = push_context (0, valu); - new->name = define_symbol (valu, name, desc, type, objfile); + newobj = push_context (0, valu); + newobj->name = define_symbol (valu, name, desc, type, objfile); break; default: @@ -3242,15 +3184,6 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, if (strcmp (name, GCC2_COMPILED_FLAG_SYMBOL) == 0) { processing_gcc_compilation = 2; -#if 0 /* Works, but is experimental. -fnf */ - /* For now, stay with AUTO_DEMANGLING for g++ output, as - we don't know whether it will use the old style or v3 - mangling. */ - if (AUTO_DEMANGLING) - { - set_demangling_style (GNU_DEMANGLING_STYLE_STRING); - } -#endif } else n_opt_found = 1; @@ -3267,7 +3200,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, char *name, N_MAIN within a given objfile, complain() and choose arbitrarily. (kingdon) */ if (name != NULL) - set_main_name (name); + set_objfile_main_name (objfile, name, language_unknown); break; /* The following symbol types can be ignored. */ @@ -3348,7 +3281,7 @@ coffstab_build_psymtabs (struct objfile *objfile, /* There is already a dbx_symfile_info allocated by our caller. It might even contain some info from the coff symtab to help us. */ - info = objfile->deprecated_sym_stab_info; + info = DBX_SYMFILE_INFO (objfile); DBX_TEXT_ADDR (objfile) = textaddr; DBX_TEXT_SIZE (objfile) = textsize; @@ -3433,11 +3366,11 @@ elfstab_build_psymtabs (struct objfile *objfile, asection *stabsect, bfd *sym_bfd = objfile->obfd; char *name = bfd_get_filename (sym_bfd); struct dbx_symfile_info *info; - struct cleanup *back_to = NULL; + struct cleanup *back_to = make_cleanup (null_cleanup, NULL); /* There is already a dbx_symfile_info allocated by our caller. It might even contain some info from the ELF symtab to help us. */ - info = objfile->deprecated_sym_stab_info; + info = DBX_SYMFILE_INFO (objfile); /* Find the first and last text address. dbx_symfile_read seems to want this. */ @@ -3477,7 +3410,7 @@ elfstab_build_psymtabs (struct objfile *objfile, asection *stabsect, symbuf_left = bfd_section_size (objfile->obfd, stabsect); stabs_data = symfile_relocate_debug_section (objfile, stabsect, NULL); if (stabs_data) - back_to = make_cleanup (free_current_contents, (void *) &stabs_data); + make_cleanup (free_current_contents, (void *) &stabs_data); /* In an elf file, we've already installed the minimal symbols that came from the elf (non-stab) symbol table, so always act like an @@ -3487,8 +3420,7 @@ elfstab_build_psymtabs (struct objfile *objfile, asection *stabsect, case it does, it will install them itself. */ dbx_symfile_read (objfile, 0); - if (back_to) - do_cleanups (back_to); + do_cleanups (back_to); } /* Scan and build partial symbols for a file with special sections for stabs @@ -3517,6 +3449,7 @@ stabsect_build_psymtabs (struct objfile *objfile, char *stab_name, asection *stabsect; asection *stabstrsect; asection *text_sect; + struct dbx_symfile_info *dbx; stabsect = bfd_get_section_by_name (sym_bfd, stab_name); stabstrsect = bfd_get_section_by_name (sym_bfd, stabstr_name); @@ -3529,10 +3462,8 @@ stabsect_build_psymtabs (struct objfile *objfile, char *stab_name, "but not string section (%s)"), stab_name, stabstr_name); - objfile->deprecated_sym_stab_info = (struct dbx_symfile_info *) - xmalloc (sizeof (struct dbx_symfile_info)); - memset (objfile->deprecated_sym_stab_info, 0, - sizeof (struct dbx_symfile_info)); + dbx = XCNEW (struct dbx_symfile_info); + set_objfile_data (objfile, dbx_objfile_data_key, dbx); text_sect = bfd_get_section_by_name (sym_bfd, text_name); if (!text_sect) @@ -3581,7 +3512,6 @@ stabsect_build_psymtabs (struct objfile *objfile, char *stab_name, static const struct sym_fns aout_sym_fns = { - bfd_target_aout_flavour, dbx_new_init, /* init anything gbl to entire symtab */ dbx_symfile_init, /* read initial info, setup for sym_read() */ dbx_symfile_read, /* read a symbol file into symtab */ @@ -3591,11 +3521,15 @@ static const struct sym_fns aout_sym_fns = default_symfile_segments, /* Get segment information from a file. */ NULL, default_symfile_relocate, /* Relocate a debug section. */ + NULL, /* sym_probe_fns */ &psym_functions }; void _initialize_dbxread (void) { - add_symtab_fns (&aout_sym_fns); + add_symtab_fns (bfd_target_aout_flavour, &aout_sym_fns); + + dbx_objfile_data_key + = register_objfile_data_with_cleanup (NULL, dbx_free_symfile_info); }