#include "aout/stab_gnu.h"
\f
-/* 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. */
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_symfile_info> 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. */
{
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";
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;
}
start_stabs ();
- start_symtab (objfile, "_globals_", (char *) NULL,
- (CORE_ADDR) 0, pst_symtab_language);
+ 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. */
/* Give all csects for this source file the same
name. */
start_symtab (objfile, filestring, NULL,
- (CORE_ADDR) 0, pst_symtab_language);
+ 0, pst_symtab_language);
record_debugformat (debugfmt);
}
filestring = cs->c_name;
start_stabs ();
- start_symtab (objfile, filestring, (char *) NULL, (CORE_ADDR) 0,
- pst_symtab_language);
+ start_symtab (objfile, filestring, NULL, 0, pst_symtab_language);
record_debugformat (debugfmt);
last_csect_name = 0;
#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. */
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)));
+ SYMBOL_SET_LINKAGE_NAME (sym, SYMNAME_ALLOC (name, symname_alloced));
SYMBOL_TYPE (sym) = objfile_type (objfile)->nodebug_text_symbol;
SYMBOL_ACLASS_INDEX (sym) = LOC_BLOCK;
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;
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;
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;
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;
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
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;
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 *));
}
/* 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;
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;
return l_nimpid - 1;
}
-/* Free the per-objfile xcoff data. */
-
-static void
-xcoff_free_info (struct objfile *objfile, void *arg)
-{
- xfree (arg);
-}
-
void
_initialize_xcoffread (void)
{
add_symtab_fns (bfd_target_xcoff_flavour, &xcoff_sym_fns);
-
- xcoff_objfile_data_key = register_objfile_data_with_cleanup (NULL,
- xcoff_free_info);
}
projects / external / binutils.git / blobdiff