All of lore.kernel.org
 help / color / mirror / Atom feed
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Thomas Huth <thuth@redhat.com>
Subject: [PATCH v3 09/10] disas: Enable capstone disassembly for s390x
Date: Thu, 17 Sep 2020 16:57:19 -0700	[thread overview]
Message-ID: <20200917235720.2685978-10-richard.henderson@linaro.org> (raw)
In-Reply-To: <20200917235720.2685978-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 e16a2b051d..a2bff9d4ae 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	other threads:[~2020-09-18  0:01 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-17 23:57 [PATCH v3 00/10] capstone + disassembler patches Richard Henderson
2020-09-17 23:57 ` [PATCH v3 01/10] capstone: Convert Makefile bits to meson bits Richard Henderson
2020-09-18  8:12   ` 罗勇刚(Yonggang Luo)
2020-09-18  8:13   ` Paolo Bonzini
2020-09-18  8:42     ` 罗勇刚(Yonggang Luo)
2020-09-18 12:58       ` Paolo Bonzini
2020-09-18 13:02         ` 罗勇刚(Yonggang Luo)
2020-09-21 10:54   ` Alex Bennée
2020-09-21 11:05     ` Alex Bennée
2020-09-21 12:50       ` 罗勇刚(Yonggang Luo)
2020-09-21 13:12     ` Paolo Bonzini
2020-09-17 23:57 ` [PATCH v3 02/10] capstone: Update to upstream "next" branch Richard Henderson
2020-09-17 23:57 ` [PATCH v3 03/10] disas: Move host asm annotations to tb_gen_code Richard Henderson
2020-09-17 23:57 ` [PATCH v3 04/10] disas: Clean up CPUDebug initialization Richard Henderson
2020-09-17 23:57 ` [PATCH v3 05/10] disas: Use qemu/bswap.h for bfd endian loads Richard Henderson
2020-09-17 23:57 ` [PATCH v3 06/10] disas: Cleanup plugin_disas Richard Henderson
2020-09-17 23:57 ` [PATCH v3 07/10] disas: Configure capstone for aarch64 host without libvixl Richard Henderson
2020-09-18  8:08   ` Philippe Mathieu-Daudé
2020-09-17 23:57 ` [PATCH v3 08/10] disas: Split out capstone code to disas/capstone.c Richard Henderson
2020-09-17 23:57 ` Richard Henderson [this message]
2020-09-17 23:57 ` [PATCH v3 10/10] disas/capstone: Add skipdata hook for s390x Richard Henderson

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=20200917235720.2685978-10-richard.henderson@linaro.org \
    --to=richard.henderson@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
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.