On 15/09/2020 01.02, Richard Henderson wrote:
> Enable s390x, aka SYSZ, in the git submodule build.
> Set the capstone parameters for both s390x host and guest.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> disas.c | 3 +++
> target/s390x/cpu.c | 4 ++++
> meson.build | 11 +++++++++++
> 3 files changed, 18 insertions(+)
>
> diff --git a/disas.c b/disas.c
> index e27dea2c19..c4cd305190 100644
> --- a/disas.c
> +++ b/disas.c
> @@ -201,6 +201,9 @@ static void initialize_debug_host(CPUDebug *s)
> s->info.print_insn = print_insn_m68k;
> #elif defined(__s390__)
> s->info.print_insn = print_insn_s390;
> + s->info.cap_arch = CS_ARCH_SYSZ;
> + s->info.cap_insn_unit = 2;
> + s->info.cap_insn_split = 6;
> #elif defined(__hppa__)
> s->info.print_insn = print_insn_hppa;
> #endif
> diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c
> index 749cd548f0..2a96692691 100644
> --- a/target/s390x/cpu.c
> +++ b/target/s390x/cpu.c
> @@ -44,6 +44,7 @@
> #include "sysemu/tcg.h"
> #endif
> #include "fpu/softfloat-helpers.h"
> +#include "disas/capstone.h"
>
> #define CR0_RESET 0xE0UL
> #define CR14_RESET 0xC2000000UL;
> @@ -182,6 +183,9 @@ static void s390_cpu_disas_set_info(CPUState *cpu, disassemble_info *info)
> {
> info->mach = bfd_mach_s390_64;
> info->print_insn = print_insn_s390;
> + info->cap_arch = CS_ARCH_SYSZ;
> + info->cap_insn_unit = 2;
> + info->cap_insn_split = 6;
> }
>
> static void s390_cpu_realizefn(DeviceState *dev, Error **errp)
> diff --git a/meson.build b/meson.build
> index 2f3da5d8c6..448c87f645 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -674,6 +674,17 @@ if capstone_opt == 'internal'
> )
> endif
>
> + if 'CONFIG_S390_DIS' in config_all_disas
> + capstone_data.set('CAPSTONE_HAS_SYSZ', '1')
> + capstone_files += files(
> + 'capstone/arch/SystemZ/SystemZDisassembler.c',
> + 'capstone/arch/SystemZ/SystemZInstPrinter.c',
> + 'capstone/arch/SystemZ/SystemZMapping.c',
> + 'capstone/arch/SystemZ/SystemZModule.c',
> + 'capstone/arch/SystemZ/SystemZMCTargetDesc.c'
> + )
> + endif
> +
> if 'CONFIG_I386_DIS' in config_all_disas
> capstone_data.set('CAPSTONE_HAS_X86', 1)
> capstone_files += files(
>
Acked-by: Thomas Huth <thuth@redhat.com>