/* Read dbx symbol tables and convert to internal format, for GDB.
Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
- 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2009, 2010.
+ 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2008, 2009, 2010, 2011.
Free Software Foundation, Inc.
This file is part of GDB.
#include "target.h"
#include "gdbcore.h" /* for bfd stuff */
#include "libaout.h" /* FIXME Secret internal BFD stuff for a.out */
+#include "filenames.h"
#include "objfiles.h"
#include "buildsym.h"
#include "stabsread.h"
#include "gdb_string.h"
#include "aout/aout64.h"
-#include "aout/stab_gnu.h" /* We always use GNU stabs, not native, now */
+#include "aout/stab_gnu.h" /* We always use GNU stabs, not
+ native, now. */
\f
/* We put a pointer to this structure in the read_symtab_private field
#define FILE_STRING_OFFSET(p) (SYMLOC(p)->file_string_offset)
\f
-/* Remember what we deduced to be the source language of this psymtab. */
+/* The objfile we are currently reading. */
+
+static struct objfile *dbxread_objfile;
+
+/* Remember what we deduced to be the source language of this psymtab. */
static enum language psymtab_language = language_unknown;
static unsigned symbol_size;
-/* This is the offset of the symbol table in the executable file. */
+/* This is the offset of the symbol table in the executable file. */
static unsigned symbol_table_offset;
-/* This is the offset of the string table in the executable file. */
+/* This is the offset of the string table in the executable file. */
static unsigned string_table_offset;
into the string table. Instead, each .o file has a base offset in
the string table, and the associated symbols contain offsets from
this base. The following two variables contain the base offset for
- the current and next .o files. */
+ the current and next .o files. */
static unsigned int file_string_table_offset;
static unsigned int next_file_string_table_offset;
/* .o and NLM files contain unrelocated addresses which are based at
0. When non-zero, this flag disables some of the special cases for
- Solaris elf+stab text addresses at location 0. */
+ Solaris elf+stab text addresses at location 0. */
static int symfile_relocatable = 0;
repeated_header_complaint (const char *arg1, int arg2)
{
complaint (&symfile_complaints,
- _("\"repeated\" header file %s not previously seen, at symtab \
-pos %d"),
+ _("\"repeated\" header file %s not "
+ "previously seen, at symtab pos %d"),
arg1, arg2);
}
/* During initial symbol readin, we need to have a structure to keep
track of which psymtabs have which bincls in them. This structure
is used during readin to setup the list of dependencies within each
- partial symbol table. */
+ partial symbol table. */
struct header_file_location
{
char *name; /* Name of header file */
int instance; /* See above */
struct partial_symtab *pst; /* Partial symtab that has the
- BINCL/EINCL defs for this file */
+ BINCL/EINCL defs for this file. */
};
-/* The actual list and controling variables */
+/* The actual list and controling variables. */
static struct header_file_location *bincl_list, *next_bincl;
static int bincls_allocated;
-/* Local function prototypes */
+/* Local function prototypes. */
extern void _initialize_dbxread (void);
struct partial_symbol **,
struct partial_symbol **);
-/* Free up old header file tables */
+/* Free up old header file tables. */
void
free_header_files (void)
n_allocated_this_object_header_files = 0;
}
-/* Allocate new header file tables */
+/* Allocate new header file tables. */
void
init_header_files (void)
static void
add_old_header_file (char *name, int instance)
{
- struct header_file *p = HEADER_FILES (current_objfile);
+ struct header_file *p = HEADER_FILES (dbxread_objfile);
int i;
- for (i = 0; i < N_HEADER_FILES (current_objfile); i++)
- if (strcmp (p[i].name, name) == 0 && instance == p[i].instance)
+ for (i = 0; i < N_HEADER_FILES (dbxread_objfile); i++)
+ if (filename_cmp (p[i].name, name) == 0 && instance == p[i].instance)
{
add_this_object_header_file (i);
return;
/* Make sure there is room for one more header file. */
- i = N_ALLOCATED_HEADER_FILES (current_objfile);
+ i = N_ALLOCATED_HEADER_FILES (dbxread_objfile);
- if (N_HEADER_FILES (current_objfile) == i)
+ if (N_HEADER_FILES (dbxread_objfile) == i)
{
if (i == 0)
{
- N_ALLOCATED_HEADER_FILES (current_objfile) = 10;
- HEADER_FILES (current_objfile) = (struct header_file *)
+ N_ALLOCATED_HEADER_FILES (dbxread_objfile) = 10;
+ HEADER_FILES (dbxread_objfile) = (struct header_file *)
xmalloc (10 * sizeof (struct header_file));
}
else
{
i *= 2;
- N_ALLOCATED_HEADER_FILES (current_objfile) = i;
- HEADER_FILES (current_objfile) = (struct header_file *)
- xrealloc ((char *) HEADER_FILES (current_objfile),
+ N_ALLOCATED_HEADER_FILES (dbxread_objfile) = i;
+ HEADER_FILES (dbxread_objfile) = (struct header_file *)
+ xrealloc ((char *) HEADER_FILES (dbxread_objfile),
(i * sizeof (struct header_file)));
}
}
/* Create an entry for this header file. */
- i = N_HEADER_FILES (current_objfile)++;
- hfile = HEADER_FILES (current_objfile) + i;
+ i = N_HEADER_FILES (dbxread_objfile)++;
+ hfile = HEADER_FILES (dbxread_objfile) + i;
hfile->name = xstrdup (name);
hfile->instance = instance;
hfile->length = 10;
static struct type **
explicit_lookup_type (int real_filenum, int index)
{
- struct header_file *f = &HEADER_FILES (current_objfile)[real_filenum];
+ struct header_file *f = &HEADER_FILES (dbxread_objfile)[real_filenum];
if (index >= f->length)
{
/* Same with virtual function tables, both global and static. */
{
char *tempstring = name;
+
if (tempstring[0] == bfd_get_symbol_leading_char (objfile->obfd))
++tempstring;
if (is_vtable_name (tempstring))
init_minimal_symbol_collection ();
make_cleanup_discard_minimal_symbols ();
- /* Read stabs data from executable file and define symbols. */
+ /* Read stabs data from executable file and define symbols. */
read_dbx_symtab (objfile);
read_dbx_dynamic_symtab (objfile);
/* Install any minimal symbols that have been collected as the current
- minimal symbols for this objfile. */
+ minimal symbols for this objfile. */
install_minimal_symbols (objfile);
Since BFD doesn't know how to read debug symbols in a format-independent
way (and may never do so...), we have to do it ourselves. We will never
- be called unless this is an a.out (or very similar) file.
+ be called unless this is an a.out (or very similar) file.
FIXME, there should be a cleaner peephole into the BFD environment here. */
#define DBX_STRINGTAB_SIZE_SIZE sizeof(long) /* FIXME */
asection *text_sect;
unsigned char size_temp[DBX_STRINGTAB_SIZE_SIZE];
- /* Allocate struct to keep track of the symfile */
+ /* Allocate struct to keep track of the symfile. */
objfile->deprecated_sym_stab_info = (struct dbx_symfile_info *)
xmalloc (sizeof (struct dbx_symfile_info));
memset (objfile->deprecated_sym_stab_info, 0,
DBX_DATA_SECTION (objfile) = bfd_get_section_by_name (sym_bfd, ".data");
DBX_BSS_SECTION (objfile) = bfd_get_section_by_name (sym_bfd, ".bss");
- /* FIXME POKING INSIDE BFD DATA STRUCTURES */
+ /* FIXME POKING INSIDE BFD DATA STRUCTURES. */
#define STRING_TABLE_OFFSET (sym_bfd->origin + obj_str_filepos (sym_bfd))
#define SYMBOL_TABLE_OFFSET (sym_bfd->origin + obj_sym_filepos (sym_bfd))
- /* FIXME POKING INSIDE BFD DATA STRUCTURES */
+ /* FIXME POKING INSIDE BFD DATA STRUCTURES. */
DBX_SYMFILE_INFO (objfile)->stab_section_info = NULL;
however at least check to see if the size is less than the size of
the size field itself, or larger than the size of the entire file.
Note that all valid string tables have a size greater than zero, since
- the bytes used to hold the size are included in the count. */
+ the bytes used to hold the size are included in the count. */
if (STRING_TABLE_OFFSET == 0)
{
/* It appears that with the existing bfd code, STRING_TABLE_OFFSET
will never be zero, even when there is no string table. This
- would appear to be a bug in bfd. */
+ would appear to be a bug in bfd. */
DBX_STRINGTAB_SIZE (objfile) = 0;
DBX_STRINGTAB (objfile) = NULL;
}
{
/* With the existing bfd code, STRING_TABLE_OFFSET will be set to
EOF if there is no string table, and attempting to read the size
- from EOF will read zero bytes. */
+ from EOF will read zero bytes. */
DBX_STRINGTAB_SIZE (objfile) = 0;
DBX_STRINGTAB (objfile) = NULL;
}
the minimum is DBX_STRINGTAB_SIZE_SIZE. If we just read some
random data that happened to be at STRING_TABLE_OFFSET, because
bfd can't tell us there is no string table, the sanity checks may
- or may not catch this. */
+ or may not catch this. */
DBX_STRINGTAB_SIZE (objfile) = bfd_h_get_32 (sym_bfd, size_temp);
if (DBX_STRINGTAB_SIZE (objfile) < sizeof (size_temp)
/* Perform any local cleanups required when we are done with a particular
objfile. I.E, we are in the process of discarding all symbol information
for an objfile, freeing up all memory held for it, and unlinking the
- objfile struct from the global list of known objfiles. */
+ objfile struct from the global list of known objfiles. */
static void
dbx_symfile_finish (struct objfile *objfile)
if (symbuf_left <= 0)
{
file_ptr filepos = symbuf_sections->section->filepos;
+
if (bfd_seek (sym_bfd, filepos, SEEK_SET) != 0)
perror_with_name (bfd_get_filename (sym_bfd));
symbuf_left = bfd_section_size (sym_bfd, symbuf_sections->section);
if (next_bincl >= bincl_list + bincls_allocated)
{
int offset = next_bincl - bincl_list;
+
bincls_allocated *= 2;
bincl_list = (struct header_file_location *)
xrealloc ((char *) bincl_list,
>= DBX_STRINGTAB_SIZE (objfile)
|| nlist->n_strx + file_string_table_offset < nlist->n_strx)
{
- complaint (&symfile_complaints, _("bad string table offset in symbol %d"),
+ complaint (&symfile_complaints,
+ _("bad string table offset in symbol %d"),
symnum);
namestring = "<bad string table offset>";
}
{
arelent *rel = *relptr;
CORE_ADDR address =
- rel->address + ANOFFSET (objfile->section_offsets,
- SECT_OFF_DATA (objfile));
+ rel->address + ANOFFSET (objfile->section_offsets,
+ SECT_OFF_DATA (objfile));
switch (bfd_get_arch (abfd))
{
}
static CORE_ADDR
-find_stab_function_addr (char *namestring, char *filename,
+find_stab_function_addr (char *namestring, const char *filename,
struct objfile *objfile)
{
struct minimal_symbol *msym;
if (msym == NULL && filename != NULL)
{
- /* Try again without the filename. */
+ /* Try again without the filename. */
p[n] = 0;
msym = lookup_minimal_symbol (p, NULL, objfile);
}
if (msym == NULL && filename != NULL)
{
- /* And try again for Sun Fortran, but without the filename. */
+ /* And try again for Sun Fortran, but without the filename. */
p[n] = '_';
p[n + 1] = 0;
msym = lookup_minimal_symbol (p, NULL, objfile);
function_outside_compilation_unit_complaint (const char *arg1)
{
complaint (&symfile_complaints,
- _("function `%s' appears to be defined outside of all compilation \
-units"),
+ _("function `%s' appears to be defined "
+ "outside of all compilation units"),
arg1);
}
/* Setup partial_symtab's describing each source file for which
- debugging information is available. */
+ debugging information is available. */
static void
read_dbx_symtab (struct objfile *objfile)
{
struct gdbarch *gdbarch = get_objfile_arch (objfile);
- struct external_nlist *bufp = 0; /* =0 avoids gcc -Wall glitch */
+ struct external_nlist *bufp = 0; /* =0 avoids gcc -Wall glitch. */
struct internal_nlist nlist;
CORE_ADDR text_addr;
int text_size;
int textlow_not_set;
int data_sect_index;
- /* Current partial symtab */
+ /* Current partial symtab. */
struct partial_symtab *pst;
- /* List of current psymtab's include files */
+ /* List of current psymtab's include files. */
char **psymtab_include_list;
int includes_allocated;
int includes_used;
- /* Index within current psymtab dependency list */
+ /* Index within current psymtab dependency list. */
struct partial_symtab **dependency_list;
int dependencies_used, dependencies_allocated;
lowest_text_address = (CORE_ADDR) -1;
- symfile_bfd = objfile->obfd; /* For next_text_symbol */
+ symfile_bfd = objfile->obfd; /* For next_text_symbol. */
abfd = objfile->obfd;
symbuf_end = symbuf_idx = 0;
next_symbol_text_func = dbx_next_symbol_text;
for (symnum = 0; symnum < DBX_SYMCOUNT (objfile); symnum++)
{
- /* Get the symbol for this run and pull out some info */
- QUIT; /* allow this to be interruptable */
+ /* Get the symbol for this run and pull out some info. */
+ QUIT; /* Allow this to be interruptable. */
if (symbuf_idx == symbuf_end)
fill_symbuf (abfd);
bufp = &symbuf[symbuf_idx++];
*) The assignment to namestring.
*) The call to strchr.
- *) The addition of a partial symbol the the two partial
+ *) The addition of a partial symbol the two partial
symbol lists. This last is a large section of code, so
- I've imbedded it in the following macro.
- */
+ I've imbedded it in the following macro. */
switch (nlist.n_type)
{
nlist.n_type, objfile); /* Always */
continue;
- /* Standard, local, non-debugger, symbols */
+ /* Standard, local, non-debugger, symbols. */
case N_NBTEXT:
goto record_it;
case N_UNDF | N_EXT:
- if (nlist.n_value != 0)
- {
- /* This is a "Fortran COMMON" symbol. See if the target
- environment knows where it has been relocated to. */
-
- CORE_ADDR reladdr;
-
- namestring = set_namestring (objfile, &nlist);
- if (target_lookup_symbol (namestring, &reladdr))
- {
- continue; /* Error in lookup; ignore symbol for now. */
- }
- nlist.n_type ^= (N_BSS ^ N_UNDF); /* Define it as a bss-symbol */
- nlist.n_value = reladdr;
- goto bss_ext_symbol;
- }
- continue; /* Just undefined, not COMMON */
+ /* The case (nlist.n_value != 0) is a "Fortran COMMON" symbol.
+ We used to rely on the target to tell us whether it knows
+ where the symbol has been relocated to, but none of the
+ target implementations actually provided that operation.
+ So we just ignore the symbol, the same way we would do if
+ we had a target-side symbol lookup which returned no match.
+
+ All other symbols (with nlist.n_value == 0), are really
+ undefined, and so we ignore them too. */
+ continue;
case N_UNDF:
if (processing_acc_compilation && nlist.n_strx == 1)
case N_NBBSS:
continue;
- /* Keep going . . . */
+ /* Keep going . . . */
/*
* Special symbol types for GNU
CORE_ADDR valu;
static int prev_so_symnum = -10;
static int first_so_symnum;
- char *p;
+ const char *p;
static char *dirname_nso;
int prev_textlow_not_set;
prev_textlow_not_set = textlow_not_set;
/* A zero value is probably an indication for the SunPRO 3.0
- compiler. end_psymtab explicitly tests for zero, so
+ compiler. end_psymtab explicitly tests for zero, so
don't relocate it. */
if (nlist.n_value == 0
past_first_source_file = 1;
if (prev_so_symnum != symnum - 1)
- { /* Here if prev stab wasn't N_SO */
+ { /* Here if prev stab wasn't N_SO. */
first_so_symnum = symnum;
if (pst)
prev_so_symnum = symnum;
- /* End the current partial symtab and start a new one */
+ /* End the current partial symtab and start a new one. */
namestring = set_namestring (objfile, &nlist);
- /* Null name means end of .o file. Don't start a new one. */
+ /* Null name means end of .o file. Don't start a new one. */
if (*namestring == '\000')
continue;
/* Some compilers (including gcc) emit a pair of initial N_SOs.
The first one is a directory name; the second the file name.
If pst exists, is empty, and has a filename ending in '/',
- we assume the previous N_SO was a directory name. */
+ we assume the previous N_SO was a directory name. */
- p = strrchr (namestring, '/');
- if (p && *(p + 1) == '\000')
+ p = lbasename (namestring);
+ if (p != namestring && *p == '\000')
{
/* Save the directory name SOs locally, then save it into
- the psymtab when it's created below. */
+ the psymtab when it's created below. */
dirname_nso = namestring;
continue;
}
case N_BINCL:
{
enum language tmp_language;
+
/* Add this bincl to the bincl_list for future EXCLs. No
need to save the string; it'll be around until
- read_dbx_symtab function returns */
+ read_dbx_symtab function returns. */
namestring = set_namestring (objfile, &nlist);
tmp_language = deduce_language_from_filename (namestring);
/* FIXME: we should not get here without a PST to work on.
Attempt to recover. */
complaint (&symfile_complaints,
- _("N_BINCL %s not in entries for any file, at symtab \
-pos %d"),
+ _("N_BINCL %s not in entries for "
+ "any file, at symtab pos %d"),
namestring, symnum);
continue;
}
add_bincl_to_list (pst, namestring, nlist.n_value);
- /* Mark down an include file in the current psymtab */
+ /* Mark down an include file in the current psymtab. */
goto record_include_file;
}
case N_SOL:
{
enum language tmp_language;
- /* Mark down an include file in the current psymtab */
+ /* Mark down an include file in the current psymtab. */
namestring = set_namestring (objfile, &nlist);
tmp_language = deduce_language_from_filename (namestring);
/* In C++, one may expect the same filename to come round many
times, when code is coming alternately from the main file
- and from inline functions in other files. So I check to see
+ and from inline functions in other files. So I check to see
if this is a file we've seen before -- either the main
source file, or a previously included file.
things like "break c-exp.y:435" need to work (I
suppose the psymtab_include_list could be hashed or put
in a binary tree, if profiling shows this is a major hog). */
- if (pst && strcmp (namestring, pst->filename) == 0)
+ if (pst && filename_cmp (namestring, pst->filename) == 0)
continue;
{
int i;
+
for (i = 0; i < includes_used; i++)
- if (strcmp (namestring, psymtab_include_list[i]) == 0)
+ if (filename_cmp (namestring, psymtab_include_list[i]) == 0)
{
i = -1;
break;
}
continue;
}
- case N_LSYM: /* Typedef or automatic variable. */
- case N_STSYM: /* Data seg var -- static */
+ case N_LSYM: /* Typedef or automatic variable. */
+ case N_STSYM: /* Data seg var -- static. */
case N_LCSYM: /* BSS " */
case N_ROSYM: /* Read-only data seg var -- static. */
case N_NBSTS: /* Gould nobase. */
case N_PC: /* I may or may not need this; I
suspect not. */
- case N_M2C: /* I suspect that I can ignore this here. */
+ case N_M2C: /* I suspect that I can ignore this here. */
case N_SCOPE: /* Same. */
{
char *p;
p = (char *) strchr (namestring, ':');
if (!p)
- continue; /* Not a debugging symbol. */
+ continue; /* Not a debugging symbol. */
sym_len = 0;
sym_name = NULL; /* pacify "gcc -Werror" */
{
char *new_name, *name = xmalloc (p - namestring + 1);
memcpy (name, namestring, p - namestring);
+
name[p - namestring] = '\0';
new_name = cp_canonicalize_string (name);
if (new_name != NULL)
data_sect_index);
if (gdbarch_static_transform_name_p (gdbarch))
- namestring = gdbarch_static_transform_name (gdbarch,
- namestring);
+ gdbarch_static_transform_name (gdbarch, namestring);
add_psymbol_to_list (sym_name, sym_len, 1,
VAR_DOMAIN, LOC_STATIC,
nlist.n_value += ANOFFSET (objfile->section_offsets,
data_sect_index);
/* The addresses in these entries are reported to be
- wrong. See the code that reads 'G's for symtabs. */
+ wrong. See the code that reads 'G's for symtabs. */
add_psymbol_to_list (sym_name, sym_len, 1,
VAR_DOMAIN, LOC_STATIC,
&objfile->global_psymbols,
goto check_enum;
case 't':
- if (p != namestring) /* a name is there, not just :T... */
+ if (p != namestring) /* a name is there, not just :T... */
{
add_psymbol_to_list (sym_name, sym_len, 1,
VAR_DOMAIN, LOC_TYPEDEF,
{
int name_len = p - namestring;
char *name = xmalloc (name_len + 1);
+
memcpy (name, namestring, name_len);
name[name_len] = '\0';
function_outside_compilation_unit_complaint (name);
}
nlist.n_value += ANOFFSET (objfile->section_offsets,
SECT_OFF_TEXT (objfile));
- /* Kludges for ELF/STABS with Sun ACC */
+ /* Kludges for ELF/STABS with Sun ACC. */
last_function_name = namestring;
/* Do not fix textlow==0 for .o or NLM files, as 0 is a legit
- value for the bottom of the text seg in those cases. */
+ value for the bottom of the text seg in those cases. */
if (nlist.n_value == ANOFFSET (objfile->section_offsets,
SECT_OFF_TEXT (objfile))
&& gdbarch_sofun_address_maybe_missing (gdbarch))
find_stab_function_addr (namestring,
pst ? pst->filename : NULL,
objfile);
+
/* find_stab_function_addr will return 0 if the minimal
symbol wasn't found. (Unfortunately, this might also
be a valid address.) Anyway, if it *does* return 0,
it is likely that the value was set correctly to begin
- with... */
+ with... */
if (minsym_valu != 0)
nlist.n_value = minsym_valu;
}
{
int name_len = p - namestring;
char *name = xmalloc (name_len + 1);
+
memcpy (name, namestring, name_len);
name[name_len] = '\0';
function_outside_compilation_unit_complaint (name);
}
nlist.n_value += ANOFFSET (objfile->section_offsets,
SECT_OFF_TEXT (objfile));
- /* Kludges for ELF/STABS with Sun ACC */
+ /* Kludges for ELF/STABS with Sun ACC. */
last_function_name = namestring;
/* Do not fix textlow==0 for .o or NLM files, as 0 is a legit
- value for the bottom of the text seg in those cases. */
+ value for the bottom of the text seg in those cases. */
if (nlist.n_value == ANOFFSET (objfile->section_offsets,
SECT_OFF_TEXT (objfile))
&& gdbarch_sofun_address_maybe_missing (gdbarch))
find_stab_function_addr (namestring,
pst ? pst->filename : NULL,
objfile);
+
/* find_stab_function_addr will return 0 if the minimal
symbol wasn't found. (Unfortunately, this might also
be a valid address.) Anyway, if it *does* return 0,
it is likely that the value was set correctly to begin
- with... */
+ with... */
if (minsym_valu != 0)
nlist.n_value = minsym_valu;
}
case '8':
case '9':
case '-':
- case '#': /* for symbol identification (used in live ranges) */
+ case '#': /* For symbol identification (used in live ranges). */
continue;
case ':':
time searching to the end of every string looking for
a backslash. */
- complaint (&symfile_complaints, _("unknown symbol descriptor `%c'"),
+ complaint (&symfile_complaints,
+ _("unknown symbol descriptor `%c'"),
p[1]);
/* Ignore it; perhaps it is an extension that we don't
namestring = set_namestring (objfile, &nlist);
/* Find the corresponding bincl and mark that psymtab on the
- psymtab dependency list */
+ psymtab dependency list. */
{
struct partial_symtab *needed_pst =
find_corresponding_bincl_psymtab (namestring, nlist.n_value);
if (dependencies_used >= dependencies_allocated)
{
struct partial_symtab **orig = dependency_list;
+
dependency_list =
(struct partial_symtab **)
alloca ((dependencies_allocated *= 2)
* sizeof (struct partial_symtab *)));
#ifdef DEBUG_INFO
fprintf_unfiltered (gdb_stderr,
- "Had to reallocate dependency list.\n");
+ "Had to reallocate "
+ "dependency list.\n");
fprintf_unfiltered (gdb_stderr,
"New dependencies allocated: %d\n",
dependencies_allocated);
{
end_psymtab (pst, psymtab_include_list, includes_used,
symnum * symbol_size,
- (CORE_ADDR) 0,
- dependency_list, dependencies_used, textlow_not_set);
+ (CORE_ADDR) 0, dependency_list,
+ dependencies_used, textlow_not_set);
pst = (struct partial_symtab *) 0;
includes_used = 0;
dependencies_used = 0;
case N_BSLINE:
case N_SSYM: /* Claim: Structure or union element.
Hopefully, I can ignore this. */
- case N_ENTRY: /* Alternate entry point; can ignore. */
+ case N_ENTRY: /* Alternate entry point; can ignore. */
case N_MAIN: /* Can definitely ignore this. */
case N_CATCH: /* These are GNU C++ extensions */
- case N_EHDECL: /* that can safely be ignored here. */
+ case N_EHDECL: /* that can safely be ignored here. */
case N_LENG:
case N_BCOMM:
case N_ECOMM:
case N_DEFD: /* GNU Modula-2 */
case N_ALIAS: /* SunPro F77: alias name, ignore for now. */
- case N_OBJ: /* useless types from Solaris */
+ case N_OBJ: /* Useless types from Solaris. */
case N_OPT:
case N_PATCH:
- /* These symbols aren't interesting; don't worry about them */
-
+ /* These symbols aren't interesting; don't worry about them. */
continue;
default:
SYMFILE_NAME is the name of the symbol-file we are reading from, and ADDR
is the address relative to which its symbols are (incremental) or 0
- (normal). */
+ (normal). */
static struct partial_symtab *
start_psymtab (struct objfile *objfile, char *filename, CORE_ADDR textlow,
struct partial_symbol **static_syms)
{
struct partial_symtab *result =
- start_psymtab_common (objfile, objfile->section_offsets,
- filename, textlow, global_syms, static_syms);
+ start_psymtab_common (objfile, objfile->section_offsets,
+ filename, textlow, global_syms, static_syms);
result->read_symtab_private = obstack_alloc (&objfile->objfile_obstack,
sizeof (struct symloc));
elfstab_offset_sections (objfile, result);
#endif
- /* Deduce the source language from the filename for this psymtab. */
+ /* Deduce the source language from the filename for this psymtab. */
psymtab_language = deduce_language_from_filename (filename);
return result;
}
-/* Close off the current usage of PST.
+/* Close off the current usage of PST.
Returns PST or NULL if the partial symtab was empty and thrown away.
FIXME: List variables and peculiarities of same. */
if (!gdbarch_sofun_address_maybe_missing (gdbarch))
;
- /* this test will be true if the last .o file is only data */
+ /* This test will be true if the last .o file is only data. */
else if (textlow_not_set)
pst->textlow = pst->texthigh;
else
if (p1->texthigh == 0 && p1->textlow != 0 && p1 != pst)
{
p1->texthigh = pst->textlow;
- /* if this file has only data, then make textlow match texthigh */
+ /* If this file has only data, then make textlow match
+ texthigh. */
if (p1->textlow == 0)
p1->textlow = p1->texthigh;
}
for (i = 0; i < num_includes; i++)
{
struct partial_symtab *subpst =
- allocate_psymtab (include_list[i], objfile);
+ allocate_psymtab (include_list[i], objfile);
- /* Copy the sesction_offsets array from the main psymtab. */
+ /* Copy the sesction_offsets array from the main psymtab. */
subpst->section_offsets = pst->section_offsets;
subpst->read_symtab_private =
obstack_alloc (&objfile->objfile_obstack, sizeof (struct symloc));
if (pst->readin)
{
- fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. \
-Shouldn't happen.\n",
+ fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. "
+ "Shouldn't happen.\n",
pst->filename);
return;
}
- /* Read in all partial symtabs on which this one is dependent */
+ /* 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)
{
fputs_filtered ("and ", gdb_stdout);
wrap_here ("");
printf_filtered ("%s...", pst->dependencies[i]->filename);
- wrap_here (""); /* Flush output */
+ wrap_here (""); /* Flush output. */
gdb_flush (gdb_stdout);
}
dbx_psymtab_to_symtab_1 (pst->dependencies[i]);
}
- if (LDSYMLEN (pst)) /* Otherwise it's a dummy */
+ if (LDSYMLEN (pst)) /* Otherwise it's a dummy. */
{
/* Init stuff necessary for reading in symbols */
stabsread_init ();
file_string_table_offset = FILE_STRING_OFFSET (pst);
symbol_size = SYMBOL_SIZE (pst);
- /* Read in this file's symbols */
+ /* Read in this file's symbols. */
bfd_seek (pst->objfile->obfd, SYMBOL_OFFSET (pst), SEEK_SET);
read_ofile_symtab (pst);
if (pst->readin)
{
- fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. \
-Shouldn't happen.\n",
+ fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in. "
+ "Shouldn't happen.\n",
pst->filename);
return;
}
= symfile_relocate_debug_section (pst->objfile,
DBX_STAB_SECTION (pst->objfile),
NULL);
+
if (stabs_data)
back_to = make_cleanup (free_current_contents,
(void *) &stabs_data);
}
}
-/* Read in a defined section of a specific object file's symbols. */
+/* Read in a defined section of a specific object file's symbols. */
static void
read_ofile_symtab (struct partial_symtab *pst)
/* This cannot be simply objfile->section_offsets because of
elfstab_offset_sections() which initializes the psymtab section
offsets information in a special way, and that is different from
- objfile->section_offsets. */
+ objfile->section_offsets. */
section_offsets = pst->section_offsets;
- current_objfile = objfile;
+ dbxread_objfile = objfile;
subfile_stack = NULL;
stringtab_global = DBX_STRINGTAB (objfile);
last_source_file = NULL;
abfd = objfile->obfd;
- symfile_bfd = objfile->obfd; /* Implicit param to next_text_symbol */
+ symfile_bfd = objfile->obfd; /* Implicit param to next_text_symbol. */
symbuf_end = symbuf_idx = 0;
symbuf_read = 0;
symbuf_left = sym_offset + sym_size;
}
/* Try to select a C++ demangling based on the compilation unit
- producer. */
+ producer. */
#if 0
/* For now, stay with AUTO_DEMANGLING for g++ output, as we don't
symnum < max_symnum;
symnum++)
{
- QUIT; /* Allow this to be interruptable */
+ QUIT; /* Allow this to be interruptable. */
if (symbuf_idx == symbuf_end)
fill_symbuf (abfd);
bufp = &symbuf[symbuf_idx++];
namestring, section_offsets, objfile);
}
/* We skip checking for a new .o or -l file; that should never
- happen in this routine. */
+ happen in this routine. */
else if (type == N_TEXT)
{
/* I don't think this code will ever be executed, because
#endif
}
else if (type & N_EXT || type == (unsigned char) N_TEXT
- || type == (unsigned char) N_NBTEXT
- )
+ || type == (unsigned char) N_NBTEXT)
{
/* Global symbol: see if we came across a dbx defintion for
a corresponding symbol. If so, store the value. Remove
syms from the chain when their values are stored, but
search the whole chain, as there may be several syms from
- different files with the same name. */
+ different files with the same name. */
/* This is probably not true. Since the files will be read
in one at a time, each reference to a global symbol will
- be satisfied in each file as it appears. So we skip this
- section. */
+ be satisfied in each file as it appears. So we skip this
+ section. */
;
}
}
/* In a Solaris elf file, this variable, which comes from the
value of the N_SO symbol, will still be 0. Luckily, text_offset,
- which comes from pst->textlow is correct. */
+ which comes from pst->textlow is correct. */
if (last_source_start_addr == 0)
last_source_start_addr = text_offset;
end_stabs ();
- current_objfile = NULL;
+ dbxread_objfile = NULL;
}
\f
/* If this is nonzero, we've seen an N_SLINE since the start of the
current function. We use this to tell us to move the first sline
to the beginning of the function regardless of what its given
- value is. */
+ value is. */
static int sline_found_in_function = 1;
/* If this is nonzero, we've seen a non-gcc N_OPT symbol for this
if (sline_found_in_function)
{
CORE_ADDR addr = last_function_start + valu;
+
record_line (current_subfile, 0,
gdbarch_addr_bits_remove (gdbarch, addr));
}
N_SO, the linker did not relocate them (sigh). */
valu += last_source_start_addr;
- new = push_context (desc, valu);
+ push_context (desc, valu);
break;
case N_RBRAC:
2000 would output N_LSYM entries after N_LBRAC
entries. As a consequence, these symbols are simply
discarded. Complain if this is the case. */
- complaint (&symfile_complaints, _("\
-misplaced N_LBRAC entry; discarding local symbols which have \
-no enclosing block"));
+ complaint (&symfile_complaints,
+ _("misplaced N_LBRAC entry; discarding local "
+ "symbols which have no enclosing block"));
}
local_symbols = new->locals;
/* Check if previous symbol was also an N_SO (with some
sanity checks). If so, that one was actually the
directory name, and the current one is the real file
- name. Patch things up. */
+ name. Patch things up. */
if (previous_stab_code == (unsigned char) N_SO)
{
patch_subfile_names (current_subfile, name);
- break; /* Ignore repeated SOs */
+ break; /* Ignore repeated SOs. */
}
end_symtab (valu, objfile, SECT_OFF_TEXT (objfile));
end_stabs ();
{
CORE_ADDR addr = processing_gcc_compilation == 2 ?
last_function_start : valu;
+
record_line (current_subfile, desc,
gdbarch_addr_bits_remove (gdbarch, addr));
sline_found_in_function = 1;
{
int deftype;
char *colon_pos = strchr (name, ':');
+
if (colon_pos == NULL)
deftype = '\0';
else
objfile it is in; If there is more than one N_MAIN, choose
the one in the symfile_objfile; If there is more than one
N_MAIN within a given objfile, complain() and choose
- arbitrarily. (kingdon) */
+ arbitrarily. (kingdon) */
if (name != NULL)
set_main_name (name);
break;
Generally this is used so that an alias can refer to its main
symbol. */
+ gdb_assert (name);
if (name[0] == '#')
{
/* Initialize symbol reference names and determine if this is a
.stabstr section exists.
This routine is mostly copied from dbx_symfile_init and dbx_symfile_read,
- adjusted for coff details. */
+ adjusted for coff details. */
void
coffstab_build_psymtabs (struct objfile *objfile,
/* In a coff file, we've already installed the minimal symbols that came
from the coff (non-stab) symbol table, so always act like an
- incremental load here. */
+ incremental load here. */
if (stabsects->next == NULL)
{
stabsize = bfd_section_size (sym_bfd, stabsects->section);
.stabstr section exists.
This routine is mostly copied from dbx_symfile_init and dbx_symfile_read,
- adjusted for elf details. */
+ adjusted for elf details. */
void
elfstab_build_psymtabs (struct objfile *objfile, asection *stabsect,
bfd *sym_bfd = objfile->obfd;
char *name = bfd_get_filename (sym_bfd);
struct dbx_symfile_info *info;
- struct cleanup *back_to = NULL;
+ struct cleanup *back_to = make_cleanup (null_cleanup, NULL);
/* There is already a dbx_symfile_info allocated by our caller.
It might even contain some info from the ELF symtab to help us. */
symbuf_left = bfd_section_size (objfile->obfd, stabsect);
stabs_data = symfile_relocate_debug_section (objfile, stabsect, NULL);
if (stabs_data)
- back_to = make_cleanup (free_current_contents, (void *) &stabs_data);
+ make_cleanup (free_current_contents, (void *) &stabs_data);
/* In an elf file, we've already installed the minimal symbols that came
from the elf (non-stab) symbol table, so always act like an
case it does, it will install them itself. */
dbx_symfile_read (objfile, 0);
- if (back_to)
- do_cleanups (back_to);
+ do_cleanups (back_to);
}
\f
/* Scan and build partial symbols for a file with special sections for stabs
STAB_NAME is the name of the section that contains the stabs.
STABSTR_NAME is the name of the section that contains the stab strings.
- This routine is mostly copied from dbx_symfile_init and dbx_symfile_read. */
+ This routine is mostly copied from dbx_symfile_init and
+ dbx_symfile_read. */
void
stabsect_build_psymtabs (struct objfile *objfile, char *stab_name,
return;
if (!stabstrsect)
- error (_("stabsect_build_psymtabs: Found stabs (%s), but not string \
-section (%s)"),
+ error (_("stabsect_build_psymtabs: Found stabs (%s), "
+ "but not string section (%s)"),
stab_name, stabstr_name);
objfile->deprecated_sym_stab_info = (struct dbx_symfile_info *)
DBX_SYMCOUNT (objfile) = bfd_section_size (sym_bfd, stabsect)
/ DBX_SYMBOL_SIZE (objfile);
DBX_STRINGTAB_SIZE (objfile) = bfd_section_size (sym_bfd, stabstrsect);
- DBX_SYMTAB_OFFSET (objfile) = stabsect->filepos; /* XXX - FIXME: POKING INSIDE BFD DATA STRUCTURES */
+ DBX_SYMTAB_OFFSET (objfile) = stabsect->filepos; /* XXX - FIXME: POKING
+ INSIDE BFD DATA
+ STRUCTURES */
if (DBX_STRINGTAB_SIZE (objfile) > bfd_get_size (sym_bfd))
error (_("ridiculous string table size: %d bytes"),
DBX_STRINGTAB_SIZE (objfile));
DBX_STRINGTAB (objfile) = (char *)
- obstack_alloc (&objfile->objfile_obstack, DBX_STRINGTAB_SIZE (objfile) + 1);
+ obstack_alloc (&objfile->objfile_obstack,
+ DBX_STRINGTAB_SIZE (objfile) + 1);
OBJSTAT (objfile, sz_strtab += DBX_STRINGTAB_SIZE (objfile) + 1);
/* Now read in the string table in one big gulp. */
val = bfd_get_section_contents (sym_bfd, /* bfd */
stabstrsect, /* bfd section */
DBX_STRINGTAB (objfile), /* input buffer */
- 0, /* offset into section */
- DBX_STRINGTAB_SIZE (objfile)); /* amount to read */
+ 0, /* offset into section */
+ DBX_STRINGTAB_SIZE (objfile)); /* amount to
+ read */
if (!val)
perror_with_name (name);
free_header_files ();
init_header_files ();
- /* Now, do an incremental load */
+ /* Now, do an incremental load. */
processing_acc_compilation = 1;
dbx_symfile_read (objfile, 0);
}
\f
-static struct sym_fns aout_sym_fns =
+static const struct sym_fns aout_sym_fns =
{
bfd_target_aout_flavour,
- dbx_new_init, /* sym_new_init: init anything gbl to entire symtab */
- dbx_symfile_init, /* sym_init: read initial info, setup for sym_read() */
- dbx_symfile_read, /* sym_read: read a symbol file into symtab */
- dbx_symfile_finish, /* sym_finish: finished with file, cleanup */
- default_symfile_offsets, /* sym_offsets: parse user's offsets to
- internal form */
- default_symfile_segments, /* sym_segments: Get segment information from
- a file. */
- NULL, /* sym_read_linetable */
- default_symfile_relocate, /* sym_relocate: Relocate a debug section. */
- &psym_functions,
- NULL /* next: pointer to next struct sym_fns */
+ dbx_new_init, /* init anything gbl to entire symtab */
+ dbx_symfile_init, /* read initial info, setup for sym_read() */
+ dbx_symfile_read, /* read a symbol file into symtab */
+ NULL, /* sym_read_psymbols */
+ dbx_symfile_finish, /* finished with file, cleanup */
+ default_symfile_offsets, /* parse user's offsets to internal form */
+ default_symfile_segments, /* Get segment information from a file. */
+ NULL,
+ default_symfile_relocate, /* Relocate a debug section. */
+ &psym_functions
};
void
projects / external / binutils.git / blobdiff