On 22/09/20 19:47, Richard Henderson wrote: > The following changes since commit 834b9273d5cdab68180dc8c84d641aaa4344b057: > > Merge remote-tracking branch > 'remotes/vivier2/tags/trivial-branch-for-5.2-pull-request' into staging > (2020-09-22 15:42:23 +0100) > > are available in the Git repository at: > > https://github.com/rth7680/qemu.git tags/pull-cap-20200922 > > for you to fetch changes up to fcfea6ced053045beb1dc8d22bdeaacc9c03d0b9: > > disas/capstone: Add skipdata hook for s390x (2020-09-22 08:59:28 -0700) > > ---------------------------------------------------------------- > 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 | 64 +---- > Makefile | 16 -- > 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, 681 insertions(+), 705 deletions(-) > create mode 100644 disas/capstone.c >
I will pull this as well into my branch (as a kind of topic branch) to avoid further conflicts. Paolo
