Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a43712c4 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Resolve symbols using objdump comment for single op ins 



Starting with inc, incl, dec, decl.

Requested-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-jvh0jspefr5jyn0l7qko12st@git.kernel.org


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

tools/perf/util/annotate.c

+45 −0
Original line number Diff line number Diff line
@@ -205,6 +205,47 @@ static struct ins_ops mov_ops = { 
	.scnprintf = mov__scnprintf,

};



static int dec__parse(struct ins_operands *ops)

{

	char *target, *comment, *s, prev;



	target = s = ops->raw;



	while (s[0] != '\0' && !isspace(s[0]))

		++s;

	prev = *s;

	*s = '\0';



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

	*s = prev;



	if (ops->target.raw == NULL)

		return -1;



	comment = strchr(s, '#');

	if (comment == NULL)

		return 0;



	while (comment[0] != '\0' && isspace(comment[0]))

		++comment;



	comment__symbol(ops->target.raw, comment, &ops->target.addr, &ops->target.name);



	return 0;

}



static int dec__scnprintf(struct ins *ins, char *bf, size_t size,

			   struct ins_operands *ops)

{

	return scnprintf(bf, size, "%-6.6s %s", ins->name,

			 ops->target.name ?: ops->target.raw);

}



static struct ins_ops dec_ops = {

	.parse	   = dec__parse,

	.scnprintf = dec__scnprintf,

};



static int nop__scnprintf(struct ins *ins __used, char *bf, size_t size,

			  struct ins_operands *ops __used)

{
@@ -232,7 +273,11 @@ static struct ins instructions[] = { 
	{ .name = "cmpq",  .ops  = &mov_ops, },

	{ .name = "cmpw",  .ops  = &mov_ops, },

	{ .name = "cmpxch", .ops  = &mov_ops, },

	{ .name = "dec",   .ops  = &dec_ops, },

	{ .name = "decl",  .ops  = &dec_ops, },

	{ .name = "imul",  .ops  = &mov_ops, },

	{ .name = "inc",   .ops  = &dec_ops, },

	{ .name = "incl",  .ops  = &dec_ops, },

	{ .name = "ja",	   .ops  = &jump_ops, },

	{ .name = "jae",   .ops  = &jump_ops, },

	{ .name = "jb",	   .ops  = &jump_ops, },