perf disasm: Don't include C files from the arch directory

Move the arch instructions.c files into appropriately named files in
annotate-arch in the util directory.

Don't #include to compile the code, switch to building the files and fix
up the #includes accordingly.

Move powerpc specific disasm code out of disasm.c and into
annotate-powerpc.c.

Declarations and static removed as appropriate for the code to compile
as separate compilation units.

The e_machine and e_flags set up is moved to the disasm.c architectures
array so that later patches can sort by them.

Reviewed-by: James Clark <james.clark@linaro.org>
Signed-off-by: Ian 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: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 0 insertions, 126 deletions

diff --git a/tools/perf/arch/arm64/annotate/instructions.c b/tools/perf/arch/arm64/annotate/instructions.c
deleted file mode 100644
index 44db33854dba..000000000000
--- a/tools/perf/arch/arm64/annotate/instructions.c
+++ /dev/null
@@ -1,126 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-#include <linux/compiler.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <regex.h>
-#include <stdlib.h>
-
-struct arm64_annotate {
-	regex_t call_insn,
-		jump_insn;
-};
-
-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)
-{
-	char *s = strchr(ops->raw, ','), *target, *endptr;
-
-	if (s == NULL)
-		return -1;
-
-	*s = '\0';
-	ops->source.raw = strdup(ops->raw);
-	*s = ',';
-
-	if (ops->source.raw == NULL)
-		return -1;
-
-	target = ++s;
-	ops->target.raw = strdup(target);
-	if (ops->target.raw == NULL)
-		goto out_free_source;
-
-	ops->target.addr = strtoull(target, &endptr, 16);
-	if (endptr == target)
-		goto out_free_target;
-
-	s = strchr(endptr, '<');
-	if (s == NULL)
-		goto out_free_target;
-	endptr = strchr(s + 1, '>');
-	if (endptr == NULL)
-		goto out_free_target;
-
-	*endptr = '\0';
-	*s = ' ';
-	ops->target.name = strdup(s);
-	*s = '<';
-	*endptr = '>';
-	if (ops->target.name == NULL)
-		goto out_free_target;
-
-	return 0;
-
-out_free_target:
-	zfree(&ops->target.raw);
-out_free_source:
-	zfree(&ops->source.raw);
-	return -1;
-}
-
-static int mov__scnprintf(const struct ins *ins, char *bf, size_t size,
-			  struct ins_operands *ops, int max_ins_name);
-
-static const struct ins_ops arm64_mov_ops = {
-	.parse	   = arm64_mov__parse,
-	.scnprintf = mov__scnprintf,
-};
-
-static const struct ins_ops *arm64__associate_instruction_ops(struct arch *arch, const char *name)
-{
-	struct arm64_annotate *arm = arch->priv;
-	const struct ins_ops *ops;
-	regmatch_t match[2];
-
-	if (!regexec(&arm->jump_insn, name, 2, match, 0))
-		ops = &jump_ops;
-	else if (!regexec(&arm->call_insn, name, 2, match, 0))
-		ops = &call_ops;
-	else if (!strcmp(name, "ret"))
-		ops = &ret_ops;
-	else
-		ops = &arm64_mov_ops;
-
-	arch__associate_ins_ops(arch, name, ops);
-	return ops;
-}
-
-static int arm64__annotate_init(struct arch *arch, char *cpuid __maybe_unused)
-{
-	struct arm64_annotate *arm;
-	int err;
-
-	if (arch->initialized)
-		return 0;
-
-	arm = zalloc(sizeof(*arm));
-	if (!arm)
-		return ENOMEM;
-
-	/* bl, blr */
-	err = regcomp(&arm->call_insn, "^blr?$", REG_EXTENDED);
-	if (err)
-		goto out_free_arm;
-	/* b, b.cond, br, cbz/cbnz, tbz/tbnz */
-	err = regcomp(&arm->jump_insn, "^[ct]?br?\\.?(cc|cs|eq|ge|gt|hi|hs|le|lo|ls|lt|mi|ne|pl|vc|vs)?n?z?$",
-		      REG_EXTENDED);
-	if (err)
-		goto out_free_call;
-
-	arch->initialized = true;
-	arch->priv	  = arm;
-	arch->associate_instruction_ops   = arm64__associate_instruction_ops;
-	arch->objdump.comment_char	  = '/';
-	arch->objdump.skip_functions_char = '+';
-	arch->e_machine = EM_AARCH64;
-	arch->e_flags = 0;
-	return 0;
-
-out_free_call:
-	regfree(&arm->call_insn);
-out_free_arm:
-	free(arm);
-	return SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_REGEXP;
-}