提交 94e44b9c 编写于 作者: A Arnaldo Carvalho de Melo

perf annotate: Stop using map->groups, use map_symbol->mg instead

These were the last uses of map->groups, next cset will nuke it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-n3g0foos7l7uxq9nar0zo0vj@git.kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 08f6680e
...@@ -38,7 +38,7 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops, ...@@ -38,7 +38,7 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops,
return -1; return -1;
target.addr = map__objdump_2mem(map, ops->target.addr); target.addr = map__objdump_2mem(map, ops->target.addr);
if (map_groups__find_ams(map->groups, &target) == 0 && if (map_groups__find_ams(ms->mg, &target) == 0 &&
map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr) map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)
ops->target.sym = target.ms.sym; ops->target.sym = target.ms.sym;
......
...@@ -430,6 +430,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser, ...@@ -430,6 +430,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
return true; return true;
} }
target_ms.mg = ms->mg;
target_ms.map = ms->map; target_ms.map = ms->map;
target_ms.sym = dl->ops.target.sym; target_ms.sym = dl->ops.target.sym;
pthread_mutex_unlock(&notes->lock); pthread_mutex_unlock(&notes->lock);
......
...@@ -271,7 +271,7 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_s ...@@ -271,7 +271,7 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_s
find_target: find_target:
target.addr = map__objdump_2mem(map, ops->target.addr); target.addr = map__objdump_2mem(map, ops->target.addr);
if (map_groups__find_ams(map->groups, &target) == 0 && if (map_groups__find_ams(ms->mg, &target) == 0 &&
map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr) map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)
ops->target.sym = target.ms.sym; ops->target.sym = target.ms.sym;
...@@ -391,7 +391,7 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s ...@@ -391,7 +391,7 @@ static int jump__parse(struct arch *arch, struct ins_operands *ops, struct map_s
* Actual navigation will come next, with further understanding of how * Actual navigation will come next, with further understanding of how
* the symbol searching and disassembly should be done. * the symbol searching and disassembly should be done.
*/ */
if (map_groups__find_ams(map->groups, &target) == 0 && if (map_groups__find_ams(ms->mg, &target) == 0 &&
map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr) map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr)
ops->target.sym = target.ms.sym; ops->target.sym = target.ms.sym;
...@@ -1545,7 +1545,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, ...@@ -1545,7 +1545,7 @@ static int symbol__parse_objdump_line(struct symbol *sym,
.ms = { .map = map, }, .ms = { .map = map, },
}; };
if (!map_groups__find_ams(map->groups, &target) && if (!map_groups__find_ams(args->ms.mg, &target) &&
target.ms.sym->start == target.al_addr) target.ms.sym->start == target.al_addr)
dl->ops.target.sym = target.ms.sym; dl->ops.target.sym = target.ms.sym;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册