Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

perf annotate: Move disassembler_style global to annotation_options 

Continuing to group annotation specific stuff into a struct.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-p3cdhltj58jt0byjzg3g7obx@git.kernel.org


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

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -519,7 +519,7 @@ int cmd_annotate(int argc, const char **argv) 
		    "Interleave source code with assembly code (default)"),

	OPT_BOOLEAN(0, "asm-raw", &annotate.opts.show_asm_raw,

		    "Display raw encoding of assembly instructions (default)"),

	OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",

	OPT_STRING('M', "disassembler-style", &annotate.opts.disassembler_style, "disassembler style",

		   "Specify disassembler style (e.g. -M intel for intel syntax)"),

	OPT_STRING(0, "objdump", &objdump_path, "path",

		   "objdump binary to use for disassembly and annotations"),

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ int cmd_report(int argc, const char **argv) 
		    "Interleave source code with assembly code (default)"),

	OPT_BOOLEAN(0, "asm-raw", &report.annotation_opts.show_asm_raw,

		    "Display raw encoding of assembly instructions (default)"),

	OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",

	OPT_STRING('M', "disassembler-style", &report.annotation_opts.disassembler_style, "disassembler style",

		   "Specify disassembler style (e.g. -M intel for intel syntax)"),

	OPT_BOOLEAN(0, "show-total-period", &symbol_conf.show_total_period,

		    "Show a column with the sum of periods"),

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -1348,7 +1348,7 @@ int cmd_top(int argc, const char **argv) 
		    "Enable kernel symbol demangling"),

	OPT_STRING(0, "objdump", &objdump_path, "path",

		    "objdump binary to use for disassembly and annotations"),

	OPT_STRING('M', "disassembler-style", &disassembler_style, "disassembler style",

	OPT_STRING('M', "disassembler-style", &top.annotation_opts.disassembler_style, "disassembler style",

		   "Specify disassembler style (e.g. -M intel for intel syntax)"),

	OPT_STRING('u', "uid", &target->uid_str, "user", "user to profile"),

	OPT_CALLBACK(0, "percent-limit", &top, "percent",

tools/perf/util/annotate.c

+2 −3
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ struct annotation_options annotation__default_options = { 
	.offset_level	= ANNOTATION__OFFSET_JUMP_TARGETS,

};



const char 	*disassembler_style;

const char	*objdump_path;

static regex_t	 file_lineno;
@@ -1659,8 +1658,8 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) 
		 " --stop-address=0x%016" PRIx64

		 " -l -d %s %s -C \"%s\" 2>/dev/null|grep -v \"%s:\"|expand",

		 objdump_path ? objdump_path : "objdump",

		 disassembler_style ? "-M " : "",

		 disassembler_style ? disassembler_style : "",

		 opts->disassembler_style ? "-M " : "",

		 opts->disassembler_style ?: "",

		 map__rip_2objdump(map, sym->start),

		 map__rip_2objdump(map, sym->end),

		 opts->show_asm_raw ? "" : "--no-show-raw",

tools/perf/util/annotate.h

+1 −2
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ struct annotation_options { 
	int  min_pcnt;

	int  max_lines;

	int  context;

	const char *disassembler_style;

};



enum {
@@ -368,8 +369,6 @@ static inline int symbol__tui_annotate(struct symbol *sym __maybe_unused, 
}

#endif



extern const char	*disassembler_style;



void annotation_config__init(void);



#endif	/* __PERF_ANNOTATE_H */