Commit 94f0705e authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Parse x86 SIB addressing properly 



When the source argument of the "mov" instruction looks like below, it
didn't parse the whole operand and just stopped at the first comma.

  mov    (%rbx,%rax,1),%rcx

Fix it by checking the parentheses and move it to the closing one.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20230511062725.514752-2-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 983034cd

tools/perf/util/annotate.c

+13 −0
Original line number Diff line number Diff line
@@ -558,6 +558,19 @@ static int mov__parse(struct arch *arch, struct ins_operands *ops, struct map_sy 
		return -1;



	*s = '\0';



	/*

	 * x86 SIB addressing has something like 0x8(%rax, %rcx, 1)

	 * then it needs to have the closing parenthesis.

	 */

	if (strchr(ops->raw, '(')) {

		*s = ',';

		s = strchr(ops->raw, ')');

		if (s == NULL || s[1] != ',')

			return -1;

		*++s = '\0';

	}



	ops->source.raw = strdup(ops->raw);

	*s = ',';