Re: [PATCH 1/2] perf annotate: handle ins parsing failures

Arnaldo Carvalho de Melo
2015-01-19T15:08:46Z

Em Sun, Jan 18, 2015 at 08:00:20PM +0100, Rabin Vincent escreveu:
> Don't use the ins's ->sncprintf() if the parsing failed.
>
> For example, this fixes the display of "imul %edx". Without this patch:
>
> | imul (null),(null)
>
> After this patch:
>
> | imul %edx

Thanks, both applied!

- Arnaldo

> Signed-off-by: Rabin Vincent <rabin@rab.in>
> ---
> tools/perf/util/annotate.c | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c
> index 79999ce..5ae428b 100644
> --- a/tools/perf/util/annotate.c
> +++ b/tools/perf/util/annotate.c
> @@ -183,8 +183,9 @@ static int lock__parse(struct ins_operands *ops)
> if (!ops->locked.ins->ops)
> return 0;
>
> - if (ops->locked.ins->ops->parse)
> - ops->locked.ins->ops->parse(ops->locked.ops);
> + if (ops->locked.ins->ops->parse
> + && ops->locked.ins->ops->parse(ops->locked.ops) < 0)
> + goto out_free_ops;
>
> return 0;
>
> @@ -531,8 +532,8 @@ static void disasm_line__init_ins(struct disasm_line *dl)
> if (!dl->ins->ops)
> return;
>
> - if (dl->ins->ops->parse)
> - dl->ins->ops->parse(&dl->ops);
> + if (dl->ins->ops->parse && dl->ins->ops->parse(&dl->ops) < 0)
> + dl->ins = NULL;
> }
>
> static int disasm_line__parse(char *line, char **namep, char **rawp)
> --
> 2.1.4