QEMU-Devel Archive on lore.kernel.org
 help / color / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>, alex.bennee@linaro.org
Subject: [PATCH v4 10/11] disas: Enable capstone disassembly for s390x
Date: Mon, 21 Sep 2020 10:41:17 -0700
Message-ID: <20200921174118.39352-11-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200921174118.39352-1-richard.henderson@linaro.org>

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

Acked-by: Thomas Huth <thuth@redhat.com>
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 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(
-- 
2.25.1



  parent reply index

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-21 17:41 [PATCH v4 00/11] capstone + disassembler patches Richard Henderson
2020-09-21 17:41 ` [PATCH v4 01/11] capstone: Convert Makefile bits to meson bits Richard Henderson
2020-09-21 19:17   ` Alex Bennée
2020-09-21 17:41 ` [PATCH v4 02/11] capstone: Update to upstream "next" branch Richard Henderson
2020-09-21 19:18   ` Alex Bennée
2020-09-21 17:41 ` [PATCH v4 03/11] capstone: Require version 4.0 from a system library Richard Henderson
2020-09-21 19:19   ` Alex Bennée
2020-09-22 10:33   ` Philippe Mathieu-Daudé
2020-09-21 17:41 ` [PATCH v4 04/11] disas: Move host asm annotations to tb_gen_code Richard Henderson
2020-09-21 19:29   ` Alex Bennée
2020-09-21 19:53     ` Richard Henderson
2020-09-22  8:26       ` Philippe Mathieu-Daudé
2020-09-22  9:50         ` Alex Bennée
2020-09-21 17:41 ` [PATCH v4 05/11] disas: Clean up CPUDebug initialization Richard Henderson
2020-09-21 19:32   ` Alex Bennée
2020-09-21 17:41 ` [PATCH v4 06/11] disas: Use qemu/bswap.h for bfd endian loads Richard Henderson
2020-09-21 19:33   ` Alex Bennée
2020-09-21 17:41 ` [PATCH v4 07/11] disas: Cleanup plugin_disas Richard Henderson
2020-09-22 10:38   ` Alex Bennée
2020-09-21 17:41 ` [PATCH v4 08/11] disas: Configure capstone for aarch64 host without libvixl Richard Henderson
2020-09-22 10:48   ` Alex Bennée
2020-09-21 17:41 ` [PATCH v4 09/11] disas: Split out capstone code to disas/capstone.c Richard Henderson
2020-09-22 10:50   ` Alex Bennée
2020-09-21 17:41 ` Richard Henderson [this message]
2020-09-22 10:58   ` [PATCH v4 10/11] disas: Enable capstone disassembly for s390x Alex Bennée
2020-09-21 17:41 ` [PATCH v4 11/11] disas/capstone: Add skipdata hook " Richard Henderson
2020-09-22 10:59   ` Alex Bennée
2020-09-22  0:50 ` [PATCH v4 00/11] capstone + disassembler patches no-reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200921174118.39352-11-richard.henderson@linaro.org \
    --to=richard.henderson@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

QEMU-Devel Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/qemu-devel/0 qemu-devel/git/0.git
	git clone --mirror https://lore.kernel.org/qemu-devel/1 qemu-devel/git/1.git
	git clone --mirror https://lore.kernel.org/qemu-devel/2 qemu-devel/git/2.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 qemu-devel qemu-devel/ https://lore.kernel.org/qemu-devel \
		qemu-devel@nongnu.org
	public-inbox-index qemu-devel

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.nongnu.qemu-devel


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git