Re: [PATCH 1/3] capstone: Update to next

[Philippe Mathieu-Daudé]

On 1/3/20 10:24 PM, Richard Henderson wrote:
> Update to aaffb38c44fa.  Choose this over the "current" 4.0.1 tag
> because next now includes the s390x z13 vector opcodes, and also
> the insn tables are now read-only.

As Thomas suggested,
Fixes: https://bugs.launchpad.net/qemu/+bug/1826175

With GCC on Linux:
Tested-by: Philippe Mathieu-Daudé <address@hidden>

> Signed-off-by: Richard Henderson <address@hidden>
> ---
>   Makefile  | 1 +
>   capstone  | 2 +-
>   configure | 2 +-
>   3 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 6b5ad1121b..12e129ac9d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -499,6 +499,7 @@ dtc/%: .git-submodule-status
>   # Remove all the extra -Warning flags that QEMU uses that Capstone doesn't;
>   # no need to annoy QEMU developers with such things.
>   CAP_CFLAGS = $(patsubst -W%,,$(CFLAGS) $(QEMU_CFLAGS))
> +CAP_CFLAGS += -I$(SRC_PATH)/capstone/include
>   CAP_CFLAGS += -DCAPSTONE_USE_SYS_DYN_MEM
>   CAP_CFLAGS += -DCAPSTONE_HAS_ARM
>   CAP_CFLAGS += -DCAPSTONE_HAS_ARM64
> diff --git a/capstone b/capstone
> index 22ead3e0bf..aaffb38c44 160000
> --- a/capstone
> +++ b/capstone
> @@ -1 +1 @@
> -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf
> +Subproject commit aaffb38c44fa58f510ba9b6264f7079bfbba4c8e

Looking at https://github.com/aquynh/capstone/pull/1549, this is 
unfortunate the upstream project use the 'squash merge request' feature :(

Since I already reviewed various of the 1589 patches in the earlier 
version of this patch (22ead3e0bf..418d36d695) I'll only focus on the 
291 'squashed' commits added on top:

  $ git log --oneline 418d36d695..aaffb38c44|wc -l
  291

Most of the commits contains a single line of description, and various 
of them have hundreds of lines of changes.

Similarly to my previous review, I skipped the architecture we don't 
support and X86. Still to many ARM/Aarch64 patches to review, so I'm 
focusing on the buildsys and changes on the API we use:

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> diff --git a/configure b/configure
> index 940bf9e87a..de96bfe017 100755
> --- a/configure
> +++ b/configure
> @@ -5062,7 +5062,7 @@ case "$capstone" in
>         git_submodules="${git_submodules} capstone"
>       fi
>       mkdir -p capstone
> -    QEMU_CFLAGS="$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include"
> +    QEMU_CFLAGS="$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include/capstone"
>       if test "$mingw32" = "yes"; then
>         LIBCAPSTONE=capstone.lib
>       else