X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fxcoffread.c;h=93bdb9b6a6567827205b2a1dfa7d376b2ec40371;hb=5a8b86270bbce5f9316ef7bdaa1a20b4832335ca;hp=d1122f420138f7762793ff984ce59864f8608016;hpb=61baf725eca99af2569262d10aca03dcde2698f6;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c index d1122f4201..93bdb9b6a6 100644 --- a/gdb/xcoffread.c +++ b/gdb/xcoffread.c @@ -1,5 +1,5 @@ /* Read AIX xcoff symbol tables and convert to internal format, for GDB. - Copyright (C) 1986-2017 Free Software Foundation, Inc. + Copyright (C) 1986-2020 Free Software Foundation, Inc. Derived from coffread.c, dbxread.c, and a lot of hacking. Contributed by IBM Corporation. @@ -28,6 +28,7 @@ #include #endif #include +#include #include "coff/internal.h" #include "libcoff.h" /* FIXME, internal data from BFD */ @@ -41,7 +42,7 @@ /* FIXME: ezannoni/2004-02-13 Verify if the include below is really needed. */ #include "symfile.h" #include "objfiles.h" -#include "buildsym.h" +#include "buildsym-legacy.h" #include "stabsread.h" #include "expression.h" #include "complaints.h" @@ -53,10 +54,6 @@ #include "aout/stab_gnu.h" -/* Key for XCOFF-associated data. */ - -static const struct objfile_data *xcoff_objfile_data_key; - /* We put a pointer to this structure in the read_symtab_private field of the psymtab. */ @@ -125,32 +122,35 @@ static CORE_ADDR first_object_file_end; static unsigned local_symesz; -struct coff_symfile_info +struct xcoff_symfile_info { - file_ptr min_lineno_offset; /* Where in file lowest line#s are. */ - file_ptr max_lineno_offset; /* 1+last byte of line#s in file. */ + file_ptr min_lineno_offset {}; /* Where in file lowest line#s are. */ + file_ptr max_lineno_offset {}; /* 1+last byte of line#s in file. */ /* Pointer to the string table. */ - char *strtbl; + char *strtbl = nullptr; /* Pointer to debug section. */ - char *debugsec; + char *debugsec = nullptr; /* Pointer to the a.out symbol table. */ - char *symtbl; + char *symtbl = nullptr; /* Number of symbols in symtbl. */ - int symtbl_num_syms; + int symtbl_num_syms = 0; /* Offset in data section to TOC anchor. */ - CORE_ADDR toc_offset; + CORE_ADDR toc_offset = 0; }; +/* Key for XCOFF-associated data. */ + +static const struct objfile_key xcoff_objfile_data_key; + /* Convenience macro to access the per-objfile XCOFF data. */ #define XCOFF_DATA(objfile) \ - ((struct coff_symfile_info *) objfile_data ((objfile), \ - xcoff_objfile_data_key)) + xcoff_objfile_data_key.get (objfile) /* XCOFF names for dwarf sections. There is no compressed sections. */ @@ -159,40 +159,43 @@ static const struct dwarf2_debug_sections dwarf2_xcoff_names = { { ".dwabrev", NULL }, { ".dwline", NULL }, { ".dwloc", NULL }, + { NULL, NULL }, /* debug_loclists */ /* AIX XCOFF defines one, named DWARF section for macro debug information. XLC does not generate debug_macinfo for DWARF4 and below. The section is assigned to debug_macro for DWARF5 and above. */ { NULL, NULL }, { ".dwmac", NULL }, { ".dwstr", NULL }, + { NULL, NULL }, /* debug_str_offsets */ + { NULL, NULL }, /* debug_line_str */ { ".dwrnges", NULL }, + { NULL, NULL }, /* debug_rnglists */ { ".dwpbtyp", NULL }, { NULL, NULL }, /* debug_addr */ { ".dwframe", NULL }, { NULL, NULL }, /* eh_frame */ { NULL, NULL }, /* gdb_index */ + { NULL, NULL }, /* debug_names */ + { NULL, NULL }, /* debug_aranges */ 23 }; static void bf_notfound_complaint (void) { - complaint (&symfile_complaints, - _("line numbers off, `.bf' symbol not found")); + complaint (_("line numbers off, `.bf' symbol not found")); } static void ef_complaint (int arg1) { - complaint (&symfile_complaints, - _("Mismatched .ef symbol ignored starting at symnum %d"), arg1); + complaint (_("Mismatched .ef symbol ignored starting at symnum %d"), arg1); } static void eb_complaint (int arg1) { - complaint (&symfile_complaints, - _("Mismatched .eb symbol ignored starting at symnum %d"), arg1); + complaint (_("Mismatched .eb symbol ignored starting at symnum %d"), arg1); } static void xcoff_initial_scan (struct objfile *, symfile_add_flags); @@ -200,7 +203,7 @@ static void xcoff_initial_scan (struct objfile *, symfile_add_flags); static void scan_xcoff_symtab (minimal_symbol_reader &, struct objfile *); -static char *xcoff_next_symbol_text (struct objfile *); +static const char *xcoff_next_symbol_text (struct objfile *); static void record_include_begin (struct coff_symbol *); @@ -227,14 +230,12 @@ static CORE_ADDR read_symbol_nvalue (int); static struct symbol *process_xcoff_symbol (struct coff_symbol *, struct objfile *); -static void read_xcoff_symtab (struct objfile *, struct partial_symtab *); +static void read_xcoff_symtab (struct objfile *, legacy_psymtab *); #if 0 static void add_stab_to_list (char *, struct pending_stabs **); #endif -static int compare_lte (const void *, const void *); - static struct linetable *arrange_linetable (struct linetable *); static void record_include_end (struct coff_symbol *); @@ -266,9 +267,9 @@ find_targ_sec (bfd *abfd, asection *sect, void *obj) if (sect->target_index == args->targ_index) { /* This is the section. Figure out what SECT_OFF_* code it is. */ - if (bfd_get_section_flags (abfd, sect) & SEC_CODE) + if (bfd_section_flags (sect) & SEC_CODE) *args->resultp = SECT_OFF_TEXT (objfile); - else if (bfd_get_section_flags (abfd, sect) & SEC_LOAD) + else if (bfd_section_flags (sect) & SEC_LOAD) *args->resultp = SECT_OFF_DATA (objfile); else *args->resultp = gdb_bfd_section_index (abfd, sect); @@ -406,18 +407,6 @@ add_stab_to_list (char *stabname, struct pending_stabs **stabvector) /* *INDENT-ON* */ - -/* compare line table entry addresses. */ - -static int -compare_lte (const void *lte1p, const void *lte2p) -{ - struct linetable_entry *lte1 = (struct linetable_entry *) lte1p; - struct linetable_entry *lte2 = (struct linetable_entry *) lte2p; - - return lte1->pc - lte2->pc; -} - /* Given a line table with function entries are marked, arrange its functions in ascending order and strip off function entry markers and return it in a newly created table. If the old one is good @@ -443,6 +432,9 @@ arrange_linetable (struct linetable *oldLineTb) for (function_count = 0, ii = 0; ii < oldLineTb->nitems; ++ii) { + if (oldLineTb->item[ii].is_stmt == 0) + continue; + if (oldLineTb->item[ii].line == 0) { /* Function entry found. */ if (function_count >= fentry_size) @@ -453,6 +445,7 @@ arrange_linetable (struct linetable *oldLineTb) fentry_size * sizeof (struct linetable_entry)); } fentry[function_count].line = ii; + fentry[function_count].is_stmt = 1; fentry[function_count].pc = oldLineTb->item[ii].pc; ++function_count; @@ -470,8 +463,9 @@ arrange_linetable (struct linetable *oldLineTb) return oldLineTb; } else if (function_count > 1) - qsort (fentry, function_count, - sizeof (struct linetable_entry), compare_lte); + std::sort (fentry, fentry + function_count, + [] (const linetable_entry <e1, const linetable_entry& lte2) + { return lte1.pc < lte2.pc; }); /* Allocate a new line table. */ newLineTb = (struct linetable *) @@ -553,7 +547,7 @@ record_include_begin (struct coff_symbol *cs) /* This can happen with old versions of GCC. GCC 2.3.3-930426 does not exhibit this on a test case which a user said produced the message for him. */ - complaint (&symfile_complaints, _("Nested C_BINCL symbols")); + complaint (_("Nested C_BINCL symbols")); } ++inclDepth; @@ -570,7 +564,7 @@ record_include_end (struct coff_symbol *cs) if (inclDepth == 0) { - complaint (&symfile_complaints, _("Mismatched C_BINCL/C_EINCL pair")); + complaint (_("Mismatched C_BINCL/C_EINCL pair")); } allocate_include_entry (); @@ -602,7 +596,7 @@ allocate_include_entry (void) /* Global variable to pass the psymtab down to all the routines involved in psymtab to symtab processing. */ -static struct partial_symtab *this_symtab_psymtab; +static legacy_psymtab *this_symtab_psymtab; /* Objfile related to this_symtab_psymtab; set at the same time. */ static struct objfile *this_symtab_objfile; @@ -711,6 +705,7 @@ process_linenos (CORE_ADDR start, CORE_ADDR end) /* Line numbers are not necessarily ordered. xlc compilation will put static function to the end. */ + struct subfile *current_subfile = get_current_subfile (); lineTb = arrange_linetable (lv); if (lv == lineTb) { @@ -768,13 +763,14 @@ process_linenos (CORE_ADDR start, CORE_ADDR end) /* Pick a fake name that will produce the same results as this one when passed to deduce_language_from_filename. Kludge on top of kludge. */ - char *fakename = strrchr (inclTable[ii].name, '.'); + const char *fakename = strrchr (inclTable[ii].name, '.'); if (fakename == NULL) fakename = " ?"; start_subfile (fakename); - xfree (current_subfile->name); + xfree (get_current_subfile ()->name); } + struct subfile *current_subfile = get_current_subfile (); current_subfile->name = xstrdup (inclTable[ii].name); #endif @@ -812,7 +808,7 @@ aix_process_linenos (struct objfile *objfile) return; /* Process line numbers and enter them into line vector. */ - process_linenos (last_source_start_addr, cur_src_end_addr); + process_linenos (get_last_source_start_addr (), cur_src_end_addr); } @@ -833,7 +829,7 @@ enter_line_range (struct subfile *subfile, unsigned beginoffset, CORE_ADDR endaddr, unsigned *firstLine) { struct objfile *objfile = this_symtab_objfile; - struct gdbarch *gdbarch = get_objfile_arch (objfile); + struct gdbarch *gdbarch = objfile->arch (); unsigned int curoffset; CORE_ADDR addr; void *ext_lnno; @@ -851,8 +847,7 @@ enter_line_range (struct subfile *subfile, unsigned beginoffset, { if (endoffset >= limit_offset) { - complaint (&symfile_complaints, - _("Bad line table offset in C_EINCL directive")); + complaint (_("Bad line table offset in C_EINCL directive")); return; } limit_offset = endoffset; @@ -874,7 +869,7 @@ enter_line_range (struct subfile *subfile, unsigned beginoffset, addr = (int_lnno.l_lnno ? int_lnno.l_addr.l_paddr : read_symbol_nvalue (int_lnno.l_addr.l_symndx)); - addr += ANOFFSET (objfile->section_offsets, SECT_OFF_TEXT (objfile)); + addr += objfile->text_section_offset (); if (addr < startaddr || (endaddr && addr >= endaddr)) return; @@ -899,7 +894,7 @@ enter_line_range (struct subfile *subfile, unsigned beginoffset, #define complete_symtab(name, start_addr) { \ set_last_source_file (name); \ - last_source_start_addr = start_addr; \ + set_last_source_start_addr (start_addr); \ } @@ -960,11 +955,11 @@ static char *raw_symbol; /* This is the function which stabsread.c calls to get symbol continuations. */ -static char * +static const char * xcoff_next_symbol_text (struct objfile *objfile) { struct internal_syment symbol; - char *retval; + const char *retval; /* FIXME: is this the same as the passed arg? */ if (this_symtab_objfile) @@ -973,7 +968,7 @@ xcoff_next_symbol_text (struct objfile *objfile) bfd_coff_swap_sym_in (objfile->obfd, raw_symbol, &symbol); if (symbol.n_zeroes) { - complaint (&symfile_complaints, _("Unexpected symbol continuation")); + complaint (_("Unexpected symbol continuation")); /* Return something which points to '\0' and hope the symbol reading code does something reasonable. */ @@ -987,7 +982,7 @@ xcoff_next_symbol_text (struct objfile *objfile) } else { - complaint (&symfile_complaints, _("Unexpected symbol continuation")); + complaint (_("Unexpected symbol continuation")); /* Return something which points to '\0' and hope the symbol reading code does something reasonable. */ @@ -999,11 +994,11 @@ xcoff_next_symbol_text (struct objfile *objfile) /* Read symbols for a given partial symbol table. */ static void -read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) +read_xcoff_symtab (struct objfile *objfile, legacy_psymtab *pst) { bfd *abfd = objfile->obfd; char *raw_auxptr; /* Pointer to first raw aux entry for sym. */ - struct coff_symfile_info *xcoff = XCOFF_DATA (objfile); + struct xcoff_symfile_info *xcoff = XCOFF_DATA (objfile); char *strtbl = xcoff->strtbl; char *debugsec = xcoff->debugsec; const char *debugfmt = bfd_xcoff_is_xcoff64 (abfd) ? "XCOFF64" : "XCOFF"; @@ -1019,6 +1014,7 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) int just_started = 1; int depth = 0; CORE_ADDR fcn_start_addr = 0; + enum language pst_symtab_language; struct coff_symbol fcn_stab_saved = { 0 }; @@ -1039,9 +1035,11 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) set_last_source_file (NULL); last_csect_name = 0; + pst_symtab_language = deduce_language_from_filename (filestring); start_stabs (); - start_symtab (objfile, filestring, (char *) NULL, file_start_addr); + start_symtab (objfile, filestring, NULL, file_start_addr, + pst_symtab_language); record_debugformat (debugfmt); symnum = ((struct symloc *) pst->read_symtab_private)->first_symnum; max_symnum = @@ -1134,14 +1132,15 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) } start_stabs (); - start_symtab (objfile, "_globals_", (char *) NULL, (CORE_ADDR) 0); + start_symtab (objfile, "_globals_", NULL, + 0, pst_symtab_language); record_debugformat (debugfmt); cur_src_end_addr = first_object_file_end; /* Done with all files, everything from here on is globals. */ } - if ((cs->c_sclass == C_EXT || cs->c_sclass == C_HIDEXT) - && cs->c_naux == 1) + if (cs->c_sclass == C_EXT || cs->c_sclass == C_HIDEXT || + cs->c_sclass == C_WEAKEXT) { /* Dealing with a symbol with a csect entry. */ @@ -1151,9 +1150,41 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) #define CSECT_SMTYP(PP) (SMTYP_SMTYP(CSECT(PP).x_smtyp)) #define CSECT_SCLAS(PP) (CSECT(PP).x_smclas) - /* Convert the auxent to something we can access. */ - bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass, - 0, cs->c_naux, &main_aux); + /* Convert the auxent to something we can access. + XCOFF can have more than one auxiliary entries. + + Actual functions will have two auxiliary entries, one to have the + function size and other to have the smtype/smclass (LD/PR). + + c_type value of main symbol table will be set only in case of + C_EXT/C_HIDEEXT/C_WEAKEXT storage class symbols. + Bit 10 of type is set if symbol is a function, ie the value is set + to 32(0x20). So we need to read the first function auxiliary entry + which contains the size. */ + if (cs->c_naux > 1 && ISFCN (cs->c_type)) + { + /* a function entry point. */ + + fcn_start_addr = cs->c_value; + + /* save the function header info, which will be used + when `.bf' is seen. */ + fcn_cs_saved = *cs; + + /* Convert the auxent to something we can access. */ + bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass, + 0, cs->c_naux, &fcn_aux_saved); + continue; + } + /* Read the csect auxiliary header, which is always the last by + convention. */ + bfd_coff_swap_aux_in (abfd, + raw_auxptr + + ((coff_data (abfd)->local_symesz) + * (cs->c_naux - 1)), + cs->c_type, cs->c_sclass, + cs->c_naux - 1, cs->c_naux, + &main_aux); switch (CSECT_SMTYP (&main_aux)) { @@ -1192,7 +1223,7 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) /* Give all csects for this source file the same name. */ start_symtab (objfile, filestring, NULL, - (CORE_ADDR) 0); + 0, pst_symtab_language); record_debugformat (debugfmt); } @@ -1206,8 +1237,7 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) } file_start_addr = - cs->c_value + ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); + cs->c_value + objfile->text_section_offset (); file_end_addr = file_start_addr + CSECT_LEN (&main_aux); if (cs->c_name && (cs->c_name[0] == '.' || cs->c_name[0] == '@')) @@ -1238,16 +1268,11 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) switch (CSECT_SCLAS (&main_aux)) { + /* We never really come to this part as this case has been + handled in ISFCN check above. + This and other cases of XTY_LD are kept just for + reference. */ case XMC_PR: - /* a function entry point. */ - function_entry_point: - - fcn_start_addr = cs->c_value; - - /* save the function header info, which will be used - when `.bf' is seen. */ - fcn_cs_saved = *cs; - fcn_aux_saved = main_aux; continue; case XMC_GL: @@ -1280,16 +1305,6 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) } } - /* If explicitly specified as a function, treat is as one. This check - evaluates to true for @FIX* bigtoc CSECT symbols, so it must occur - after the above CSECT check. */ - if (ISFCN (cs->c_type) && cs->c_sclass != C_TPDEF) - { - bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass, - 0, cs->c_naux, &main_aux); - goto function_entry_point; - } - switch (cs->c_sclass) { case C_FILE: @@ -1327,7 +1342,7 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) filestring = cs->c_name; start_stabs (); - start_symtab (objfile, filestring, (char *) NULL, (CORE_ADDR) 0); + start_symtab (objfile, filestring, NULL, 0, pst_symtab_language); record_debugformat (debugfmt); last_csect_name = 0; @@ -1344,8 +1359,7 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) case C_FCN: if (strcmp (cs->c_name, ".bf") == 0) { - CORE_ADDR off = ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); + CORE_ADDR off = objfile->text_section_offset (); bfd_coff_swap_aux_in (abfd, raw_auxptr, cs->c_type, cs->c_sclass, 0, cs->c_naux, &main_aux); @@ -1370,27 +1384,26 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) /* { main_aux.x_sym.x_misc.x_lnsz.x_lnno contains number of lines to '}' */ - if (context_stack_depth <= 0) + if (outermost_context_p ()) { /* We attempted to pop an empty context stack. */ ef_complaint (cs->c_symnum); within_function = 0; break; } - newobj = pop_context (); + struct context_stack cstk = pop_context (); /* Stack must be empty now. */ - if (context_stack_depth > 0 || newobj == NULL) + if (!outermost_context_p ()) { ef_complaint (cs->c_symnum); within_function = 0; break; } - finish_block (newobj->name, &local_symbols, newobj->old_blocks, - NULL, newobj->start_addr, + finish_block (cstk.name, cstk.old_blocks, + NULL, cstk.start_addr, (fcn_cs_saved.c_value + fcn_aux_saved.x_sym.x_misc.x_fsize - + ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)))); + + objfile->text_section_offset ())); within_function = 0; } break; @@ -1398,12 +1411,12 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) case C_BSTAT: /* Begin static block. */ { - struct internal_syment symbol; + struct internal_syment static_symbol; - read_symbol (&symbol, cs->c_value); - static_block_base = symbol.n_value; + read_symbol (&static_symbol, cs->c_value); + static_block_base = static_symbol.n_value; static_block_section = - secnum_to_section (symbol.n_scnum, objfile); + secnum_to_section (static_symbol.n_scnum, objfile); } break; @@ -1421,8 +1434,7 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) case C_UNTAG: case C_ENTAG: { - complaint (&symfile_complaints, - _("Unrecognized storage class %d."), + complaint (_("Unrecognized storage class %d."), cs->c_sclass); } break; @@ -1458,33 +1470,31 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) depth++; newobj = push_context (depth, (cs->c_value - + ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)))); + + objfile->text_section_offset ())); } else if (strcmp (cs->c_name, ".eb") == 0) { - if (context_stack_depth <= 0) + if (outermost_context_p ()) { /* We attempted to pop an empty context stack. */ eb_complaint (cs->c_symnum); break; } - newobj = pop_context (); - if (depth-- != newobj->depth) + struct context_stack cstk = pop_context (); + if (depth-- != cstk.depth) { eb_complaint (cs->c_symnum); break; } - if (local_symbols && context_stack_depth > 0) + if (*get_local_symbols () && !outermost_context_p ()) { /* Make a block for the local symbols within. */ - finish_block (newobj->name, &local_symbols, - newobj->old_blocks, NULL, - newobj->start_addr, + finish_block (cstk.name, + cstk.old_blocks, NULL, + cstk.start_addr, (cs->c_value - + ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)))); + + objfile->text_section_offset ())); } - local_symbols = newobj->locals; + *get_local_symbols () = cstk.locals; } break; @@ -1511,14 +1521,9 @@ read_xcoff_symtab (struct objfile *objfile, struct partial_symtab *pst) } } -#define SYMBOL_DUP(SYMBOL1, SYMBOL2) \ - (SYMBOL2) = XOBNEW (&objfile->objfile_obstack, struct symbol); \ - *(SYMBOL2) = *(SYMBOL1); - - #define SYMNAME_ALLOC(NAME, ALLOCED) \ - ((ALLOCED) ? (NAME) : obstack_copy0 (&objfile->objfile_obstack, \ - (NAME), strlen (NAME))) + ((ALLOCED) ? (NAME) : obstack_strdup (&objfile->objfile_obstack, \ + (NAME))) /* process one xcoff symbol. */ @@ -1544,17 +1549,15 @@ process_xcoff_symbol (struct coff_symbol *cs, struct objfile *objfile) else { sec = secnum_to_section (cs->c_secnum, objfile); - off = ANOFFSET (objfile->section_offsets, sec); + off = objfile->section_offsets[sec]; } name = cs->c_name; if (name[0] == '.') ++name; - initialize_objfile_symbol (sym); - /* default assumptions */ - SYMBOL_VALUE_ADDRESS (sym) = cs->c_value + off; + SET_SYMBOL_VALUE_ADDRESS (sym, cs->c_value + off); SYMBOL_DOMAIN (sym) = VAR_DOMAIN; SYMBOL_SECTION (sym) = secnum_to_section (cs->c_secnum, objfile); @@ -1564,17 +1567,16 @@ process_xcoff_symbol (struct coff_symbol *cs, struct objfile *objfile) will be patched with the type from its stab entry later on in patch_block_stabs (), unless the file was compiled without -g. */ - SYMBOL_SET_LINKAGE_NAME (sym, ((const char *) - SYMNAME_ALLOC (name, symname_alloced))); + sym->set_linkage_name (SYMNAME_ALLOC (name, symname_alloced)); SYMBOL_TYPE (sym) = objfile_type (objfile)->nodebug_text_symbol; SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK; - SYMBOL_DUP (sym, sym2); + sym2 = new (&objfile->objfile_obstack) symbol (*sym); - if (cs->c_sclass == C_EXT) - add_symbol_to_list (sym2, &global_symbols); + if (cs->c_sclass == C_EXT || C_WEAKEXT) + add_symbol_to_list (sym2, get_global_symbols ()); else if (cs->c_sclass == C_HIDEXT || cs->c_sclass == C_STAT) - add_symbol_to_list (sym2, &file_symbols); + add_symbol_to_list (sym2, get_file_symbols ()); } else { @@ -1607,7 +1609,7 @@ process_xcoff_symbol (struct coff_symbol *cs, struct objfile *objfile) break; default: - complaint (&symfile_complaints, _("Unexpected storage class: %d"), + complaint (_("Unexpected storage class: %d"), cs->c_sclass); /* FALLTHROUGH */ @@ -1648,12 +1650,13 @@ process_xcoff_symbol (struct coff_symbol *cs, struct objfile *objfile) if (*pp == 'V' && !within_function) *pp = 'S'; sym = define_symbol ((cs->c_value - + ANOFFSET (objfile->section_offsets, - static_block_section)), + + objfile->section_offsets[static_block_section]), cs->c_name, 0, 0, objfile); if (sym != NULL) { - SYMBOL_VALUE_ADDRESS (sym) += static_block_base; + SET_SYMBOL_VALUE_ADDRESS (sym, + SYMBOL_VALUE_ADDRESS (sym) + + static_block_base); SYMBOL_SECTION (sym) = static_block_section; } return sym; @@ -1686,13 +1689,13 @@ coff_getfilename (union internal_auxent *aux_entry, struct objfile *objfile) static void read_symbol (struct internal_syment *symbol, int symno) { - struct coff_symfile_info *xcoff = XCOFF_DATA (this_symtab_objfile); + struct xcoff_symfile_info *xcoff = XCOFF_DATA (this_symtab_objfile); int nsyms = xcoff->symtbl_num_syms; char *stbl = xcoff->symtbl; if (symno < 0 || symno >= nsyms) { - complaint (&symfile_complaints, _("Invalid symbol offset")); + complaint (_("Invalid symbol offset")); symbol->n_value = 0; symbol->n_scnum = -1; return; @@ -1723,7 +1726,7 @@ read_symbol_lineno (int symno) struct objfile *objfile = this_symtab_objfile; int xcoff64 = bfd_xcoff_is_xcoff64 (objfile->obfd); - struct coff_symfile_info *info = XCOFF_DATA (objfile); + struct xcoff_symfile_info *info = XCOFF_DATA (objfile); int nsyms = info->symtbl_num_syms; char *stbl = info->symtbl; char *strtbl = info->strtbl; @@ -1789,7 +1792,7 @@ gotit: static void find_linenos (struct bfd *abfd, struct bfd_section *asect, void *vpinfo) { - struct coff_symfile_info *info; + struct xcoff_symfile_info *info; int size, count; file_ptr offset, maxoff; @@ -1799,7 +1802,7 @@ find_linenos (struct bfd *abfd, struct bfd_section *asect, void *vpinfo) return; size = count * coff_data (abfd)->local_linesz; - info = (struct coff_symfile_info *) vpinfo; + info = (struct xcoff_symfile_info *) vpinfo; offset = asect->line_filepos; maxoff = offset + size; @@ -1811,91 +1814,43 @@ find_linenos (struct bfd *abfd, struct bfd_section *asect, void *vpinfo) } static void -xcoff_psymtab_to_symtab_1 (struct objfile *objfile, struct partial_symtab *pst) +xcoff_expand_psymtab (legacy_psymtab *pst, struct objfile *objfile) { - struct cleanup *old_chain; - int i; - - if (!pst) - return; - - 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); - } - xcoff_psymtab_to_symtab_1 (objfile, pst->dependencies[i]); - } + pst->expand_dependencies (objfile); if (((struct symloc *) pst->read_symtab_private)->numsyms != 0) { /* Init stuff necessary for reading in symbols. */ stabsread_init (); - buildsym_init (); - old_chain = make_cleanup (really_free_pendings, 0); + scoped_free_pendings free_pending; read_xcoff_symtab (objfile, pst); - - do_cleanups (old_chain); } - 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 -xcoff_read_symtab (struct partial_symtab *self, struct objfile *objfile) +xcoff_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 (((struct symloc *) self->read_symtab_private)->numsyms != 0 || 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 = xcoff_next_symbol_text; - xcoff_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"); } } @@ -1903,7 +1858,6 @@ static void xcoff_new_init (struct objfile *objfile) { stabsread_new_init (); - buildsym_new_init (); } /* Do initialization in preparation for reading symbols from OBJFILE. @@ -1915,11 +1869,8 @@ xcoff_new_init (struct objfile *objfile) static void xcoff_symfile_init (struct objfile *objfile) { - struct coff_symfile_info *xcoff; - /* Allocate struct to keep track of the symfile. */ - xcoff = XNEW (struct coff_symfile_info); - set_objfile_data (objfile, xcoff_objfile_data_key, xcoff); + xcoff_objfile_data_key.emplace (objfile); /* XCOFF objects may be reordered, so set OBJF_REORDERED. If we find this causes a significant slowdown in gdb then we could @@ -1942,8 +1893,6 @@ xcoff_symfile_finish (struct objfile *objfile) inclTable = NULL; } inclIndx = inclLength = inclDepth = 0; - - dwarf2_free_objfile (objfile); } @@ -1954,7 +1903,7 @@ init_stringtab (bfd *abfd, file_ptr offset, struct objfile *objfile) int val; unsigned char lengthbuf[4]; char *strtbl; - struct coff_symfile_info *xcoff = XCOFF_DATA (objfile); + struct xcoff_symfile_info *xcoff = XCOFF_DATA (objfile); xcoff->strtbl = NULL; @@ -2007,23 +1956,18 @@ static unsigned int first_fun_line_offset; is the address relative to which its symbols are (incremental) or 0 (normal). */ -static struct partial_symtab * +static legacy_psymtab * xcoff_start_psymtab (struct objfile *objfile, - const char *filename, int first_symnum, - struct partial_symbol **global_syms, - struct partial_symbol **static_syms) + const char *filename, int first_symnum) { - struct partial_symtab *result = - start_psymtab_common (objfile, - filename, - /* We fill in textlow later. */ - 0, - global_syms, static_syms); + /* We fill in textlow later. */ + legacy_psymtab *result = new legacy_psymtab (filename, objfile, 0); result->read_symtab_private = XOBNEW (&objfile->objfile_obstack, struct symloc); ((struct symloc *) result->read_symtab_private)->first_symnum = first_symnum; - result->read_symtab = xcoff_read_symtab; + result->legacy_read_symtab = xcoff_read_symtab; + result->legacy_expand_psymtab = xcoff_expand_psymtab; /* Deduce the source language from the filename for this psymtab. */ psymtab_language = deduce_language_from_filename (filename); @@ -2039,11 +1983,11 @@ xcoff_start_psymtab (struct objfile *objfile, INCLUDE_LIST, NUM_INCLUDES, DEPENDENCY_LIST, and NUMBER_DEPENDENCIES are the information for includes and dependencies. */ -static struct partial_symtab * -xcoff_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, +static legacy_psymtab * +xcoff_end_psymtab (struct objfile *objfile, legacy_psymtab *pst, const char **include_list, int num_includes, int capping_symbol_number, - struct partial_symtab **dependency_list, + legacy_psymtab **dependency_list, int number_dependencies, int textlow_not_set) { int i; @@ -2061,42 +2005,32 @@ xcoff_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, pst->number_of_dependencies = number_dependencies; if (number_dependencies) { - pst->dependencies = XOBNEWVEC (&objfile->objfile_obstack, - struct partial_symtab *, - number_dependencies); + 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 = obstack_alloc (&objfile->objfile_obstack, - sizeof (struct symloc)); + subpst->read_symtab_private = XOBNEW (&objfile->objfile_obstack, symloc); ((struct symloc *) subpst->read_symtab_private)->first_symnum = 0; ((struct symloc *) subpst->read_symtab_private)->numsyms = 0; - subpst->textlow = 0; - subpst->texthigh = 0; /* We could save slight bits of space by only making one of these, shared by the entire set of include files. FIXME-someday. */ subpst->dependencies = - XOBNEW (&objfile->objfile_obstack, struct partial_symtab *); + objfile->partial_symtabs->allocate_dependencies (1); subpst->dependencies[0] = pst; subpst->number_of_dependencies = 1; - subpst->globals_offset = - subpst->n_global_syms = - subpst->statics_offset = - subpst->n_static_syms = 0; - - subpst->readin = 0; - subpst->compunit_symtab = NULL; - 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 @@ -2109,7 +2043,7 @@ xcoff_end_psymtab (struct objfile *objfile, struct partial_symtab *pst, /* Empty psymtabs happen as a result of header files which don't have any symbols in them. There can be a lot of them. */ - discard_psymtab (objfile, pst); + objfile->partial_symtabs->discard_psymtab (pst); /* Indicate that psymtab was thrown away. */ pst = NULL; @@ -2171,8 +2105,7 @@ swap_sym (struct internal_syment *symbol, union internal_auxent *aux, static void function_outside_compilation_unit_complaint (const char *arg1) { - complaint (&symfile_complaints, - _("function `%s' appears to be defined " + complaint (_("function `%s' appears to be defined " "outside of all compilation units"), arg1); } @@ -2181,7 +2114,7 @@ static void scan_xcoff_symtab (minimal_symbol_reader &reader, struct objfile *objfile) { - struct gdbarch *gdbarch = get_objfile_arch (objfile); + struct gdbarch *gdbarch = objfile->arch (); CORE_ADDR toc_offset = 0; /* toc offset value in data section. */ const char *filestring = NULL; @@ -2191,7 +2124,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, unsigned int nsyms; /* Current partial symtab */ - struct partial_symtab *pst; + legacy_psymtab *pst; /* List of current psymtab's include files. */ const char **psymtab_include_list; @@ -2199,7 +2132,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, int includes_used; /* Index within current psymtab dependency list. */ - struct partial_symtab **dependency_list; + legacy_psymtab **dependency_list; int dependencies_used, dependencies_allocated; char *sraw_symbol; @@ -2213,7 +2146,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, int misc_func_recorded = 0; /* true if any misc. function. */ int textlow_not_set = 1; - pst = (struct partial_symtab *) 0; + pst = (legacy_psymtab *) 0; includes_allocated = 30; includes_used = 0; @@ -2223,8 +2156,8 @@ scan_xcoff_symtab (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); @@ -2247,6 +2180,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, { case C_EXT: case C_HIDEXT: + case C_WEAKEXT: { /* The CSECT auxent--always the last auxent. */ union internal_auxent csect_aux; @@ -2310,9 +2244,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, pst = xcoff_start_psymtab (objfile, filestring, - symnum_before, - objfile->global_psymbols.next, - objfile->static_psymbols.next); + symnum_before); } } /* Activate the misc_func_recorded mechanism for @@ -2330,10 +2262,11 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, CORE_ADDR highval = symbol.n_value + csect_aux.x_csect.x_scnlen.l; - if (highval > pst->texthigh) - pst->texthigh = highval; - if (pst->textlow == 0 || symbol.n_value < pst->textlow) - pst->textlow = symbol.n_value; + if (highval > pst->raw_text_high ()) + pst->set_text_high (highval); + if (!pst->text_low_valid + || symbol.n_value < pst->raw_text_low ()) + pst->set_text_low (symbol.n_value); } misc_func_recorded = 0; break; @@ -2358,7 +2291,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, section. */ bfd_sect = secnum_to_bfd_section (symbol.n_scnum, objfile); if (bfd_sect) - toc_offset -= bfd_section_vma (objfile->obfd, bfd_sect); + toc_offset -= bfd_section_vma (bfd_sect); break; case XMC_TC: @@ -2493,24 +2426,21 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, pst = xcoff_start_psymtab (objfile, filestring, - symnum_before, - objfile->global_psymbols.next, - objfile->static_psymbols.next); + symnum_before); last_csect_name = NULL; } break; default: { - complaint (&symfile_complaints, - _("Storage class %d not recognized during scan"), + complaint (_("Storage class %d not recognized during scan"), sclass); } /* FALLTHROUGH */ + case C_FCN: /* C_FCN is .bf and .ef symbols. I think it is sufficient to handle only the C_FUN and C_EXT. */ - case C_FCN: case C_BSTAT: case C_ESTAT: @@ -2647,28 +2577,27 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, switch (p[1]) { case 'S': - symbol.n_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_DATA (objfile)); - if (gdbarch_static_transform_name_p (gdbarch)) namestring = gdbarch_static_transform_name (gdbarch, namestring); - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_STATIC, - &objfile->static_psymbols, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_STATIC, + SECT_OFF_DATA (objfile), + psymbol_placement::STATIC, symbol.n_value, psymtab_language, objfile); continue; case 'G': - symbol.n_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_DATA (objfile)); /* The addresses in these entries are reported to be wrong. See the code that reads 'G's for symtabs. */ - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_STATIC, - &objfile->global_psymbols, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_STATIC, + SECT_OFF_DATA (objfile), + psymbol_placement::GLOBAL, symbol.n_value, psymtab_language, objfile); continue; @@ -2684,16 +2613,18 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, || (p == namestring + 1 && namestring[0] != ' ')) { - add_psymbol_to_list (namestring, p - namestring, 1, - STRUCT_DOMAIN, LOC_TYPEDEF, - &objfile->static_psymbols, + 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, - &objfile->static_psymbols, + 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; } @@ -2703,9 +2634,10 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, case 't': if (p != namestring) /* a name is there, not just :T... */ { - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_TYPEDEF, - &objfile->static_psymbols, + 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: @@ -2765,9 +2697,9 @@ scan_xcoff_symtab (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, - &objfile->static_psymbols, + add_psymbol_to_list (gdb::string_view (p, q - p), true, + VAR_DOMAIN, LOC_CONST, -1, + psymbol_placement::STATIC, 0, psymtab_language, objfile); /* Point past the name. */ p = q; @@ -2783,9 +2715,10 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, case 'c': /* Constant, e.g. from "const" in Pascal. */ - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_CONST, - &objfile->static_psymbols, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_CONST, -1, + psymbol_placement::STATIC, 0, psymtab_language, objfile); continue; @@ -2800,11 +2733,11 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, function_outside_compilation_unit_complaint (name); xfree (name); } - symbol.n_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_BLOCK, - &objfile->static_psymbols, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_BLOCK, + SECT_OFF_TEXT (objfile), + psymbol_placement::STATIC, symbol.n_value, psymtab_language, objfile); continue; @@ -2831,11 +2764,11 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, if (startswith (namestring, "@FIX")) continue; - symbol.n_value += ANOFFSET (objfile->section_offsets, - SECT_OFF_TEXT (objfile)); - add_psymbol_to_list (namestring, p - namestring, 1, - VAR_DOMAIN, LOC_BLOCK, - &objfile->global_psymbols, + add_psymbol_to_list (gdb::string_view (namestring, + p - namestring), + true, VAR_DOMAIN, LOC_BLOCK, + SECT_OFF_TEXT (objfile), + psymbol_placement::GLOBAL, symbol.n_value, psymtab_language, objfile); continue; @@ -2879,8 +2812,7 @@ scan_xcoff_symtab (minimal_symbol_reader &reader, the end of every string looking for a backslash. */ - complaint (&symfile_complaints, - _("unknown symbol descriptor `%c'"), p[1]); + complaint (_("unknown symbol descriptor `%c'"), p[1]); /* Ignore it; perhaps it is an extension that we don't know about. */ @@ -2929,11 +2861,10 @@ xcoff_initial_scan (struct objfile *objfile, symfile_add_flags symfile_flags) { bfd *abfd; int val; - struct cleanup *back_to; int num_symbols; /* # of symbols */ file_ptr symtab_offset; /* symbol table and */ file_ptr stringtab_offset; /* string table file offsets */ - struct coff_symfile_info *info; + struct xcoff_symfile_info *info; const char *name; unsigned int size; @@ -2955,31 +2886,33 @@ xcoff_initial_scan (struct objfile *objfile, symfile_add_flags symfile_flags) /* Read the string table. */ init_stringtab (abfd, stringtab_offset, objfile); - /* Read the .debug section, if present. */ - { - struct bfd_section *secp; - bfd_size_type length; - bfd_byte *debugsec = NULL; + /* Read the .debug section, if present and if we're not ignoring + it. */ + if (!(objfile->flags & OBJF_READNEVER)) + { + struct bfd_section *secp; + bfd_size_type length; + bfd_byte *debugsec = NULL; - secp = bfd_get_section_by_name (abfd, ".debug"); - if (secp) - { - length = bfd_section_size (abfd, secp); - if (length) - { - debugsec - = (bfd_byte *) obstack_alloc (&objfile->objfile_obstack, - length); + secp = bfd_get_section_by_name (abfd, ".debug"); + if (secp) + { + length = bfd_section_size (secp); + if (length) + { + debugsec + = (bfd_byte *) obstack_alloc (&objfile->objfile_obstack, + length); - if (!bfd_get_full_section_contents (abfd, secp, &debugsec)) - { - error (_("Error reading .debug section of `%s': %s"), - name, bfd_errmsg (bfd_get_error ())); - } - } - } - info->debugsec = (char *) debugsec; - } + if (!bfd_get_full_section_contents (abfd, secp, &debugsec)) + { + error (_("Error reading .debug section of `%s': %s"), + name, bfd_errmsg (bfd_get_error ())); + } + } + } + info->debugsec = (char *) debugsec; + } } /* Read the symbols. We keep them in core because we will want to @@ -2996,17 +2929,13 @@ xcoff_initial_scan (struct objfile *objfile, symfile_add_flags symfile_flags) if (val != size) perror_with_name (_("reading symbol table")); - /* If we are reinitializing, or if we have never loaded syms yet, init. */ - if (objfile->global_psymbols.size == 0 && objfile->static_psymbols.size == 0) - /* I'm not sure how how good num_symbols is; the rule of thumb in - init_psymbol_list was developed for a.out. On the one hand, - num_symbols includes auxents. On the other hand, it doesn't - include N_SLINE. */ - init_psymbol_list (objfile, num_symbols); - - free_pending_blocks (); - back_to = make_cleanup (really_free_pendings, 0); + /* I'm not sure how how good num_symbols is; the rule of thumb in + init_psymbol_list was developed for a.out. On the one hand, + num_symbols includes auxents. On the other hand, it doesn't + include N_SLINE. */ + init_psymbol_list (objfile, num_symbols); + scoped_free_pendings free_pending; minimal_symbol_reader reader (objfile); /* Now that the symbol table data of the executable file are all in core, @@ -3025,13 +2954,11 @@ xcoff_initial_scan (struct objfile *objfile, symfile_add_flags symfile_flags) dwarf2_build_psymtabs (objfile); dwarf2_build_frame_info (objfile); - - do_cleanups (back_to); } static void xcoff_symfile_offsets (struct objfile *objfile, - const struct section_addr_info *addrs) + const section_addr_info &addrs) { const char *first_section_name; @@ -3044,11 +2971,10 @@ xcoff_symfile_offsets (struct objfile *objfile, us to test whether the associated section exists or not, and then access it quickly (without searching it again). */ - if (objfile->num_sections == 0) + if (objfile->section_offsets.empty ()) return; /* Is that even possible? Better safe than sorry. */ - first_section_name - = bfd_section_name (objfile->obfd, objfile->sections[0].the_bfd_section); + first_section_name = bfd_section_name (objfile->sections[0].the_bfd_section); if (objfile->sect_index_text == 0 && strcmp (first_section_name, ".text") != 0) @@ -3107,7 +3033,7 @@ xcoff_get_core_n_import_files (bfd *abfd) if (sect == NULL) return -1; /* Not a core file. */ - for (offset = 0; offset < bfd_get_section_size (sect);) + for (offset = 0; offset < bfd_section_size (sect);) { int next; @@ -3155,22 +3081,9 @@ xcoff_get_n_import_files (bfd *abfd) return l_nimpid - 1; } -/* Free the per-objfile xcoff data. */ - -static void -xcoff_free_info (struct objfile *objfile, void *arg) -{ - xfree (arg); -} - -/* Provide a prototype to silence -Wmissing-prototypes. */ -extern initialize_file_ftype _initialize_xcoffread; - +void _initialize_xcoffread (); void -_initialize_xcoffread (void) +_initialize_xcoffread () { add_symtab_fns (bfd_target_xcoff_flavour, &xcoff_sym_fns); - - xcoff_objfile_data_key = register_objfile_data_with_cleanup (NULL, - xcoff_free_info); }