From nobody Tue Feb 10 18:54:26 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1578457497; cv=none; d=zohomail.com; s=zohoarc; b=KU11AT0i1sm49gU+uLeqc0fFN7g+/IyjChr6nbIreaV+As1S8CysN3Z0Eifz3CgwjdwO9075uCzlRUzgh3TRjAiavS1+F993QUkJ0qwBUpcsVpReBwhq0EtwtkGw2mJk4IGM82E/Mo00oYFkS8uTBIvoc3AJu7rfJFMUjS+h47U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578457497; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=KVGu8j9Uoy9WavakRemYI+JFu7Y8Rpjk9OFUdSfPagE=; b=j+ds9z66S13Uz1zHVL8u+bqAUeaf+uyqTQZNFWa+BqZkI+CCVOO3aJF5lsSTJJuWvS0eICXBPqiPz2LRBkDDrBgcANEPFyJsgKbH3UbV9W3/lNBfAMrc3uMll6TRNVHr0WNO9MLJACkYi5em0ULvnhQwQ/urDvqNtLU6bPNZxxM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578457497671754.9518342895382; Tue, 7 Jan 2020 20:24:57 -0800 (PST) Received: from localhost ([::1]:36158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2ts-0000Af-Db for importer@patchew.org; Tue, 07 Jan 2020 23:24:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:46613) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ip2sp-0007ix-Hl for qemu-devel@nongnu.org; Tue, 07 Jan 2020 23:23:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ip2so-0003YR-Ho for qemu-devel@nongnu.org; Tue, 07 Jan 2020 23:23:51 -0500 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]:44690) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ip2so-0003XU-CM for qemu-devel@nongnu.org; Tue, 07 Jan 2020 23:23:50 -0500 Received: by mail-pl1-x629.google.com with SMTP id az3so568676plb.11 for ; Tue, 07 Jan 2020 20:23:50 -0800 (PST) Received: from localhost.localdomain (alanje.lnk.telstra.net. [120.151.179.201]) by smtp.gmail.com with ESMTPSA id f9sm1192702pfd.141.2020.01.07.20.23.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jan 2020 20:23:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=KVGu8j9Uoy9WavakRemYI+JFu7Y8Rpjk9OFUdSfPagE=; b=Fs9kTHVApCEbaPI4WZcOyz2O377drFdV55STwIItPBZKsoEWxATCbxpYneS5KQwKdU dmSir6kglM/k1FG8cDwdq3t7OOl9ARuUHTA8wWIqIDWwFQId+mzvmhV8muZ7nxZkT15M cvE3H8QwW6CjtRL548xM2xK8Cg+KQ5O3PXNnB5am7zM4dgqs4xDa8z5F0umAUSuUjNR5 nc/ZDlGFMOmNU20n1KAbOAAGIK/1uNDDa6Lj5tYhQpgBeVZMgkynwCH5xdvJTAhubH5x x6PUm2GnwWM0b77/n2wd4WYdkH9mV98tcWKnWyurZwkb2j6fZXnr2/REpF+/XQ3WTywh 7krg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=KVGu8j9Uoy9WavakRemYI+JFu7Y8Rpjk9OFUdSfPagE=; b=lkD1vVq6f2r7tTt7Nj3H7Ude+vZYF3GC4YaoeTLB7EqNmy5KZ4yyV1SoTurS95CGEV zeZC5ywwPtcgCcK8z4A9zvOgkATpN7cJBIxUddw0Cb5CrEDZBjMVZqdlBWNFpgNXcEcf 6QHeWdQHtQOPFvg2igSOG5U0cOgPetcmXMpvYBT6mzSeyDLL5bo5YvoPfFDYNO1NY2f+ Ga/2dRS4fQkNpswRp/w8V10XyoTIBT3lfewvCQtwAhax0vkj4k9ir9KWG+2FucuMChVN fELnETYpEKst396s9G3S8WRQYzApLIXPJvc//v4s7VYLS2bPNqSxiEdXPYhSwMFCvESM 6Q4g== X-Gm-Message-State: APjAAAW3wF8jkbsz6bI71SE09z+t080t6RyNy1w1Pd4DyQJcPF3wXqMZ 2Hxnx8sjFkzdL/WfFttU+6HHyccrbjDZYQ== X-Google-Smtp-Source: APXvYqxeyCqf4ywogqEaMUpqy8qpQNB3SfOP4Fs4v/3evi0OUQXaUaE2NuKr+Wkt0ymqG8fjLitUiQ== X-Received: by 2002:a17:902:6909:: with SMTP id j9mr3315318plk.269.1578457429021; Tue, 07 Jan 2020 20:23:49 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PULL 2/3] capstone: Enable disassembly for s390x Date: Wed, 8 Jan 2020 15:23:37 +1100 Message-Id: <20200108042338.9082-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200108042338.9082-1-richard.henderson@linaro.org> References: <20200108042338.9082-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::629 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) Enable s390x, aka SYSZ, in the git submodule build. Set the capstone parameters for both s390x host and guest. Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Richard Henderson --- Makefile | 1 + disas.c | 3 +++ target/s390x/cpu.c | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/Makefile b/Makefile index 12e129ac9d..df1c692ccd 100644 --- a/Makefile +++ b/Makefile @@ -504,6 +504,7 @@ CAP_CFLAGS +=3D -DCAPSTONE_USE_SYS_DYN_MEM CAP_CFLAGS +=3D -DCAPSTONE_HAS_ARM CAP_CFLAGS +=3D -DCAPSTONE_HAS_ARM64 CAP_CFLAGS +=3D -DCAPSTONE_HAS_POWERPC +CAP_CFLAGS +=3D -DCAPSTONE_HAS_SYSZ CAP_CFLAGS +=3D -DCAPSTONE_HAS_X86 =20 .PHONY: capstone/all diff --git a/disas.c b/disas.c index 3937da6157..845c40fca8 100644 --- a/disas.c +++ b/disas.c @@ -660,6 +660,9 @@ void disas(FILE *out, void *code, unsigned long size) print_insn =3D print_insn_m68k; #elif defined(__s390__) print_insn =3D print_insn_s390; + s.info.cap_arch =3D CS_ARCH_SYSZ; + s.info.cap_insn_unit =3D 2; + s.info.cap_insn_split =3D 6; #elif defined(__hppa__) print_insn =3D print_insn_hppa; #endif diff --git a/target/s390x/cpu.c b/target/s390x/cpu.c index 625daeedd1..1734ad9c3a 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -43,6 +43,7 @@ #include "sysemu/tcg.h" #endif #include "fpu/softfloat-helpers.h" +#include "disas/capstone.h" =20 #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; @@ -162,6 +163,9 @@ static void s390_cpu_disas_set_info(CPUState *cpu, disa= ssemble_info *info) { info->mach =3D bfd_mach_s390_64; info->print_insn =3D print_insn_s390; + info->cap_arch =3D CS_ARCH_SYSZ; + info->cap_insn_unit =3D 2; + info->cap_insn_split =3D 6; } =20 static void s390_cpu_realizefn(DeviceState *dev, Error **errp) --=20 2.20.1