Messages in this thread Patch in this message | | | From | Adrian Hunter <> | Subject | [PATCH V6 5/8] perf tools: find kcore symbols on other maps | Date | Wed, 9 Oct 2013 15:01:15 +0300 |
| |
Use the new map__find_other_map_symbol() to find kcore symbols on other maps.
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- tools/perf/util/annotate.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 8763dab..ed98e01 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -825,20 +825,15 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, dl->ops.target.offset = dl->ops.target.addr - map__rip_2objdump(map, sym->start); - /* - * kcore has no symbols, so add the call target name if it is on the - * same map. - */ + /* kcore has no symbols, so add the call target name */ if (dl->ins && ins__is_call(dl->ins) && !dl->ops.target.name) { + struct map *map_ptr = map; struct symbol *s; u64 ip = dl->ops.target.addr; - if (ip >= map->start && ip <= map->end) { - ip = map->map_ip(map, ip); - s = map__find_symbol(map, ip, NULL); - if (s && s->start == ip) - dl->ops.target.name = strdup(s->name); - } + s = map__find_other_map_symbol(&map_ptr, &ip, NULL); + if (s && s->start == ip) + dl->ops.target.name = strdup(s->name); } disasm__add(¬es->src->source, dl); -- 1.7.11.7
| |