Commit 94e44b9c authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 08f6680e

tools/perf/arch/s390/annotate/instructions.c

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static int s390_call__parse(struct arch *arch, struct ins_operands *ops, 
		return -1;

	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)

		ops->target.sym = target.ms.sym;

tools/perf/ui/browsers/annotate.c

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser, 
		return true;

	}



	target_ms.mg  = ms->mg;

	target_ms.map = ms->map;

	target_ms.sym = dl->ops.target.sym;

	pthread_mutex_unlock(&notes->lock);

tools/perf/util/annotate.c

+3 −3
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static int call__parse(struct arch *arch, struct ins_operands *ops, struct map_s 
find_target:

	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)

		ops->target.sym = target.ms.sym;
@@ -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

	 * 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)

		ops->target.sym = target.ms.sym;
@@ -1545,7 +1545,7 @@ static int symbol__parse_objdump_line(struct symbol *sym, 
			.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)

			dl->ops.target.sym = target.ms.sym;

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE