aboutsummaryrefslogtreecommitdiff
path: root/binutils/dwarf.c
diff options
context:
space:
mode:
Diffstat (limited to 'binutils/dwarf.c')
-rw-r--r--binutils/dwarf.c191
1 files changed, 105 insertions, 86 deletions
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index 8e004ce..8806cde 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -489,7 +489,7 @@ process_extended_line_op (unsigned char * data,
printf (_("set Discriminator to %" PRIu64 "\n"), val);
break;
- /* HP extensions. */
+ /* HP extensions. */
case DW_LNE_HP_negate_is_UV_update:
printf ("DW_LNE_HP_negate_is_UV_update\n");
break;
@@ -753,7 +753,7 @@ fetch_indexed_offset (uint64_t idx,
offset_of_offset, section->name);
return -1;
}
-
+
return base_address + byte_get (section->start + offset_of_offset, offset_size);
}
@@ -1053,7 +1053,7 @@ find_and_process_abbrev_set (struct dwarf_section *section,
/* PR 17531: file:4bcd9ce9. */
warn (_("Debug info is corrupted, abbrev size (%#" PRIx64 ")"
" is larger than abbrev section size (%#" PRIx64 ")\n"),
- abbrev_base + abbrev_size, section->size);
+ abbrev_base + abbrev_size, section->size);
return NULL;
}
if (abbrev_offset >= abbrev_size)
@@ -1577,8 +1577,8 @@ decode_location_expression (unsigned char * data,
/* PR 17531: file: 0cc9cd00. */
if (uvalue > (size_t) (end - data))
uvalue = end - data;
- printf ("%s: (", (op == DW_OP_entry_value ? "DW_OP_entry_value"
- : "DW_OP_GNU_entry_value"));
+ printf ("%s: (", (op == DW_OP_entry_value
+ ? "DW_OP_entry_value" : "DW_OP_GNU_entry_value"));
if (decode_location_expression (data, pointer_size, offset_size,
dwarf_version, uvalue,
cu_offset, section))
@@ -1590,8 +1590,8 @@ decode_location_expression (unsigned char * data,
case DW_OP_GNU_const_type:
READ_ULEB (uvalue, data, end);
printf ("%s: <%#" PRIx64 "> ",
- (op == DW_OP_const_type ? "DW_OP_const_type"
- : "DW_OP_GNU_const_type"),
+ (op == DW_OP_const_type
+ ? "DW_OP_const_type" : "DW_OP_GNU_const_type"),
cu_offset + uvalue);
SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
data = display_block (data, uvalue, end, ' ');
@@ -1600,8 +1600,8 @@ decode_location_expression (unsigned char * data,
case DW_OP_GNU_regval_type:
READ_ULEB (uvalue, data, end);
printf ("%s: %" PRIu64 " (%s)",
- (op == DW_OP_regval_type ? "DW_OP_regval_type"
- : "DW_OP_GNU_regval_type"),
+ (op == DW_OP_regval_type
+ ? "DW_OP_regval_type" : "DW_OP_GNU_regval_type"),
uvalue, regname (uvalue, 1));
READ_ULEB (uvalue, data, end);
printf (" <%#" PRIx64 ">", cu_offset + uvalue);
@@ -1610,8 +1610,8 @@ decode_location_expression (unsigned char * data,
case DW_OP_GNU_deref_type:
SAFE_BYTE_GET_AND_INC (uvalue, data, 1, end);
printf ("%s: %" PRId64,
- (op == DW_OP_deref_type ? "DW_OP_deref_type"
- : "DW_OP_GNU_deref_type"),
+ (op == DW_OP_deref_type
+ ? "DW_OP_deref_type" : "DW_OP_GNU_deref_type"),
uvalue);
READ_ULEB (uvalue, data, end);
printf (" <%#" PRIx64 ">", cu_offset + uvalue);
@@ -1627,8 +1627,8 @@ decode_location_expression (unsigned char * data,
case DW_OP_GNU_reinterpret:
READ_ULEB (uvalue, data, end);
printf ("%s <%#" PRIx64 ">",
- (op == DW_OP_reinterpret ? "DW_OP_reinterpret"
- : "DW_OP_GNU_reinterpret"),
+ (op == DW_OP_reinterpret
+ ? "DW_OP_reinterpret" : "DW_OP_GNU_reinterpret"),
uvalue ? cu_offset + uvalue : uvalue);
break;
case DW_OP_GNU_parameter_ref:
@@ -3617,17 +3617,17 @@ skip_attribute (unsigned long form,
case DW_FORM_flag:
case DW_FORM_data1:
case DW_FORM_strx1:
- case DW_FORM_addrx1:
+ case DW_FORM_addrx1:
inc = 1;
break;
case DW_FORM_ref2:
case DW_FORM_data2:
case DW_FORM_strx2:
- case DW_FORM_addrx2:
+ case DW_FORM_addrx2:
inc = 2;
break;
case DW_FORM_strx3:
- case DW_FORM_addrx3:
+ case DW_FORM_addrx3:
inc = 3;
break;
case DW_FORM_ref_sup4:
@@ -3643,7 +3643,7 @@ skip_attribute (unsigned long form,
case DW_FORM_ref_sig8:
inc = 8;
break;
- case DW_FORM_data16:
+ case DW_FORM_data16:
inc = 16;
break;
case DW_FORM_sdata:
@@ -3807,13 +3807,11 @@ process_debug_info (struct dwarf_section * section,
}
if ((do_loc || do_debug_loc || do_debug_ranges || do_debug_info)
- && num_debug_info_entries == 0
- && ! do_types)
+ && alloc_num_debug_info_entries == 0
+ && !do_types)
{
-
/* Then allocate an array to hold the information. */
- debug_information = (debug_info *) cmalloc (num_units,
- sizeof (* debug_information));
+ debug_information = cmalloc (num_units, sizeof (*debug_information));
if (debug_information == NULL)
{
error (_("Not enough memory for a debug info array of %u entries\n"),
@@ -4242,15 +4240,15 @@ process_debug_info (struct dwarf_section * section,
break;
case DW_TAG_subprogram:
need_base_address = 0;
- if (level <= frame_base_level)
- /* Don't reset that for nested subprogram. */
- have_frame_base = 0;
+ if (level <= frame_base_level)
+ /* Don't reset that for nested subprogram. */
+ have_frame_base = 0;
break;
}
- debug_info *debug_info_p =
- (debug_information && unit < alloc_num_debug_info_entries)
- ? debug_information + unit : NULL;
+ debug_info *debug_info_p = ((debug_information
+ && unit < alloc_num_debug_info_entries)
+ ? debug_information + unit : NULL);
assert (!debug_info_p
|| (debug_info_p->num_loc_offsets
@@ -4332,7 +4330,7 @@ process_debug_info (struct dwarf_section * section,
default:
assert (0);
- }
+ }
if (entry->children)
++level;
@@ -7326,7 +7324,7 @@ display_debug_loc (struct dwarf_section *section, void *file)
unsigned int *array = NULL;
const char *suffix = strrchr (section->name, '.');
bool is_dwo = false;
- int is_loclists = strstr (section->name, "debug_loclists") != NULL;
+ bool is_loclists = strstr (section->name, "debug_loclists") != NULL;
uint64_t next_header_offset = 0;
if (suffix && strcmp (suffix, ".dwo") == 0)
@@ -7416,8 +7414,7 @@ display_debug_loc (struct dwarf_section *section, void *file)
for (; j < num; j++)
{
- if (last_offset >
- debug_information [i].loc_offsets [j]
+ if (last_offset > debug_information [i].loc_offsets [j]
|| (last_offset == debug_information [i].loc_offsets [j]
&& last_view > debug_information [i].loc_views [j]))
{
@@ -7450,9 +7447,18 @@ display_debug_loc (struct dwarf_section *section, void *file)
uint64_t base_address;
unsigned int k;
int has_frame_base;
- debug_info *debug_info_p = debug_information + i;
- uint32_t offset_count;
-
+ debug_info *debug_info_p = debug_information + i;
+ uint32_t offset_count;
+
+ /* .debug_loclists section is loaded into debug_information as
+ DWARF-5 debug info and .debug_loc section is loaded into
+ debug_information as pre-DWARF-5 debug info. When dumping
+ .debug_loc section, we should only process pre-DWARF-5 debug
+ info in debug_information. When dumping .debug_loclists
+ section, we should only process DWARF-5 info in
+ debug_information. */
+ if ((debug_info_p->dwarf_version >= 5) != is_loclists)
+ continue;
if (!locs_sorted)
{
@@ -7466,7 +7472,7 @@ display_debug_loc (struct dwarf_section *section, void *file)
/* .debug_loclists has a per-unit header.
Update start if we are detecting it. */
- if (debug_info_p->dwarf_version == 5)
+ if (debug_info_p->dwarf_version >= 5)
{
j = locs_sorted ? 0 : array [0];
@@ -7503,10 +7509,10 @@ display_debug_loc (struct dwarf_section *section, void *file)
j = locs_sorted ? k : array[k];
if (k
&& (debug_info_p->loc_offsets [locs_sorted
- ? k - 1 : array [k - 1]]
+ ? k - 1 : array [k - 1]]
== debug_info_p->loc_offsets [j])
&& (debug_info_p->loc_views [locs_sorted
- ? k - 1 : array [k - 1]]
+ ? k - 1 : array [k - 1]]
== debug_info_p->loc_views [j]))
continue;
has_frame_base = debug_info_p->have_frame_base [j];
@@ -8084,7 +8090,7 @@ range_entry_compar (const void *ap, const void *bp)
return (a > b) - (b > a);
}
-static void
+static unsigned char *
display_debug_ranges_list (unsigned char * start,
unsigned char * finish,
unsigned int pointer_size,
@@ -8131,6 +8137,8 @@ display_debug_ranges_list (unsigned char * start,
putchar ('\n');
}
+
+ return start;
}
static unsigned char *
@@ -8352,6 +8360,7 @@ display_debug_ranges (struct dwarf_section *section,
{
unsigned char *start = section->start;
unsigned char *last_start = start;
+ unsigned char *last_end;
uint64_t bytes = section->size;
unsigned char *section_begin = start;
unsigned char *finish = start + bytes;
@@ -8370,7 +8379,7 @@ display_debug_ranges (struct dwarf_section *section,
}
introduce (section, false);
-
+
if (load_debug_info (file) == 0)
{
warn (_("Unable to load/parse the .debug_info section, so cannot interpret the %s section.\n"),
@@ -8415,14 +8424,11 @@ display_debug_ranges (struct dwarf_section *section,
qsort (range_entries, num_range_list, sizeof (*range_entries),
range_entry_compar);
- if (dwarf_check != 0 && range_entries[0].ranges_offset != 0)
- warn (_("Range lists in %s section start at %#" PRIx64 "\n"),
- section->name, range_entries[0].ranges_offset);
-
putchar ('\n');
if (!is_rnglists)
printf (_(" Offset Begin End\n"));
+ last_end = NULL;
for (i = 0; i < num_range_list; i++)
{
struct range_entry *range_entry = &range_entries[i];
@@ -8460,7 +8466,13 @@ display_debug_ranges (struct dwarf_section *section,
}
next = section_begin + offset; /* Offset is from the section start, the base has already been added. */
-
+
+ if (i == 0)
+ {
+ last_end = section_begin;
+ if (is_rnglists)
+ last_end += 2 * offset_size - 4 + 2 + 1 + 1 + 4;
+ }
/* If multiple DWARF entities reference the same range then we will
have multiple entries in the `range_entries' list for the same
offset. Thanks to the sort above these will all be consecutive in
@@ -8470,11 +8482,15 @@ display_debug_ranges (struct dwarf_section *section,
continue;
last_offset = offset;
- if (dwarf_check != 0 && i > 0)
+ if (dwarf_check != 0)
{
if (start < next)
- warn (_("There is a hole [%#tx - %#tx] in %s section.\n"),
- start - section_begin, next - section_begin, section->name);
+ {
+ if (last_end != next)
+ warn (_("There is a hole [%#tx - %#tx] in %s section.\n"),
+ last_end - section_begin, next - section_begin,
+ section->name);
+ }
else if (start > next)
{
if (next == last_start)
@@ -8488,11 +8504,14 @@ display_debug_ranges (struct dwarf_section *section,
last_start = next;
if (is_rnglists)
- display_debug_rnglists_list
- (start, finish, pointer_size, offset, base_address, debug_info_p->addr_base);
+ last_end
+ = display_debug_rnglists_list
+ (start, finish, pointer_size, offset, base_address,
+ debug_info_p->addr_base);
else
- display_debug_ranges_list
- (start, finish, pointer_size, offset, base_address);
+ last_end
+ = display_debug_ranges_list
+ (start, finish, pointer_size, offset, base_address);
}
/* Display trailing empty (or unreferenced) compile units, if any. */
@@ -9270,7 +9289,7 @@ decode_eh_encoding (unsigned int value)
Upon success, returns the read value and sets * RETURN_LEN to
the number of bytes read.
Upon failure returns zero and sets * RETURN_LEN to 0.
-
+
Note: does not perform any application transformations to the value. */
static uint64_t
@@ -9344,7 +9363,6 @@ get_encoded_eh_value (unsigned int encoding,
fail:
* return_len = 0;
return 0;
-
}
static uint64_t
@@ -9417,7 +9435,7 @@ display_eh_frame_hdr (struct dwarf_section *section,
uint64_t offset_eh_frame_ptr = encoded_eh_offset (ptr_enc, section, 4, eh_frame_ptr);
if (offset_eh_frame_ptr != eh_frame_ptr)
printf (_(" (offset: %#" PRIx64 ")"), offset_eh_frame_ptr);
-
+
printf ("\n");
start += len;
@@ -9432,7 +9450,7 @@ display_eh_frame_hdr (struct dwarf_section *section,
warn (_("The count field format should be absolute, not relative to an address\n"));
return 0;
}
-
+
uint64_t fde_count = get_encoded_eh_value (count_enc, start, end, & len);
if (len == 0)
{
@@ -9524,7 +9542,7 @@ display_debug_frames (struct dwarf_section *section,
if (length == 0)
{
printf ("\n%08tx ZERO terminator\n\n",
- saved_start - section_start);
+ saved_start - section_start);
/* Skip any zero terminators that directly follow.
A corrupt section size could have loaded a whole
slew of zero filled memory bytes. eg
@@ -10833,6 +10851,7 @@ display_debug_names (struct dwarf_section *section, void *file)
uint64_t abbrev_tag;
uint64_t dwarf_tag;
const struct abbrev_lookup_entry *entry;
+ uint64_t this_entry = entryptr - entry_pool;
READ_ULEB (abbrev_tag, entryptr, unit_end);
if (tagno == -1)
@@ -10845,9 +10864,9 @@ display_debug_names (struct dwarf_section *section, void *file)
if (abbrev_tag == 0)
break;
if (tagno >= 0)
- printf ("%s<%" PRIu64 ">",
+ printf ("%s<%#" PRIx64 "><%" PRIu64 ">",
(tagno == 0 && second_abbrev_tag == 0 ? " " : "\n\t"),
- abbrev_tag);
+ this_entry, abbrev_tag);
for (entry = abbrev_lookup;
entry < abbrev_lookup + abbrev_lookup_used;
@@ -10911,7 +10930,7 @@ display_debug_links (struct dwarf_section * section,
(padding) If needed to reach a 4 byte boundary.
(uint32_t) CRC32 value.
- The .gun_debugaltlink section is formatted as:
+ The .gnu_debugaltlink section is formatted as:
(c-string) Filename.
(binary) Build-ID. */
@@ -11015,7 +11034,7 @@ display_gdb_index (struct dwarf_section *section,
if (version < 6)
warn (_("Version 5 does not include inlined functions.\n"));
if (version < 7)
- warn (_("Version 6 does not include symbol attributes.\n"));
+ warn (_("Version 6 does not include symbol attributes.\n"));
/* Version 7 indices generated by Gold have bad type unit references,
PR binutils/15021. But we don't know if the index was generated by
Gold or not, so to avoid worrying users with gdb-generated indices
@@ -11248,24 +11267,24 @@ get_DW_SECT_short_name (unsigned int dw_sect)
switch (dw_sect)
{
- case DW_SECT_INFO:
- return "info";
- case DW_SECT_TYPES:
- return "types";
- case DW_SECT_ABBREV:
- return "abbrev";
- case DW_SECT_LINE:
- return "line";
- case DW_SECT_LOC:
- return "loc";
- case DW_SECT_STR_OFFSETS:
- return "str_off";
- case DW_SECT_MACINFO:
- return "macinfo";
- case DW_SECT_MACRO:
- return "macro";
- default:
- break;
+ case DW_SECT_INFO:
+ return "info";
+ case DW_SECT_TYPES:
+ return "types";
+ case DW_SECT_ABBREV:
+ return "abbrev";
+ case DW_SECT_LINE:
+ return "line";
+ case DW_SECT_LOC:
+ return "loc";
+ case DW_SECT_STR_OFFSETS:
+ return "str_off";
+ case DW_SECT_MACINFO:
+ return "macinfo";
+ case DW_SECT_MACRO:
+ return "macro";
+ default:
+ break;
}
snprintf (buf, sizeof (buf), "%d", dw_sect);
@@ -11427,7 +11446,7 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
{
printf (_(" Offset table\n"));
printf (" slot %-16s ",
- is_tu_index ? _("signature") : _("dwo_id"));
+ is_tu_index ? _("signature") : _("dwo_id"));
}
else
{
@@ -11514,7 +11533,7 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
printf ("\n");
printf (_(" Size table\n"));
printf (" slot %-16s ",
- is_tu_index ? _("signature") : _("dwo_id"));
+ is_tu_index ? _("signature") : _("dwo_id"));
}
for (j = 0; j < ncols; j++)
@@ -11567,7 +11586,7 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
if (dw_sect >= DW_SECT_MAX)
warn (_("Overlarge Dwarf section index detected: %u\n"), dw_sect);
else
- this_set [row - 1].section_sizes [dw_sect] = val;
+ this_set [row - 1].section_sizes [dw_sect] = val;
}
}
@@ -11583,7 +11602,7 @@ process_cu_tu_index (struct dwarf_section *section, int do_display)
printf (_(" Unsupported version (%d)\n"), version);
if (do_display)
- printf ("\n");
+ printf ("\n");
return true;
}
@@ -11653,7 +11672,7 @@ display_debug_not_supported (struct dwarf_section *section,
void *file ATTRIBUTE_UNUSED)
{
printf (_("Displaying the debug contents of section %s is not yet supported.\n"),
- section->name);
+ section->name);
return 1;
}
@@ -12311,7 +12330,7 @@ load_build_id_debug_file (const char * main_filename ATTRIBUTE_UNUSED, void * ma
+ strlen (".debug")
/* The next string should be the same as the longest
name found in the prefixes[] array below. */
- + strlen ("/usrlib64/debug/usr")
+ + strlen ("/usr/lib64/debug/usr/")
+ 1);
void * handle;
@@ -12322,7 +12341,7 @@ load_build_id_debug_file (const char * main_filename ATTRIBUTE_UNUSED, void * ma
"/usr/lib/debug/",
"/usr/lib/debug/usr/",
"/usr/lib64/debug/",
- "/usr/lib64/debug/usr"
+ "/usr/lib64/debug/usr/"
};
long unsigned int i;
generated by cgit v1.1 at 2025-07-02 10:30:40 +0000