X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fdbxread.c;h=1e1a5dc9b979e520c7859eb1b32046b6670efcff;hb=a350efd4fb368a35ada608f6bc26ccd3bed0ae6b;hp=73f1ba8759a1f790c961cc9940336a987f8ffde3;hpb=987012b89bce7f6385ed88585547f852a8005a3f;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/dbxread.c b/gdb/dbxread.c index 73f1ba8759..1e1a5dc9b9 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-2020 Free Software Foundation, Inc. This file is part of GDB. @@ -245,7 +245,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 +254,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 +263,16 @@ 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 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,7 +297,7 @@ 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 *, +static legacy_psymtab *start_psymtab (struct objfile *, const char *, CORE_ADDR, int); /* Free up old header file tables. */ @@ -857,7 +857,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 +866,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, @@ -951,7 +951,7 @@ function_outside_compilation_unit_complaint (const char *arg1) static void read_dbx_symtab (minimal_symbol_reader &reader, 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 +968,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 +976,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 +989,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 +999,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 +1046,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++) { @@ -1138,7 +1136,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) ? 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; @@ -1253,7 +1251,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) ? 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; @@ -1436,12 +1434,13 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) 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 ()); } } @@ -1764,7 +1763,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 +1790,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 " @@ -1825,7 +1824,7 @@ read_dbx_symtab (minimal_symbol_reader &reader, struct objfile *objfile) 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; @@ -1901,17 +1900,17 @@ 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 * +static legacy_psymtab * start_psymtab (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, objfile, 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 +1928,16 @@ 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, 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); @@ -2019,15 +2018,15 @@ dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, pst->dependencies = objfile->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], objfile); subpst->read_symtab_private = XOBNEW (&objfile->objfile_obstack, struct symloc); @@ -2041,7 +2040,8 @@ dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, 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 @@ -2058,7 +2058,7 @@ dbx_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, is not empty, but we don't realize that. Fixing that without slowing things down might be tricky. */ - discard_psymtab (objfile, pst); + objfile->partial_symtabs->discard_psymtab (pst); /* Indicate that psymtab was thrown away. */ pst = NULL; @@ -2067,35 +2067,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 +2087,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 +2114,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. */ 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 +2138,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; @@ -2378,10 +2336,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 @@ -2456,7 +2414,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 +2427,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; @@ -2557,7 +2515,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, 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)); + valu += section_offsets[SECT_OFF_TEXT (objfile)]; break; case N_SO: @@ -2565,7 +2523,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, 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)); + valu += section_offsets[SECT_OFF_TEXT (objfile)]; n_opt_found = 0; @@ -2601,7 +2559,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, 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)); + valu += section_offsets[SECT_OFF_TEXT (objfile)]; start_subfile (name); break; @@ -2701,7 +2659,7 @@ 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; } } @@ -2723,22 +2681,22 @@ 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. @@ -2789,8 +2747,7 @@ process_one_symbol (int type, int desc, CORE_ADDR valu, const char *name, /* Deal with the SunPRO 3.0 compiler which omits the 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 +2780,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); } @@ -3184,8 +3141,9 @@ static const struct sym_fns aout_sym_fns = &psym_functions }; +void _initialize_dbxread (); void -_initialize_dbxread (void) +_initialize_dbxread () { add_symtab_fns (bfd_target_aout_flavour, &aout_sym_fns); }