/* 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"
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);
/* 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;
if (inclDepth == 0)
{
- complaint (&symfile_complaints, _("Mismatched C_BINCL/C_EINCL pair"));
+ complaint (_("Mismatched C_BINCL/C_EINCL pair"));
}
allocate_include_entry ();
/* 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)
{
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
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);
}
{
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;
#define complete_symtab(name, start_addr) { \
set_last_source_file (name); \
- last_source_start_addr = start_addr; \
+ set_last_source_start_addr (start_addr); \
}
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. */
}
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. */
/* { 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,
case C_UNTAG:
case C_ENTAG:
{
- complaint (&symfile_complaints,
- _("Unrecognized storage class %d."),
+ complaint (_("Unrecognized storage class %d."),
cs->c_sclass);
}
break;
}
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))));
}
- local_symbols = newobj->locals;
+ *get_local_symbols () = cstk.locals;
}
break;
SYMBOL_DUP (sym, sym2);
if (cs->c_sclass == C_EXT || C_WEAKEXT)
- add_symbol_to_list (sym2, &global_symbols);
+ 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
{
break;
default:
- complaint (&symfile_complaints, _("Unexpected storage class: %d"),
+ complaint (_("Unexpected storage class: %d"),
cs->c_sclass);
/* FALLTHROUGH */
if (symno < 0 || symno >= nsyms)
{
- complaint (&symfile_complaints, _("Invalid symbol offset"));
+ complaint (_("Invalid symbol offset"));
symbol->n_value = 0;
symbol->n_scnum = -1;
return;
{
/* Init stuff necessary for reading in symbols. */
stabsread_init ();
- buildsym_init ();
scoped_free_pendings free_pending;
read_xcoff_symtab (objfile, pst);
xcoff_new_init (struct objfile *objfile)
{
stabsread_new_init ();
- buildsym_new_init ();
}
/* Do initialization in preparation for reading symbols from OBJFILE.
inclTable = NULL;
}
inclIndx = inclLength = inclDepth = 0;
-
- dwarf2_free_objfile (objfile);
}
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);
}
default:
{
- complaint (&symfile_complaints,
- _("Storage class %d not recognized during scan"),
+ complaint (_("Storage class %d not recognized during scan"),
sclass);
}
/* FALLTHROUGH */
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. */
include N_SLINE. */
init_psymbol_list (objfile, num_symbols);
- free_pending_blocks ();
-
scoped_free_pendings free_pending;
minimal_symbol_reader reader (objfile);