Version 2 retains a dummy capstone/all makefile target, to avoid the build failure that Peter saw.
r~ The following changes since commit dd8c1e808f1ca311e1f50bff218c3ee3198b1f02: Merge remote-tracking branch 'remotes/cohuck/tags/s390x-20201002' into staging (2020-10-02 14:29:49 +0100) are available in the Git repository at: https://gitlab.com/rth7680/qemu.git tags/pull-cap-20201002 for you to fetch changes up to 94816249a1e14f90f56a2f6e1d566e959e9bc26d: disas/capstone: Add skipdata hook for s390x (2020-10-02 11:05:07 -0500) ---------------------------------------------------------------- Update capstone submodule from v3.0.5 to v5 ("next"). Convert submodule build to meson. Enable capstone disassembly for s390x. Code cleanups in disas.c ---------------------------------------------------------------- Richard Henderson (11): capstone: Convert Makefile bits to meson bits capstone: Update to upstream "next" branch capstone: Require version 4.0 from a system library 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 configure | 68 +---- Makefile | 18 +- meson.build | 124 +++++++- include/disas/dis-asm.h | 104 +++---- include/disas/disas.h | 2 +- include/exec/log.h | 4 +- accel/tcg/translate-all.c | 24 +- disas.c | 707 +++++++++++----------------------------------- disas/capstone.c | 326 +++++++++++++++++++++ target/s390x/cpu.c | 4 + tcg/tcg.c | 4 +- capstone | 2 +- disas/meson.build | 1 + meson_options.txt | 4 + 14 files changed, 687 insertions(+), 705 deletions(-) create mode 100644 disas/capstone.c
