summaryrefslogtreecommitdiff
path: root/tools/perf/util/annotate.h
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2012-04-25 08:00:23 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2012-04-25 08:00:23 -0300
commit44d1a3edfbd65f9da6725921e2425b10477772d8 (patch)
tree127655e788cf172e26eea4e38b98303c998e0d4a /tools/perf/util/annotate.h
parent9481ede909e08418c9379665ee9f25335d20dd06 (diff)
downloadlwn-44d1a3edfbd65f9da6725921e2425b10477772d8.tar.gz
lwn-44d1a3edfbd65f9da6725921e2425b10477772d8.zip
perf annotate: Disambiguage offsets and addresses in operands
We were using ins_ops->target for callq addresses and jump offsets, disambiguate by having ins_ops->target.addr and ins_ops->target.offset. For jumps we'll need both to fixup lines that don't have an offset on the <> part. 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-3nlcmstua75u07ao7wja1rwx@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/annotate.h')
-rw-r--r--tools/perf/util/annotate.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index 8a8af0d82b07..2b9e3e038a84 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -11,8 +11,11 @@ struct ins;
struct ins_operands {
char *raw;
- char *target_name;
- u64 target;
+ struct {
+ char *name;
+ u64 offset;
+ u64 addr;
+ } target;
};
struct ins_ops {