| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CAP-5=fX2+UMzhMCEBVtA0Es_-T7QNxn2c7rPJi4se6bamLsD=w@mail.gmail.com>
Date: Fri, 30 Jan 2026 10:59:59 -0800
From: Ian Rogers <irogers@...gle.com>
To: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: Peter Zijlstra <peterz@...radead.org>, Ingo Molnar <mingo@...hat.com>,
Namhyung Kim <namhyung@...nel.org>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>, Jiri Olsa <jolsa@...nel.org>,
Adrian Hunter <adrian.hunter@...el.com>, Nathan Chancellor <nathan@...nel.org>,
Nick Desaulniers <nick.desaulniers+lkml@...il.com>, Bill Wendling <morbo@...gle.com>,
Justin Stitt <justinstitt@...gle.com>, Charlie Jenkins <charlie@...osinc.com>,
"Masami Hiramatsu (Google)" <mhiramat@...nel.org>, James Clark <james.clark@...aro.org>,
Collin Funk <collin.funk1@...il.com>, Dmitry Vyukov <dvyukov@...gle.com>,
linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org,
llvm@...ts.linux.dev
Subject: Re: [PATCH v9 1/3] perf capstone: Support for dlopen-ing libcapstone.so
On Wed, Jan 28, 2026 at 10:47 AM Arnaldo Carvalho de Melo
<acme@...nel.org> wrote:
>
> On Mon, Jan 26, 2026 at 10:23:00PM -0800, Ian Rogers wrote:
> > If perf wasn't built against libcapstone, no HAVE_LIBCAPSTONE_SUPPORT,
> > support dlopen-ing libcapstone.so and then calling the necessary
> > functions by looking them up using dlsym. Reverse engineer the types
> > in the API using pahole, adding only what's used in the perf code or
> > necessary for the sake of struct size and alignment.
>
> Trying to test this, I built it with NO_CAPSTONE=1 but with:
>
> ⬢ [acme@...lbx perf-tools-next]$ perf config
> annotate.disassemblers=capstone
> ⬢ [acme@...lbx perf-tools-next]$
>
> And:
>
> ⬢ [acme@...lbx perf-tools-next]$ rpm -qa | grep capstone
> capstone-5.0.5-7.fc43.x86_64
> capstone-devel-5.0.5-7.fc43.x86_64
> ⬢ [acme@...lbx perf-tools-next]$
>
> It manages to build with the needed dlopen magic, etc and ends up
> calling dlopen, locates the .so, loads it, etc, but eventually fails:
>
>
> Breakpoint 1, perf_cs_open (arch=CS_ARCH_X86, mode=CS_MODE_64, handle=0x7fffffff93a8) at util/capstone.c:152
> 152 {
> (gdb) bt
> #0 perf_cs_open (arch=CS_ARCH_X86, mode=CS_MODE_64, handle=0x7fffffff93a8) at util/capstone.c:152
> #1 0x00000000005e2eb8 in capstone_init (machine=0x1083b98, cs_handle=0x7fffffff93a8, is64=true, disassembler_style=true) at util/capstone.c:278
> #2 0x00000000005e37f7 in symbol__disassemble_capstone (filename=0x7fffffff96f0 "/home/acme/.debug/.build-id/cc/315df11334de01fb444465f08f6bca45a12bd2/elf", sym=0x10b0d20, args=0x7fffffffa770)
> at util/capstone.c:489
> #3 0x00000000005ee303 in symbol__disassemble (sym=0x10b0d20, args=0x7fffffffa770) at util/disasm.c:1622
> #4 0x00000000005d25be in symbol__annotate (ms=0x10a4dd0, evsel=0x10842f0, parch=0x0) at util/annotate.c:1056
> #5 0x00000000005d4808 in hist_entry__tty_annotate (he=0x10a4d30, evsel=0x10842f0) at util/annotate.c:1710
> #6 0x0000000000404544 in hist_entry__stdio_annotate (he=0x10a4d30, evsel=0x10842f0, ann=0x7fffffffcae0) at builtin-annotate.c:332
> #7 0x000000000040516c in hists__find_annotations (hists=0x10845b0, evsel=0x10842f0, ann=0x7fffffffcae0) at builtin-annotate.c:545
> #8 0x000000000040569c in __cmd_annotate (ann=0x7fffffffcae0) at builtin-annotate.c:655
> #9 0x000000000040685e in cmd_annotate (argc=0, argv=0x7fffffffe070) at builtin-annotate.c:949
> #10 0x00000000004cbebb in run_builtin (p=0xff2cb0 <commands+432>, argc=2, argv=0x7fffffffe070) at perf.c:348
> #11 0x00000000004cc10d in handle_internal_command (argc=2, argv=0x7fffffffe070) at perf.c:398
> #12 0x00000000004cc269 in run_argv (argcp=0x7fffffffdeec, argv=0x7fffffffdee0) at perf.c:442
> #13 0x00000000004cc53d in main (argc=2, argv=0x7fffffffe070) at perf.c:549
> (gdb) n
> 159 if (!fn_init) {
> (gdb) n
> 160 fn = dlsym(perf_cs_dll_handle(), "cs_open");
> (gdb) n
> Downloading 8.80 M separate debug info for /usr/lib64/libcapstone.so
> Downloading 2.02 M separate debug info for /home/acme/.cache/debuginfod_client/6f0ac051dccbc6a7a322a5950c4955eca60e8498/debuginfo
> 161 if (!fn)
> (gdb) p fn
> $1 = (enum cs_err (*)(enum cs_arch, enum cs_mode, csh *)) 0x7fffecad7cd0 <cs_open>
> (gdb) n
> 163 fn_init = true;
> (gdb) n
> 165 if (!fn)
> (gdb) n
> 167 return fn(arch, mode, handle);
> (gdb) n
> 169 }
> (gdb) n
> capstone_init (machine=0x1083b98, cs_handle=0x7fffffff93a8, is64=true, disassembler_style=true) at util/capstone.c:283
> 283 if (machine__normalized_is(machine, "x86")) {
> (gdb) n
> 289 if (disassembler_style)
> (gdb) n
> 290 perf_cs_option(*cs_handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT);
> (gdb) n
> 295 perf_cs_option(*cs_handle, CS_OPT_DETAIL, CS_OPT_ON);
> (gdb) n
> 298 return 0;
> (gdb) n
> 299 }
> (gdb) n
> symbol__disassemble_capstone (filename=0x7fffffff96f0 "/home/acme/.debug/.build-id/cc/315df11334de01fb444465f08f6bca45a12bd2/elf", sym=0x10b0d20, args=0x7fffffffa770) at util/capstone.c:493
> 493 needs_cs_close = true;
> (gdb) n
> 495 free_count = count = perf_cs_disasm(handle, buf, buf_len, start, buf_len, &insn);
> (gdb) n
> 496 for (i = 0, offset = 0; i < count; i++) {
> (gdb) p count
> $2 = 32
> (gdb) n
> 501 insn[i].mnemonic, insn[i].op_str);
> (gdb) n
> 499 printed = scnprintf(disasm_buf, sizeof(disasm_buf),
> (gdb) n
> 502 print_capstone_detail(&insn[i], disasm_buf + printed,
> (gdb) n
> 503 sizeof(disasm_buf) - printed, args,
> (gdb) n
> 502 print_capstone_detail(&insn[i], disasm_buf + printed,
> (gdb) n
> 506 args->offset = offset;
> (gdb) n
> 507 args->line = disasm_buf;
> (gdb) n
> 509 dl = disasm_line__new(args);
> (gdb) n
> 510 if (dl == NULL)
> (gdb) n
> 511 goto err;
>
> While doing it without NO_CAPSTONE=1, i.e. dyn linking against capstone
> seems to work:
>
> ⬢ [acme@...lbx perf-tools-next]$ perf config
> annotate.disassemblers=capstone
> ⬢ [acme@...lbx perf-tools-next]$
> ⬢ [acme@...lbx perf-tools-next]$ ldd ~/bin/perf | grep capstone
> libcapstone.so.5 => /usr/lib64/libcapstone.so.5 (0x00007f1f94588000)
> ⬢ [acme@...lbx perf-tools-next]$ perf -vv | grep capst
> libcapstone: [ on ] # HAVE_LIBCAPSTONE_SUPPORT
> ⬢ [acme@...lbx perf-tools-next]$
> ⬢ [acme@...lbx perf-tools-next]$ perf annotate -v | head
> symbol__disassemble: filename=/home/acme/.debug/.build-id/cc/315df11334de01fb444465f08f6bca45a12bd2/elf, sym=cache_rpath, start=0x7efd8294fd90, end=0x7efd8294fdfc
> annotating [0x1d043db0] /usr/lib64/ld-linux-x86-64.so.2 : [0x1d0c2b50] cache_rpath
> Disassembled with capstone
> Open Debuginfo file: /home/acme/.debug/.build-id/cc/315df11334de01fb444465f08f6bca45a12bd2/elf
> symbol__disassemble: filename=/home/acme/.debug/.build-id/cc/315df11334de01fb444465f08f6bca45a12bd2/elf, sym=_dl_start, start=0x7efd82967990, end=0x7efd82968069
> annotating [0x1d043db0] /usr/lib64/ld-linux-x86-64.so.2 : [0x1d0c6470] _dl_start
> Disassembled with capstone
> Open Debuginfo file: /home/acme/.debug/.build-id/cc/315df11334de01fb444465f08f6bca45a12bd2/elf
> Percent | Source code & Disassembly of ld-linux-x86-64.so.2 for cpu/cycles/Pu (1 samples, percent: local period)
> ----------------------------------------------------------------------------------------------------------------------
> 6d93: 1
> h->nr_samples: 1
> : 0 0x6d90 <cache_rpath>:
> 0.00 : 6d90: movq (%rsi), %rax
> 100.00 : 6d93: movq %rsi, %r8
> 0.00 : 6d96: movq %rcx, %r9
> 0.00 : 6d99: cmpq $-1, %rax
> 0.00 : 6d9d: je 0x6df7
> ⬢ [acme@...lbx perf-tools-next]$
>
> What am I missing?
>
> Fedora 43.
>
> ⬢ [acme@...lbx perf-tools-next]$ git log --oneline -20
> e88f915e5f2a809b (HEAD -> perf-tools-next) perf llvm: Mangle libperf-llvm.so function names
> cf0b92a9652719c1 perf llvm: Support for dlopen-ing libLLVM.so
> b8bf08b8e4e22c39 perf capstone: Support for dlopen-ing libcapstone.so
> e205952db7717557 perf jevents: Validate that all names given an Event
> 82e53e7ae09a054b perf jevents: Add cycles breakdown metric for arm64/AMD/Intel
> e74f72a7e2178233 perf jevents: Add mesh bandwidth saturation metric for Intel
> 5dc81578ad77c298 perf jevents: Add upi_bw metric for Intel
> 6ec3058e709cc635 perf jevents: Add local/remote miss latency metrics for Intel
> 1fee2701a7d35fa7 perf jevents: Add C-State metrics from the PCU PMU for Intel
> 2166b44be9384209 perf jevents: Add dir breakdown metrics for Intel
> cde9c1a5d92520a8 perf jevents: Add local/remote "mem" breakdown metrics for Intel
> 130f4245af99e140 perf jevents: Add mem_bw metric for Intel
> 426b8442898de9af perf jevents: Add Miss Level Parallelism (MLP) metric for Intel
> d666f0172ab306fa perf jevents: Add FPU metrics for Intel
> 2f3d6ea05deca7c1 perf jevents: Add context switch metrics for Intel
> 59341f4e171170d3 perf jevents: Add ILP metrics for Intel
> d80edef23124baff perf jevents: Add load store breakdown metrics ldst for Intel
> 7413633e255cb02d perf jevents: Add L2 metrics for Intel
> cd1c6a487407a350 perf jevents: Add ports metric group giving utilization on Intel
> 397fdb3a24435f55 perf jevents: Add software prefetch (swpf) metric group for Intel
> ⬢ [acme@...lbx perf-tools-next]$
I can repro the issue. I'm noticing that the patch has:
CS_ARCH_X86 = 3,
but that doesn't match here:
https://github.com/capstone-engine/capstone/blob/next/include/capstone/capstone.h#L90
where X86 now has value 4. Fixing up the values I still get the issue
and so more exploration is necessary. Given capstone's ABI isn't
stable we may not be able to use pahole constants and require a header
file like Namhyung asked for.
Thanks,
Ian
> - Arnaldo
>
> > Signed-off-by: Ian Rogers <irogers@...gle.com>
> > ---
> > tools/perf/util/capstone.c | 285 ++++++++++++++++++++++++++++++++-----
> > 1 file changed, 248 insertions(+), 37 deletions(-)
> >
> > diff --git a/tools/perf/util/capstone.c b/tools/perf/util/capstone.c
> > index 9216916f848f..43168d43e4a3 100644
> > --- a/tools/perf/util/capstone.c
> > +++ b/tools/perf/util/capstone.c
> > @@ -11,20 +11,250 @@
> > #include "print_insn.h"
> > #include "symbol.h"
> > #include "thread.h"
> > +#include <dlfcn.h>
> > #include <errno.h>
> > #include <fcntl.h>
> > +#include <inttypes.h>
> > #include <string.h>
> >
> > #ifdef HAVE_LIBCAPSTONE_SUPPORT
> > #include <capstone/capstone.h>
> > +#else
> > +typedef size_t csh;
> > +enum cs_arch {
> > + CS_ARCH_ARM = 0,
> > + CS_ARCH_ARM64 = 1,
> > + CS_ARCH_X86 = 3,
> > + CS_ARCH_SYSZ = 6,
> > +};
> > +enum cs_mode {
> > + CS_MODE_ARM = 0,
> > + CS_MODE_32 = 1 << 2,
> > + CS_MODE_64 = 1 << 3,
> > + CS_MODE_V8 = 1 << 6,
> > + CS_MODE_BIG_ENDIAN = 1 << 31,
> > +};
> > +enum cs_opt_type {
> > + CS_OPT_SYNTAX = 1,
> > + CS_OPT_DETAIL = 2,
> > +};
> > +enum cs_opt_value {
> > + CS_OPT_SYNTAX_ATT = 2,
> > + CS_OPT_ON = 3,
> > +};
> > +enum cs_err {
> > + CS_ERR_OK = 0,
> > + CS_ERR_HANDLE = 3,
> > +};
> > +enum x86_op_type {
> > + X86_OP_IMM = 2,
> > + X86_OP_MEM = 3,
> > +};
> > +enum x86_reg {
> > + X86_REG_RIP = 41,
> > +};
> > +typedef int32_t x86_avx_bcast;
> > +struct x86_op_mem {
> > + enum x86_reg segment;
> > + enum x86_reg base;
> > + enum x86_reg index;
> > + int scale;
> > + int64_t disp;
> > +};
> > +
> > +struct cs_x86_op {
> > + enum x86_op_type type;
> > + union {
> > + enum x86_reg reg;
> > + int64_t imm;
> > + struct x86_op_mem mem;
> > + };
> > + uint8_t size;
> > + uint8_t access;
> > + x86_avx_bcast avx_bcast;
> > + bool avx_zero_opmask;
> > +};
> > +struct cs_x86_encoding {
> > + uint8_t modrm_offset;
> > + uint8_t disp_offset;
> > + uint8_t disp_size;
> > + uint8_t imm_offset;
> > + uint8_t imm_size;
> > +};
> > +typedef int32_t x86_xop_cc;
> > +typedef int32_t x86_sse_cc;
> > +typedef int32_t x86_avx_cc;
> > +typedef int32_t x86_avx_rm;
> > +struct cs_x86 {
> > + uint8_t prefix[4];
> > + uint8_t opcode[4];
> > + uint8_t rex;
> > + uint8_t addr_size;
> > + uint8_t modrm;
> > + uint8_t sib;
> > + int64_t disp;
> > + enum x86_reg sib_index;
> > + int8_t sib_scale;
> > + enum x86_reg sib_base;
> > + x86_xop_cc xop_cc;
> > + x86_sse_cc sse_cc;
> > + x86_avx_cc avx_cc;
> > + bool avx_sae;
> > + x86_avx_rm avx_rm;
> > + union {
> > + uint64_t eflags;
> > + uint64_t fpu_flags;
> > + };
> > + uint8_t op_count;
> > + struct cs_x86_op operands[8];
> > + struct cs_x86_encoding encoding;
> > +};
> > +struct cs_detail {
> > + uint16_t regs_read[12];
> > + uint8_t regs_read_count;
> > + uint16_t regs_write[20];
> > + uint8_t regs_write_count;
> > + uint8_t groups[8];
> > + uint8_t groups_count;
> > +
> > + union {
> > + struct cs_x86 x86;
> > + };
> > +};
> > +struct cs_insn {
> > + unsigned int id;
> > + uint64_t address;
> > + uint16_t size;
> > + uint8_t bytes[16];
> > + char mnemonic[32];
> > + char op_str[160];
> > + struct cs_detail *detail;
> > +};
> > +#endif
> > +
> > +#ifndef HAVE_LIBCAPSTONE_SUPPORT
> > +static void *perf_cs_dll_handle(void)
> > +{
> > + static bool dll_handle_init;
> > + static void *dll_handle;
> > +
> > + if (!dll_handle_init) {
> > + dll_handle_init = true;
> > + dll_handle = dlopen("libcapstone.so", RTLD_LAZY);
> > + if (!dll_handle)
> > + pr_debug("dlopen failed for libcapstone.so\n");
> > + }
> > + return dll_handle;
> > +}
> > +#endif
> > +
> > +static enum cs_err perf_cs_open(enum cs_arch arch, enum cs_mode mode, csh *handle)
> > +{
> > +#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > + return cs_open(arch, mode, handle);
> > +#else
> > + static bool fn_init;
> > + static enum cs_err (*fn)(enum cs_arch arch, enum cs_mode mode, csh *handle);
> > +
> > + if (!fn_init) {
> > + fn = dlsym(perf_cs_dll_handle(), "cs_open");
> > + if (!fn)
> > + pr_debug("dlsym failed for cs_open\n");
> > + fn_init = true;
> > + }
> > + if (!fn)
> > + return CS_ERR_HANDLE;
> > + return fn(arch, mode, handle);
> > +#endif
> > +}
> > +
> > +static enum cs_err perf_cs_option(csh handle, enum cs_opt_type type, size_t value)
> > +{
> > +#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > + return cs_option(handle, type, value);
> > +#else
> > + static bool fn_init;
> > + static enum cs_err (*fn)(csh handle, enum cs_opt_type type, size_t value);
> > +
> > + if (!fn_init) {
> > + fn = dlsym(perf_cs_dll_handle(), "cs_option");
> > + if (!fn)
> > + pr_debug("dlsym failed for cs_option\n");
> > + fn_init = true;
> > + }
> > + if (!fn)
> > + return CS_ERR_HANDLE;
> > + return fn(handle, type, value);
> > +#endif
> > +}
> > +
> > +static size_t perf_cs_disasm(csh handle, const uint8_t *code, size_t code_size,
> > + uint64_t address, size_t count, struct cs_insn **insn)
> > +{
> > +#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > + return cs_disasm(handle, code, code_size, address, count, insn);
> > +#else
> > + static bool fn_init;
> > + static enum cs_err (*fn)(csh handle, const uint8_t *code, size_t code_size,
> > + uint64_t address, size_t count, struct cs_insn **insn);
> > +
> > + if (!fn_init) {
> > + fn = dlsym(perf_cs_dll_handle(), "cs_disasm");
> > + if (!fn)
> > + pr_debug("dlsym failed for cs_disasm\n");
> > + fn_init = true;
> > + }
> > + if (!fn)
> > + return CS_ERR_HANDLE;
> > + return fn(handle, code, code_size, address, count, insn);
> > #endif
> > +}
> >
> > +static void perf_cs_free(struct cs_insn *insn, size_t count)
> > +{
> > #ifdef HAVE_LIBCAPSTONE_SUPPORT
> > + cs_free(insn, count);
> > +#else
> > + static bool fn_init;
> > + static void (*fn)(struct cs_insn *insn, size_t count);
> > +
> > + if (!fn_init) {
> > + fn = dlsym(perf_cs_dll_handle(), "cs_free");
> > + if (!fn)
> > + pr_debug("dlsym failed for cs_free\n");
> > + fn_init = true;
> > + }
> > + if (!fn)
> > + return;
> > + fn(insn, count);
> > +#endif
> > +}
> > +
> > +static enum cs_err perf_cs_close(csh *handle)
> > +{
> > +#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > + return cs_close(handle);
> > +#else
> > + static bool fn_init;
> > + static enum cs_err (*fn)(csh *handle);
> > +
> > + if (!fn_init) {
> > + fn = dlsym(perf_cs_dll_handle(), "cs_close");
> > + if (!fn)
> > + pr_debug("dlsym failed for cs_close\n");
> > + fn_init = true;
> > + }
> > + if (!fn)
> > + return CS_ERR_HANDLE;
> > + return fn(handle);
> > +#endif
> > +}
> > +
> > static int capstone_init(struct machine *machine, csh *cs_handle, bool is64,
> > bool disassembler_style)
> > {
> > - cs_arch arch;
> > - cs_mode mode;
> > + enum cs_arch arch;
> > + enum cs_mode mode;
> >
> > if (machine__is(machine, "x86_64") && is64) {
> > arch = CS_ARCH_X86;
> > @@ -45,7 +275,7 @@ static int capstone_init(struct machine *machine, csh *cs_handle, bool is64,
> > return -1;
> > }
> >
> > - if (cs_open(arch, mode, cs_handle) != CS_ERR_OK) {
> > + if (perf_cs_open(arch, mode, cs_handle) != CS_ERR_OK) {
> > pr_warning_once("cs_open failed\n");
> > return -1;
> > }
> > @@ -57,27 +287,25 @@ static int capstone_init(struct machine *machine, csh *cs_handle, bool is64,
> > * is set via annotation args
> > */
> > if (disassembler_style)
> > - cs_option(*cs_handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT);
> > + perf_cs_option(*cs_handle, CS_OPT_SYNTAX, CS_OPT_SYNTAX_ATT);
> > /*
> > * Resolving address operands to symbols is implemented
> > * on x86 by investigating instruction details.
> > */
> > - cs_option(*cs_handle, CS_OPT_DETAIL, CS_OPT_ON);
> > + perf_cs_option(*cs_handle, CS_OPT_DETAIL, CS_OPT_ON);
> > }
> >
> > return 0;
> > }
> > -#endif
> >
> > -#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > -static size_t print_insn_x86(struct thread *thread, u8 cpumode, cs_insn *insn,
> > +static size_t print_insn_x86(struct thread *thread, u8 cpumode, struct cs_insn *insn,
> > int print_opts, FILE *fp)
> > {
> > struct addr_location al;
> > size_t printed = 0;
> >
> > if (insn->detail && insn->detail->x86.op_count == 1) {
> > - cs_x86_op *op = &insn->detail->x86.operands[0];
> > + struct cs_x86_op *op = &insn->detail->x86.operands[0];
> >
> > addr_location__init(&al);
> > if (op->type == X86_OP_IMM &&
> > @@ -95,7 +323,6 @@ static size_t print_insn_x86(struct thread *thread, u8 cpumode, cs_insn *insn,
> > printed += fprintf(fp, "%s %s", insn[0].mnemonic, insn[0].op_str);
> > return printed;
> > }
> > -#endif
> >
> >
> > ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused,
> > @@ -106,9 +333,8 @@ ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused,
> > uint64_t ip __maybe_unused, int *lenp __maybe_unused,
> > int print_opts __maybe_unused, FILE *fp __maybe_unused)
> > {
> > -#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > size_t printed;
> > - cs_insn *insn;
> > + struct cs_insn *insn;
> > csh cs_handle;
> > size_t count;
> > int ret;
> > @@ -118,7 +344,7 @@ ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused,
> > if (ret < 0)
> > return ret;
> >
> > - count = cs_disasm(cs_handle, code, code_size, ip, 1, &insn);
> > + count = perf_cs_disasm(cs_handle, code, code_size, ip, 1, &insn);
> > if (count > 0) {
> > if (machine__normalized_is(machine, "x86"))
> > printed = print_insn_x86(thread, cpumode, &insn[0], print_opts, fp);
> > @@ -126,20 +352,16 @@ ssize_t capstone__fprintf_insn_asm(struct machine *machine __maybe_unused,
> > printed = fprintf(fp, "%s %s", insn[0].mnemonic, insn[0].op_str);
> > if (lenp)
> > *lenp = insn->size;
> > - cs_free(insn, count);
> > + perf_cs_free(insn, count);
> > } else {
> > printed = -1;
> > }
> >
> > - cs_close(&cs_handle);
> > + perf_cs_close(&cs_handle);
> > return printed;
> > -#else
> > - return -1;
> > -#endif
> > }
> >
> > -#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > -static void print_capstone_detail(cs_insn *insn, char *buf, size_t len,
> > +static void print_capstone_detail(struct cs_insn *insn, char *buf, size_t len,
> > struct annotate_args *args, u64 addr)
> > {
> > int i;
> > @@ -154,7 +376,7 @@ static void print_capstone_detail(cs_insn *insn, char *buf, size_t len,
> > return;
> >
> > for (i = 0; i < insn->detail->x86.op_count; i++) {
> > - cs_x86_op *op = &insn->detail->x86.operands[i];
> > + struct cs_x86_op *op = &insn->detail->x86.operands[i];
> > u64 orig_addr;
> >
> > if (op->type != X86_OP_MEM)
> > @@ -195,9 +417,7 @@ static void print_capstone_detail(cs_insn *insn, char *buf, size_t len,
> > break;
> > }
> > }
> > -#endif
> >
> > -#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > struct find_file_offset_data {
> > u64 ip;
> > u64 offset;
> > @@ -214,13 +434,11 @@ static int find_file_offset(u64 start, u64 len, u64 pgoff, void *arg)
> > }
> > return 0;
> > }
> > -#endif
> >
> > int symbol__disassemble_capstone(const char *filename __maybe_unused,
> > struct symbol *sym __maybe_unused,
> > struct annotate_args *args __maybe_unused)
> > {
> > -#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > struct annotation *notes = symbol__annotation(sym);
> > struct map *map = args->ms->map;
> > struct dso *dso = map__dso(map);
> > @@ -235,7 +453,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,
> > const u8 *buf;
> > u64 buf_len;
> > csh handle;
> > - cs_insn *insn = NULL;
> > + struct cs_insn *insn = NULL;
> > char disasm_buf[512];
> > struct disasm_line *dl;
> > bool disassembler_style = false;
> > @@ -274,7 +492,7 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,
> >
> > needs_cs_close = true;
> >
> > - free_count = count = cs_disasm(handle, buf, buf_len, start, buf_len, &insn);
> > + free_count = count = perf_cs_disasm(handle, buf, buf_len, start, buf_len, &insn);
> > for (i = 0, offset = 0; i < count; i++) {
> > int printed;
> >
> > @@ -313,9 +531,9 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,
> >
> > out:
> > if (needs_cs_close) {
> > - cs_close(&handle);
> > + perf_cs_close(&handle);
> > if (free_count > 0)
> > - cs_free(insn, free_count);
> > + perf_cs_free(insn, free_count);
> > }
> > free(code_buf);
> > return count < 0 ? count : 0;
> > @@ -335,16 +553,12 @@ int symbol__disassemble_capstone(const char *filename __maybe_unused,
> > }
> > count = -1;
> > goto out;
> > -#else
> > - return -1;
> > -#endif
> > }
> >
> > int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused,
> > struct symbol *sym __maybe_unused,
> > struct annotate_args *args __maybe_unused)
> > {
> > -#ifdef HAVE_LIBCAPSTONE_SUPPORT
> > struct annotation *notes = symbol__annotation(sym);
> > struct map *map = args->ms->map;
> > struct dso *dso = map__dso(map);
> > @@ -458,7 +672,7 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused,
> >
> > out:
> > if (needs_cs_close)
> > - cs_close(&handle);
> > + perf_cs_close(&handle);
> > free(buf);
> > return count < 0 ? count : 0;
> >
> > @@ -467,7 +681,4 @@ int symbol__disassemble_capstone_powerpc(const char *filename __maybe_unused,
> > close(fd);
> > count = -1;
> > goto out;
> > -#else
> > - return -1;
> > -#endif
> > }
> > --
> > 2.52.0.457.g6b5491de43-goog
> >
>
Powered by blists - more mailing lists