On 8/15/24 19:39, Sami Tolvanen wrote:
> Add support for expanding DW_TAG_subroutine_type and the parameters
> in DW_TAG_formal_parameter. Use this to also expand subprograms.
>
> Example output with --debug:
>
> subprogram(
> formal_parameter base_type usize byte_size(8),
> formal_parameter base_type usize byte_size(8),
> )
> -> base_type void;
>
> Signed-off-by: Sami Tolvanen <samitolvanen@xxxxxxxxxx>
> ---
> scripts/gendwarfksyms/dwarf.c | 57 ++++++++++++++++++++++++++-
> scripts/gendwarfksyms/gendwarfksyms.h | 1 +
> 2 files changed, 57 insertions(+), 1 deletion(-)
>
> diff --git a/scripts/gendwarfksyms/dwarf.c b/scripts/gendwarfksyms/dwarf.c
> index 82185737fa2a..c81652426be8 100644
> --- a/scripts/gendwarfksyms/dwarf.c
> +++ b/scripts/gendwarfksyms/dwarf.c
> [...]
>
> +static int __process_subroutine_type(struct state *state, struct die *cache,
> + Dwarf_Die *die, const char *type)
> +{
> + check(process(state, cache, type));
> + check(process(state, cache, "("));
> + check(process_linebreak(cache, 1));
> + /* Parameters */
> + check(process_die_container(state, cache, die, process_type,
> + match_formal_parameter_type));
> + check(process_linebreak(cache, -1));
> + check(process(state, cache, ")"));
> + process_linebreak(cache, 0);
> + /* Return type */
> + check(process(state, cache, "-> "));
> + return check(process_type_attr(state, cache, die));
> +}
If I understand correctly, this formatting logic also affects the
symtypes output. Looking at its format, I would like to propose a few
minor changes.
Example of the current symtypes output:
kprobe_event_cmd_init subprogram( formal_parameter pointer_type <unnamed> { s#dynevent_cmd } byte_size(8), formal_parameter pointer_type <unnamed> { base_type char byte_size(1) encoding(8) } byte_size(8), formal_parameter base_type int byte_size(4) encoding(5), ) -> base_type void
Proposed changes:
kprobe_event_cmd_init subprogram ( formal_parameter pointer_type <unnamed> { s#dynevent_cmd } byte_size(8) , formal_parameter pointer_type <unnamed> { base_type char byte_size(1) encoding(8) } byte_size(8) , formal_parameter base_type int byte_size(4) encoding(5) ) -> base_type void
^- (1) ^- (2) ^- (3)
(1) "subprogram(" is split to "subprogram (".
(2) A space is added prior to ",".
(3) String ", " is removed after the last parameter.
Separating each token with a whitespace matches the current genksyms
format, makes the data trivially parsable and easy to pretty-print by
additional tools. If some tokens are merged, as in "subprogram(", then
such a tool needs to have extra logic to parse each word and split it
into tokens.
For attributes with one value, such as "byte_size(4)", I think the
current format is probably ok.
--
Thanks,
Petr
