X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2Fmdebugread.c;h=5c4158cd6fbfabe1d1546d6ba05b7c69b5be6e54;hb=a65189c980ccd5370bc2d020220f66d1dd327190;hp=accf07c27804bd29f0080b4d14d84d886c44819b;hpb=f252c6d5dc49cb27838e153e863f16ea7895859e;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c index accf07c278..5c4158cd6f 100644 --- a/gdb/mdebugread.c +++ b/gdb/mdebugread.c @@ -1,6 +1,6 @@ /* Read a symbol table in ECOFF format (Third-Eye). - Copyright (C) 1986-2019 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. Original version contributed by Alessandro Forin (af@cs.cmu.edu) at CMU. Major work by Per Bothner, John Gilmore and Ian Lance Taylor @@ -68,6 +68,8 @@ #include "expression.h" +#include + /* Provide a way to test if we have both ECOFF and ELF symbol tables. We use this define in order to know whether we should override a symbol's ECOFF section with its ELF section. This is necessary in @@ -187,7 +189,7 @@ static const struct ecoff_debug_swap *debug_swap; static struct ecoff_debug_info *debug_info; -/* Pointer to current file decriptor record, and its index. */ +/* Pointer to current file descriptor record, and its index. */ static FDR *cur_fdr; static int cur_fd; @@ -249,10 +251,10 @@ static struct symbol *mylookup_symbol (const char *, const struct block *, static void sort_blocks (struct symtab *); -static struct partial_symtab *new_psymtab (const char *, struct objfile *); +static legacy_psymtab *new_psymtab (const char *, struct objfile *); -static void psymtab_to_symtab_1 (struct objfile *objfile, - struct partial_symtab *, const char *); +static void mdebug_expand_psymtab (legacy_psymtab *pst, + struct objfile *objfile); static void add_block (struct block *, struct symtab *); @@ -273,24 +275,15 @@ static const char *mdebug_next_symbol_text (struct objfile *); and reorders the symtab list at the end. SELF is not NULL. */ static void -mdebug_read_symtab (struct partial_symtab *self, struct objfile *objfile) +mdebug_read_symtab (legacy_psymtab *self, struct objfile *objfile) { - if (info_verbose) - { - printf_filtered (_("Reading in symbols for %s..."), self->filename); - gdb_flush (gdb_stdout); - } - next_symbol_text_func = mdebug_next_symbol_text; - psymtab_to_symtab_1 (objfile, self, self->filename); + 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); - - if (info_verbose) - printf_filtered (_("done.\n")); } /* File-level interface functions. */ @@ -348,7 +341,7 @@ mdebug_build_psymtabs (minimal_symbol_reader &reader, init_header_files (); /* Make sure all the FDR information is swapped in. */ - if (info->fdr == (FDR *) NULL) + if (info->fdr == NULL) { char *fdr_src; char *fdr_end; @@ -377,7 +370,6 @@ mdebug_build_psymtabs (minimal_symbol_reader &reader, objfile->name); printf_unfiltered (_("You should compile with -g2 or " "-g3 for best debugging support.\n")); - gdb_flush (gdb_stdout); } #endif } @@ -388,7 +380,7 @@ mdebug_build_psymtabs (minimal_symbol_reader &reader, struct pst_map { - struct partial_symtab *pst; /* the psymtab proper */ + legacy_psymtab *pst; /* the psymtab proper */ long n_globals; /* exported globals (external symbols) */ long globals_offset; /* cumulative */ }; @@ -540,7 +532,7 @@ mdebug_reg_to_regnum (struct symbol *sym, struct gdbarch *gdbarch) if (regno < 0 || regno >= gdbarch_num_cooked_regs (gdbarch)) { reg_value_complaint (regno, gdbarch_num_cooked_regs (gdbarch), - SYMBOL_PRINT_NAME (sym)); + sym->print_name ()); regno = gdbarch_sp_regnum (gdbarch); /* Known safe, though useless. */ } @@ -579,9 +571,9 @@ add_data_symbol (SYMR *sh, union aux_ext *ax, int bigend, static int parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, - struct section_offsets *section_offsets, struct objfile *objfile) + const section_offsets §ion_offsets, struct objfile *objfile) { - struct gdbarch *gdbarch = get_objfile_arch (objfile); + struct gdbarch *gdbarch = objfile->arch (); const bfd_size_type external_sym_size = debug_swap->external_sym_size; void (*const swap_sym_in) (bfd *, void *, SYMR *) = debug_swap->swap_sym_in; const char *name; @@ -594,7 +586,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, long svalue = sh->value; int bitsize; - if (ext_sh == (char *) NULL) + if (ext_sh == NULL) name = debug_info->ssext + sh->iss; else name = debug_info->ss + cur_fdr->issBase + sh->iss; @@ -609,18 +601,18 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, The value of a stBlock symbol is the displacement from the procedure address. */ if (sh->st != stEnd && sh->st != stBlock) - sh->value += ANOFFSET (section_offsets, SECT_OFF_TEXT (objfile)); + sh->value += section_offsets[SECT_OFF_TEXT (objfile)]; break; case scData: case scSData: case scRData: case scPData: case scXData: - sh->value += ANOFFSET (section_offsets, SECT_OFF_DATA (objfile)); + sh->value += section_offsets[SECT_OFF_DATA (objfile)]; break; case scBss: case scSBss: - sh->value += ANOFFSET (section_offsets, SECT_OFF_BSS (objfile)); + sh->value += section_offsets[SECT_OFF_BSS (objfile)]; break; } @@ -633,7 +625,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, b = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (top_stack->cur_st), GLOBAL_BLOCK); s = new_symbol (name); - SYMBOL_VALUE_ADDRESS (s) = (CORE_ADDR) sh->value; + SET_SYMBOL_VALUE_ADDRESS (s, (CORE_ADDR) sh->value); add_data_symbol (sh, ax, bigend, s, LOC_STATIC, b, objfile, name); break; @@ -645,12 +637,12 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, /* It is a FORTRAN common block. At least for SGI Fortran the address is not in the symbol; we need to fix it later in scan_file_globals. */ - int bucket = hashname (SYMBOL_LINKAGE_NAME (s)); + int bucket = hashname (s->linkage_name ()); SYMBOL_VALUE_CHAIN (s) = global_sym_chain[bucket]; global_sym_chain[bucket] = s; } else - SYMBOL_VALUE_ADDRESS (s) = (CORE_ADDR) sh->value; + SET_SYMBOL_VALUE_ADDRESS (s, (CORE_ADDR) sh->value); add_data_symbol (sh, ax, bigend, s, LOC_STATIC, b, objfile, name); break; @@ -707,7 +699,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, s = new_symbol (name); SYMBOL_DOMAIN (s) = VAR_DOMAIN; /* So that it can be used */ SYMBOL_ACLASS_INDEX (s) = LOC_LABEL; /* but not misused. */ - SYMBOL_VALUE_ADDRESS (s) = (CORE_ADDR) sh->value; + SET_SYMBOL_VALUE_ADDRESS (s, (CORE_ADDR) sh->value); SYMBOL_TYPE (s) = objfile_type (objfile)->builtin_int; add_symbol (s, top_stack->cur_st, top_stack->cur_block); break; @@ -793,11 +785,11 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, /* All functions in C++ have prototypes. For C we don't have enough information in the debug info. */ - if (SYMBOL_LANGUAGE (s) == language_cplus) + if (s->language () == language_cplus) TYPE_PROTOTYPED (SYMBOL_TYPE (s)) = 1; /* Create and enter a new lexical context. */ - b = new_block (FUNCTION_BLOCK, SYMBOL_LANGUAGE (s)); + b = new_block (FUNCTION_BLOCK, s->language ()); SYMBOL_BLOCK_VALUE (s) = b; BLOCK_FUNCTION (b) = s; BLOCK_START (b) = BLOCK_END (b) = sh->value; @@ -1006,7 +998,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, /* Create a new type or use the pending type. */ pend = is_pending_symbol (cur_fdr, ext_sh); - if (pend == (struct mdebug_pending *) NULL) + if (pend == NULL) { t = new_type (NULL); add_pending (cur_fdr, ext_sh, t); @@ -1065,10 +1057,9 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, FIELD_BITSIZE (*f) = 0; enum_sym = allocate_symbol (mdebugread_objfile); - SYMBOL_SET_LINKAGE_NAME - (enum_sym, - (char *) obstack_copy0 (&mdebugread_objfile->objfile_obstack, - f->name, strlen (f->name))); + enum_sym->set_linkage_name + (obstack_strdup (&mdebugread_objfile->objfile_obstack, + f->name)); SYMBOL_ACLASS_INDEX (enum_sym) = LOC_CONST; SYMBOL_TYPE (enum_sym) = t; SYMBOL_DOMAIN (enum_sym) = VAR_DOMAIN; @@ -1268,9 +1259,9 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, /* Parse the type or use the pending type. */ pend = is_pending_symbol (cur_fdr, ext_sh); - if (pend == (struct mdebug_pending *) NULL) + if (pend == NULL) { - t = parse_type (cur_fd, ax, sh->index, (int *) NULL, bigend, name); + t = parse_type (cur_fd, ax, sh->index, NULL, bigend, name); add_pending (cur_fdr, ext_sh, t); } else @@ -1333,7 +1324,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, for anything except pointers or functions. */ } else - TYPE_NAME (SYMBOL_TYPE (s)) = SYMBOL_LINKAGE_NAME (s); + TYPE_NAME (SYMBOL_TYPE (s)) = s->linkage_name (); } break; @@ -1359,14 +1350,15 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend, /* Basic types. */ -static const struct objfile_data *basic_type_data; +static const struct objfile_key> + basic_type_data; static struct type * basic_type (int bt, struct objfile *objfile) { - struct gdbarch *gdbarch = get_objfile_arch (objfile); - struct type **map_bt - = (struct type **) objfile_data (objfile, basic_type_data); + struct gdbarch *gdbarch = objfile->arch (); + struct type **map_bt = basic_type_data.get (objfile); struct type *tp; if (bt >= btMax) @@ -1376,7 +1368,7 @@ basic_type (int bt, struct objfile *objfile) { map_bt = OBSTACK_CALLOC (&objfile->objfile_obstack, btMax, struct type *); - set_objfile_data (objfile, basic_type_data, map_bt); + basic_type_data.set (objfile, map_bt); } if (map_bt[bt]) @@ -1437,13 +1429,11 @@ basic_type (int bt, struct objfile *objfile) break; case btComplex: - tp = init_complex_type (objfile, "complex", - basic_type (btFloat, objfile)); + tp = init_complex_type ("complex", basic_type (btFloat, objfile)); break; case btDComplex: - tp = init_complex_type (objfile, "double complex", - basic_type (btFloat, objfile)); + tp = init_complex_type ("double complex", basic_type (btFloat, objfile)); break; case btFixedDec: @@ -1579,7 +1569,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, int width = AUX_GET_WIDTH (bigend, ax); /* Inhibit core dumps if TIR is corrupted. */ - if (bs == (int *) NULL) + if (bs == NULL) { /* Alpha cc -migrate encodes char and unsigned char types as short and unsigned short types with a field width of 8. @@ -1626,7 +1616,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, xref_fh = get_rfd (fd, rf); xref_fd = xref_fh - debug_info->fdr; tp = parse_type (xref_fd, debug_info->external_aux + xref_fh->iauxBase, - rn->index, (int *) NULL, xref_fh->fBigendian, sym_name); + rn->index, NULL, xref_fh->fBigendian, sym_name); } /* All these types really point to some (common) MIPS type @@ -1644,7 +1634,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, /* Try to cross reference this type, build new type on failure. */ ax += cross_ref (fd, ax, &tp, type_code, &name, bigend, sym_name); - if (tp == (struct type *) NULL) + if (tp == NULL) tp = init_type (mdebugread_objfile, type_code, 0, NULL); /* DEC c89 produces cross references to qualified aggregate types, @@ -1688,9 +1678,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, else if (TYPE_NAME (tp) == NULL || strcmp (TYPE_NAME (tp), name) != 0) TYPE_NAME (tp) - = ((const char *) - obstack_copy0 (&mdebugread_objfile->objfile_obstack, - name, strlen (name))); + = obstack_strdup (&mdebugread_objfile->objfile_obstack, name); } } @@ -1704,7 +1692,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, /* Try to cross reference this type, build new type on failure. */ ax += cross_ref (fd, ax, &tp, type_code, &name, bigend, sym_name); - if (tp == (struct type *) NULL) + if (tp == NULL) tp = init_type (mdebugread_objfile, type_code, 0, NULL); /* Make sure that TYPE_CODE(tp) has an expected type code. @@ -1726,9 +1714,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, if (TYPE_NAME (tp) == NULL || strcmp (TYPE_NAME (tp), name) != 0) TYPE_NAME (tp) - = ((const char *) - obstack_copy0 (&mdebugread_objfile->objfile_obstack, - name, strlen (name))); + = obstack_strdup (&mdebugread_objfile->objfile_obstack, name); } } if (t->bt == btTypedef) @@ -1737,7 +1723,7 @@ parse_type (int fd, union aux_ext *ax, unsigned int aux_index, int *bs, /* Try to cross reference this type, it should succeed. */ ax += cross_ref (fd, ax, &tp, type_code, &name, bigend, sym_name); - if (tp == (struct type *) NULL) + if (tp == NULL) { complaint (_("unable to cross ref btTypedef for %s"), sym_name); tp = basic_type (btInt, mdebugread_objfile); @@ -1841,7 +1827,7 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend, indx = parse_type (fh - debug_info->fdr, debug_info->external_aux + fh->iauxBase, - id, (int *) NULL, bigend, sym_name); + id, NULL, bigend, sym_name); /* The bounds type should be an integer type, but might be anything else due to corrupt aux entries. */ @@ -1860,10 +1846,9 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend, ax++; rf = AUX_GET_WIDTH (bigend, ax); /* bit size of array element */ - range = create_static_range_type ((struct type *) NULL, indx, - lower, upper); + range = create_static_range_type (NULL, indx, lower, upper); - t = create_array_type ((struct type *) NULL, *tpp, range); + t = create_array_type (NULL, *tpp, range); /* We used to fill in the supplied array element bitsize here if the TYPE_LENGTH of the target type was zero. @@ -1914,7 +1899,7 @@ upgrade_type (int fd, struct type **tpp, int tq, union aux_ext *ax, int bigend, static void parse_procedure (PDR *pr, struct compunit_symtab *search_symtab, - struct partial_symtab *pst) + legacy_psymtab *pst) { struct symbol *s, *i; const struct block *b; @@ -1998,7 +1983,7 @@ parse_procedure (PDR *pr, struct compunit_symtab *search_symtab, s = new_symbol (sh_name); SYMBOL_DOMAIN (s) = VAR_DOMAIN; SYMBOL_CLASS (s) = LOC_BLOCK; - /* Donno its type, hope int is ok. */ + /* Don't know its type, hope int is ok. */ SYMBOL_TYPE (s) = lookup_function_type (objfile_type (pst->objfile)->builtin_int); add_symbol (s, top_stack->cur_st, top_stack->cur_block); @@ -2027,8 +2012,7 @@ parse_procedure (PDR *pr, struct compunit_symtab *search_symtab, /* GDB expects the absolute function start address for the procedure descriptor in e->pdr.adr. As the address in the procedure descriptor is usually relative, - we would have to relocate e->pdr.adr with cur_fdr->adr and - ANOFFSET (pst->section_offsets, SECT_OFF_TEXT (pst->objfile)). + we would have to relocate e->pdr.adr with cur_fdr->adr. Unfortunately cur_fdr->adr and e->pdr.adr are both absolute in shared libraries on some systems, and on other systems e->pdr.adr is sometimes offset by a bogus value. @@ -2064,11 +2048,8 @@ parse_procedure (PDR *pr, struct compunit_symtab *search_symtab, This routine clobbers top_stack->cur_block and ->cur_st. */ -static void parse_external (EXTR *, int, struct section_offsets *, - struct objfile *); - static void -parse_external (EXTR *es, int bigend, struct section_offsets *section_offsets, +parse_external (EXTR *es, int bigend, const section_offsets §ion_offsets, struct objfile *objfile) { union aux_ext *ax; @@ -2144,7 +2125,7 @@ parse_external (EXTR *es, int bigend, struct section_offsets *section_offsets, /* Note that the case of a symbol with indexNil must be handled anyways by parse_symbol(). */ - parse_symbol (&es->asym, ax, (char *) NULL, + parse_symbol (&es->asym, ax, NULL, bigend, section_offsets, objfile); break; default: @@ -2302,7 +2283,7 @@ static void parse_partial_symbols (minimal_symbol_reader &reader, struct objfile *objfile) { - struct gdbarch *gdbarch = get_objfile_arch (objfile); + struct gdbarch *gdbarch = objfile->arch (); const bfd_size_type external_sym_size = debug_swap->external_sym_size; const bfd_size_type external_rfd_size = debug_swap->external_rfd_size; const bfd_size_type external_ext_size = debug_swap->external_ext_size; @@ -2318,7 +2299,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, EXTR *ext_in; EXTR *ext_in_end; SYMR sh; - struct partial_symtab *pst; + legacy_psymtab *pst; int textlow_not_set = 1; /* List of current psymtab's include files. */ @@ -2328,7 +2309,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, EXTR *extern_tab; struct pst_map *fdr_to_pst; /* Index within current psymtab dependency list. */ - struct partial_symtab **dependency_list; + legacy_psymtab **dependency_list; int dependencies_used, dependencies_allocated; char *name; enum language prev_language; @@ -2343,7 +2324,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, the text section (and fh->adr) really starts at zero. */ text_sect = bfd_get_section_by_name (cur_bfd, ".text"); if (text_sect != NULL - && (bfd_get_section_flags (cur_bfd, text_sect) & SEC_RELOC)) + && (bfd_section_flags (text_sect) & SEC_RELOC)) relocatable = 1; extern_tab = XOBNEWVEC (&objfile->objfile_obstack, EXTR, hdr->iextMax); @@ -2357,8 +2338,8 @@ parse_partial_symbols (minimal_symbol_reader &reader, 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 *)); set_last_source_file (NULL); @@ -2381,7 +2362,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, fdr_to_pst = fdr_to_pst_holder.data (); fdr_to_pst++; { - struct partial_symtab *new_pst = new_psymtab ("", objfile); + legacy_psymtab *new_pst = new_psymtab ("", objfile); fdr_to_pst[-1].pst = new_pst; FDR_IDX (new_pst) = -1; @@ -2447,7 +2428,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, (inefficient; assumes no side-effects result from ignoring ECOFF symbol) 3) create it, but lookup ELF's minimal symbol and use it's section - during relocation, then modify "uniqify" phase to merge and + during relocation, then modify "uniquify" phase to merge and eliminate the duplicate symbol (highly inefficient) @@ -2599,7 +2580,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, /* Pass 3 over files, over local syms: fill in static symbols. */ for (f_idx = 0; f_idx < hdr->ifdMax; f_idx++) { - struct partial_symtab *save_pst; + legacy_psymtab *save_pst; EXTR *ext_ptr; CORE_ADDR textlow; @@ -2617,9 +2598,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, textlow = fh->adr; else textlow = 0; - pst = start_psymtab_common (objfile, - fdr_name (fh), - textlow); + pst = new legacy_psymtab (fdr_name (fh), objfile, textlow); pst->read_symtab_private = XOBNEW (&objfile->objfile_obstack, symloc); memset (pst->read_symtab_private, 0, sizeof (struct symloc)); @@ -2631,7 +2610,8 @@ parse_partial_symbols (minimal_symbol_reader &reader, PENDING_LIST (pst) = pending_list; /* The way to turn this into a symtab is to call... */ - pst->read_symtab = mdebug_read_symtab; + pst->legacy_read_symtab = mdebug_read_symtab; + pst->legacy_expand_psymtab = mdebug_expand_psymtab; /* Set up language for the pst. The language from the FDR is used if it is unambigious (e.g. cfront @@ -2905,7 +2885,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, { /* Here if prev stab wasn't N_SO. */ if (pst) { - pst = (struct partial_symtab *) 0; + pst = (legacy_psymtab *) 0; includes_used = 0; dependencies_used = 0; } @@ -3053,8 +3033,9 @@ parse_partial_symbols (minimal_symbol_reader &reader, namestring = gdbarch_static_transform_name (gdbarch, namestring); - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_STATIC, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_STATIC, SECT_OFF_DATA (objfile), psymbol_placement::STATIC, sh.value, @@ -3064,8 +3045,9 @@ parse_partial_symbols (minimal_symbol_reader &reader, /* The addresses in these entries are reported to be wrong. See the code that reads 'G's for symtabs. */ - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_STATIC, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_STATIC, SECT_OFF_DATA (objfile), psymbol_placement::GLOBAL, sh.value, @@ -3083,21 +3065,20 @@ parse_partial_symbols (minimal_symbol_reader &reader, || (p == namestring + 1 && namestring[0] != ' ')) { - add_psymbol_to_list (namestring, p - namestring, 1, - STRUCT_DOMAIN, LOC_TYPEDEF, - -1, - psymbol_placement::STATIC, - 0, psymtab_language, objfile); + add_psymbol_to_list + (gdb::string_view (namestring, p - namestring), + true, STRUCT_DOMAIN, LOC_TYPEDEF, -1, + psymbol_placement::STATIC, 0, psymtab_language, + objfile); if (p[2] == 't') { /* Also a typedef with the same name. */ - add_psymbol_to_list (namestring, - p - namestring, 1, - VAR_DOMAIN, LOC_TYPEDEF, - -1, - psymbol_placement::STATIC, - 0, psymtab_language, - objfile); + add_psymbol_to_list + (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_TYPEDEF, -1, + psymbol_placement::STATIC, 0, + psymtab_language, objfile); p += 1; } } @@ -3106,11 +3087,12 @@ parse_partial_symbols (minimal_symbol_reader &reader, if (p != namestring) /* a name is there, not just :T... */ { - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_TYPEDEF, - -1, - psymbol_placement::STATIC, - 0, psymtab_language, objfile); + add_psymbol_to_list + (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_TYPEDEF, -1, + psymbol_placement::STATIC, 0, psymtab_language, + objfile); } check_enum: /* If this is an enumerated type, we need to add @@ -3171,9 +3153,10 @@ parse_partial_symbols (minimal_symbol_reader &reader, /* Note that the value doesn't matter for enum constants in psymtabs, just in symtabs. */ - add_psymbol_to_list (p, q - p, 1, - VAR_DOMAIN, LOC_CONST, - -1, + add_psymbol_to_list (gdb::string_view (p, + q - p), + true, VAR_DOMAIN, + LOC_CONST, -1, psymbol_placement::STATIC, 0, psymtab_language, objfile); @@ -3190,8 +3173,9 @@ parse_partial_symbols (minimal_symbol_reader &reader, continue; case 'c': /* Constant, e.g. from "const" in Pascal. */ - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_CONST, -1, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_CONST, -1, psymbol_placement::STATIC, 0, psymtab_language, objfile); continue; @@ -3203,8 +3187,9 @@ parse_partial_symbols (minimal_symbol_reader &reader, function_outside_compilation_unit_complaint (copy.c_str ()); } - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_BLOCK, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_BLOCK, SECT_OFF_TEXT (objfile), psymbol_placement::STATIC, sh.value, @@ -3222,8 +3207,9 @@ parse_partial_symbols (minimal_symbol_reader &reader, function_outside_compilation_unit_complaint (copy.c_str ()); } - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_BLOCK, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_BLOCK, SECT_OFF_TEXT (objfile), psymbol_placement::GLOBAL, sh.value, @@ -3289,7 +3275,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, if (pst && gdbarch_sofun_address_maybe_missing (gdbarch)) { - pst = (struct partial_symtab *) 0; + pst = (legacy_psymtab *) 0; includes_used = 0; dependencies_used = 0; } @@ -3447,7 +3433,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, /* Usually there is a local and a global stProc symbol for a function. This means that the function name - has already been entered into the mimimal symbol table + has already been entered into the minimal symbol table while processing the global symbols in pass 2 above. One notable exception is the PROGRAM name from f77 compiled executables, it is only put out as @@ -3457,13 +3443,13 @@ parse_partial_symbols (minimal_symbol_reader &reader, symbol table, and the MAIN__ symbol via the minimal symbol table. */ if (sh.st == stProc) - add_psymbol_to_list (sym_name, strlen (sym_name), 1, + add_psymbol_to_list (sym_name, true, VAR_DOMAIN, LOC_BLOCK, section, psymbol_placement::GLOBAL, sh.value, psymtab_language, objfile); else - add_psymbol_to_list (sym_name, strlen (sym_name), 1, + add_psymbol_to_list (sym_name, true, VAR_DOMAIN, LOC_BLOCK, section, psymbol_placement::STATIC, @@ -3530,7 +3516,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, && sh.iss != 0 && sh.index != cur_sdx + 2) { - add_psymbol_to_list (sym_name, strlen (sym_name), 1, + add_psymbol_to_list (sym_name, true, STRUCT_DOMAIN, LOC_TYPEDEF, -1, psymbol_placement::STATIC, 0, psymtab_language, objfile); @@ -3570,7 +3556,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, continue; } /* Use this gdb symbol. */ - add_psymbol_to_list (sym_name, strlen (sym_name), 1, + add_psymbol_to_list (sym_name, true, VAR_DOMAIN, theclass, section, psymbol_placement::STATIC, sh.value, psymtab_language, objfile); @@ -3590,9 +3576,8 @@ parse_partial_symbols (minimal_symbol_reader &reader, CORE_ADDR svalue; short section; - if (ext_ptr->ifd != f_idx) - internal_error (__FILE__, __LINE__, - _("failed internal consistency check")); + gdb_assert (ext_ptr->ifd == f_idx); + psh = &ext_ptr->asym; /* Do not add undefined symbols to the partial symbol table. */ @@ -3649,7 +3634,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, break; } char *sym_name = debug_info->ssext + psh->iss; - add_psymbol_to_list (sym_name, strlen (sym_name), 1, + add_psymbol_to_list (sym_name, true, VAR_DOMAIN, theclass, section, psymbol_placement::GLOBAL, @@ -3704,7 +3689,7 @@ parse_partial_symbols (minimal_symbol_reader &reader, fh = f_idx + debug_info->fdr; pst = fdr_to_pst[f_idx].pst; - if (pst == (struct partial_symtab *) NULL) + if (pst == NULL) continue; /* This should catch stabs-in-ecoff. */ @@ -3734,8 +3719,8 @@ parse_partial_symbols (minimal_symbol_reader &reader, if (rh == f_idx) continue; - /* Do not add to dependeny list if psymtab was empty. */ - if (fdr_to_pst[rh].pst == (struct partial_symtab *) NULL) + /* Do not add to dependency list if psymtab was empty. */ + if (fdr_to_pst[rh].pst == NULL) continue; pst->dependencies[pst->number_of_dependencies++] = fdr_to_pst[rh].pst; @@ -3744,12 +3729,12 @@ parse_partial_symbols (minimal_symbol_reader &reader, /* Remove the dummy psymtab created for -O3 images above, if it is still empty, to enable the detection of stripped executables. */ - pst = objfile->partial_symtabs->psymtabs; - if (pst->next == NULL - && pst->number_of_dependencies == 0 - && pst->n_global_syms == 0 - && pst->n_static_syms == 0) - objfile->partial_symtabs->psymtabs = NULL; + partial_symtab *pst_del = objfile->partial_symtabs->psymtabs; + if (pst_del->next == NULL + && pst_del->number_of_dependencies == 0 + && pst_del->n_global_syms == 0 + && pst_del->n_static_syms == 0) + objfile->partial_symtabs->discard_psymtab (pst_del); } /* If the current psymbol has an enumerated type, we need to add @@ -3812,7 +3797,7 @@ handle_psymbol_enumerators (struct objfile *objfile, FDR *fh, int stype, /* Note that the value doesn't matter for enum constants in psymtabs, just in symtabs. */ - add_psymbol_to_list (name, strlen (name), 1, + add_psymbol_to_list (name, true, VAR_DOMAIN, LOC_CONST, -1, psymbol_placement::STATIC, 0, psymtab_language, objfile); @@ -3847,8 +3832,7 @@ mdebug_next_symbol_text (struct objfile *objfile) The flow of control and even the memory allocation differs. FIXME. */ static void -psymtab_to_symtab_1 (struct objfile *objfile, - struct partial_symtab *pst, const char *filename) +mdebug_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile) { bfd_size_type external_sym_size; bfd_size_type external_pdr_size; @@ -3860,35 +3844,16 @@ psymtab_to_symtab_1 (struct objfile *objfile, struct linetable *lines; CORE_ADDR lowest_pdr_addr = 0; int last_symtab_ended = 0; - struct section_offsets *section_offsets = objfile->section_offsets; + const section_offsets §ion_offsets = objfile->section_offsets; if (pst->readin) return; - pst->readin = 1; + pst->readin = true; - /* Read in all partial symbtabs on which this one is dependent. + /* Read in all partial symtabs on which this one is dependent. NOTE that we do have circular dependencies, sigh. We solved that by setting pst->readin before this point. */ - - for (i = 0; i < pst->number_of_dependencies; i++) - if (!pst->dependencies[i]->readin) - { - /* Inform about additional files 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); - } - /* We only pass the filename for debug purposes. */ - psymtab_to_symtab_1 (objfile, pst->dependencies[i], - pst->dependencies[i]->filename); - } + pst->expand_dependencies (objfile); /* Do nothing if this is a dummy psymtab. */ @@ -3909,13 +3874,13 @@ psymtab_to_symtab_1 (struct objfile *objfile, mdebugread_objfile = objfile; cur_fd = FDR_IDX (pst); fh = ((cur_fd == -1) - ? (FDR *) NULL + ? NULL : debug_info->fdr + cur_fd); cur_fdr = fh; /* See comment in parse_partial_symbols about the @stabs sentinel. */ processing_gcc_compilation = 0; - if (fh != (FDR *) NULL && fh->csym >= 2) + if (fh != NULL && fh->csym >= 2) { SYMR sh; @@ -3934,7 +3899,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, if (processing_gcc_compilation != 0) { - struct gdbarch *gdbarch = get_objfile_arch (objfile); + struct gdbarch *gdbarch = objfile->arch (); /* This symbol table contains stabs-in-ecoff entries. */ @@ -3978,8 +3943,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, && previous_stab_code != (unsigned char) N_SO && *name == '\000') { - valu += ANOFFSET (section_offsets, - SECT_OFF_TEXT (objfile)); + valu += section_offsets[SECT_OFF_TEXT (objfile)]; previous_stab_code = N_SO; cust = end_symtab (valu, SECT_OFF_TEXT (objfile)); end_stabs (); @@ -4026,8 +3990,7 @@ psymtab_to_symtab_1 (struct objfile *objfile, else { /* Handle encoded stab line number. */ - valu += ANOFFSET (section_offsets, - SECT_OFF_TEXT (objfile)); + valu += section_offsets[SECT_OFF_TEXT (objfile)]; record_line (get_current_subfile (), sh.index, gdbarch_addr_bits_remove (gdbarch, valu)); } @@ -4425,7 +4388,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, *tpp = parse_type (xref_fd, debug_info->external_aux + fh->iauxBase, sh.index, - (int *) NULL, + NULL, fh->fBigendian, debug_info->ss + fh->issBase + sh.iss); add_pending (fh, esh, *tpp); @@ -4451,7 +4414,7 @@ cross_ref (int fd, union aux_ext *ax, struct type **tpp, *tpp = parse_type (xref_fd, debug_info->external_aux + fh->iauxBase, sh.index, - (int *) NULL, + NULL, fh->fBigendian, debug_info->ss + fh->issBase + sh.iss); } @@ -4486,10 +4449,10 @@ mylookup_symbol (const char *name, const struct block *block, inc = name[0]; ALL_BLOCK_SYMBOLS (block, iter, sym) { - if (SYMBOL_LINKAGE_NAME (sym)[0] == inc + if (sym->linkage_name ()[0] == inc && SYMBOL_DOMAIN (sym) == domain && SYMBOL_CLASS (sym) == theclass - && strcmp (SYMBOL_LINKAGE_NAME (sym), name) == 0) + && strcmp (sym->linkage_name (), name) == 0) return sym; } @@ -4565,17 +4528,16 @@ add_line (struct linetable *lt, int lineno, CORE_ADDR adr, int last) /* Blocks with a smaller low bound should come first. */ -static int -compare_blocks (const void *arg1, const void *arg2) +static bool +block_is_less_than (const struct block *b1, const struct block *b2) { - LONGEST addr_diff; - struct block **b1 = (struct block **) arg1; - struct block **b2 = (struct block **) arg2; - - addr_diff = (BLOCK_START ((*b1))) - (BLOCK_START ((*b2))); - if (addr_diff == 0) - return (BLOCK_END ((*b2))) - (BLOCK_END ((*b1))); - return addr_diff; + CORE_ADDR start1 = BLOCK_START (b1); + CORE_ADDR start2 = BLOCK_START (b2); + + if (start1 != start2) + return start1 < start2; + + return (BLOCK_END (b2)) < (BLOCK_END (b1)); } /* Sort the blocks of a symtab S. @@ -4605,10 +4567,9 @@ sort_blocks (struct symtab *s) * to detect -O3 images in advance. */ if (BLOCKVECTOR_NBLOCKS (bv) > FIRST_LOCAL_BLOCK + 1) - qsort (&BLOCKVECTOR_BLOCK (bv, FIRST_LOCAL_BLOCK), - BLOCKVECTOR_NBLOCKS (bv) - FIRST_LOCAL_BLOCK, - sizeof (struct block *), - compare_blocks); + std::sort (&BLOCKVECTOR_BLOCK (bv, FIRST_LOCAL_BLOCK), + &BLOCKVECTOR_BLOCK (bv, BLOCKVECTOR_NBLOCKS (bv)), + block_is_less_than); { CORE_ADDR high = 0; @@ -4663,12 +4624,12 @@ new_symtab (const char *name, int maxlines, struct objfile *objfile) /* Allocate a new partial_symtab NAME. */ -static struct partial_symtab * +static legacy_psymtab * new_psymtab (const char *name, struct objfile *objfile) { - struct partial_symtab *psymtab; + legacy_psymtab *psymtab; - psymtab = allocate_psymtab (name, objfile); + psymtab = new legacy_psymtab (name, objfile); /* Keep a backpointer to the file's symbols. */ @@ -4680,7 +4641,8 @@ new_psymtab (const char *name, struct objfile *objfile) PENDING_LIST (psymtab) = pending_list; /* The way to turn this into a symtab is to call... */ - psymtab->read_symtab = mdebug_read_symtab; + psymtab->legacy_read_symtab = mdebug_read_symtab; + psymtab->legacy_expand_psymtab = mdebug_expand_psymtab; return (psymtab); } @@ -4761,9 +4723,8 @@ new_symbol (const char *name) { struct symbol *s = allocate_symbol (mdebugread_objfile); - SYMBOL_SET_LANGUAGE (s, psymtab_language, - &mdebugread_objfile->objfile_obstack); - SYMBOL_SET_NAMES (s, name, strlen (name), 1, mdebugread_objfile); + s->set_language (psymtab_language, &mdebugread_objfile->objfile_obstack); + s->compute_and_set_names (name, true, mdebugread_objfile->per_bfd); return s; } @@ -4809,11 +4770,10 @@ elfmdebug_build_psymtabs (struct objfile *objfile, reader.install (); } +void _initialize_mdebugread (); void -_initialize_mdebugread (void) +_initialize_mdebugread () { - basic_type_data = register_objfile_data (); - mdebug_register_index = register_symbol_register_impl (LOC_REGISTER, &mdebug_register_funcs); mdebug_regparm_index