perf disasm: Define stubs for the LLVM and capstone disassemblers
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 11 Nov 2024 15:17:33 +0000 (12:17 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Wed, 13 Nov 2024 19:20:32 +0000 (16:20 -0300)
This reduces the number of ifdefs in the main symbol__disassemble()
method and paves the way for allowing the user to configure the
disassemblers of preference.

Acked-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Aditya Bodkhe <Aditya.Bodkhe1@ibm.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Steinar H. Gunderson <sesse@google.com>
Link: https://lore.kernel.org/r/20241111151734.1018476-3-acme@kernel.org
[ Applied fixes from Masami Hiramatsu and Aditya Bodkhe for when capstone devel files are not available ]
Link: https://lore.kernel.org/r/B78FB6DF-24E9-4A3C-91C9-535765EC0E2A@ibm.com
Link: https://lore.kernel.org/r/173145729034.2747044.453926054000880254.stgit@mhiramat.roam.corp.google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/disasm.c

index 36cf61602c17fe6935f7b86335cab4524068fe72..6259dfe9aacc1339db54be875c1cadc10057e958 100644 (file)
@@ -1424,6 +1424,15 @@ err:
 }
 #endif
 
+#if !defined(HAVE_LIBCAPSTONE_SUPPORT) || !defined(HAVE_LIBLLVM_SUPPORT)
+static void symbol__disassembler_missing(const char *disassembler, const char *filename,
+                                        struct symbol *sym)
+{
+       pr_debug("The %s disassembler isn't linked in for %s in %s\n",
+                disassembler, sym->name, filename);
+}
+#endif
+
 #ifdef HAVE_LIBCAPSTONE_SUPPORT
 static void print_capstone_detail(cs_insn *insn, char *buf, size_t len,
                                  struct annotate_args *args, u64 addr)
@@ -1715,7 +1724,21 @@ err:
        count = -1;
        goto out;
 }
-#endif
+#else // HAVE_LIBCAPSTONE_SUPPORT
+static int symbol__disassemble_capstone(char *filename, struct symbol *sym,
+                                       struct annotate_args *args __maybe_unused)
+{
+       symbol__disassembler_missing("capstone", filename, sym);
+       return -1;
+}
+
+static int symbol__disassemble_capstone_powerpc(char *filename, struct symbol *sym,
+                                               struct annotate_args *args __maybe_unused)
+{
+       symbol__disassembler_missing("capstone powerpc", filename, sym);
+       return -1;
+}
+#endif // HAVE_LIBCAPSTONE_SUPPORT
 
 static int symbol__disassemble_raw(char *filename, struct symbol *sym,
                                        struct annotate_args *args)
@@ -1983,7 +2006,14 @@ err:
        free(line_storage);
        return ret;
 }
-#endif
+#else // HAVE_LIBLLVM_SUPPORT
+static int symbol__disassemble_llvm(char *filename, struct symbol *sym,
+                                   struct annotate_args *args __maybe_unused)
+{
+       symbol__disassembler_missing("LLVM", filename, sym);
+       return -1;
+}
+#endif // HAVE_LIBLLVM_SUPPORT
 
 /*
  * Possibly create a new version of line with tabs expanded. Returns the
@@ -2242,24 +2272,21 @@ int symbol__disassemble(struct symbol *sym, struct annotate_args *args)
                        err = symbol__disassemble_raw(symfs_filename, sym, args);
                        if (err == 0)
                                goto out_remove_tmp;
-#ifdef HAVE_LIBCAPSTONE_SUPPORT
+
                        err = symbol__disassemble_capstone_powerpc(symfs_filename, sym, args);
                        if (err == 0)
                                goto out_remove_tmp;
-#endif
                }
        }
 
-#ifdef HAVE_LIBLLVM_SUPPORT
        err = symbol__disassemble_llvm(symfs_filename, sym, args);
        if (err == 0)
                goto out_remove_tmp;
-#endif
-#ifdef HAVE_LIBCAPSTONE_SUPPORT
+
        err = symbol__disassemble_capstone(symfs_filename, sym, args);
        if (err == 0)
                goto out_remove_tmp;
-#endif
+
        err = symbol__disassemble_objdump(symfs_filename, sym, args);
 
 out_remove_tmp: