Commit 5301cc69 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf disasm: Refactor ins__is_call/jump to avoid exposing arch ins_ops 



Add booleans indicating whether and ins_ops are call or jump and
return it. This avoids exposing loongarch and s390 ins_ops for the
sake of matching.

Reviewed-by: default avatarJames Clark <james.clark@linaro.org>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Aditya Bodkhe <aditya.b1@linux.ibm.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Athira Rajeev <atrajeev@linux.ibm.com>
Cc: Bill Wendling <morbo@google.com>
Cc: Dr. David Alan Gilbert <linux@treblig.org>
Cc: Guo Ren <guoren@kernel.org>
Cc: Howard Chu <howardchu95@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Julia Lawall <Julia.Lawall@inria.fr>
Cc: Justin Stitt <justinstitt@google.com>
Cc: Krzysztof Łopatowski <krzysztof.m.lopatowski@gmail.com>
Cc: Leo Yan <leo.yan@linux.dev>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <nick.desaulniers+lkml@gmail.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Paul Walmsley <pjw@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sergei Trofimovich <slyich@gmail.com>
Cc: Shimin Guo <shimin.guo@skydio.com>
Cc: Suchit Karunakaran <suchitkarunakaran@gmail.com>
Cc: Thomas Falcon <thomas.falcon@intel.com>
Cc: Tianyou Li <tianyou.li@intel.com>
Cc: Will Deacon <will@kernel.org>
Cc: Zecheng Li <zecheng@google.com>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 07b972ff

tools/perf/util/annotate-arch/annotate-loongarch.c

+4 −2
Original line number Diff line number Diff line
@@ -57,9 +57,10 @@ static int loongarch_call__parse(const struct arch *arch, struct ins_operands *o 
	return 0;

}



const struct ins_ops loongarch_call_ops = {

static const struct ins_ops loongarch_call_ops = {

	.parse	   = loongarch_call__parse,

	.scnprintf = call__scnprintf,

	.is_call   = true,

};



static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *ops,
@@ -106,9 +107,10 @@ static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *o 
	return 0;

}



const struct ins_ops loongarch_jump_ops = {

static const struct ins_ops loongarch_jump_ops = {

	.parse	   = loongarch_jump__parse,

	.scnprintf = jump__scnprintf,

	.is_jump   = true,

};



static

tools/perf/util/annotate-arch/annotate-s390.c

+2 −1
Original line number Diff line number Diff line
@@ -57,9 +57,10 @@ static int s390_call__parse(const struct arch *arch, struct ins_operands *ops, 
	return 0;

}



const struct ins_ops s390_call_ops = {

static const struct ins_ops s390_call_ops = {

	.parse	   = s390_call__parse,

	.scnprintf = call__scnprintf,

	.is_call   = true,

};



static int s390_mov__parse(const struct arch *arch __maybe_unused,

tools/perf/util/disasm.c

+4 −2
Original line number Diff line number Diff line
@@ -315,11 +315,12 @@ int call__scnprintf(const struct ins *ins, char *bf, size_t size, 
const struct ins_ops call_ops = {

	.parse	   = call__parse,

	.scnprintf = call__scnprintf,

	.is_call   = true,

};



bool ins__is_call(const struct ins *ins)

{

	return ins->ops == &call_ops || ins->ops == &s390_call_ops || ins->ops == &loongarch_call_ops;

	return ins->ops && ins->ops->is_call;

}



/*
@@ -469,11 +470,12 @@ const struct ins_ops jump_ops = { 
	.free	   = jump__delete,

	.parse	   = jump__parse,

	.scnprintf = jump__scnprintf,

	.is_jump   = true,

};



bool ins__is_jump(const struct ins *ins)

{

	return ins->ops == &jump_ops || ins->ops == &loongarch_jump_ops;

	return ins->ops && ins->ops->is_jump;

}



static int comment__symbol(char *raw, char *comment, u64 *addrp, char **namep)

tools/perf/util/disasm.h

+2 −3
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ struct ins_ops { 
			struct disasm_line *dl);

	int (*scnprintf)(const struct ins *ins, char *bf, size_t size,

			 struct ins_operands *ops, int max_ins_name);

	bool is_jump;

	bool is_call;

};



struct annotate_args {
@@ -139,9 +141,6 @@ bool ins__is_fused(const struct arch *arch, const char *ins1, const char *ins2); 
bool ins__is_ret(const struct ins *ins);

bool ins__is_lock(const struct ins *ins);



extern const struct ins_ops s390_call_ops;

extern const struct ins_ops loongarch_call_ops;

extern const struct ins_ops loongarch_jump_ops;

const struct ins_ops *check_ppc_insn(struct disasm_line *dl);



struct disasm_line *disasm_line__new(struct annotate_args *args);