[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/11] disas: Enable capstone disassembly for s390x
From: |
Richard Henderson |
Subject: |
[PULL 10/11] disas: Enable capstone disassembly for s390x |
Date: |
Tue, 22 Sep 2020 10:47:40 -0700 |
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>
---
meson.build | 11 +++++++++++
disas.c | 3 +++
target/s390x/cpu.c | 4 ++++
3 files changed, 18 insertions(+)
diff --git a/meson.build b/meson.build
index f06e3a1b65..d9f021837b 100644
--- a/meson.build
+++ b/meson.build
@@ -670,6 +670,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(
diff --git a/disas.c b/disas.c
index 9dfbeededc..7c18d7d2a7 100644
--- a/disas.c
+++ b/disas.c
@@ -203,6 +203,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 e350edc9f5..f21b1f7795 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)
--
2.25.1
- [PULL 00/11] capstone + disassembler patch queue, Richard Henderson, 2020/09/22
- [PULL 05/11] disas: Clean up CPUDebug initialization, Richard Henderson, 2020/09/22
- [PULL 01/11] capstone: Convert Makefile bits to meson bits, Richard Henderson, 2020/09/22
- [PULL 04/11] disas: Move host asm annotations to tb_gen_code, Richard Henderson, 2020/09/22
- [PULL 03/11] capstone: Require version 4.0 from a system library, Richard Henderson, 2020/09/22
- [PULL 02/11] capstone: Update to upstream "next" branch, Richard Henderson, 2020/09/22
- [PULL 06/11] disas: Use qemu/bswap.h for bfd endian loads, Richard Henderson, 2020/09/22
- [PULL 08/11] disas: Configure capstone for aarch64 host without libvixl, Richard Henderson, 2020/09/22
- [PULL 11/11] disas/capstone: Add skipdata hook for s390x, Richard Henderson, 2020/09/22
- [PULL 10/11] disas: Enable capstone disassembly for s390x,
Richard Henderson <=
- [PULL 07/11] disas: Cleanup plugin_disas, Richard Henderson, 2020/09/22
- [PULL 09/11] disas: Split out capstone code to disas/capstone.c, Richard Henderson, 2020/09/22
- Re: [PULL 00/11] capstone + disassembler patch queue, Paolo Bonzini, 2020/09/24
- Re: [PULL 00/11] capstone + disassembler patch queue, Peter Maydell, 2020/09/25