Re: [PATCH 2/4] Handle DWARF5 headers for compile and partial units.

[Jakub Jelinek <jakub@redhat.com>]

On Mon, Sep 14, 2020 at 12:23:53PM +0200, Mark Wielaard wrote:
> DWARF5 also has separate unit headers for types (replacing .debug_types)
> and unit types for split-DWARF both a skeleton tree as compile and split
> trees. Which aren't handled yet.
> 
> 	* dwz.c (get_DW_UT_str): New function.
> 	(read_debug_line): Add .debug_line in version message error string.
> 	(try_debug_info): Parse cu_version 5 header for DW_UT_compile and
> 	DW_UT_partial. Add explicit error message for failing to read
> 	abbrev.
> 	(read_debug_info): Likewise.
> ---
>  dwz.c | 146 +++++++++++++++++++++++++++++++++++++++++++++++-----------
>  1 file changed, 120 insertions(+), 26 deletions(-)
> 
> diff --git a/dwz.c b/dwz.c
> index 6a4c96c..5d4b004 100644
> --- a/dwz.c
> +++ b/dwz.c
> @@ -670,6 +670,28 @@ get_DW_AT_str (unsigned int at)
>    return buf;
>  }
>  
> +/* Retrun a DW_UT_* name.  */
> +static const char *
> +get_DW_UT_str (unsigned int ut)
> +{
> +  const char *name;
> +  static char buf[7 + 3 * sizeof (int)];
> +  switch (ut)
> +    {
> +    case DW_UT_compile: name = "DW_UT_compile"; break;
> +    case DW_UT_type: name = "DW_UT_type"; break;
> +    case DW_UT_partial: name = "DW_UT_partial"; break;
> +    case DW_UT_skeleton: name = "DW_UT_partial"; break;

Pasto?

> +    case DW_UT_split_compile: name = "DW_UT_split_compile"; break;
> +    case DW_UT_split_type: name = "DW_UT_split_type"; break;
> +    default: name = 0; break;
> +    }

> @@ -5572,24 +5594,41 @@ try_debug_info (DSO *dso)
>  	}
>  
>        cu_version = read_16 (ptr);
> -      if (cu_version < 2 || cu_version > 4)
> +      if (kind == DEBUG_TYPES &&
> +	  (cu_version < 2 || cu_version > 4))

I think dwz follows e.g. the GCC formatting and &&s etc. go
to the start of line rather than end of it.

Ok with the nits fixed.

	Jakub