The primary change here is the update for capstone to meson. This bypasses capstone's build system entirely. There's more commentary on that subject with the first patch.
Plus a collection of other fixes and cleanups in the area. There are a couple of other targets that could use capstone: The current capstone branch has a fatal bug affecting RISC-V. I have submitted a fix upstream for that, and have the minimal patches required to enable it here. There is capstone support for m68k, but it doesn't look like there's coldfire support. So capstone is a subset of what we have in disas/m68k.c. There's probably no point changing here. There is capstone support for mips, which might be good enough to replace disas/mips.c. It wouldn't replace disas/nanomips.c, and there's no support at all for the micromips isa. r~ Richard Henderson (11): capstone: Convert Makefile bits to meson bits capstone: Update to upstream "next" branch disas: Move host asm annotations to tb_gen_code disas: Clean up CPUDebug initialization disas: Use qemu/bswap.h for bfd endian loads disas: Cleanup plugin_disas disas: Configure capstone for aarch64 host without libvixl disas: Split out capstone code to disas/capstone.c disas: Enable capstone disassembly for s390x disas/capstone: Add skipdata hook for s390x disas: Enable capstone disassembly for sparc configure | 24 +- Makefile | 16 - include/disas/dis-asm.h | 102 +++--- include/disas/disas.h | 2 +- include/exec/log.h | 4 +- accel/tcg/translate-all.c | 24 +- disas.c | 702 +++++++++----------------------------- disas/capstone.c | 326 ++++++++++++++++++ target/s390x/cpu.c | 4 + target/sparc/cpu.c | 4 + tcg/tcg.c | 4 +- capstone | 2 +- disas/meson.build | 1 + meson.build | 112 +++++- meson_options.txt | 3 + 15 files changed, 672 insertions(+), 658 deletions(-) create mode 100644 disas/capstone.c -- 2.25.1