Commit 57d26593 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf disasm: Constify use of 'struct arch' 



The 'struct arch' holds variables that are read but not written, except
during some initialization.

Change most uses to be for a "const struct arch *" version to capture
this immutability.

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 6fdd2676

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

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ struct arm64_annotate { 
		jump_insn;

};



static int arm64_mov__parse(struct arch *arch __maybe_unused,

static int arm64_mov__parse(const struct arch *arch __maybe_unused,

			    struct ins_operands *ops,

			    struct map_symbol *ms __maybe_unused,

			    struct disasm_line *dl __maybe_unused)

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

+8 −4
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ 
 * Copyright (C) 2020-2023 Loongson Technology Corporation Limited

 */



static int loongarch_call__parse(struct arch *arch, struct ins_operands *ops, struct map_symbol *ms,

static int loongarch_call__parse(const struct arch *arch, struct ins_operands *ops,

				 struct map_symbol *ms,

				 struct disasm_line *dl __maybe_unused)



{

	char *c, *endptr, *tok, *name;

	struct map *map = ms->map;
@@ -54,8 +56,10 @@ static struct ins_ops loongarch_call_ops = { 
	.scnprintf = call__scnprintf,

};



static int loongarch_jump__parse(struct arch *arch, struct ins_operands *ops, struct map_symbol *ms,

static int loongarch_jump__parse(const struct arch *arch, struct ins_operands *ops,

				 struct map_symbol *ms,

				 struct disasm_line *dl __maybe_unused)



{

	struct map *map = ms->map;

	struct symbol *sym = ms->sym;

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

+4 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/compiler.h>



static int s390_call__parse(struct arch *arch, struct ins_operands *ops,

			    struct map_symbol *ms, struct disasm_line *dl __maybe_unused)

static int s390_call__parse(const struct arch *arch, struct ins_operands *ops,

			    struct map_symbol *ms,

			    struct disasm_line *dl __maybe_unused)

{

	char *endptr, *tok, *name;

	struct map *map = ms->map;
@@ -53,7 +54,7 @@ static struct ins_ops s390_call_ops = { 
	.scnprintf = call__scnprintf,

};



static int s390_mov__parse(struct arch *arch __maybe_unused,

static int s390_mov__parse(const struct arch *arch __maybe_unused,

			   struct ins_operands *ops,

			   struct map_symbol *ms __maybe_unused,

			   struct disasm_line *dl __maybe_unused)

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

+2 −2
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static struct ins x86__instructions[] = { 
	{ .name = "xorps",	.ops = &mov_ops, },

};



static bool amd__ins_is_fused(struct arch *arch, const char *ins1,

static bool amd__ins_is_fused(const struct arch *arch, const char *ins1,

			      const char *ins2)

{

	if (strstr(ins2, "jmp"))
@@ -142,7 +142,7 @@ static bool amd__ins_is_fused(struct arch *arch, const char *ins1, 
	return false;

}



static bool intel__ins_is_fused(struct arch *arch, const char *ins1,

static bool intel__ins_is_fused(const struct arch *arch, const char *ins1,

				const char *ins2)

{

	if (arch->family != 6 || arch->model < 0x1e || strstr(ins2, "jmp"))

tools/perf/ui/browsers/annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ struct annotate_browser { 
	struct rb_root		    entries;

	struct rb_node		   *curr_hot;

	struct annotation_line	   *selection;

	struct arch		   *arch;

	const struct arch	   *arch;

	/*

	 * perf top can delete hist_entry anytime.  Callers should make sure

	 * its lifetime.