remove remnants of old Mach-O workaround
I happened to run readelf on an ELF file created by Guile. readelf complained about invalid values for DW_FORM_strp. At first I assumed this was just a Guile bug, but eu-readelf did the right thing, so I looked a bit deeper. I came across some old Mach-O code to bias some offsets by section addresses. Guile, unlike many ELF writers, sets the address for the various DWARF-related sections, causing this unusual code to be run. This code came from an old commit: 2005-09-30 H.J. Lu <hongjiu.lu@intel.com> * dwarf.c (fetch_indirect_string): Adjust for section address. (process_debug_info): Likewise. (display_debug_loc): Likewise. (display_debug_ranges): Likewise. * objdump.c (mach_o_dwarf_sections): New. (generic_dwarf_sections): Likewise. (check_mach_o_dwarf): Likewise. (dump_dwarf): Call check_mach_o_dwarf. However it was partially reverted here: https://sourceware.org/ml/binutils/2008-11/msg00134.html This patch just completes the reversion. Built and regtested on x86-64 Fedora 18. I also ran the resulting readelf against the Guile-created object with success. I have no way of testing this on Mach-O, so your feedback is solicited. 2013-12-19 Tom Tromey <tromey@redhat.com> * dwarf.c (fetch_indirect_string): Don't bias by section address. (fetch_indexed_string): Likewise. (process_debug_info): Likewise. (display_debug_loc): Likewise. (display_debug_ranges): Likewise.
This commit is contained in:
parent
9373215cff
commit
d493b2839b
@ -1,3 +1,11 @@
|
||||
2013-12-19 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* dwarf.c (fetch_indirect_string): Don't bias by section address.
|
||||
(fetch_indexed_string): Likewise.
|
||||
(process_debug_info): Likewise.
|
||||
(display_debug_loc): Likewise.
|
||||
(display_debug_ranges): Likewise.
|
||||
|
||||
2013-12-13 Kuan-Lin Chen <kuanlinchentw@gmail.com>
|
||||
Wei-Cheng Wang <cole945@gmail.com>
|
||||
|
||||
|
@ -560,8 +560,6 @@ fetch_indirect_string (dwarf_vma offset)
|
||||
if (section->start == NULL)
|
||||
return (const unsigned char *) _("<no .debug_str section>");
|
||||
|
||||
/* DWARF sections under Mach-O have non-zero addresses. */
|
||||
offset -= section->address;
|
||||
if (offset > section->size)
|
||||
{
|
||||
warn (_("DW_FORM_strp offset too big: %s\n"),
|
||||
@ -587,8 +585,6 @@ fetch_indexed_string (dwarf_vma idx, struct cu_tu_set *this_set,
|
||||
return (dwo ? _("<no .debug_str_offsets.dwo section>")
|
||||
: _("<no .debug_str_offsets section>"));
|
||||
|
||||
/* DWARF sections under Mach-O have non-zero addresses. */
|
||||
index_offset -= index_section->address;
|
||||
if (this_set != NULL)
|
||||
index_offset += this_set->section_offsets [DW_SECT_STR_OFFSETS];
|
||||
if (index_offset > index_section->size)
|
||||
@ -2367,8 +2363,7 @@ process_debug_info (struct dwarf_section *section,
|
||||
|
||||
free_abbrevs ();
|
||||
|
||||
/* Process the abbrevs used by this compilation unit. DWARF
|
||||
sections under Mach-O have non-zero addresses. */
|
||||
/* Process the abbrevs used by this compilation unit. */
|
||||
if (compunit.cu_abbrev_offset >= abbrev_size)
|
||||
warn (_("Debug info is corrupted, abbrev offset (%lx) is larger than abbrev section size (%lx)\n"),
|
||||
(unsigned long) compunit.cu_abbrev_offset,
|
||||
@ -4431,9 +4426,8 @@ display_debug_loc (struct dwarf_section *section, void *file)
|
||||
if (!seen_first_offset)
|
||||
error (_("No location lists in .debug_info section!\n"));
|
||||
|
||||
/* DWARF sections under Mach-O have non-zero addresses. */
|
||||
if (debug_information [first].num_loc_offsets > 0
|
||||
&& debug_information [first].loc_offsets [0] != section->address)
|
||||
&& debug_information [first].loc_offsets [0] != 0)
|
||||
warn (_("Location lists in %s section start at 0x%s\n"),
|
||||
section->name,
|
||||
dwarf_vmatoa ("x", debug_information [first].loc_offsets [0]));
|
||||
@ -4468,8 +4462,7 @@ display_debug_loc (struct dwarf_section *section, void *file)
|
||||
== debug_information [i].loc_offsets [j])
|
||||
continue;
|
||||
has_frame_base = debug_information [i].have_frame_base [j];
|
||||
/* DWARF sections under Mach-O have non-zero addresses. */
|
||||
offset = debug_information [i].loc_offsets [j] - section->address;
|
||||
offset = debug_information [i].loc_offsets [j];
|
||||
next = section_begin + offset;
|
||||
base_address = debug_information [i].base_address;
|
||||
|
||||
@ -4877,8 +4870,7 @@ display_debug_ranges (struct dwarf_section *section,
|
||||
qsort (range_entries, num_range_list, sizeof (*range_entries),
|
||||
range_entry_compar);
|
||||
|
||||
/* DWARF sections under Mach-O have non-zero addresses. */
|
||||
if (dwarf_check != 0 && range_entries[0].ranges_offset != section->address)
|
||||
if (dwarf_check != 0 && range_entries[0].ranges_offset != 0)
|
||||
warn (_("Range lists in %s section start at 0x%lx\n"),
|
||||
section->name, range_entries[0].ranges_offset);
|
||||
|
||||
@ -4896,8 +4888,7 @@ display_debug_ranges (struct dwarf_section *section,
|
||||
|
||||
pointer_size = debug_info_p->pointer_size;
|
||||
|
||||
/* DWARF sections under Mach-O have non-zero addresses. */
|
||||
offset = range_entry->ranges_offset - section->address;
|
||||
offset = range_entry->ranges_offset;
|
||||
next = section_begin + offset;
|
||||
base_address = debug_info_p->base_address;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user