Skip to content

Commit

Permalink
perf annotate: Resolve symbols using objdump comment for single op ins
Browse files Browse the repository at this point in the history
Starting with inc, incl, dec, decl.

Requested-by: Linus 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: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed May 11, 2012
1 parent 6de783b commit a43712c
Showing 1 changed file with 45 additions and 0 deletions.
45 changes: 45 additions & 0 deletions tools/perf/util/annotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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, },
Expand Down

0 comments on commit a43712c

Please sign in to comment.