Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304932
b: refs/heads/master
c: e8ea156
h: refs/heads/master
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo committed May 11, 2012
1 parent 88d55db commit 4cc600c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5dcefda0fd87fefa440abc9b9d3f1089229f8911
refs/heads/master: e8ea1561952b04276cf4c02500e363de76c142aa
9 changes: 9 additions & 0 deletions trunk/tools/perf/util/annotate.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ static int call__parse(struct ins_operands *ops)
return ops->target.name == NULL ? -1 : 0;

indirect_call:
tok = strchr(endptr, '(');
if (tok != NULL) {
ops->target.addr = 0;
return 0;
}

tok = strchr(endptr, '*');
if (tok == NULL)
return -1;
Expand All @@ -70,6 +76,9 @@ static int call__scnprintf(struct ins *ins, char *bf, size_t size,
if (ops->target.name)
return scnprintf(bf, size, "%-6.6s %s", ins->name, ops->target.name);

if (ops->target.addr == 0)
return ins__raw_scnprintf(ins, bf, size, ops);

return scnprintf(bf, size, "%-6.6s *%" PRIx64, ins->name, ops->target.addr);
}

Expand Down

0 comments on commit 4cc600c

Please sign in to comment.