bfd_vma *sec_vma;
/* Number of sections whose VMA we must adjust. */
- unsigned int adjusted_section_count;
+ int adjusted_section_count;
/* Array of sections with adjusted VMA. */
struct adjusted_section *adjusted_sections;
if (ret == NULL)
{
ret = (struct info_hash_entry *) bfd_hash_allocate (table,
- sizeof (* ret));
+ sizeof (* ret));
if (ret == NULL)
return NULL;
}
return FALSE;
node = (struct info_list_node *) bfd_hash_allocate (&hash_table->base,
- sizeof (*node));
+ sizeof (*node));
if (!node)
return FALSE;
if (! msec)
{
section_name = sec->compressed_name;
- if (section_name != NULL)
- msec = bfd_get_section_by_name (abfd, section_name);
+ if (section_name != NULL)
+ msec = bfd_get_section_by_name (abfd, section_name);
}
if (! msec)
{
(*_bfd_error_handler) (_("Dwarf Error: Can't find %s section."),
- sec->uncompressed_name);
+ sec->uncompressed_name);
bfd_set_error (bfd_error_bad_value);
return FALSE;
}
*bytes_read_ptr = unit->offset_size;
if (! read_section (unit->abfd, &stash->debug_sections[debug_str],
- stash->syms, offset,
+ stash->syms, offset,
&stash->dwarf_str_buffer, &stash->dwarf_str_size))
return NULL;
}
/* Like read_indirect_string but uses a .debug_str located in
- an alternate filepointed to by the .gnu_debuglink section.
+ an alternate file pointed to by the .gnu_debugaltlink section.
Used to impement DW_FORM_GNU_strp_alt. */
static char *
bfd_size_type amt;
if (! read_section (abfd, &stash->debug_sections[debug_abbrev],
- stash->syms, offset,
+ stash->syms, offset,
&stash->dwarf_abbrev_buffer, &stash->dwarf_abbrev_size))
return NULL;
info->prev_line = table->lcl_head->prev_line;
table->lcl_head->prev_line = info;
if (address < seq->low_pc)
- seq->low_pc = address;
+ seq->low_pc = address;
}
return TRUE;
}
for (n = 1; n < table->num_sequences; n++)
{
if (sequences[n].low_pc < last_high_pc)
- {
+ {
if (sequences[n].last_line->address <= last_high_pc)
/* Skip nested entries. */
continue;
/* Trim overlapping entries. */
sequences[n].low_pc = last_high_pc;
- }
+ }
last_high_pc = sequences[n].last_line->address;
if (n > num_sequences)
- {
- /* Close up the gap. */
- sequences[num_sequences].low_pc = sequences[n].low_pc;
- sequences[num_sequences].last_line = sequences[n].last_line;
- }
+ {
+ /* Close up the gap. */
+ sequences[num_sequences].low_pc = sequences[n].low_pc;
+ sequences[num_sequences].last_line = sequences[n].last_line;
+ }
num_sequences++;
}
bfd_size_type amt;
if (! read_section (abfd, &stash->debug_sections[debug_line],
- stash->syms, unit->line_offset,
+ stash->syms, unit->line_offset,
&stash->dwarf_line_buffer, &stash->dwarf_line_size))
return NULL;
if (!add_line_info (table, address, op_index, filename,
line, column, discriminator, 0))
goto line_fail;
- discriminator = 0;
+ discriminator = 0;
if (address < low_pc)
low_pc = address;
if (address > high_pc)
if (!add_line_info (table, address, op_index, filename, line,
column, discriminator, end_sequence))
goto line_fail;
- discriminator = 0;
+ discriminator = 0;
if (address < low_pc)
low_pc = address;
if (address > high_pc)
break;
case DW_LNE_set_discriminator:
discriminator =
- read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
+ read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
line_ptr += bytes_read;
break;
case DW_LNE_HP_source_file_correlation:
if (!add_line_info (table, address, op_index,
filename, line, column, discriminator, 0))
goto line_fail;
- discriminator = 0;
+ discriminator = 0;
if (address < low_pc)
low_pc = address;
if (address > high_pc)
{
/* Note: seq->last_line should be a descendingly sorted list. */
for (each_line = seq->last_line;
- each_line;
- each_line = each_line->prev_line)
- if (addr >= each_line->address)
- break;
+ each_line;
+ each_line = each_line->prev_line)
+ if (addr >= each_line->address)
+ break;
if (each_line
- && !(each_line->end_sequence || each_line == seq->last_line))
- {
- *filename_ptr = each_line->filename;
- *linenumber_ptr = each_line->line;
- if (discriminator_ptr)
- *discriminator_ptr = each_line->discriminator;
- return seq->last_line->address - seq->low_pc;
- }
+ && !(each_line->end_sequence || each_line == seq->last_line))
+ {
+ *filename_ptr = each_line->filename;
+ *linenumber_ptr = each_line->line;
+ if (discriminator_ptr)
+ *discriminator_ptr = each_line->discriminator;
+ return seq->last_line->address - seq->low_pc;
+ }
}
*filename_ptr = NULL;
{
struct dwarf2_debug *stash = unit->stash;
return read_section (unit->abfd, &stash->debug_sections[debug_ranges],
- stash->syms, 0,
+ stash->syms, 0,
&stash->dwarf_ranges_buffer, &stash->dwarf_ranges_size);
}
static asection *
find_debug_info (bfd *abfd, const struct dwarf_debug_section *debug_sections,
- asection *after_sec)
+ asection *after_sec)
{
asection *msec;
const char *look;
return NULL;
}
+/* Transfer VMAs from object file to separate debug file. */
+
+static void
+set_debug_vma (bfd *orig_bfd, bfd *debug_bfd)
+{
+ asection *s, *d;
+
+ for (s = orig_bfd->sections, d = debug_bfd->sections;
+ s != NULL && d != NULL;
+ s = s->next, d = d->next)
+ {
+ if ((d->flags & SEC_DEBUGGING) != 0)
+ break;
+ /* ??? Assumes 1-1 correspondence between sections in the
+ two files. */
+ if (strcmp (s->name, d->name) == 0)
+ {
+ d->output_section = s->output_section;
+ d->output_offset = s->output_offset;
+ d->vma = s->vma;
+ }
+ }
+}
+
/* Unset vmas for adjusted sections in STASH. */
static void
unset_sections (struct dwarf2_debug *stash)
{
- unsigned int i;
+ int i;
struct adjusted_section *p;
i = stash->adjusted_section_count;
p->section->vma = 0;
}
-/* Set unique VMAs for loadable and DWARF sections in ABFD and save
- VMAs in STASH for unset_sections. */
+/* Set VMAs for allocated and .debug_info sections in ORIG_BFD, a
+ relocatable object file. VMAs are normally all zero in relocatable
+ object files, so if we want to distinguish locations in sections by
+ address we need to set VMAs so the sections do not overlap. We
+ also set VMA on .debug_info so that when we have multiple
+ .debug_info sections (or the linkonce variant) they also do not
+ overlap. The multiple .debug_info sections make up a single
+ logical section. ??? We should probably do the same for other
+ debug sections. */
static bfd_boolean
-place_sections (bfd *abfd, struct dwarf2_debug *stash)
+place_sections (bfd *orig_bfd, struct dwarf2_debug *stash)
{
+ bfd *abfd;
struct adjusted_section *p;
- unsigned int i;
+ int i;
+ const char *debug_info_name;
if (stash->adjusted_section_count != 0)
{
p = stash->adjusted_sections;
for (; i > 0; i--, p++)
p->section->vma = p->adj_vma;
+ return TRUE;
}
- else
+
+ debug_info_name = stash->debug_sections[debug_info].uncompressed_name;
+ i = 0;
+ abfd = orig_bfd;
+ while (1)
{
asection *sect;
- bfd_vma last_vma = 0, last_dwarf = 0;
- bfd_size_type amt;
- const char *debug_info_name;
- debug_info_name = stash->debug_sections[debug_info].uncompressed_name;
- i = 0;
for (sect = abfd->sections; sect != NULL; sect = sect->next)
{
- bfd_size_type sz;
int is_debug_info;
if ((sect->output_section != NULL
- && sect->output_section != sect)
+ && sect->output_section != sect
+ && (sect->flags & SEC_DEBUGGING) == 0)
|| sect->vma != 0)
continue;
- /* We need to adjust the VMAs of any .debug_info sections.
- Skip compressed ones, since no relocations could target
- them - they should not appear in object files anyway. */
- if (strcmp (sect->name, debug_info_name) == 0)
- is_debug_info = 1;
- else if (CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO))
- is_debug_info = 1;
- else
- is_debug_info = 0;
-
- if (!is_debug_info && (sect->flags & SEC_LOAD) == 0)
- continue;
+ is_debug_info = (strcmp (sect->name, debug_info_name) == 0
+ || CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO));
- sz = sect->rawsize ? sect->rawsize : sect->size;
- if (sz == 0)
+ if (!((sect->flags & SEC_ALLOC) != 0 && abfd == orig_bfd)
+ && !is_debug_info)
continue;
i++;
}
- if (i <= 1)
- return TRUE;
+ if (abfd == stash->bfd_ptr)
+ break;
+ abfd = stash->bfd_ptr;
+ }
+
+ if (i <= 1)
+ stash->adjusted_section_count = -1;
+ else
+ {
+ bfd_vma last_vma = 0, last_dwarf = 0;
+ bfd_size_type amt = i * sizeof (struct adjusted_section);
- amt = i * sizeof (struct adjusted_section);
- p = (struct adjusted_section *) bfd_alloc (abfd, amt);
- if (! p)
+ p = (struct adjusted_section *) bfd_malloc (amt);
+ if (p == NULL)
return FALSE;
stash->adjusted_sections = p;
stash->adjusted_section_count = i;
- for (sect = abfd->sections; sect != NULL; sect = sect->next)
+ abfd = orig_bfd;
+ while (1)
{
- bfd_size_type sz;
- int is_debug_info;
+ asection *sect;
- if ((sect->output_section != NULL
- && sect->output_section != sect)
- || sect->vma != 0)
- continue;
+ for (sect = abfd->sections; sect != NULL; sect = sect->next)
+ {
+ bfd_size_type sz;
+ int is_debug_info;
- /* We need to adjust the VMAs of any .debug_info sections.
- Skip compressed ones, since no relocations could target
- them - they should not appear in object files anyway. */
- if (strcmp (sect->name, debug_info_name) == 0)
- is_debug_info = 1;
- else if (CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO))
- is_debug_info = 1;
- else
- is_debug_info = 0;
+ if ((sect->output_section != NULL
+ && sect->output_section != sect
+ && (sect->flags & SEC_DEBUGGING) == 0)
+ || sect->vma != 0)
+ continue;
- if (!is_debug_info && (sect->flags & SEC_LOAD) == 0)
- continue;
+ is_debug_info = (strcmp (sect->name, debug_info_name) == 0
+ || CONST_STRNEQ (sect->name, GNU_LINKONCE_INFO));
- sz = sect->rawsize ? sect->rawsize : sect->size;
- if (sz == 0)
- continue;
+ if (!((sect->flags & SEC_ALLOC) != 0 && abfd == orig_bfd)
+ && !is_debug_info)
+ continue;
- p->section = sect;
- if (is_debug_info)
- {
- BFD_ASSERT (sect->alignment_power == 0);
- sect->vma = last_dwarf;
- last_dwarf += sz;
- }
- else if (last_vma != 0)
- {
- /* Align the new address to the current section
- alignment. */
- last_vma = ((last_vma
- + ~((bfd_vma) -1 << sect->alignment_power))
- & ((bfd_vma) -1 << sect->alignment_power));
- sect->vma = last_vma;
- last_vma += sect->vma + sz;
- }
- else
- last_vma += sect->vma + sz;
+ sz = sect->rawsize ? sect->rawsize : sect->size;
- p->adj_vma = sect->vma;
+ if (is_debug_info)
+ {
+ BFD_ASSERT (sect->alignment_power == 0);
+ sect->vma = last_dwarf;
+ last_dwarf += sz;
+ }
+ else
+ {
+ /* Align the new address to the current section
+ alignment. */
+ last_vma = ((last_vma
+ + ~((bfd_vma) -1 << sect->alignment_power))
+ & ((bfd_vma) -1 << sect->alignment_power));
+ sect->vma = last_vma;
+ last_vma += sz;
+ }
- p++;
+ p->section = sect;
+ p->adj_vma = sect->vma;
+ p++;
+ }
+ if (abfd == stash->bfd_ptr)
+ break;
+ abfd = stash->bfd_ptr;
}
}
+ if (orig_bfd != stash->bfd_ptr)
+ set_debug_vma (orig_bfd, stash->bfd_ptr);
+
return TRUE;
}
bfd_boolean
_bfd_dwarf2_slurp_debug_info (bfd *abfd, bfd *debug_bfd,
- const struct dwarf_debug_section *debug_sections,
- asymbol **symbols,
- void **pinfo)
+ const struct dwarf_debug_section *debug_sections,
+ asymbol **symbols,
+ void **pinfo,
+ bfd_boolean do_place)
{
bfd_size_type amt = sizeof (struct dwarf2_debug);
bfd_size_type total_size;
if (stash != NULL)
{
- if (stash->syms == symbols
- && section_vma_same (abfd, stash))
+ if (section_vma_same (abfd, stash))
return TRUE;
_bfd_dwarf2_cleanup_debug_info (abfd, pinfo);
memset (stash, 0, amt);
if ((debug_bfd = bfd_openr (debug_filename, NULL)) == NULL
|| ! bfd_check_format (debug_bfd, bfd_object)
|| (msec = find_debug_info (debug_bfd,
- debug_sections, NULL)) == NULL)
+ debug_sections, NULL)) == NULL
+ || !bfd_generic_link_read_symbols (debug_bfd))
{
if (debug_bfd)
bfd_close (debug_bfd);
free (debug_filename);
return FALSE;
}
+
+ symbols = bfd_get_outsymbols (debug_bfd);
+ stash->syms = symbols;
stash->close_on_cleanup = TRUE;
}
stash->bfd_ptr = debug_bfd;
+ if (do_place
+ && !place_sections (abfd, stash))
+ return FALSE;
+
/* There can be more than one DWARF2 info section in a BFD these
days. First handle the easy case when there's only one. If
there's more than one, try case two: none of the sections is
static bfd_boolean
find_line (bfd *abfd,
- const struct dwarf_debug_section *debug_sections,
+ const struct dwarf_debug_section *debug_sections,
asection *section,
bfd_vma offset,
asymbol *symbol,
if (discriminator_ptr)
*discriminator_ptr = 0;
- if (! _bfd_dwarf2_slurp_debug_info (abfd, NULL,
- debug_sections, symbols, pinfo))
+ if (! _bfd_dwarf2_slurp_debug_info (abfd, NULL, debug_sections,
+ symbols, pinfo,
+ (abfd->flags & (EXEC_P | DYNAMIC)) == 0))
return FALSE;
stash = (struct dwarf2_debug *) *pinfo;
- /* In a relocatable file, 2 functions may have the same address.
- We change the section vma so that they won't overlap. */
- if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
- {
- if (! place_sections (abfd, stash))
- return FALSE;
- }
-
do_line = (section == NULL
&& offset == 0
&& functionname_ptr == NULL
== stash->sec->size)
{
stash->sec = find_debug_info (stash->bfd_ptr, debug_sections,
- stash->sec);
+ stash->sec);
stash->sec_info_ptr = stash->info_ptr;
}
bfd_boolean
_bfd_dwarf2_find_nearest_line (bfd *abfd,
- const struct dwarf_debug_section *debug_sections,
+ const struct dwarf_debug_section *debug_sections,
asection *section,
asymbol **symbols,
bfd_vma offset,
const char **filename_ptr,
const char **functionname_ptr,
unsigned int *linenumber_ptr,
- unsigned int *discriminator_ptr,
+ unsigned int *discriminator_ptr,
unsigned int addr_size,
void **pinfo)
{
return find_line (abfd, debug_sections, section, offset, NULL, symbols,
- filename_ptr, functionname_ptr, linenumber_ptr,
- discriminator_ptr, addr_size, pinfo);
+ filename_ptr, functionname_ptr, linenumber_ptr,
+ discriminator_ptr, addr_size, pinfo);
}
/* The DWARF2 version of find_line.
asymbol *symbol,
const char **filename_ptr,
unsigned int *linenumber_ptr,
- unsigned int *discriminator_ptr,
+ unsigned int *discriminator_ptr,
unsigned int addr_size,
void **pinfo)
{
return find_line (abfd, dwarf_debug_sections, NULL, 0, symbol, symbols,
- filename_ptr, NULL, linenumber_ptr, discriminator_ptr,
- addr_size, pinfo);
+ filename_ptr, NULL, linenumber_ptr, discriminator_ptr,
+ addr_size, pinfo);
}
bfd_boolean
free (stash->alt_dwarf_info_buffer);
if (stash->sec_vma)
free (stash->sec_vma);
+ if (stash->adjusted_sections)
+ free (stash->adjusted_sections);
if (stash->alt_bfd_ptr)
bfd_close (stash->alt_bfd_ptr);
}
projects / deliverable / binutils-gdb.git / commitdiff
