SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

disas: Enable capstone disassembly for s390x

Browse Source 
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>
This commit is contained in:
Richard Henderson 2020-01-04 07:24:59 +10:00
parent f343346b14
commit 3d56284524
3 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
disas.c
View File

@ -203,6 +203,9 @@ static void initialize_debug_host(CPUDebug *s)
s->info.print_insn = print_insn_m68k; s->info.print_insn = print_insn_m68k;
#elif defined(__s390__) #elif defined(__s390__)
s->info.print_insn = print_insn_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__) #elif defined(__hppa__)
s->info.print_insn = print_insn_hppa; s->info.print_insn = print_insn_hppa;
#endif #endif

11
meson.build
View File

@ -795,6 +795,17 @@ if capstone_opt == 'internal'
) )
endif 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 if 'CONFIG_I386_DIS' in config_all_disas
capstone_data.set('CAPSTONE_HAS_X86', 1) capstone_data.set('CAPSTONE_HAS_X86', 1)
capstone_files += files( capstone_files += files(

4
target/s390x/cpu.c
View File

@ -44,6 +44,7 @@
#include "sysemu/tcg.h" #include "sysemu/tcg.h"
#endif #endif
#include "fpu/softfloat-helpers.h" #include "fpu/softfloat-helpers.h"
#include "disas/capstone.h"
#define CR0_RESET 0xE0UL #define CR0_RESET 0xE0UL
#define CR14_RESET 0xC2000000UL; #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->mach = bfd_mach_s390_64;
info->print_insn = print_insn_s390; 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) static void s390_cpu_realizefn(DeviceState *dev, Error **errp)