[Qemu-commits] [qemu/qemu] 8b18cd: capstone: Convert Makefile bits to meson bits

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8b18cdbfd6c7add5fb8dae5c81596c381fe6e237
      
https://github.com/qemu/qemu/commit/8b18cdbfd6c7add5fb8dae5c81596c381fe6e237
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M Makefile
    M configure
    M meson.build
    M meson_options.txt

  Log Message:
  -----------
  capstone: Convert Makefile bits to meson bits

There are better ways to do this, e.g. meson cmake subproject,
but that requires cmake 3.7 and some of our CI environments
only provide cmake 3.5.

Nor can we add a meson.build file to capstone/, because the git
submodule would then always report "untracked files".  Fixing that
would require creating our own branch on the qemu git mirror, at
which point we could just as easily create a native meson subproject.

Instead, build the library via the main meson.build.

This improves the current state of affairs in that we will re-link
the qemu executables against a changed libcapstone.a, which we wouldn't
do before-hand.  In addition, the use of the configuration header file
instead of command-line -DEFINES means that we will rebuild the
capstone objects with changes to meson.build.

Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: eef20e402c8ff5cacd86222288a722ce7e1a3cb8
      
https://github.com/qemu/qemu/commit/eef20e402c8ff5cacd86222288a722ce7e1a3cb8
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M capstone
    M meson.build

  Log Message:
  -----------
  capstone: Update to upstream "next" branch

This branch contains a number of improvements over master,
including making all of the disassembler data constant.

We are skipping past the 4.0 branchpoint, which changed
the location of the includes within the source directory.

Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: bcf368626cb33c4d8bf1c0c8fd1dcafb3c9f8d53
      
https://github.com/qemu/qemu/commit/bcf368626cb33c4d8bf1c0c8fd1dcafb3c9f8d53
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M meson.build

  Log Message:
  -----------
  capstone: Require version 4.0 from a system library

We're about to use a portion of the 4.0 API.
Reject a system library version prior to that.

Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 4c389f6edf4a6bbdbc3dbcd7c4d639d868d0cf0c
      
https://github.com/qemu/qemu/commit/4c389f6edf4a6bbdbc3dbcd7c4d639d868d0cf0c
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M accel/tcg/translate-all.c
    M disas.c
    M include/disas/disas.h
    M include/exec/log.h
    M tcg/tcg.c

  Log Message:
  -----------
  disas: Move host asm annotations to tb_gen_code

Instead of creating GStrings and passing them into log_disas,
just print the annotations directly in tb_gen_code.

Fix the annotations for the slow paths of the TB, after the
part implementing the final guest instruction.

Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 12b6e9b27d4c7e1d33c6d95ef85ddfd22b16a168
      
https://github.com/qemu/qemu/commit/12b6e9b27d4c7e1d33c6d95ef85ddfd22b16a168
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M disas.c
    M include/disas/dis-asm.h

  Log Message:
  -----------
  disas: Clean up CPUDebug initialization

Rename several functions, dropping "generic" and making "host"
vs "target" clearer.  Make a bunch of functions static that are
not used outside this file. Replace INIT_DISASSEMBLE_INFO with
a trio of functions.

Acked-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 86944d1d11efaef208566de49a949dd7af232adb
      
https://github.com/qemu/qemu/commit/86944d1d11efaef208566de49a949dd7af232adb
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M disas.c
    M include/disas/dis-asm.h

  Log Message:
  -----------
  disas: Use qemu/bswap.h for bfd endian loads

Use the routines we have already instead of open-coding.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: b71f3a68e2b67c2a26be0a528482fd99a089af3f
      
https://github.com/qemu/qemu/commit/b71f3a68e2b67c2a26be0a528482fd99a089af3f
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M disas.c

  Log Message:
  -----------
  disas: Cleanup plugin_disas

Do not retain a GString in thread-local storage.  Allocate a
new one and free it on every invocation.  Do not g_strdup the
result; return the buffer from the GString.  Do not use
warn_report.

Using cs_disasm allocated memory via the &insn parameter, but
that was never freed.  Use cs_disasm_iter so that we use the
memory that we've already allocated, and so that we only try
to disassemble one insn, as desired.  Do not allocate 1k to
hold the bytes for a single instruction.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: a4038a00ed94d3752044edae8f285772a244a887
      
https://github.com/qemu/qemu/commit/a4038a00ed94d3752044edae8f285772a244a887
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M disas.c

  Log Message:
  -----------
  disas: Configure capstone for aarch64 host without libvixl

The ifdef tangle failed to set cap_arch if libvixl itself
was not configured (e.g. due to lack of c++ compiler).

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: f343346b147b8871d628defa4fe038eb1a2e4e08
      
https://github.com/qemu/qemu/commit/f343346b147b8871d628defa4fe038eb1a2e4e08
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M disas.c
    A disas/capstone.c
    M disas/meson.build
    M include/disas/dis-asm.h
    M meson.build

  Log Message:
  -----------
  disas: Split out capstone code to disas/capstone.c

There is nothing target-specific about this code, so it
can be added to common_ss.  This also requires that the
base capstone dependency be added to common_ss, so that
we get the correct include paths added to CFLAGS.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 3d56284524bbefade952d9abae68274be726cd5c
      
https://github.com/qemu/qemu/commit/3d56284524bbefade952d9abae68274be726cd5c
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M disas.c
    M meson.build
    M target/s390x/cpu.c

  Log Message:
  -----------
  disas: Enable capstone disassembly for s390x

Enable s390x, aka SYSZ, in the git submodule build.
Set the capstone parameters for both s390x host and guest.

Tested-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Acked-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: c6d3da962f058bca09b25f99da35436816fb6de8
      
https://github.com/qemu/qemu/commit/c6d3da962f058bca09b25f99da35436816fb6de8
  Author: Richard Henderson <richard.henderson@linaro.org>
  Date:   2020-10-03 (Sat, 03 Oct 2020)

  Changed paths:
    M disas/capstone.c

  Log Message:
  -----------
  disas/capstone: Add skipdata hook for s390x

It is always possible to tell the length of an insn, even if the
actual insn is unknown.  Skip the correct number of bytes, so that
we stay in sync with the instruction stream.

Acked-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


  Commit: 671ad7c4468f795b66b4cd8f376f1b1ce6701b63
      
https://github.com/qemu/qemu/commit/671ad7c4468f795b66b4cd8f376f1b1ce6701b63
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2020-10-05 (Mon, 05 Oct 2020)

  Changed paths:
    M Makefile
    M accel/tcg/translate-all.c
    M capstone
    M configure
    M disas.c
    A disas/capstone.c
    M disas/meson.build
    M include/disas/dis-asm.h
    M include/disas/disas.h
    M include/exec/log.h
    M meson.build
    M meson_options.txt
    M target/s390x/cpu.c
    M tcg/tcg.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/rth-gitlab/tags/pull-cap-20201003' into 
staging

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

# gpg: Signature made Sat 03 Oct 2020 10:33:44 BST
# gpg:                using RSA key 7A481E78868B4DB6A85A05C064DF38E8AF7E215F
# gpg:                issuer "richard.henderson@linaro.org"
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" 
[full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth-gitlab/tags/pull-cap-20201003:
  disas/capstone: Add skipdata hook for s390x
  disas: Enable capstone disassembly for s390x
  disas: Split out capstone code to disas/capstone.c
  disas: Configure capstone for aarch64 host without libvixl
  disas: Cleanup plugin_disas
  disas: Use qemu/bswap.h for bfd endian loads
  disas: Clean up CPUDebug initialization
  disas: Move host asm annotations to tb_gen_code
  capstone: Require version 4.0 from a system library
  capstone: Update to upstream "next" branch
  capstone: Convert Makefile bits to meson bits

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/469e72ab7dbb...671ad7c4468f