From 256a67e6a5a07e37997d3a5ef64204a99b8e5a50 Mon Sep 17 00:00:00 2001

From: Mark Wielaard <mark@klomp.org>

Date: Mon, 25 Jan 2021 15:33:34 +0100

Subject: [PATCH] DWARF5

---

 coregrind/m_debuginfo/d3basics.c        |  99 ++++

 coregrind/m_debuginfo/priv_d3basics.h   | 195 +++++-

 coregrind/m_debuginfo/priv_readdwarf.h  |   3 +-

 coregrind/m_debuginfo/priv_readdwarf3.h |   3 +-

 coregrind/m_debuginfo/readdwarf.c       | 465 ++++++++++++---

 coregrind/m_debuginfo/readdwarf3.c      | 748 +++++++++++++++++++-----

 coregrind/m_debuginfo/readelf.c         |  33 +-

 coregrind/m_debuginfo/readmacho.c       |  14 +-

 8 files changed, 1304 insertions(+), 256 deletions(-)

diff --git a/coregrind/m_debuginfo/d3basics.c b/coregrind/m_debuginfo/d3basics.c

index b6d13c118..e1127ffe2 100644

--- a/coregrind/m_debuginfo/d3basics.c

+++ b/coregrind/m_debuginfo/d3basics.c

@@ -128,6 +128,16 @@ const HChar* ML_(pp_DW_TAG) ( DW_TAG tag )

       case DW_TAG_type_unit:          return "DW_TAG_type_unit";

       case DW_TAG_rvalue_reference_type: return "DW_TAG_rvalue_reference_type";

       case DW_TAG_template_alias:     return "DW_TAG_template_alias";

+      /* DWARF 5.  */

+      case DW_TAG_coarray_type:       return "DW_TAG_coarray_type";

+      case DW_TAG_generic_subrange:   return "DW_TAG_generic_subrange";

+      case DW_TAG_dynamic_type:       return "DW_TAG_dynamic_type";

+      case DW_TAG_atomic_type:        return "DW_TAG_atomic_type";

+      case DW_TAG_call_site:          return "DW_TAG_call_site";

+      case DW_TAG_call_site_parameter:

+         return "DW_TAG_call_site_parameter";

+      case DW_TAG_skeleton_unit:      return "DW_TAG_skeleton_unit";

+      case DW_TAG_immutable_type:     return "DW_TAG_immutable_type";

       /* SGI/MIPS Extensions.  */

       case DW_TAG_MIPS_loop:          return "DW_TAG_MIPS_loop";

       /* HP extensions.  See:

@@ -140,6 +150,16 @@ const HChar* ML_(pp_DW_TAG) ( DW_TAG tag )

       case DW_TAG_class_template:     return "DW_TAG_class_template";

       case DW_TAG_GNU_BINCL:          return "DW_TAG_GNU_BINCL";

       case DW_TAG_GNU_EINCL:          return "DW_TAG_GNU_EINCL";

+      case DW_TAG_GNU_template_template_param:

+         return "DW_TAG_GNU_template_template_param";

+      case DW_TAG_GNU_template_parameter_pack:

+         return"DW_TAG_GNU_template_parameter_pack";

+      case DW_TAG_GNU_formal_parameter_pack:

+         return "DW_TAG_GNU_formal_parameter_pack";

+      case DW_TAG_GNU_call_site:

+         return "DW_TAG_GNU_call_site";

+      case DW_TAG_GNU_call_site_parameter:

+         return "DW_TAG_GNU_call_site_parameter";

       /* Extensions for UPC.  See: http://upc.gwu.edu/~upc.  */

       case DW_TAG_upc_shared_type:    return "DW_TAG_upc_shared_type";

       case DW_TAG_upc_strict_type:    return "DW_TAG_upc_strict_type";

@@ -180,6 +200,27 @@ const HChar* ML_(pp_DW_FORM) ( DW_FORM form )

       case DW_FORM_exprloc:   return "DW_FORM_exprloc";

       case DW_FORM_flag_present:return "DW_FORM_flag_present";

       case DW_FORM_ref_sig8:  return "DW_FORM_ref_sig8";

+      case DW_FORM_strx:      return "DW_FORM_strx";

+      case DW_FORM_addrx:     return "DW_FORM_addrx";

+      case DW_FORM_ref_sup4:  return "DW_FORM_ref_sup4";

+      case DW_FORM_strp_sup:  return "DW_FORM_strp_sup";

+      case DW_FORM_data16:    return "DW_FORM_data16";

+      case DW_FORM_line_strp: return "DW_FORM_line_strp";

+      case DW_FORM_implicit_const:return "DW_FORM_implicit_const";

+      case DW_FORM_loclistx:  return "DW_FORM_loclistx";

+      case DW_FORM_rnglistx:  return "DW_FORM_rnglistx";

+      case DW_FORM_ref_sup8:  return "DW_FORM_ref_sup8";

+      case DW_FORM_strx1:     return "DW_FORM_strx1";

+      case DW_FORM_strx2:     return "DW_FORM_strx2";

+      case DW_FORM_strx3:     return "DW_FORM_strx3";

+      case DW_FORM_strx4:     return "DW_FORM_strx4";

+      case DW_FORM_addrx1:    return "DW_FORM_addrx1";

+      case DW_FORM_addrx2:    return "DW_FORM_addrx2";

+      case DW_FORM_addrx3:    return "DW_FORM_addrx3";

+      case DW_FORM_addrx4:    return "DW_FORM_addrx4";

+      /* GNU Debug Fission extensions.  */

+      case DW_FORM_GNU_addr_index:return "DW_FORM_GNU_addr_index";

+      case DW_FORM_GNU_str_index:return "DW_FORM_GNU_str_index";

       case DW_FORM_GNU_ref_alt:return "DW_FORM_GNU_ref_alt";

       case DW_FORM_GNU_strp_alt:return "DW_FORM_GNU_strp_alt";

    }

@@ -286,6 +327,36 @@ const HChar* ML_(pp_DW_AT) ( DW_AT attr )

       case DW_AT_const_expr: return "DW_AT_const_expr";

       case DW_AT_enum_class: return "DW_AT_enum_class";

       case DW_AT_linkage_name: return "DW_AT_linkage_name";

+      /* DWARF 5 values.  */

+      case DW_AT_string_length_bit_size: return "DW_AT_string_length_bit_size";

+      case DW_AT_string_length_byte_size: return "DW_AT_string_length_byte_size";

+      case DW_AT_rank: return "DW_AT_rank";

+      case DW_AT_str_offsets_base: return "DW_AT_str_offsets_base";

+      case DW_AT_addr_base: return "DW_AT_addr_base";

+      case DW_AT_rnglists_base: return "DW_AT_rnglists_base";

+      case DW_AT_dwo_name: return "DW_AT_dwo_name";

+      case DW_AT_reference: return "DW_AT_reference";

+      case DW_AT_rvalue_reference: return "DW_AT_rvalue_reference";

+      case DW_AT_macros: return "DW_AT_macros";

+      case DW_AT_call_all_calls: return "DW_AT_call_all_calls";

+      case DW_AT_call_all_source_calls: return "DW_AT_call_all_source_calls";

+      case DW_AT_call_all_tail_calls: return "DW_AT_call_all_tail_calls";

+      case DW_AT_call_return_pc: return "DW_AT_call_return_pc";

+      case DW_AT_call_value: return "DW_AT_call_value";

+      case DW_AT_call_origin: return "DW_AT_call_origin";

+      case DW_AT_call_parameter: return "DW_AT_call_parameter";

+      case DW_AT_call_pc: return "DW_AT_call_pc";

+      case DW_AT_call_tail_call: return "DW_AT_call_tail_call";

+      case DW_AT_call_target: return "DW_AT_call_target";

+      case DW_AT_call_target_clobbered: return "DW_AT_call_target_clobbered";

+      case DW_AT_call_data_location: return "DW_AT_call_data_location";

+      case DW_AT_call_data_value: return "DW_AT_call_data_value";

+      case DW_AT_noreturn: return "DW_AT_noreturn";

+      case DW_AT_alignment: return "DW_AT_alignment";

+      case DW_AT_export_symbols: return "DW_AT_export_symbols";

+      case DW_AT_deleted: return "DW_AT_deleted";

+      case DW_AT_defaulted: return "DW_AT_defaulted";

+      case DW_AT_loclists_base: return "DW_AT_loclists_base";

       /* SGI/MIPS extensions.  */

       /* case DW_AT_MIPS_fde: return "DW_AT_MIPS_fde"; */

       /* DW_AT_MIPS_fde == DW_AT_HP_unmodifiable */

@@ -322,8 +393,36 @@ const HChar* ML_(pp_DW_AT) ( DW_AT attr )

       case DW_AT_body_begin: return "DW_AT_body_begin";

       case DW_AT_body_end: return "DW_AT_body_end";

       case DW_AT_GNU_vector: return "DW_AT_GNU_vector";

+      case DW_AT_GNU_guarded_by: return "DW_AT_GNU_guarded_by";

+      case DW_AT_GNU_pt_guarded_by: return "DW_AT_GNU_pt_guarded_by";

+      case DW_AT_GNU_guarded: return "DW_AT_GNU_guarded";

+      case DW_AT_GNU_pt_guarded: return "DW_AT_GNU_pt_guarded";

+      case DW_AT_GNU_locks_excluded: return "DW_AT_GNU_locks_excluded";

+      case DW_AT_GNU_exclusive_locks_required: return "DW_AT_GNU_exclusive_locks_required";

+      case DW_AT_GNU_shared_locks_required: return "DW_AT_GNU_shared_locks_required";

+      case DW_AT_GNU_odr_signature: return "DW_AT_GNU_odr_signature";

+      case DW_AT_GNU_template_name: return "DW_AT_GNU_template_name";

+      case DW_AT_GNU_call_site_value: return "DW_AT_GNU_call_site_value";

+      case DW_AT_GNU_call_site_data_value: return "DW_AT_GNU_call_site_data_value";

+      case DW_AT_GNU_call_site_target: return "DW_AT_GNU_call_site_target";

+      case DW_AT_GNU_call_site_target_clobbered: return "DW_AT_GNU_call_site_target_clobbered";

+      case DW_AT_GNU_tail_call: return "DW_AT_GNU_tail_call";

       case DW_AT_GNU_all_tail_call_sites: return "DW_AT_GNU_all_tail_call_sites";

       case DW_AT_GNU_all_call_sites: return "DW_AT_GNU_all_call_sites";

+      case DW_AT_GNU_all_source_call_sites: return "DW_AT_GNU_all_source_call_sites";

+      case DW_AT_GNU_locviews: return "DW_AT_GNU_locviews";

+      case DW_AT_GNU_entry_view: return "DW_AT_GNU_entry_view";

+      case DW_AT_GNU_macros: return "DW_AT_GNU_macros";

+      case DW_AT_GNU_deleted: return "DW_AT_GNU_deleted";

+      case DW_AT_GNU_dwo_name: return "DW_AT_GNU_dwo_name";

+      case DW_AT_GNU_dwo_id: return "DW_AT_GNU_dwo_id";

+      case DW_AT_GNU_ranges_base: return "DW_AT_GNU_ranges_base";

+      case DW_AT_GNU_addr_base: return "DW_AT_GNU_addr_base";

+      case DW_AT_GNU_pubnames: return "DW_AT_GNU_pubnames";

+      case DW_AT_GNU_pubtypes: return "DW_AT_GNU_pubtypes";

+      case DW_AT_GNU_numerator: return "DW_AT_GNU_numerator";

+      case DW_AT_GNU_denominator: return "DW_AT_GNU_denominator";

+      case DW_AT_GNU_bias: return "DW_AT_GNU_bias";

       /* VMS extensions.  */

       case DW_AT_VMS_rtnbeg_pd_address: return "DW_AT_VMS_rtnbeg_pd_address";

       /* UPC extension.  */

diff --git a/coregrind/m_debuginfo/priv_d3basics.h b/coregrind/m_debuginfo/priv_d3basics.h

index b60e3e8eb..9d825e39e 100644

--- a/coregrind/m_debuginfo/priv_d3basics.h

+++ b/coregrind/m_debuginfo/priv_d3basics.h

@@ -108,6 +108,15 @@ typedef enum

     DW_TAG_type_unit = 0x41,

     DW_TAG_rvalue_reference_type = 0x42,

     DW_TAG_template_alias = 0x43,

+    /* DWARF 5.  */

+    DW_TAG_coarray_type = 0x44,

+    DW_TAG_generic_subrange = 0x45,

+    DW_TAG_dynamic_type = 0x46,

+    DW_TAG_atomic_type = 0x47,

+    DW_TAG_call_site = 0x48,

+    DW_TAG_call_site_parameter = 0x49,

+    DW_TAG_skeleton_unit = 0x4a,

+    DW_TAG_immutable_type = 0x4b,

     /* SGI/MIPS Extensions.  */

     DW_TAG_MIPS_loop = 0x4081,

     /* HP extensions.  See: ftp://ftp.hp.com/pub/lang/tools/WDB/wdb-4.0.tar.gz .  */

@@ -118,6 +127,11 @@ typedef enum

     DW_TAG_class_template = 0x4103,	/* For C++.  */

     DW_TAG_GNU_BINCL = 0x4104,

     DW_TAG_GNU_EINCL = 0x4105,

+    DW_TAG_GNU_template_template_param = 0x4106,

+    DW_TAG_GNU_template_parameter_pack = 0x4107,

+    DW_TAG_GNU_formal_parameter_pack = 0x4108,

+    DW_TAG_GNU_call_site = 0x4109,

+    DW_TAG_GNU_call_site_parameter = 0x410a,

     /* Extensions for UPC.  See: http://upc.gwu.edu/~upc.  */

     DW_TAG_upc_shared_type = 0x8765,

     DW_TAG_upc_strict_type = 0x8766,

@@ -164,13 +178,23 @@ typedef enum dwarf_source_language

     DW_LANG_D = 0x0013,

     /* DWARF 4.  */

     DW_LANG_Python = 0x0014,

-    /* DWARF 5-pre. Only what GCC already outputs. */

+    /* DWARF 5.  */

     DW_LANG_Go = 0x0016,

+    DW_LANG_Modula3 = 0x0017,

+    DW_LANG_Haskell = 0x0018,

+    DW_LANG_C_plus_plus_03 = 0x0019,

     DW_LANG_C_plus_plus_11 = 0x001a,

+    DW_LANG_OCaml = 0x001b,

+    DW_LANG_Rust = 0x001c,

     DW_LANG_C11 = 0x001d,

+    DW_LANG_Swift = 0x001e,

+    DW_LANG_Julia = 0x001f,

+    DW_LANG_Dylan = 0x0020,

     DW_LANG_C_plus_plus_14 = 0x0021,

     DW_LANG_Fortran03 = 0x0022,

     DW_LANG_Fortran08 = 0x0023,

+    DW_LANG_RenderScript = 0x0024,

+    DW_LANG_BLISS = 0x0025,

     /* MIPS.  */

     DW_LANG_Mips_Assembler = 0x8001,

     /* UPC.  */

@@ -207,6 +231,28 @@ typedef enum

     DW_FORM_exprloc = 0x18,

     DW_FORM_flag_present = 0x19,

     DW_FORM_ref_sig8 = 0x20,

+    /* DWARF 5 values.  */

+    DW_FORM_strx = 0x1a,

+    DW_FORM_addrx = 0x1b,

+    DW_FORM_ref_sup4 = 0x1c,

+    DW_FORM_strp_sup = 0x1d,

+    DW_FORM_data16 = 0x1e,

+    DW_FORM_line_strp = 0x1f,

+    DW_FORM_implicit_const = 0x21,

+    DW_FORM_loclistx = 0x22,

+    DW_FORM_rnglistx = 0x23,

+    DW_FORM_ref_sup8 = 0x24,

+    DW_FORM_strx1 = 0x25,

+    DW_FORM_strx2 = 0x26,

+    DW_FORM_strx3 = 0x27,

+    DW_FORM_strx4 = 0x28,

+    DW_FORM_addrx1 = 0x29,

+    DW_FORM_addrx2 = 0x2a,

+    DW_FORM_addrx3 = 0x2b,

+    DW_FORM_addrx4 = 0x2c,

+    /* GNU Debug Fission extensions.  */

+    DW_FORM_GNU_addr_index = 0x1f01,

+    DW_FORM_GNU_str_index = 0x1f02,

     /* Extensions for DWZ multifile.

        See http://www.dwarfstd.org/ShowIssue.php?issue=120604.1&type=open .  */

     DW_FORM_GNU_ref_alt = 0x1f20,

@@ -314,6 +360,36 @@ typedef enum

     DW_AT_const_expr      = 0x6c,

     DW_AT_enum_class      = 0x6d,

     DW_AT_linkage_name    = 0x6e,

+    DW_AT_string_length_bit_size = 0x6f,

+    DW_AT_string_length_byte_size = 0x70,

+    DW_AT_rank = 0x71,

+    DW_AT_str_offsets_base = 0x72,

+    DW_AT_addr_base = 0x73,

+    DW_AT_rnglists_base = 0x74,

+    /* 0x75 reserved.  */

+    DW_AT_dwo_name = 0x76,

+    DW_AT_reference = 0x77,

+    DW_AT_rvalue_reference = 0x78,

+    DW_AT_macros = 0x79,

+    DW_AT_call_all_calls = 0x7a,

+    DW_AT_call_all_source_calls = 0x7b,

+    DW_AT_call_all_tail_calls = 0x7c,

+    DW_AT_call_return_pc = 0x7d,

+    DW_AT_call_value = 0x7e,

+    DW_AT_call_origin = 0x7f,

+    DW_AT_call_parameter = 0x80,

+    DW_AT_call_pc = 0x81,

+    DW_AT_call_tail_call = 0x82,

+    DW_AT_call_target = 0x83,

+    DW_AT_call_target_clobbered = 0x84,

+    DW_AT_call_data_location = 0x85,

+    DW_AT_call_data_value = 0x86,

+    DW_AT_noreturn = 0x87,

+    DW_AT_alignment = 0x88,

+    DW_AT_export_symbols = 0x89,

+    DW_AT_deleted = 0x8a,

+    DW_AT_defaulted = 0x8b,

+    DW_AT_loclists_base = 0x8c,

     /* SGI/MIPS extensions.  */

     DW_AT_MIPS_fde = 0x2001,

     DW_AT_MIPS_loop_begin = 0x2002,

@@ -349,8 +425,39 @@ typedef enum

     DW_AT_body_begin = 0x2105,

     DW_AT_body_end   = 0x2106,

     DW_AT_GNU_vector = 0x2107,

+    DW_AT_GNU_guarded_by = 0x2108,

+    DW_AT_GNU_pt_guarded_by = 0x2109,

+    DW_AT_GNU_guarded = 0x210a,

+    DW_AT_GNU_pt_guarded = 0x210b,

+    DW_AT_GNU_locks_excluded = 0x210c,

+    DW_AT_GNU_exclusive_locks_required = 0x210d,

+    DW_AT_GNU_shared_locks_required = 0x210e,

+    DW_AT_GNU_odr_signature = 0x210f,

+    DW_AT_GNU_template_name = 0x2110,

+    DW_AT_GNU_call_site_value = 0x2111,

+    DW_AT_GNU_call_site_data_value = 0x2112,

+    DW_AT_GNU_call_site_target = 0x2113,

+    DW_AT_GNU_call_site_target_clobbered = 0x2114,

+    DW_AT_GNU_tail_call = 0x2115,

     DW_AT_GNU_all_tail_call_sites = 0x2116,

     DW_AT_GNU_all_call_sites = 0x2117,

+    DW_AT_GNU_all_source_call_sites = 0x2118,

+    DW_AT_GNU_locviews = 0x2137,

+    DW_AT_GNU_entry_view = 0x2138,

+    DW_AT_GNU_macros = 0x2119,

+    DW_AT_GNU_deleted = 0x211a,

+    /* GNU Debug Fission extensions.  */

+    DW_AT_GNU_dwo_name = 0x2130,

+    DW_AT_GNU_dwo_id = 0x2131,

+    DW_AT_GNU_ranges_base = 0x2132,

+    DW_AT_GNU_addr_base = 0x2133,

+    DW_AT_GNU_pubnames = 0x2134,

+    DW_AT_GNU_pubtypes = 0x2135,

+    /* https://gcc.gnu.org/wiki/DW_AT_GNU_numerator_denominator  */

+    DW_AT_GNU_numerator = 0x2303,

+    DW_AT_GNU_denominator = 0x2304,

+    /* https://gcc.gnu.org/wiki/DW_AT_GNU_bias  */

+    DW_AT_GNU_bias = 0x2305,

     /* VMS extensions.  */

     DW_AT_VMS_rtnbeg_pd_address = 0x2201,

     /* UPC extension.  */

@@ -387,6 +494,9 @@ typedef enum

     DW_ATE_decimal_float = 0xf,

     /* DWARF 4.  */

     DW_ATE_UTF = 0x10,

+    /* DWARF 5.  */

+    DW_ATE_UCS = 0x11,

+    DW_ATE_ASCII = 0x12,

     /* HP extensions.  */

     DW_ATE_HP_float80            = 0x80, /* Floating-point (80 bit).  */

     DW_ATE_HP_complex_float80    = 0x81, /* Complex floating-point (80 bit).  */

@@ -558,8 +668,35 @@ typedef enum

     /* DWARF 4 extensions.  */

     DW_OP_implicit_value = 0x9e,

     DW_OP_stack_value = 0x9f,

+    /* DWARF 5 extensions.  */

+    DW_OP_implicit_pointer = 0xa0,

+    DW_OP_addrx = 0xa1,

+    DW_OP_constx = 0xa2,

+    DW_OP_entry_value = 0xa3,

+    DW_OP_const_type = 0xa4,

+    DW_OP_regval_type = 0xa5,

+    DW_OP_deref_type = 0xa6,

+    DW_OP_xderef_type = 0xa7,

+    DW_OP_convert = 0xa8,

+    DW_OP_reinterpret = 0xa9,

     /* GNU extensions.  */

     DW_OP_GNU_push_tls_address = 0xe0,

+    DW_OP_GNU_uninit = 0xf0,

+    DW_OP_GNU_encoded_addr = 0xf1,

+    DW_OP_GNU_implicit_pointer = 0xf2,

+    DW_OP_GNU_entry_value = 0xf3,

+    DW_OP_GNU_const_type = 0xf4,

+    DW_OP_GNU_regval_type = 0xf5,

+    DW_OP_GNU_deref_type = 0xf6,

+    DW_OP_GNU_convert = 0xf7,

+    DW_OP_GNU_reinterpret = 0xf9,

+    DW_OP_GNU_parameter_ref = 0xfa,

+    /* GNU Debug Fission extensions.  */

+    DW_OP_GNU_addr_index = 0xfb,

+    DW_OP_GNU_const_index = 0xfc,

+    /* The GNU variable value extension.

+       See http://dwarfstd.org/ShowIssue.php?issue=161109.2 . */

+    DW_OP_GNU_variable_value = 0xfd,

     /* HP extensions.  */

     DW_OP_HP_unknown     = 0xe0, /* Ouch, the same as GNU_push_tls_address.  */

     DW_OP_HP_is_value    = 0xe1,

@@ -571,6 +708,62 @@ typedef enum

   }

   DW_OP;

+typedef enum

+  {

+    DW_UT_compile = 0x01,

+    DW_UT_type = 0x02,

+    DW_UT_partial = 0x03,

+    DW_UT_skeleton = 0x04,

+    DW_UT_split_compile = 0x05,

+    DW_UT_split_type = 0x06,

+

+    DW_UT_lo_user = 0x80,

+    DW_UT_hi_user = 0xff

+  }

+  DW_UT;

+

+typedef enum

+  {

+    DW_LNCT_path = 0x1,

+    DW_LNCT_directory_index = 0x2,

+    DW_LNCT_timestamp = 0x3,

+    DW_LNCT_size = 0x4,

+    DW_LNCT_MD5 = 0x5,

+

+    DW_LNCT_lo_user = 0x2000,

+    DW_LNCT_hi_user = 0x3fff

+  }

+  DW_LNCT;

+

+typedef enum

+  {

+    DW_RLE_end_of_list = 0x00,

+    DW_RLE_base_addressx = 0x01,

+    DW_RLE_startx_endx = 0x02,

+    DW_RLE_startx_length = 0x03,

+    DW_RLE_offset_pair = 0x04,

+    DW_RLE_base_address = 0x05,

+    DW_RLE_start_end = 0x06,

+    DW_RLE_start_length = 0x07

+  }

+  DW_RLE;

+

+typedef enum

+  {

+    DW_LLE_end_of_list = 0x00,

+    DW_LLE_base_addressx = 0x01,

+    DW_LLE_startx_endx = 0x02,

+    DW_LLE_startx_length = 0x03,

+    DW_LLE_offset_pair = 0x04,

+    DW_LLE_default_location = 0x05,

+    DW_LLE_base_address = 0x06,

+    DW_LLE_start_end = 0x07,

+    DW_LLE_start_length = 0x08,

+

+    DW_LLE_GNU_view_pair = 0x09

+  }

+  DW_LLE;

+

 const HChar* ML_(pp_DW_children) ( DW_children hashch );

 const HChar* ML_(pp_DW_TAG)      ( DW_TAG tag );

 const HChar* ML_(pp_DW_FORM)     ( DW_FORM form );

diff --git a/coregrind/m_debuginfo/priv_readdwarf.h b/coregrind/m_debuginfo/priv_readdwarf.h

index 1e3f24c2a..302266924 100644

--- a/coregrind/m_debuginfo/priv_readdwarf.h

+++ b/coregrind/m_debuginfo/priv_readdwarf.h

@@ -50,7 +50,8 @@ void ML_(read_debuginfo_dwarf3)

           DiSlice escn_debug_abbv,      /* .debug_abbrev */

           DiSlice escn_debug_line,      /* .debug_line */

           DiSlice escn_debug_str,       /* .debug_str */

-          DiSlice escn_debug_str_alt ); /* .debug_str */

+          DiSlice escn_debug_str_alt,   /* .debug_str */

+          DiSlice escn_debug_line_str );/* .debug_line_str */

 /* --------------------

    DWARF1 reader

diff --git a/coregrind/m_debuginfo/priv_readdwarf3.h b/coregrind/m_debuginfo/priv_readdwarf3.h

index 1a5bd61c3..f6d1dd1ee 100644

--- a/coregrind/m_debuginfo/priv_readdwarf3.h

+++ b/coregrind/m_debuginfo/priv_readdwarf3.h

@@ -45,9 +45,10 @@ ML_(new_dwarf3_reader) (

    DiSlice escn_debug_info,      DiSlice escn_debug_types,

    DiSlice escn_debug_abbv,      DiSlice escn_debug_line,

    DiSlice escn_debug_str,       DiSlice escn_debug_ranges,

+   DiSlice escn_debug_rnglists,  DiSlice escn_debug_loclists,

    DiSlice escn_debug_loc,       DiSlice escn_debug_info_alt,

    DiSlice escn_debug_abbv_alt,  DiSlice escn_debug_line_alt,

-   DiSlice escn_debug_str_alt

+   DiSlice escn_debug_str_alt,   DiSlice escn_debug_line_str

 );

 #endif /* ndef __PRIV_READDWARF3_H */

diff --git a/coregrind/m_debuginfo/readdwarf.c b/coregrind/m_debuginfo/readdwarf.c

index 5701c504b..88d5d99f1 100644

--- a/coregrind/m_debuginfo/readdwarf.c

+++ b/coregrind/m_debuginfo/readdwarf.c

@@ -322,6 +322,123 @@ void process_extended_line_op( struct _DebugInfo* di,

 ////////////////////////////////////////////////////////////////////

 ////////////////////////////////////////////////////////////////////

+static

+HChar * get_line_str (struct _DebugInfo* di, const UnitInfo* ui,

+                      DiCursor *data, const UInt form,

+                      DiCursor debugstr_img, DiCursor debuglinestr_img)

+{

+   HChar *str = NULL;

+   switch (form) {

+   case DW_FORM_string:

+      str = ML_(cur_step_strdup)(data, "di.gls.string");

+      break;

+   case DW_FORM_strp:

+      if (!ui->dw64)

+         str = ML_(cur_read_strdup)(ML_(cur_plus)(debugstr_img,

+                                                  ML_(cur_step_UInt)(data)),

+                                    "di.gls.strp.dw32");

+      else

+         str = ML_(cur_read_strdup)(ML_(cur_plus)(debugstr_img,

+                                                  ML_(cur_step_ULong)(data)),

+                                    "di.gls.strp.dw64");

+      break;

+   case DW_FORM_line_strp:

+      if (!ui->dw64)

+         str = ML_(cur_read_strdup)(ML_(cur_plus)(debuglinestr_img,

+                                                  ML_(cur_step_UInt)(data)),

+                                    "di.gls.line_strp.dw32");

+      else

+         str = ML_(cur_read_strdup)(ML_(cur_plus)(debuglinestr_img,

+                                                  ML_(cur_step_ULong)(data)),

+                                    "di.gls.line_strp.dw64");

+      break;

+   default:

+      ML_(symerr)(di, True,

+                  "Unknown path string FORM in .debug_line");

+      break;

+   }

+   return str;

+}

+

+static

+Int get_line_ndx (struct _DebugInfo* di,

+                  DiCursor *data, const UInt form)

+{

+   Int res = 0;

+   switch (form) {

+   case DW_FORM_data1:

+      res = ML_(cur_step_UChar)(data);

+      break;

+   case DW_FORM_data2:

+      res = ML_(cur_step_UShort)(data);

+      break;

+   case DW_FORM_udata:

+      res = step_leb128U(data);

+      break;

+   default:

+      ML_(symerr)(di, True,

+                  "Unknown directory_index value FORM in .debug_line");

+      break;

+   }

+   return res;

+}

+

+static

+DiCursor skip_line_form (struct _DebugInfo* di, const UnitInfo* ui,

+                         DiCursor d, const UInt form)

+{

+   switch (form) {

+   case DW_FORM_block: {

+      ULong len = step_leb128U(&d);

+      d = ML_(cur_plus)(d, len);

+      break;

+   }

+   case DW_FORM_block1:

+      d = ML_(cur_plus)(d, ML_(cur_read_UChar)(d) + 1);

+      break;

+   case DW_FORM_block2:

+      d = ML_(cur_plus)(d, ML_(cur_read_UShort)(d) + 2);

+      break;

+   case DW_FORM_block4:

+      d = ML_(cur_plus)(d, ML_(cur_read_UInt)(d) + 4);

+      break;

+   case DW_FORM_flag:

+   case DW_FORM_data1:

+      d = ML_(cur_plus)(d, 1);

+      break;

+   case DW_FORM_data2:

+      d = ML_(cur_plus)(d, 2);

+      break;

+   case DW_FORM_data4:

+      d = ML_(cur_plus)(d, 4);

+      break;

+   case DW_FORM_data8:

+      d = ML_(cur_plus)(d, 8);

+      break;

+   case DW_FORM_data16:

+      d = ML_(cur_plus)(d, 16);

+      break;

+   case DW_FORM_string:

+      d = ML_(cur_plus)(d, ML_(cur_strlen)(d) + 1);

+      break;

+   case DW_FORM_strp:

+   case DW_FORM_line_strp:

+   case DW_FORM_sec_offset:

+      d = ML_(cur_plus)(d, ui->dw64 ? 8 : 4);

+      break;

+   case DW_FORM_udata:

+      (void)step_leb128U(&d);

+      break;

+   case DW_FORM_sdata:

+      (void)step_leb128S(&d);

+      break;

+   default:

+      ML_(symerr)(di, True, "Unknown FORM in .debug_line");

+      break;

+   }

+   return d;

+}

+

 /* read a .debug_line section block for a compilation unit

  *

  * Input:   - theBlock must point to the start of the block

@@ -335,7 +452,9 @@ static

 void read_dwarf2_lineblock ( struct _DebugInfo* di,

                              const UnitInfo* ui, 

                              DiCursor  theBlock, /* IMAGE */

-                             Int       noLargerThan )

+                             Int       noLargerThan,

+                             DiCursor  debugstr_img,

+                             DiCursor  debuglinestr_img)

 {

    Int            i;

    DebugLineInfo  info;

@@ -348,6 +467,9 @@ void read_dwarf2_lineblock ( struct _DebugInfo* di,

    DiCursor       external = theBlock;

    DiCursor       data = theBlock;

+   UChar          p_ndx = 0, d_ndx = 0; /* DWARF5 path and dir index. */

+   UInt           forms[256];           /* DWARF5 forms. */

+

    /* fndn_ix_xa is an xarray of fndn_ix (indexes in di->fndnpool) which

       are build from file names harvested from the DWARF2

       info.  Entry [0] is the "null" pool index and is never referred to

@@ -372,17 +494,6 @@ void read_dwarf2_lineblock ( struct _DebugInfo* di,

    fndn_ix_xa = VG_(newXA) (ML_(dinfo_zalloc), "di.rd2l.2", ML_(dinfo_free),

                             sizeof(UInt) );

-   /* DWARF2 starts numbering filename entries at 1, so we need to

-      add a dummy zeroth entry to the table. */

-   fndn_ix = 0; // 0 is the "null" index in a fixed pool.

-   VG_(addToXA) (fndn_ix_xa, &fndn_ix);

-

-   if (ML_(cur_is_valid)(ui->compdir))

-      dirname = ML_(addStrFromCursor)(di, ui->compdir);

-   else

-      dirname = ML_(addStr)(di, ".", -1);

-   VG_(addToXA) (dirname_xa, &dirname);

-

    info.li_length = step_initial_length_field( &external, &is64 );

    if (di->ddump_line)

       VG_(printf)("  Length:                      %llu\n", 

@@ -402,13 +513,19 @@ void read_dwarf2_lineblock ( struct _DebugInfo* di,

       VG_(printf)("  DWARF Version:               %d\n", 

                   (Int)info.li_version);

-   if (info.li_version != 2 && info.li_version != 3 && info.li_version != 4) {

+   if (info.li_version != 2 && info.li_version != 3 && info.li_version != 4

+       && info.li_version != 5) {

       ML_(symerr)(di, True,

-                  "Only DWARF version 2, 3 and 4 line info "

+                  "Only DWARF version 2, 3, 4 and 5 line info "

                   "is currently supported.");

       goto out;

    }

+   if (info.li_version >= 5) {

+      /* UChar addr_size = */ ML_(cur_step_UChar)(&external);

+      /* UChar seg_size = */  ML_(cur_step_UChar)(&external);

+   }

+

    info.li_header_length = is64 ? ML_(cur_step_ULong)(&external) 

                                 : (ULong)(ML_(cur_step_UInt)(&external));

    if (di->ddump_line)

@@ -485,60 +602,141 @@ void read_dwarf2_lineblock ( struct _DebugInfo* di,

    /* skip over "standard_opcode_lengths" */

    data = ML_(cur_plus)(standard_opcodes, info.li_opcode_base - 1);

-   /* Read the contents of the Directory table.  */

-   if (di->ddump_line)

-      VG_(printf)(" The Directory Table%s\n", 

-                  ML_(cur_read_UChar)(data) == 0 ? " is empty." : ":" );

-

-   while (ML_(cur_read_UChar)(data) != 0) {

+   if (ML_(cur_is_valid)(ui->compdir))

+      dirname = ML_(addStrFromCursor)(di, ui->compdir);

+   else

+      dirname = ML_(addStr)(di, ".", -1);

-      HChar* data_str = ML_(cur_read_strdup)(data, "di.rd2l.1");

+   if (info.li_version < 5) {

+      /* Read the contents of the Directory table.  */

       if (di->ddump_line)

-         VG_(printf)("  %s\n", data_str);

-

-      /* If data[0] is '/', then 'data' is an absolute path and we

-         don't mess with it.  Otherwise, construct the

-         path 'ui->compdir' ++ "/" ++ 'data'. */

-

-      if (data_str[0] != '/' 

-          /* not an absolute path */

-          && ML_(cur_is_valid)(ui->compdir)

-          /* actually got something sensible for compdir */

-          && ML_(cur_strlen)(ui->compdir))

-      {

-         HChar* compdir_str = ML_(cur_read_strdup)(ui->compdir, "di.rd2l.1b");

-         SizeT  len = VG_(strlen)(compdir_str) + 1 + VG_(strlen)(data_str);

-         HChar *buf = ML_(dinfo_zalloc)("di.rd2l.1c", len + 1);

-

-         VG_(strcpy)(buf, compdir_str);

-         VG_(strcat)(buf, "/");

-         VG_(strcat)(buf, data_str);

-

-         dirname = ML_(addStr)(di, buf, len);

-         VG_(addToXA) (dirname_xa, &dirname);

-         if (0) VG_(printf)("rel path  %s\n", buf);

-         ML_(dinfo_free)(compdir_str);

-         ML_(dinfo_free)(buf);

-      } else {

-         /* just use 'data'. */

-         dirname = ML_(addStr)(di,data_str,-1);

-         VG_(addToXA) (dirname_xa, &dirname);

-         if (0) VG_(printf)("abs path  %s\n", data_str);

+         VG_(printf)("The Directory Table%s\n",

+                     ML_(cur_read_UChar)(data) == 0 ? " is empty." : ":" );

+

+      /* DWARF2 starts numbering filename entries at 1, so we need to

+         add a dummy zeroth entry to the table.  */

+      fndn_ix = 0; // 0 is the "null" index in a fixed pool.

+      VG_(addToXA) (fndn_ix_xa, &fndn_ix);

+      VG_(addToXA) (dirname_xa, &dirname);

+

+      while (ML_(cur_read_UChar)(data) != 0) {

+

+         HChar* data_str = ML_(cur_read_strdup)(data, "di.rd2l.1");

+         if (di->ddump_line)

+            VG_(printf)("  %s\n", data_str);

+

+         /* If data[0] is '/', then 'data' is an absolute path and we

+            don't mess with it.  Otherwise, construct the

+            path 'ui->compdir' ++ "/" ++ 'data'. */

+

+         if (data_str[0] != '/'

+             /* not an absolute path */

+             && ML_(cur_is_valid)(ui->compdir)

+             /* actually got something sensible for compdir */

+             && ML_(cur_strlen)(ui->compdir))

+         {

+            HChar* compdir_str = ML_(cur_read_strdup)(ui->compdir,

+                                                      "di.rd2l.1b");

+            SizeT  len = VG_(strlen)(compdir_str) + 1 + VG_(strlen)(data_str);

+            HChar *buf = ML_(dinfo_zalloc)("di.rd2l.1c", len + 1);

+

+            VG_(strcpy)(buf, compdir_str);

+            VG_(strcat)(buf, "/");

+            VG_(strcat)(buf, data_str);

+

+            dirname = ML_(addStr)(di, buf, len);

+            VG_(addToXA) (dirname_xa, &dirname);

+            if (0) VG_(printf)("rel path  %s\n", buf);

+            ML_(dinfo_free)(compdir_str);

+            ML_(dinfo_free)(buf);

+         } else {

+            /* just use 'data'. */

+            dirname = ML_(addStr)(di,data_str,-1);

+            VG_(addToXA) (dirname_xa, &dirname);

+            if (0) VG_(printf)("abs path  %s\n", data_str);

+         }

+

+         data = ML_(cur_plus)(data, VG_(strlen)(data_str) + 1);

+         ML_(dinfo_free)(data_str);

       }

-      data = ML_(cur_plus)(data, VG_(strlen)(data_str) + 1);

-      ML_(dinfo_free)(data_str);

-   }

+      if (di->ddump_line)

+         VG_(printf)("\n");

-   if (di->ddump_line)

-      VG_(printf)("\n");

+      if (ML_(cur_read_UChar)(data) != 0) {

+         ML_(symerr)(di, True,

+                     "can't find NUL at end of DWARF2 directory table");

+         goto out;

+      }

+      data = ML_(cur_plus)(data, 1);

+   } else {

+      UInt directories_count;

+      UChar directory_entry_format_count = ML_(cur_step_UChar)(&data);

+      UInt n;

+      for (n = 0; n < directory_entry_format_count; n++) {

+         UInt lnct = step_leb128U(&data);

+         UInt form = step_leb128U(&data);

+         if (lnct == DW_LNCT_path)

+            p_ndx = n;

+         forms[n] = form;

+      }

+      directories_count = step_leb128U(&data);

+      /* Read the contents of the Directory table.  */

+      if (di->ddump_line)

+         VG_(printf)(" dwarf The Directory Table%s\n",

+                     directories_count == 0 ? " is empty." : ":" );

+

+      for (n = 0; n < directories_count; n++) {

+         UInt f;

+         for (f = 0; f < directory_entry_format_count; f++) {

+            UInt form = forms[f];

+            if (f == p_ndx) {

+               HChar *data_str = get_line_str (di, ui, &data, form,

+                                               debugstr_img,

+                                               debuglinestr_img);

+               if (di->ddump_line)

+                  VG_(printf)("  %s\n", data_str);

+

+               /* If data[0] is '/', then 'data' is an absolute path and we

+                  don't mess with it.  Otherwise, construct the

+                  path 'ui->compdir' ++ "/" ++ 'data'. */

+

+               if (data_str[0] != '/'

+                   /* not an absolute path */

+                   && ML_(cur_is_valid)(ui->compdir)

+                   /* actually got something sensible for compdir */

+                   && ML_(cur_strlen)(ui->compdir))

+               {

+                  HChar* compdir_str = ML_(cur_read_strdup)(ui->compdir,

+                                                            "di.rd2l.1b");

+                  SizeT  len = VG_(strlen)(compdir_str) + 1

+                     + VG_(strlen)(data_str);

+                  HChar *buf = ML_(dinfo_zalloc)("di.rd2l.1c", len + 1);

+

+                  VG_(strcpy)(buf, compdir_str);

+                  VG_(strcat)(buf, "/");

+                  VG_(strcat)(buf, data_str);

+

+                  dirname = ML_(addStr)(di, buf, len);

+                  VG_(addToXA) (dirname_xa, &dirname);

+                  if (0) VG_(printf)("rel path  %s\n", buf);

+                  ML_(dinfo_free)(compdir_str);

+                  ML_(dinfo_free)(buf);

+               } else {

+                  /* just use 'data'. */

+                  dirname = ML_(addStr)(di,data_str,-1);

+                  VG_(addToXA) (dirname_xa, &dirname);

+                  if (0) VG_(printf)("abs path  %s\n", data_str);

+               }

-   if (ML_(cur_read_UChar)(data) != 0) {

-      ML_(symerr)(di, True,

-                  "can't find NUL at end of DWARF2 directory table");

-      goto out;

+               ML_(dinfo_free)(data_str);

+

+            } else {

+               data = skip_line_form (di, ui, data, form);

+            }

+         }

+      }

    }

-   data = ML_(cur_plus)(data, 1);

    /* Read the contents of the File Name table.  This produces a bunch

       of fndn_ix in fndn_ix_xa. */

@@ -547,33 +745,76 @@ void read_dwarf2_lineblock ( struct _DebugInfo* di,

       VG_(printf)("  Entry	Dir	Time	Size	Name\n");

    }

-   i = 1;

-   while (ML_(cur_read_UChar)(data) != 0) {

-      HChar* name    = ML_(cur_step_strdup)(&data, "di.rd2l.2");

-      Int    diridx  = step_leb128U(&data);

-      Int    uu_time = step_leb128U(&data); /* unused */

-      Int    uu_size = step_leb128U(&data); /* unused */

+   if (info.li_version < 5) {

+      i = 1;

+      while (ML_(cur_read_UChar)(data) != 0) {

+         HChar* name    = ML_(cur_step_strdup)(&data, "di.rd2l.2");

+         Int    diridx  = step_leb128U(&data);

+         Int    uu_time = step_leb128U(&data); /* unused */

+         Int    uu_size = step_leb128U(&data); /* unused */

+

+         dirname = safe_dirname_ix( dirname_xa, diridx );

+         fndn_ix = ML_(addFnDn) (di, name, dirname);

+         VG_(addToXA) (fndn_ix_xa, &fndn_ix);

+         if (0) VG_(printf)("file %s diridx %d\n", name, diridx );

+         if (di->ddump_line)

+            VG_(printf)("  %d\t%d\t%d\t%d\t%s\n",

+                        i, diridx, uu_time, uu_size, name);

+         i++;

+         ML_(dinfo_free)(name);

+      }

-      dirname = safe_dirname_ix( dirname_xa, diridx );

-      fndn_ix = ML_(addFnDn) (di, name, dirname);

-      VG_(addToXA) (fndn_ix_xa, &fndn_ix);

-      if (0) VG_(printf)("file %s diridx %d\n", name, diridx );

       if (di->ddump_line)

-         VG_(printf)("  %d\t%d\t%d\t%d\t%s\n", 

-                     i, diridx, uu_time, uu_size, name);

-      i++;

-      ML_(dinfo_free)(name);

-   }

+         VG_(printf)("\n");

-   if (di->ddump_line)

-      VG_(printf)("\n");