X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gdb%2Fdbxread.c;h=165040dd7ce4fd7ecc29204f03b0c5ff72daf382;hb=e008305278cb42a576107cd8aa9f0b182eea1af2;hp=bbef372670036119d24e80382b6924f04d322155;hpb=85102364b2d1845fe9ae7d70096671a3ea4bccf3;p=binutils-gdb.git diff --git a/gdb/dbxread.c b/gdb/dbxread.c index bbef3726700..165040dd7ce 100644 --- a/gdb/dbxread.c +++ b/gdb/dbxread.c @@ -1,5 +1,5 @@ /* Read dbx symbol tables and convert to internal format, for GDB. - Copyright (C) 1986-2019 Free Software Foundation, Inc. + Copyright (C) 1986-2022 Free Software Foundation, Inc. This file is part of GDB. @@ -31,12 +31,8 @@ for real. dbx_psymtab_to_symtab() is the function that does this */ #include "defs.h" -#if defined(__CYGNUSCLIB__) -#include -#include -#endif -#include "gdb_obstack.h" +#include "gdbsupport/gdb_obstack.h" #include #include "symtab.h" #include "breakpoint.h" @@ -245,7 +241,7 @@ find_text_range (bfd * sym_bfd, struct objfile *objfile) struct header_file_location { header_file_location (const char *name_, int instance_, - struct partial_symtab *pst_) + legacy_psymtab *pst_) : name (name_), instance (instance_), pst (pst_) @@ -254,7 +250,7 @@ struct header_file_location const char *name; /* Name of header file */ int instance; /* See above */ - struct partial_symtab *pst; /* Partial symtab that has the + legacy_psymtab *pst; /* Partial symtab that has the BINCL/EINCL defs for this file. */ }; @@ -263,16 +259,17 @@ static std::vector *bincl_list; /* Local function prototypes. */ -static void read_ofile_symtab (struct objfile *, struct partial_symtab *); +static void read_ofile_symtab (struct objfile *, legacy_psymtab *); -static void dbx_read_symtab (struct partial_symtab *self, +static void dbx_read_symtab (legacy_psymtab *self, struct objfile *objfile); -static void dbx_psymtab_to_symtab_1 (struct objfile *, struct partial_symtab *); +static void dbx_expand_psymtab (legacy_psymtab *, struct objfile *); -static void read_dbx_symtab (minimal_symbol_reader &, struct objfile *); +static void read_dbx_symtab (minimal_symbol_reader &, psymtab_storage *, + struct objfile *); -static struct partial_symtab *find_corresponding_bincl_psymtab (const char *, +static legacy_psymtab *find_corresponding_bincl_psymtab (const char *, int); static const char *dbx_next_symbol_text (struct objfile *); @@ -297,8 +294,8 @@ static void add_old_header_file (const char *, int); static void add_this_object_header_file (int); -static struct partial_symtab *start_psymtab (struct objfile *, const char *, - CORE_ADDR, int); +static legacy_psymtab *start_psymtab (psymtab_storage *, struct objfile *, + const char *, CORE_ADDR, int); /* Free up old header file tables. */ @@ -461,8 +458,8 @@ record_minimal_symbol (minimal_symbol_reader &reader, break; case N_SETV: /* I don't think this type actually exists; since a N_SETV is the result - of going over many .o files, it doesn't make sense to have one - file local. */ + of going over many .o files, it doesn't make sense to have one + file local. */ ms_type = mst_file_data; section = SECT_OFF_DATA (objfile); break; @@ -478,9 +475,9 @@ record_minimal_symbol (minimal_symbol_reader &reader, ms_type = mst_file_data; /* Check for __DYNAMIC, which is used by Sun shared libraries. - Record it as global even if it's local, not global, so - lookup_minimal_symbol can find it. We don't check symbol_leading_char - because for SunOS4 it always is '_'. */ + Record it as global even if it's local, not global, so + lookup_minimal_symbol can find it. We don't check symbol_leading_char + because for SunOS4 it always is '_'. */ if (name[8] == 'C' && strcmp ("__DYNAMIC", name) == 0) ms_type = mst_data; @@ -535,9 +532,6 @@ dbx_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) if (val < 0) perror_with_name (objfile_name (objfile)); - /* Size the symbol table. */ - init_psymbol_list (objfile, DBX_SYMCOUNT (objfile)); - symbol_size = DBX_SYMBOL_SIZE (objfile); symbol_table_offset = DBX_SYMTAB_OFFSET (objfile); @@ -547,7 +541,10 @@ dbx_symfile_read (struct objfile *objfile, symfile_add_flags symfile_flags) /* Read stabs data from executable file and define symbols. */ - read_dbx_symtab (reader, objfile); + psymbol_functions *psf = new psymbol_functions (); + psymtab_storage *partial_symtabs = psf->get_partial_symtabs ().get (); + objfile->qf.emplace_front (psf); + read_dbx_symtab (reader, partial_symtabs, objfile); /* Install any minimal symbols that have been collected as the current minimal symbols for this objfile. */ @@ -630,8 +627,8 @@ dbx_symfile_init (struct objfile *objfile) if (STRING_TABLE_OFFSET == 0) { /* It appears that with the existing bfd code, STRING_TABLE_OFFSET - will never be zero, even when there is no string table. This - would appear to be a bug in bfd. */ + will never be zero, even when there is no string table. This + would appear to be a bug in bfd. */ DBX_STRINGTAB_SIZE (objfile) = 0; DBX_STRINGTAB (objfile) = NULL; } @@ -765,7 +762,7 @@ fill_symbuf (bfd *sym_bfd) { nbytes = sizeof (symbuf); if (nbytes > symbuf_left) - nbytes = symbuf_left; + nbytes = symbuf_left; memcpy (symbuf, stabs_data + symbuf_read, nbytes); } else if (symbuf_sections == NULL) @@ -857,7 +854,7 @@ dbx_next_symbol_text (struct objfile *objfile) bincl in the list. Return the partial symtab associated with that header_file_location. */ -static struct partial_symtab * +static legacy_psymtab * find_corresponding_bincl_psymtab (const char *name, int instance) { for (const header_file_location &bincl : *bincl_list) @@ -866,7 +863,7 @@ find_corresponding_bincl_psymtab (const char *name, int instance) return bincl.pst; repeated_header_complaint (name, symnum); - return (struct partial_symtab *) 0; + return (legacy_psymtab *) 0; } /* Set namestring based on nlist. If the string table index is invalid, @@ -913,8 +910,8 @@ find_stab_function (const char *namestring, const char *filename, if (msym.minsym == NULL) { /* Sun Fortran appends an underscore to the minimal symbol name, - try again with an appended underscore if the minimal symbol - was not found. */ + try again with an appended underscore if the minimal symbol + was not found. */ p[n] = '_'; p[n + 1] = 0; msym = lookup_minimal_symbol (p, filename, objfile); @@ -949,9 +946,11 @@ function_outside_compilation_unit_complaint (const char *arg1) debugging information is available. */ static void -read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) +read_dbx_symtab (minimal_symbol_reader &reader, + psymtab_storage *partial_symtabs, + struct objfile *objfile) { - struct gdbarch *gdbarch = get_objfile_arch (objfile); + struct gdbarch *gdbarch = objfile->arch (); struct external_nlist *bufp = 0; /* =0 avoids gcc -Wall glitch. */ struct internal_nlist nlist; CORE_ADDR text_addr; @@ -968,7 +967,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) int data_sect_index; /* Current partial symtab. */ - struct partial_symtab *pst; + legacy_psymtab *pst; /* List of current psymtab's include files. */ const char **psymtab_include_list; @@ -976,7 +975,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) int includes_used; /* Index within current psymtab dependency list. */ - struct partial_symtab **dependency_list; + legacy_psymtab **dependency_list; int dependencies_used, dependencies_allocated; text_addr = DBX_TEXT_ADDR (objfile); @@ -989,7 +988,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) stringtab_global = DBX_STRINGTAB (objfile); - pst = (struct partial_symtab *) 0; + pst = (legacy_psymtab *) 0; includes_allocated = 30; includes_used = 0; @@ -999,8 +998,8 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) dependencies_allocated = 30; dependencies_used = 0; dependency_list = - (struct partial_symtab **) alloca (dependencies_allocated * - sizeof (struct partial_symtab *)); + (legacy_psymtab **) alloca (dependencies_allocated * + sizeof (legacy_psymtab *)); /* Init bincl list */ std::vector bincl_storage; @@ -1046,9 +1045,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) /* If data_sect_index is still -1, that's okay. It's perfectly fine for the file to have no .data, no .bss, and no .text at all, if - it also has no global or static variables. If it does, we will - get an internal error from an ANOFFSET macro below when we try to - use data_sect_index. */ + it also has no global or static variables. */ for (symnum = 0; symnum < DBX_SYMCOUNT (objfile); symnum++) { @@ -1071,15 +1068,15 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) OBJSTAT (objfile, n_stabs++); /* Ok. There is a lot of code duplicated in the rest of this - switch statement (for efficiency reasons). Since I don't - like duplicating code, I will do my penance here, and - describe the code which is duplicated: + switch statement (for efficiency reasons). Since I don't + like duplicating code, I will do my penance here, and + describe the code which is duplicated: - *) The assignment to namestring. - *) The call to strchr. - *) The addition of a partial symbol the two partial - symbol lists. This last is a large section of code, so - I've imbedded it in the following macro. */ + *) The assignment to namestring. + *) The call to strchr. + *) The addition of a partial symbol the two partial + symbol lists. This last is a large section of code, so + I've imbedded it in the following macro. */ switch (nlist.n_type) { @@ -1132,13 +1129,14 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) which are not the address. */ && nlist.n_value >= pst->raw_text_low ()) { - dbx_end_psymtab (objfile, pst, psymtab_include_list, + dbx_end_psymtab (objfile, partial_symtabs, + pst, psymtab_include_list, includes_used, symnum * symbol_size, nlist.n_value > pst->raw_text_high () ? nlist.n_value : pst->raw_text_high (), dependency_list, dependencies_used, textlow_not_set); - pst = (struct partial_symtab *) 0; + pst = (legacy_psymtab *) 0; includes_used = 0; dependencies_used = 0; has_line_numbers = 0; @@ -1247,13 +1245,14 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) if (pst) { - dbx_end_psymtab (objfile, pst, psymtab_include_list, + dbx_end_psymtab (objfile, partial_symtabs, + pst, psymtab_include_list, includes_used, symnum * symbol_size, (valu > pst->raw_text_high () ? valu : pst->raw_text_high ()), dependency_list, dependencies_used, prev_textlow_not_set); - pst = (struct partial_symtab *) 0; + pst = (legacy_psymtab *) 0; includes_used = 0; dependencies_used = 0; has_line_numbers = 0; @@ -1280,8 +1279,8 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) { /* Save the directory name SOs locally, then save it into the psymtab when it's created below. */ - dirname_nso = namestring; - continue; + dirname_nso = namestring; + continue; } /* Some other compilers (C++ ones in particular) emit useless @@ -1290,7 +1289,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) if (!pst) { - pst = start_psymtab (objfile, + pst = start_psymtab (partial_symtabs, objfile, namestring, valu, first_so_symnum * symbol_size); pst->dirname = dirname_nso; @@ -1431,25 +1430,26 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) if (!p) continue; /* Not a debugging symbol. */ - sym_len = 0; + sym_len = 0; sym_name = NULL; /* pacify "gcc -Werror" */ - if (psymtab_language == language_cplus) - { + if (psymtab_language == language_cplus) + { std::string name (namestring, p - namestring); - std::string new_name = cp_canonicalize_string (name.c_str ()); - if (!new_name.empty ()) + gdb::unique_xmalloc_ptr new_name + = cp_canonicalize_string (name.c_str ()); + if (new_name != nullptr) { - sym_len = new_name.length (); + sym_len = strlen (new_name.get ()); sym_name = obstack_strdup (&objfile->objfile_obstack, - new_name); + new_name.get ()); } } - if (sym_len == 0) - { - sym_name = namestring; - sym_len = p - namestring; - } + if (sym_len == 0) + { + sym_name = namestring; + sym_len = p - namestring; + } /* Main processing section for debugging symbols which the initial read through the symbol tables needs to worry @@ -1461,24 +1461,33 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) switch (p[1]) { case 'S': - if (gdbarch_static_transform_name_p (gdbarch)) - gdbarch_static_transform_name (gdbarch, namestring); - - add_psymbol_to_list (sym_name, sym_len, true, - VAR_DOMAIN, LOC_STATIC, - data_sect_index, - psymbol_placement::STATIC, - nlist.n_value, psymtab_language, objfile); + if (pst != nullptr) + pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + VAR_DOMAIN, LOC_STATIC, + data_sect_index, + psymbol_placement::STATIC, + nlist.n_value, psymtab_language, + partial_symtabs, objfile); + else + complaint (_("static `%*s' appears to be defined " + "outside of all compilation units"), + sym_len, sym_name); continue; case 'G': /* The addresses in these entries are reported to be wrong. See the code that reads 'G's for symtabs. */ - add_psymbol_to_list (sym_name, sym_len, true, - VAR_DOMAIN, LOC_STATIC, - data_sect_index, - psymbol_placement::GLOBAL, - nlist.n_value, psymtab_language, objfile); + if (pst != nullptr) + pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + VAR_DOMAIN, LOC_STATIC, + data_sect_index, + psymbol_placement::GLOBAL, + nlist.n_value, psymtab_language, + partial_symtabs, objfile); + else + complaint (_("global `%*s' appears to be defined " + "outside of all compilation units"), + sym_len, sym_name); continue; case 'T': @@ -1492,17 +1501,30 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) || (p == namestring + 1 && namestring[0] != ' ')) { - add_psymbol_to_list (sym_name, sym_len, true, - STRUCT_DOMAIN, LOC_TYPEDEF, -1, - psymbol_placement::STATIC, - 0, psymtab_language, objfile); + if (pst != nullptr) + pst->add_psymbol (gdb::string_view (sym_name, sym_len), + true, STRUCT_DOMAIN, LOC_TYPEDEF, -1, + psymbol_placement::STATIC, + 0, psymtab_language, + partial_symtabs, objfile); + else + complaint (_("enum, struct, or union `%*s' appears " + "to be defined outside of all " + "compilation units"), + sym_len, sym_name); if (p[2] == 't') { /* Also a typedef with the same name. */ - add_psymbol_to_list (sym_name, sym_len, true, - VAR_DOMAIN, LOC_TYPEDEF, -1, - psymbol_placement::STATIC, - 0, psymtab_language, objfile); + if (pst != nullptr) + pst->add_psymbol (gdb::string_view (sym_name, sym_len), + true, VAR_DOMAIN, LOC_TYPEDEF, -1, + psymbol_placement::STATIC, + 0, psymtab_language, + partial_symtabs, objfile); + else + complaint (_("typedef `%*s' appears to be defined " + "outside of all compilation units"), + sym_len, sym_name); p += 1; } } @@ -1511,10 +1533,16 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) case 't': if (p != namestring) /* a name is there, not just :T... */ { - add_psymbol_to_list (sym_name, sym_len, true, - VAR_DOMAIN, LOC_TYPEDEF, -1, - psymbol_placement::STATIC, - 0, psymtab_language, objfile); + if (pst != nullptr) + pst->add_psymbol (gdb::string_view (sym_name, sym_len), + true, VAR_DOMAIN, LOC_TYPEDEF, -1, + psymbol_placement::STATIC, + 0, psymtab_language, + partial_symtabs, objfile); + else + complaint (_("typename `%*s' appears to be defined " + "outside of all compilation units"), + sym_len, sym_name); } check_enum: /* If this is an enumerated type, we need to @@ -1572,10 +1600,16 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) ; /* Note that the value doesn't matter for enum constants in psymtabs, just in symtabs. */ - add_psymbol_to_list (p, q - p, true, - VAR_DOMAIN, LOC_CONST, -1, - psymbol_placement::STATIC, 0, - psymtab_language, objfile); + if (pst != nullptr) + pst->add_psymbol (gdb::string_view (p, q - p), true, + VAR_DOMAIN, LOC_CONST, -1, + psymbol_placement::STATIC, 0, + psymtab_language, + partial_symtabs, objfile); + else + complaint (_("enum constant `%*s' appears to be defined " + "outside of all compilation units"), + ((int) (q - p)), p); /* Point past the name. */ p = q; /* Skip over the value. */ @@ -1590,22 +1624,24 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) case 'c': /* Constant, e.g. from "const" in Pascal. */ - add_psymbol_to_list (sym_name, sym_len, true, - VAR_DOMAIN, LOC_CONST, -1, - psymbol_placement::STATIC, 0, - psymtab_language, objfile); + if (pst != nullptr) + pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + VAR_DOMAIN, LOC_CONST, -1, + psymbol_placement::STATIC, 0, + psymtab_language, + partial_symtabs, objfile); + else + complaint (_("constant `%*s' appears to be defined " + "outside of all compilation units"), + sym_len, sym_name); + continue; case 'f': if (! pst) { - int name_len = p - namestring; - char *name = (char *) xmalloc (name_len + 1); - - memcpy (name, namestring, name_len); - name[name_len] = '\0'; - function_outside_compilation_unit_complaint (name); - xfree (name); + std::string name (namestring, (p - namestring)); + function_outside_compilation_unit_complaint (name.c_str ()); } /* Kludges for ELF/STABS with Sun ACC. */ last_function_name = namestring; @@ -1645,11 +1681,13 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) pst->set_text_low (nlist.n_value); textlow_not_set = 0; } - add_psymbol_to_list (sym_name, sym_len, true, - VAR_DOMAIN, LOC_BLOCK, - SECT_OFF_TEXT (objfile), - psymbol_placement::STATIC, - nlist.n_value, psymtab_language, objfile); + if (pst != nullptr) + pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + VAR_DOMAIN, LOC_BLOCK, + SECT_OFF_TEXT (objfile), + psymbol_placement::STATIC, + nlist.n_value, psymtab_language, + partial_symtabs, objfile); continue; /* Global functions were ignored here, but now they @@ -1658,13 +1696,8 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) case 'F': if (! pst) { - int name_len = p - namestring; - char *name = (char *) xmalloc (name_len + 1); - - memcpy (name, namestring, name_len); - name[name_len] = '\0'; - function_outside_compilation_unit_complaint (name); - xfree (name); + std::string name (namestring, (p - namestring)); + function_outside_compilation_unit_complaint (name.c_str ()); } /* Kludges for ELF/STABS with Sun ACC. */ last_function_name = namestring; @@ -1704,11 +1737,13 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) pst->set_text_low (nlist.n_value); textlow_not_set = 0; } - add_psymbol_to_list (sym_name, sym_len, true, - VAR_DOMAIN, LOC_BLOCK, - SECT_OFF_TEXT (objfile), - psymbol_placement::GLOBAL, - nlist.n_value, psymtab_language, objfile); + if (pst != nullptr) + pst->add_psymbol (gdb::string_view (sym_name, sym_len), true, + VAR_DOMAIN, LOC_BLOCK, + SECT_OFF_TEXT (objfile), + psymbol_placement::GLOBAL, + nlist.n_value, psymtab_language, + partial_symtabs, objfile); continue; /* Two things show up here (hopefully); static symbols of @@ -1764,7 +1799,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) /* Find the corresponding bincl and mark that psymtab on the psymtab dependency list. */ { - struct partial_symtab *needed_pst = + legacy_psymtab *needed_pst = find_corresponding_bincl_psymtab (namestring, nlist.n_value); /* If this include file was defined earlier in this file, @@ -1791,15 +1826,15 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) dependency_list[dependencies_used++] = needed_pst; if (dependencies_used >= dependencies_allocated) { - struct partial_symtab **orig = dependency_list; + legacy_psymtab **orig = dependency_list; dependency_list = - (struct partial_symtab **) + (legacy_psymtab **) alloca ((dependencies_allocated *= 2) - * sizeof (struct partial_symtab *)); + * sizeof (legacy_psymtab *)); memcpy (dependency_list, orig, (dependencies_used - * sizeof (struct partial_symtab *))); + * sizeof (legacy_psymtab *))); #ifdef DEBUG_INFO fprintf_unfiltered (gdb_stderr, "Had to reallocate " @@ -1820,12 +1855,12 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) compiled without debugging info follows this module. */ if (pst && gdbarch_sofun_address_maybe_missing (gdbarch)) { - dbx_end_psymtab (objfile, pst, + dbx_end_psymtab (objfile, partial_symtabs, pst, psymtab_include_list, includes_used, symnum * symbol_size, (CORE_ADDR) 0, dependency_list, dependencies_used, textlow_not_set); - pst = (struct partial_symtab *) 0; + pst = (legacy_psymtab *) 0; includes_used = 0; dependencies_used = 0; has_line_numbers = 0; @@ -1886,7 +1921,8 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) : lowest_text_address) + text_size; - dbx_end_psymtab (objfile, pst, psymtab_include_list, includes_used, + dbx_end_psymtab (objfile, partial_symtabs, + pst, psymtab_include_list, includes_used, symnum * symbol_size, (text_end > pst->raw_text_high () ? text_end : pst->raw_text_high ()), @@ -1901,17 +1937,18 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) is the address relative to which its symbols are (incremental) or 0 (normal). */ -static struct partial_symtab * -start_psymtab (struct objfile *objfile, const char *filename, CORE_ADDR textlow, - int ldsymoff) +static legacy_psymtab * +start_psymtab (psymtab_storage *partial_symtabs, struct objfile *objfile, + const char *filename, CORE_ADDR textlow, int ldsymoff) { - struct partial_symtab *result = - start_psymtab_common (objfile, filename, textlow); + legacy_psymtab *result = new legacy_psymtab (filename, partial_symtabs, + objfile->per_bfd, textlow); result->read_symtab_private = XOBNEW (&objfile->objfile_obstack, struct symloc); LDSYMOFF (result) = ldsymoff; - result->read_symtab = dbx_read_symtab; + result->legacy_read_symtab = dbx_read_symtab; + result->legacy_expand_psymtab = dbx_expand_psymtab; SYMBOL_SIZE (result) = symbol_size; SYMBOL_OFFSET (result) = symbol_table_offset; STRING_OFFSET (result) = string_table_offset; @@ -1929,16 +1966,17 @@ start_psymtab (struct objfile *objfile, const char *filename, CORE_ADDR textlow, FIXME: List variables and peculiarities of same. */ -struct partial_symtab * -dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, +legacy_psymtab * +dbx_end_psymtab (struct objfile *objfile, psymtab_storage *partial_symtabs, + legacy_psymtab *pst, const char **include_list, int num_includes, int capping_symbol_offset, CORE_ADDR capping_text, - struct partial_symtab **dependency_list, + legacy_psymtab **dependency_list, int number_dependencies, int textlow_not_set) { int i; - struct gdbarch *gdbarch = get_objfile_arch (objfile); + struct gdbarch *gdbarch = objfile->arch (); if (capping_symbol_offset != -1) LDSYMLEN (pst) = capping_symbol_offset - LDSYMOFF (pst); @@ -2000,34 +2038,34 @@ dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, else { /* If we know our own starting text address, then walk through all other - psymtabs for this objfile, and if any didn't know their ending text - address, set it to our starting address. Take care to not set our - own ending address to our starting address. */ + psymtabs for this objfile, and if any didn't know their ending text + address, set it to our starting address. Take care to not set our + own ending address to our starting address. */ - for (partial_symtab *p1 : objfile->psymtabs ()) + for (partial_symtab *p1 : partial_symtabs->range ()) if (!p1->text_high_valid && p1->text_low_valid && p1 != pst) p1->set_text_high (pst->raw_text_low ()); } /* End of kludge for patching Solaris textlow and texthigh. */ - end_psymtab_common (objfile, pst); + pst->end (); pst->number_of_dependencies = number_dependencies; if (number_dependencies) { pst->dependencies - = objfile->partial_symtabs->allocate_dependencies (number_dependencies); + = partial_symtabs->allocate_dependencies (number_dependencies); memcpy (pst->dependencies, dependency_list, - number_dependencies * sizeof (struct partial_symtab *)); + number_dependencies * sizeof (legacy_psymtab *)); } else pst->dependencies = 0; for (i = 0; i < num_includes; i++) { - struct partial_symtab *subpst = - allocate_psymtab (include_list[i], objfile); + legacy_psymtab *subpst = + new legacy_psymtab (include_list[i], partial_symtabs, objfile->per_bfd); subpst->read_symtab_private = XOBNEW (&objfile->objfile_obstack, struct symloc); @@ -2035,30 +2073,29 @@ dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, LDSYMLEN (subpst) = 0; /* We could save slight bits of space by only making one of these, - shared by the entire set of include files. FIXME-someday. */ + shared by the entire set of include files. FIXME-someday. */ subpst->dependencies = - objfile->partial_symtabs->allocate_dependencies (1); + partial_symtabs->allocate_dependencies (1); subpst->dependencies[0] = pst; subpst->number_of_dependencies = 1; - subpst->read_symtab = pst->read_symtab; + subpst->legacy_read_symtab = pst->legacy_read_symtab; + subpst->legacy_expand_psymtab = pst->legacy_expand_psymtab; } if (num_includes == 0 && number_dependencies == 0 - && pst->n_global_syms == 0 - && pst->n_static_syms == 0 + && pst->empty () && has_line_numbers == 0) { - /* Throw away this psymtab, it's empty. We can't deallocate it, since - it is on the obstack, but we can forget to chain it on the list. */ + /* Throw away this psymtab, it's empty. */ /* Empty psymtabs happen as a result of header files which don't have - any symbols in them. There can be a lot of them. But this check - is wrong, in that a psymtab with N_SLINE entries but nothing else - is not empty, but we don't realize that. Fixing that without slowing - things down might be tricky. */ + any symbols in them. There can be a lot of them. But this check + is wrong, in that a psymtab with N_SLINE entries but nothing else + is not empty, but we don't realize that. Fixing that without slowing + things down might be tricky. */ - discard_psymtab (objfile, pst); + partial_symtabs->discard_psymtab (pst); /* Indicate that psymtab was thrown away. */ pst = NULL; @@ -2067,35 +2104,12 @@ dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, } static void -dbx_psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *pst) +dbx_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile) { - int i; - - if (pst->readin) - { - fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. " - "Shouldn't happen.\n", - pst->filename); - return; - } + gdb_assert (!pst->readin); /* Read in all partial symtabs on which this one is dependent. */ - for (i = 0; i < pst->number_of_dependencies; i++) - if (!pst->dependencies[i]->readin) - { - /* Inform about additional files that need to be read in. */ - if (info_verbose) - { - fputs_filtered (" ", gdb_stdout); - wrap_here (""); - fputs_filtered ("and ", gdb_stdout); - wrap_here (""); - printf_filtered ("%s...", pst->dependencies[i]->filename); - wrap_here (""); /* Flush output. */ - gdb_flush (gdb_stdout); - } - dbx_psymtab_to_symtab_1 (objfile, pst->dependencies[i]); - } + pst->expand_dependencies (objfile); if (LDSYMLEN (pst)) /* Otherwise it's a dummy. */ { @@ -2110,33 +2124,19 @@ dbx_psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *pst) read_ofile_symtab (objfile, pst); } - pst->readin = 1; + pst->readin = true; } /* Read in all of the symbols for a given psymtab for real. Be verbose about it if the user wants that. SELF is not NULL. */ static void -dbx_read_symtab (struct partial_symtab *self, struct objfile *objfile) +dbx_read_symtab (legacy_psymtab *self, struct objfile *objfile) { - if (self->readin) - { - fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. " - "Shouldn't happen.\n", - self->filename); - return; - } + gdb_assert (!self->readin); if (LDSYMLEN (self) || self->number_of_dependencies) { - /* Print the message now, before reading the string table, - to avoid disconcerting pauses. */ - if (info_verbose) - { - printf_filtered ("Reading in symbols for %s...", self->filename); - gdb_flush (gdb_stdout); - } - next_symbol_text_func = dbx_next_symbol_text; { @@ -2151,23 +2151,19 @@ dbx_read_symtab (struct partial_symtab *self, struct objfile *objfile) data_holder.reset (stabs_data); } - dbx_psymtab_to_symtab_1 (objfile, self); + self->expand_psymtab (objfile); } /* Match with global symbols. This only needs to be done once, - after all of the symtabs and dependencies have been read in. */ + after all of the symtabs and dependencies have been read in. */ scan_file_globals (objfile); - - /* Finish up the debug error message. */ - if (info_verbose) - printf_filtered ("done.\n"); } } /* Read in a defined section of a specific object file's symbols. */ static void -read_ofile_symtab (struct objfile *objfile, struct partial_symtab *pst) +read_ofile_symtab (struct objfile *objfile, legacy_psymtab *pst) { const char *namestring; struct external_nlist *bufp; @@ -2179,13 +2175,12 @@ read_ofile_symtab (struct objfile *objfile, struct partial_symtab *pst) 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; sym_offset = LDSYMOFF (pst); sym_size = LDSYMLEN (pst); text_offset = pst->text_low (objfile); text_size = pst->text_high (objfile) - pst->text_low (objfile); - section_offsets = objfile->section_offsets; + const section_offsets §ion_offsets = objfile->section_offsets; dbxread_objfile = objfile; @@ -2232,8 +2227,8 @@ read_ofile_symtab (struct objfile *objfile, struct partial_symtab *pst) else { /* The N_SO starting this symtab is the first symbol, so we - better not check the symbol before it. I'm not this can - happen, but it doesn't hurt to check for it. */ + better not check the symbol before it. I'm not this can + happen, but it doesn't hurt to check for it. */ stabs_seek (sym_offset); processing_gcc_compilation = 0; } @@ -2281,7 +2276,7 @@ read_ofile_symtab (struct objfile *objfile, struct partial_symtab *pst) PST_LANGUAGE (pst)); } /* We skip checking for a new .o or -l file; that should never - happen in this routine. */ + happen in this routine. */ else if (type == N_TEXT) { /* I don't think this code will ever be executed, because @@ -2341,7 +2336,7 @@ cp_set_block_scope (const struct symbol *symbol, struct block *block, struct obstack *obstack) { - if (SYMBOL_DEMANGLED_NAME (symbol) != NULL) + if (symbol->demangled_name () != NULL) { /* Try to figure out the appropriate namespace from the demangled name. */ @@ -2351,7 +2346,7 @@ cp_set_block_scope (const struct symbol *symbol, name of the class as well. This should be harmless, but is a little unfortunate. */ - const char *name = SYMBOL_DEMANGLED_NAME (symbol); + const char *name = symbol->demangled_name (); unsigned int prefix_len = cp_entire_prefix_len (name); block_set_scope (block, obstack_strndup (obstack, name, prefix_len), @@ -2378,10 +2373,10 @@ cp_set_block_scope (const struct symbol *symbol, void process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, - const struct section_offsets *section_offsets, + const section_offsets §ion_offsets, struct objfile *objfile, enum language language) { - struct gdbarch *gdbarch = get_objfile_arch (objfile); + struct gdbarch *gdbarch = objfile->arch (); struct context_stack *newobj; struct context_stack cstk; /* This remembers the address of the start of a function. It is @@ -2412,9 +2407,9 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, 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 - gracefully with the case. A complain()t might be in order, - but this should not be an error (). */ + Currently no one puts symbols there, but we should deal + gracefully with the case. A complain()t might be in order, + but this should not be an error (). */ return; } @@ -2430,10 +2425,10 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, struct block *block; if (outermost_context_p ()) - { + { lbrac_mismatch_complaint (symnum); - break; - } + break; + } /* The following check is added before recording line 0 at end of function so as to handle hand-generated stabs @@ -2456,7 +2451,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, cstk.start_addr, cstk.start_addr + valu); /* For C++, set the block's scope. */ - if (SYMBOL_LANGUAGE (cstk.name) == language_cplus) + if (cstk.name->language () == language_cplus) cp_set_block_scope (cstk.name, block, &objfile->objfile_obstack); /* May be switching to an assembler file which may not be using @@ -2469,7 +2464,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, sline_found_in_function = 0; /* Relocate for dynamic loading. */ - valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); + valu += section_offsets[SECT_OFF_TEXT (objfile)]; valu = gdbarch_addr_bits_remove (gdbarch, valu); last_function_start = valu; @@ -2477,7 +2472,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, case N_LBRAC: /* This "symbol" just indicates the start of an inner lexical - context within a function. */ + context within a function. */ /* Ignore extra outermost context from SunPRO cc and acc. */ if (n_opt_found && desc == 1) @@ -2490,7 +2485,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, case N_RBRAC: /* This "symbol" just indicates the end of an inner lexical - context that was started with N_LBRAC. */ + context that was started with N_LBRAC. */ /* Ignore extra outermost context from SunPRO cc and acc. */ if (n_opt_found && desc == 1) @@ -2556,16 +2551,16 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, case N_FN: case N_FN_SEQ: /* This kind of symbol indicates the start of an object file. - Relocate for dynamic loading. */ - valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); + Relocate for dynamic loading. */ + valu += section_offsets[SECT_OFF_TEXT (objfile)]; break; case N_SO: /* This type of symbol indicates the start of data for one - source file. Finish the symbol table of the previous source - file (if any) and start accumulating a new symbol table. - Relocate for dynamic loading. */ - valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); + source file. Finish the symbol table of the previous source + file (if any) and start accumulating a new symbol table. + Relocate for dynamic loading. */ + valu += section_offsets[SECT_OFF_TEXT (objfile)]; n_opt_found = 0; @@ -2585,7 +2580,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, } /* Null name means this just marks the end of text for this .o - file. Don't start a new symtab in this case. */ + file. Don't start a new symtab in this case. */ if (*name == '\000') break; @@ -2598,10 +2593,10 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, case N_SOL: /* This type of symbol indicates the start of data for a - sub-source-file, one whose contents were copied or included - 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)); + sub-source-file, one whose contents were copied or included + in the compilation of the main source file (whose name was + given in the N_SO symbol). Relocate for dynamic loading. */ + valu += section_offsets[SECT_OFF_TEXT (objfile)]; start_subfile (name); break; @@ -2621,11 +2616,11 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, case N_SLINE: /* This type of "symbol" really just records one line-number -- - core-address correspondence. Enter it in the line list for - this symbol table. */ + core-address correspondence. Enter it in the line list for + this symbol table. */ /* Relocate for dynamic loading and for ELF acc - function-relative symbols. */ + function-relative symbols. */ valu += function_start_offset; /* GCC 2.95.3 emits the first N_SLINE stab somewhere in the @@ -2665,22 +2660,22 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, break; /* The following symbol types need to have the appropriate - offset added to their value; then we process symbol - definitions in the name. */ + offset added to their value; then we process symbol + definitions in the name. */ case N_STSYM: /* Static symbol in data segment. */ case N_LCSYM: /* Static symbol in BSS segment. */ case N_ROSYM: /* Static symbol in read-only data segment. */ /* HORRID HACK DEPT. However, it's Sun's furgin' fault. - Solaris 2's stabs-in-elf makes *most* symbols relative but - leaves a few absolute (at least for Solaris 2.1 and version - 2.0.1 of the SunPRO compiler). N_STSYM and friends sit on - the fence. .stab "foo:S...",N_STSYM is absolute (ld - relocates it) .stab "foo:V...",N_STSYM is relative (section - base subtracted). This leaves us no choice but to search for - the 'S' or 'V'... (or pass the whole section_offsets stuff - down ONE MORE function call level, which we really don't want - to do). */ + Solaris 2's stabs-in-elf makes *most* symbols relative but + leaves a few absolute (at least for Solaris 2.1 and version + 2.0.1 of the SunPRO compiler). N_STSYM and friends sit on + the fence. .stab "foo:S...",N_STSYM is absolute (ld + relocates it) .stab "foo:V...",N_STSYM is relative (section + base subtracted). This leaves us no choice but to search for + the 'S' or 'V'... (or pass the whole section_offsets stuff + down ONE MORE function call level, which we really don't want + to do). */ { const char *p; @@ -2701,12 +2696,12 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, symbol_file_add as addr (this is known to affect 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)); + valu += section_offsets[SECT_OFF_TEXT (objfile)]; goto define_a_symbol; } } /* Since it's not the kludge case, re-dispatch to the right - handler. */ + handler. */ switch (type) { case N_STSYM: @@ -2723,27 +2718,27 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, case_N_STSYM: /* Static symbol in data segment. */ case N_DSLINE: /* Source line number, data segment. */ - valu += ANOFFSET (section_offsets, SECT_OFF_DATA (objfile)); + valu += section_offsets[SECT_OFF_DATA (objfile)]; goto define_a_symbol; case_N_LCSYM: /* Static symbol in BSS segment. */ case N_BSLINE: /* Source line number, BSS segment. */ /* N_BROWS: overlaps with N_BSLINE. */ - valu += ANOFFSET (section_offsets, SECT_OFF_BSS (objfile)); + valu += section_offsets[SECT_OFF_BSS (objfile)]; goto define_a_symbol; case_N_ROSYM: /* Static symbol in read-only data segment. */ - valu += ANOFFSET (section_offsets, SECT_OFF_RODATA (objfile)); + valu += section_offsets[SECT_OFF_RODATA (objfile)]; goto define_a_symbol; case N_ENTRY: /* Alternate entry point. */ /* Relocate for dynamic loading. */ - valu += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); + valu += section_offsets[SECT_OFF_TEXT (objfile)]; goto define_a_symbol; /* The following symbol types we don't know how to process. - Handle them in a "default" way, but complain to people who - care. */ + Handle them in a "default" way, but complain to people who + care. */ default: case N_CATCH: /* Exception handler catcher. */ case N_EHDECL: /* Exception handler name. */ @@ -2762,7 +2757,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, define_a_symbol: /* These symbol types don't need the address field relocated, - since it is either unused, or is absolute. */ + since it is either unused, or is absolute. */ case N_GSYM: /* Global variable. */ case N_NSYMS: /* Number of symbols (Ultrix). */ case N_NOMAP: /* No map? (Ultrix). */ @@ -2787,10 +2782,9 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, case 'f': case 'F': /* Deal with the SunPRO 3.0 compiler which omits the - address from N_FUN symbols. */ + address from N_FUN symbols. */ if (type == N_FUN - && valu == ANOFFSET (section_offsets, - SECT_OFF_TEXT (objfile)) + && valu == section_offsets[SECT_OFF_TEXT (objfile)] && gdbarch_sofun_address_maybe_missing (gdbarch)) { struct bound_minimal_symbol minsym @@ -2823,7 +2817,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, cstk.start_addr, valu); /* For C++, set the block's scope. */ - if (SYMBOL_LANGUAGE (cstk.name) == language_cplus) + if (cstk.name->language () == language_cplus) cp_set_block_scope (cstk.name, block, &objfile->objfile_obstack); } @@ -2840,8 +2834,8 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, break; /* We use N_OPT to carry the gcc2_compiled flag. Sun uses it - for a bunch of other flags, too. Someday we may parse their - flags; for now we ignore theirs and hope they'll ignore ours. */ + for a bunch of other flags, too. Someday we may parse their + flags; for now we ignore theirs and hope they'll ignore ours. */ case N_OPT: /* Solaris 2: Compiler options. */ if (name) { @@ -2872,7 +2866,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, case N_PATCH: /* Solaris 2: Patch Run Time Checker. */ /* N_UNDF: Solaris 2: File separator mark. */ /* N_UNDF: -- we will never encounter it, since we only process - one file's symbols at once. */ + one file's symbols at once. */ case N_ENDM: /* Solaris 2: End of module. */ case N_ALIAS: /* SunPro F77: alias name, ignore for now. */ break; @@ -2887,17 +2881,17 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, if (name[0] == '#') { /* Initialize symbol reference names and determine if this is a - definition. If a symbol reference is being defined, go ahead - and add it. Otherwise, just return. */ + definition. If a symbol reference is being defined, go ahead + and add it. Otherwise, just return. */ const char *s = name; int refnum; /* If this stab defines a new reference ID that is not on the - reference list, then put it on the reference list. + reference list, then put it on the reference list. - We go ahead and advance NAME past the reference, even though - it is not strictly necessary at this time. */ + We go ahead and advance NAME past the reference, even though + it is not strictly necessary at this time. */ refnum = symbol_reference_defined (&s); if (refnum >= 0) if (!ref_search (refnum)) @@ -3174,18 +3168,17 @@ static const struct sym_fns aout_sym_fns = 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 */ - NULL, /* sym_read_psymbols */ dbx_symfile_finish, /* finished with file, cleanup */ default_symfile_offsets, /* parse user's offsets to internal form */ 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 -_initialize_dbxread (void) +_initialize_dbxread () { add_symtab_fns (bfd_target_aout_flavour, &aout_sym_fns); }