diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-05-14 10:45:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-05-14 10:45:01 +0200 |
| commit | 0c5a0f96e82ed73bca017c1c5601a4253cff49df (patch) | |
| tree | a15295eb3489e9ace0b6c55c595366665e939084 /tools/perf/util/annotate.h | |
| parent | 5dcefda0fd87fefa440abc9b9d3f1089229f8911 (diff) | |
| parent | 54e7a4e88eed9ac423e22a259ec51a973fd59bab (diff) | |
| download | linux-next-0c5a0f96e82ed73bca017c1c5601a4253cff49df.tar.gz linux-next-0c5a0f96e82ed73bca017c1c5601a4253cff49df.zip | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Arjan & Linus Annotation Edition
- Fix indirect calls beautifier, reported by Linus.
- Use the objdump comments to nuke specificities about how access to a well
know variable is encoded, suggested by Linus.
- Show the number of places that jump to a target, requested by Arjan.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/util/annotate.h')
| -rw-r--r-- | tools/perf/util/annotate.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index bb0a9f27165b..78a5692dd718 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -13,13 +13,26 @@ struct ins; struct ins_operands { char *raw; struct { + char *raw; char *name; - u64 offset; u64 addr; + u64 offset; } target; + union { + struct { + char *raw; + char *name; + u64 addr; + } source; + struct { + struct ins *ins; + struct ins_operands *ops; + } locked; + }; }; struct ins_ops { + void (*free)(struct ins_operands *ops); int (*parse)(struct ins_operands *ops); int (*scnprintf)(struct ins *ins, char *bf, size_t size, struct ins_operands *ops); |