Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 304934
b: refs/heads/master
c: a43712c
h: refs/heads/master
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo committed May 11, 2012
1 parent fdf72bc commit 8328e5b
Show file tree
Hide file tree
Showing 2 changed files with 46 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: 6de783b6f50f7f1db18a3fda0aa34b2e84b5771d
refs/heads/master: a43712c4720c8df4bad7d3760c67086168553b05
45 changes: 45 additions & 0 deletions trunk/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 8328e5b

Please sign in to comment.