diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-08-18 10:14:43 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-08-18 10:14:43 +0200 |
| commit | af924aa35129edf338ebc8da6a4eae08cf7cb297 (patch) | |
| tree | 45417e729d0b4f0a346963f6b76e34687df2aa5a /tools/perf/util/annotate.c | |
| parent | f373da34282560c60f0c197690eecb1b2dc49fc0 (diff) | |
| parent | 759e612bf96627b64fcafe4174b3f6f2dedf2c0d (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
User visible changes:
* Warn user to rebuild target with debuginfo in 'perf probe' (Masami Hiramatsu)
* Don't truncate Intel style addresses in 'annotate'. (Alex Converse)
Infrastructure changes:
* Annotate PMU related list_head members with type info. (Cody P Schafer)
* Add the triplet used for arm64 by Android (Elliott Hughes)
* Replace thread unsafe strerror() with strerror_r() accross the
whole tools/perf/ tree (Masami Hiramatsu)
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.c')
| -rw-r--r-- | tools/perf/util/annotate.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 7745fec01a6..36437527dbb 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -232,9 +232,16 @@ static int mov__parse(struct ins_operands *ops) return -1; target = ++s; + comment = strchr(s, '#'); - while (s[0] != '\0' && !isspace(s[0])) - ++s; + if (comment != NULL) + s = comment - 1; + else + s = strchr(s, '\0') - 1; + + while (s > target && isspace(s[0])) + --s; + s++; prev = *s; *s = '\0'; @@ -244,7 +251,6 @@ static int mov__parse(struct ins_operands *ops) if (ops->target.raw == NULL) goto out_free_source; - comment = strchr(s, '#'); if (comment == NULL) return 0; |