From f18acc9c4e5d18f4783f3a7d59e3ec95d7af0199 Mon Sep 17 00:00:00 2001
From: "Kumar N, Bhuvanendra" <Kavitha.Natarajan@amd.com>
Date: Wed, 22 Jun 2022 17:07:25 +0100
Subject: [PATCH] Binutils support for split-dwarf and dwarf-5
* dwarf.c (fetch_indexed_string): Added new parameter
str_offsets_base to calculate the string offset.
(read_and_display_attr_value): Read DW_AT_str_offsets_base
attribute.
(process_debug_info): While allocating memory and initializing
debug_information, do it for do_debug_info also, if its true.
(load_separate_debug_files): Load .debug_str_offsets if exists.
* dwarf.h (struct debug_info): Add str_offsets_base field.
Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=f18acc9c4e5d18f4783f3a7d59e3ec95d7af0199]
Signed-off-by: Pgowda <pgowda.cve@gmail.com>
---
binutils/ChangeLog | 13 ++++++++++-
binutils/dwarf.c | 57 ++++++++++++++++++++++++++++++++++------------
binutils/dwarf.h | 1 +
3 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/binutils/dwarf.c b/binutils/dwarf.c
index f9c46cf54dd..d9a3144023c 100644
--- a/binutils/dwarf.c
+++ b/binutils/dwarf.c
@@ -687,8 +687,11 @@ fetch_indirect_line_string (dwarf_vma of
}
static const char *
-fetch_indexed_string (dwarf_vma idx, struct cu_tu_set *this_set,
- dwarf_vma offset_size, bool dwo)
+fetch_indexed_string (dwarf_vma idx,
+ struct cu_tu_set * this_set,
+ dwarf_vma offset_size,
+ bool dwo,
+ dwarf_vma str_offsets_base)
{
enum dwarf_section_display_enum str_sec_idx = dwo ? str_dwo : str;
enum dwarf_section_display_enum idx_sec_idx = dwo ? str_index_dwo : str_index;
@@ -776,7 +779,15 @@ fetch_indexed_string (dwarf_vma idx, str
return _("<index offset is too big>");
}
- str_offset = byte_get (curr + index_offset, offset_size);
+ if (str_offsets_base > 0)
+ {
+ if (offset_size == 8)
+ str_offsets_base -= 16;
+ else
+ str_offsets_base -= 8;
+ }
+
+ str_offset = byte_get (curr + index_offset + str_offsets_base, offset_size);
str_offset -= str_section->address;
if (str_offset >= str_section->size)
{
@@ -2721,11 +2732,13 @@ read_and_display_attr_value (unsigned lo
/* We have already displayed the form name. */
printf (_("%c(offset: 0x%s): %s"), delimiter,
dwarf_vmatoa ("x", uvalue),
- fetch_indexed_string (uvalue, this_set, offset_size, dwo));
+ fetch_indexed_string (uvalue, this_set, offset_size, dwo,
+ debug_info_p->str_offsets_base));
else
printf (_("%c(indexed string: 0x%s): %s"), delimiter,
dwarf_vmatoa ("x", uvalue),
- fetch_indexed_string (uvalue, this_set, offset_size, dwo));
+ fetch_indexed_string (uvalue, this_set, offset_size, dwo,
+ debug_info_p->str_offsets_base));
}
break;
@@ -2800,7 +2813,7 @@ read_and_display_attr_value (unsigned lo
break;
}
- if ((do_loc || do_debug_loc || do_debug_ranges)
+ if ((do_loc || do_debug_loc || do_debug_ranges || do_debug_info)
&& num_debug_info_entries == 0
&& debug_info_p != NULL)
{
@@ -2818,6 +2831,13 @@ read_and_display_attr_value (unsigned lo
dwarf_vmatoa ("x", debug_info_p->cu_offset));
debug_info_p->rnglists_base = uvalue;
break;
+ case DW_AT_str_offsets_base:
+ if (debug_info_p->str_offsets_base)
+ warn (_("CU @ 0x%s has multiple str_offsets_base values"),
+ dwarf_vmatoa ("x", debug_info_p->cu_offset));
+ debug_info_p->str_offsets_base = uvalue;
+ break;
+
case DW_AT_frame_base:
have_frame_base = 1;
/* Fall through. */
@@ -2956,7 +2976,9 @@ read_and_display_attr_value (unsigned lo
case DW_FORM_strx2:
case DW_FORM_strx3:
case DW_FORM_strx4:
- add_dwo_name (fetch_indexed_string (uvalue, this_set, offset_size, false), cu_offset);
+ add_dwo_name (fetch_indexed_string (uvalue, this_set, offset_size, false,
+ debug_info_p->str_offsets_base),
+ cu_offset);
break;
case DW_FORM_string:
add_dwo_name ((const char *) orig_data, cu_offset);
@@ -2988,7 +3010,9 @@ read_and_display_attr_value (unsigned lo
case DW_FORM_strx2:
case DW_FORM_strx3:
case DW_FORM_strx4:
- add_dwo_dir (fetch_indexed_string (uvalue, this_set, offset_size, false), cu_offset);
+ add_dwo_dir (fetch_indexed_string (uvalue, this_set, offset_size, false,
+ debug_info_p->str_offsets_base),
+ cu_offset);
break;
case DW_FORM_string:
add_dwo_dir ((const char *) orig_data, cu_offset);
@@ -3309,6 +3333,7 @@ read_and_display_attr_value (unsigned lo
case DW_AT_location:
case DW_AT_loclists_base:
case DW_AT_rnglists_base:
+ case DW_AT_str_offsets_base:
case DW_AT_string_length:
case DW_AT_return_addr:
case DW_AT_data_member_location:
@@ -3329,7 +3354,8 @@ read_and_display_attr_value (unsigned lo
|| form == DW_FORM_sec_offset
|| form == DW_FORM_loclistx)
{
- if (attribute != DW_AT_rnglists_base)
+ if (attribute != DW_AT_rnglists_base
+ && attribute != DW_AT_str_offsets_base)
printf (_(" (location list)"));
}
/* Fall through. */
@@ -3562,7 +3588,7 @@ process_debug_info (struct dwarf_section
return false;
}
- if ((do_loc || do_debug_loc || do_debug_ranges)
+ if ((do_loc || do_debug_loc || do_debug_ranges || do_debug_info)
&& num_debug_info_entries == 0
&& ! do_types)
{
@@ -3797,7 +3823,7 @@ process_debug_info (struct dwarf_section
continue;
}
- if ((do_loc || do_debug_loc || do_debug_ranges)
+ if ((do_loc || do_debug_loc || do_debug_ranges || do_debug_info)
&& num_debug_info_entries == 0
&& alloc_num_debug_info_entries > unit
&& ! do_types)
@@ -3819,6 +3845,7 @@ process_debug_info (struct dwarf_section
debug_information [unit].max_range_lists= 0;
debug_information [unit].num_range_lists = 0;
debug_information [unit].rnglists_base = 0;
+ debug_information [unit].str_offsets_base = 0;
}
if (!do_loc && dwarf_start_die == 0)
@@ -4089,7 +4116,7 @@ process_debug_info (struct dwarf_section
/* Set num_debug_info_entries here so that it can be used to check if
we need to process .debug_loc and .debug_ranges sections. */
- if ((do_loc || do_debug_loc || do_debug_ranges)
+ if ((do_loc || do_debug_loc || do_debug_ranges || do_debug_info)
&& num_debug_info_entries == 0
&& ! do_types)
{
@@ -6237,7 +6264,7 @@ display_debug_macro (struct dwarf_sectio
READ_ULEB (lineno, curr, end);
READ_ULEB (offset, curr, end);
string = (const unsigned char *)
- fetch_indexed_string (offset, NULL, offset_size, false);
+ fetch_indexed_string (offset, NULL, offset_size, false, 0);
if (op == DW_MACRO_define_strx)
printf (" DW_MACRO_define_strx ");
else
@@ -7851,7 +7878,7 @@ display_debug_str_offsets (struct dwarf_
SAFE_BYTE_GET_AND_INC (offset, curr, entry_length, entries_end);
if (dwo)
string = (const unsigned char *)
- fetch_indexed_string (idx, NULL, entry_length, dwo);
+ fetch_indexed_string (idx, NULL, entry_length, dwo, 0);
else
string = fetch_indirect_string (offset);
@@ -11937,6 +11964,8 @@ load_separate_debug_files (void * file,
{
/* Load the .debug_addr section, if it exists. */
load_debug_section (debug_addr, file);
+ /* Load the .debug_str_offsets section, if it exists. */
+ load_debug_section (str_index, file);
free_dwo_info ();
diff --git a/binutils/dwarf.h b/binutils/dwarf.h
index 8a89c08e7c2..adbf20f9a28 100644
--- a/binutils/dwarf.h
+++ b/binutils/dwarf.h
@@ -193,6 +193,7 @@ typedef struct
unsigned int num_range_lists;
unsigned int max_range_lists;
dwarf_vma rnglists_base;
+ dwarf_vma str_offsets_base;
}
debug_info;