Re: [PATCH v3 09/20] gendwarfksyms: Expand array_type

[Petr Pavlu]

On 9/23/24 20:18, Sami Tolvanen wrote:
> Add support for expanding DW_TAG_array_type, and the subrange type
> indicating array size.
> 
> Example source code:
> 
>   const char *s[34];
> 
> Output with --dump-dies:
> 
>   variable array_type[34] {
> pointer_type {
>   const_type {
> base_type char byte_size(1) encoding(6)
>   }
> } byte_size(8)
>   }
> 
> Signed-off-by: Sami Tolvanen 
> [...]

Looks ok to me, feel free to add:
Reviewed-by: Petr Pavlu 

-- 
Thanks,
Petr

[PATCH v3 09/20] gendwarfksyms: Expand array_type

[Sami Tolvanen]

Add support for expanding DW_TAG_array_type, and the subrange type
indicating array size.

Example source code:

  const char *s[34];

Output with --dump-dies:

  variable array_type[34] {
pointer_type {
  const_type {
base_type char byte_size(1) encoding(6)
  }
} byte_size(8)
  }

Signed-off-by: Sami Tolvanen 
---
 scripts/gendwarfksyms/dwarf.c | 30 ++
 1 file changed, 30 insertions(+)

diff --git a/scripts/gendwarfksyms/dwarf.c b/scripts/gendwarfksyms/dwarf.c
index 5bdab5b80ca2..caf25da0a9b9 100644
--- a/scripts/gendwarfksyms/dwarf.c
+++ b/scripts/gendwarfksyms/dwarf.c
@@ -217,6 +217,7 @@ DEFINE_PROCESS_UDATA_ATTRIBUTE(encoding)
}
 
 DEFINE_MATCH(formal_parameter)
+DEFINE_MATCH(subrange)
 
 bool match_all(Dwarf_Die *die)
 {
@@ -339,6 +340,33 @@ DEFINE_PROCESS_TYPE(shared)
 DEFINE_PROCESS_TYPE(volatile)
 DEFINE_PROCESS_TYPE(typedef)
 
+static void process_subrange_type(struct state *state, struct die *cache,
+ Dwarf_Die *die)
+{
+   Dwarf_Word count = 0;
+
+   if (get_udata_attr(die, DW_AT_count, &count))
+   process_fmt(cache, "[%" PRIu64 "]", count);
+   else if (get_udata_attr(die, DW_AT_upper_bound, &count))
+   process_fmt(cache, "[%" PRIu64 "]", count + 1);
+   else
+   process(cache, "[]");
+}
+
+static void process_array_type(struct state *state, struct die *cache,
+  Dwarf_Die *die)
+{
+   process(cache, "array_type");
+   /* Array size */
+   check(process_die_container(state, cache, die, process_type,
+   match_subrange_type));
+   process(cache, " {");
+   process_linebreak(cache, 1);
+   process_type_attr(state, cache, die);
+   process_linebreak(cache, -1);
+   process(cache, "}");
+}
+
 static void __process_subroutine_type(struct state *state, struct die *cache,
  Dwarf_Die *die, const char *type)
 {
@@ -434,7 +462,9 @@ static int process_type(struct state *state, struct die 
*parent, Dwarf_Die *die)
PROCESS_TYPE(volatile)
/* Subtypes */
PROCESS_TYPE(formal_parameter)
+   PROCESS_TYPE(subrange)
/* Other types */
+   PROCESS_TYPE(array)
PROCESS_TYPE(base)
PROCESS_TYPE(subroutine)
PROCESS_TYPE(typedef)
-- 
2.46.0.792.g87dc391469-goog