/* dwarf2dbg.c - DWARF2 debug support
- Copyright (C) 1999, 2000 Free Software Foundation, Inc.
+ Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
Contributed by David Mosberger-Tang <davidm@hpl.hp.com>
This file is part of GAS, the GNU Assembler.
#ifdef HAVE_LIMITS_H
#include <limits.h>
#else
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
#ifndef INT_MAX
#define INT_MAX (int) (((unsigned) (-1)) >> 1)
#endif
static unsigned int files_in_use;
static unsigned int files_allocated;
-/* Correlate file numbers as given by the user in .file/.loc directives
- with the file numbers used in the output debug info. */
-static unsigned int *user_filenum;
-static unsigned int user_filenum_allocated;
-
/* True when we've seen a .loc directive recently. Used to avoid
doing work when there's nothing to do. */
static boolean loc_directive_seen;
if (i >= files_allocated)
{
+ unsigned int old = files_allocated;
+
files_allocated = i + 32;
files = (struct file_entry *)
xrealloc (files, (i + 32) * sizeof (struct file_entry));
+
+ memset (files + old, 0, (i + 32 - old) * sizeof (struct file_entry));
}
files[i].filename = xstrdup (filename);
int dummy ATTRIBUTE_UNUSED;
{
offsetT num;
- const char *filename;
+ char *filename;
int filename_len;
/* Continue to accept a bare string and pass it off. */
filename = demand_copy_C_string (&filename_len);
demand_empty_rest_of_line ();
- if (num < 0)
+ if (num < 1)
+ {
+ as_bad (_("File number less than one"));
+ return;
+ }
+
+ if (num < files_in_use && files[num].filename != 0)
{
- as_bad (_("File number less than zero"));
+ as_bad (_("File number %ld already allocated"), (long) num);
return;
}
- if (num >= (int) user_filenum_allocated)
+ if (num >= (int) files_allocated)
{
- unsigned int old = user_filenum_allocated;
+ unsigned int old = files_allocated;
- user_filenum_allocated = num + 16;
- user_filenum = (unsigned int *)
- xrealloc (user_filenum, (num + 16) * sizeof (unsigned int));
+ files_allocated = num + 16;
+ files = (struct file_entry *)
+ xrealloc (files, (num + 16) * sizeof (struct file_entry));
/* Zero the new memory. */
- memset (user_filenum + old, 0, (num + 16 - old) * sizeof (unsigned int));
+ memset (files + old, 0, (num + 16 - old) * sizeof (struct file_entry));
}
- user_filenum[num] = get_filenum (filename);
+ files[num].filename = filename;
+ files[num].dir = 0;
+ files_in_use = num + 1;
}
void
column = get_absolute_expression ();
demand_empty_rest_of_line ();
- if (filenum < 0)
+ if (filenum < 1)
{
- as_bad (_("File number less than zero"));
+ as_bad (_("File number less than one"));
return;
}
- if (filenum >= (int) user_filenum_allocated
- || user_filenum[filenum] == 0)
+ if (filenum >= (int) files_in_use || files[filenum].filename == 0)
{
as_bad (_("Unassigned file number %ld"), (long) filenum);
return;
}
- current.filenum = user_filenum[filenum];
+ current.filenum = filenum;
current.line = line;
current.column = column;
current.flags = DWARF2_FLAG_BEGIN_STMT;
{
offsetT addr_diff;
- addr_diff = resolve_symbol_value (frag->fr_symbol, 1);
+ addr_diff = resolve_symbol_value (frag->fr_symbol, finalize_syms);
/* fr_var carries the max_chars that we created the fragment with.
fr_subtype carries the current expected length. We must, of
changed = 1;
}
- if (line != e->loc.line || changed)
+ /* Don't try to optimize away redundant entries; gdb wants two
+ entries for a function where the code starts on the same line as
+ the {, and there's no way to identify that case here. Trust gcc
+ to optimize appropriately. */
+ if (1 /* line != e->loc.line || changed */)
{
int line_delta = e->loc.line - line;
if (frag == NULL)
for (i = 1; i < files_in_use; ++i)
{
+ if (files[i].filename == NULL)
+ {
+ as_bad (_("Unassigned file number %u"), i);
+ continue;
+ }
+
size = strlen (files[i].filename) + 1;
cp = frag_more (size);
memcpy (cp, files[i].filename, size);
out_abbrev (DW_AT_producer, DW_FORM_string);
out_abbrev (DW_AT_language, DW_FORM_data2);
out_abbrev (0, 0);
+
+ /* Terminate the abbreviations for this compilation unit. */
+ out_byte (0);
}
/* Emit a description of this compilation unit for .debug_info. */
return;
/* Calculate the size of an address for the target machine. */
-#ifdef BFD_ASSEMBLER
sizeof_address = bfd_arch_bits_per_address (stdoutput) / 8;
-#else
- /* FIXME. */
- sizeof_address = 4;
-#endif
/* Create and switch to the line number section. */
line_seg = subseg_new (".debug_line", 0);
-#ifdef BFD_ASSEMBLER
bfd_set_section_flags (stdoutput, line_seg, SEC_READONLY);
-#endif
/* For each subsection, chain the debug entries together. */
for (s = all_segs; s; s = s->next)
abbrev_seg = subseg_new (".debug_abbrev", 0);
aranges_seg = subseg_new (".debug_aranges", 0);
-#ifdef BFD_ASSEMBLER
bfd_set_section_flags (stdoutput, info_seg, SEC_READONLY);
bfd_set_section_flags (stdoutput, abbrev_seg, SEC_READONLY);
bfd_set_section_flags (stdoutput, aranges_seg, SEC_READONLY);
-#endif
record_alignment (aranges_seg, ffs (2 * sizeof_address) - 1);
dwarf2_directive_file (dummy)
int dummy ATTRIBUTE_UNUSED;
{
- as_fatal (_("dwarf2 is not supported for this object file format"));
+ s_app_file (0);
}
void
projects / deliverable / binutils-gdb.git / blobdiff