From nobody Mon Apr 29 18:43:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1558580052; cv=none; d=zoho.com; s=zohoarc; b=aBWA1BQazszJa6/OUhjreBgVeHpMRf3o36p7HkYGfwy1iwbHsWhgwHDL+unFd1HC8V5qf2frENgVcLqoBZ4ow71uI8Zv1sR2U56J4CctSIw95sizj01zsdcEKUEt/mIztc5n+NQY38n6T6u6IeoutFhZTKLpmju7QOZ9tq1SQEY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558580052; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=hJlj0a8T7befv3zY0YqLNtddqSz+Zz6qoIsCXjt90zc=; b=QEHW+t03qw3N5BPRzsnGUbIaPzGnqwzok2568C1tUgIxJrr0/cCo8kuT5tVS27Nqi5P9gFsjYh5SCrPKdoKNto+HBkr2H9Cobcud38VBJqqt7vFYH864JsgoPSpmTrdQx3KLuzZ0Wifh1go84MWTPAUAr3zAZp1vWPrG5B+NlFE= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1558580052016393.4047366286551; Wed, 22 May 2019 19:54:12 -0700 (PDT) Received: from localhost ([127.0.0.1]:56577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTdrp-0007ze-5i for importer@patchew.org; Wed, 22 May 2019 22:54:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTdoZ-0005Qx-32 for qemu-devel@nongnu.org; Wed, 22 May 2019 22:50:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTdgf-0001rV-Rt for qemu-devel@nongnu.org; Wed, 22 May 2019 22:42:34 -0400 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]:45837) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTdgf-0001r9-OB for qemu-devel@nongnu.org; Wed, 22 May 2019 22:42:33 -0400 Received: by mail-yw1-xc41.google.com with SMTP id w18so1672540ywa.12 for ; Wed, 22 May 2019 19:42:33 -0700 (PDT) Received: from localhost.localdomain ([71.46.56.17]) by smtp.gmail.com with ESMTPSA id n12sm7559320ywn.81.2019.05.22.19.42.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 19:42:32 -0700 (PDT) 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; bh=hJlj0a8T7befv3zY0YqLNtddqSz+Zz6qoIsCXjt90zc=; b=KUeoFYkONNWEXXoOoL4p8rNYvG+crmpzm9fBPDSuRXJ31OPkA9RS7Ru875ij2ZtR0J HTVdmIgqEoTPBRKcVdSnv11wa6eytshy2ybGP6Dlz8QmhHEhCvOxpB/6oV0NDqIWVUGd LIqCSOOx8xYOspeVb14tsRFWmeyP1lI51w7uwXHKiioX6Qrc8CbkihMXKl0GRWQRkFTU MR9wQXxtBEgJBbpbhTj078QlpKWlrYt2ETDh2vwSqc11FaMrDAI1PdaEknsYLydtRUpk ehoejxfS2Bw8KYH050jXXO7XQYROco0MJ/nJP14P7Jwrxtzt6u1hgIbsdYVyhkebt8oM GydA== 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; bh=hJlj0a8T7befv3zY0YqLNtddqSz+Zz6qoIsCXjt90zc=; b=RvlI+xDVPGhmtzPNrUCRbsX8hPkESQueYtGzCyyECc7pzd0smS15paHaTGzfYepRbz 8pCp18yxfTpTn47uyHDZmikCN1u6rGAwsxwOUbIhan5BzGLLlEF7BHgUkHxcIZfu61zu p2qsg0M07N6bBvkPn6hvR67rrS3c/f4m/XVil8++EesKl5EN/g2S7tA9Fd2376Fczz8Q XKhkLFttCpiTVIco5eukfDxbuu42YHq6XD1S9ATqgBUErID7+QxtpKb0u0cBW/Y7o79t 0VCLK7/CKCPh2YsMe7O8iJT5gWrZsIsjF1af9gzZKbj2/7w8X0WbKBo3s+veU3N05z+9 lFcg== X-Gm-Message-State: APjAAAW3VjhKHLTEvd7HA6myAUWr06oxybszKM85MpHNTDc6UuZUhe9l rrdkT3y2RTzPd4DDtm8RNktOVzDvfO4= X-Google-Smtp-Source: APXvYqwwkrMPYF5OXZbpvbZI1pk/1VBuHTOimUBJJL7PXPN4Ktt8F5DKkK9twyASs3EdmSZCAurE9A== X-Received: by 2002:a81:4d42:: with SMTP id a63mr27652804ywb.346.1558579352684; Wed, 22 May 2019 19:42:32 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 22:42:27 -0400 Message-Id: <20190523024229.1158-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190523024229.1158-1-richard.henderson@linaro.org> References: <20190523024229.1158-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c41 Subject: [Qemu-devel] [PATCH 1/3] capstone: Adjust include of capstone.h X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, david@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Since v4.0, capstone.h has moved to . Signed-off-by: Richard Henderson Reviewed-by: Alex Benn=C3=A9e Reviewed-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- include/disas/capstone.h | 4 ++++ configure | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/include/disas/capstone.h b/include/disas/capstone.h index e29068dd97..90631d84a9 100644 --- a/include/disas/capstone.h +++ b/include/disas/capstone.h @@ -3,7 +3,11 @@ =20 #ifdef CONFIG_CAPSTONE =20 +#ifdef CONFIG_CAPSTONE_CAPSTONE_H +#include +#else #include +#endif =20 #else =20 diff --git a/configure b/configure index d2fc346302..eec7f061c3 100755 --- a/configure +++ b/configure @@ -5021,6 +5021,9 @@ case "$capstone" in system) QEMU_CFLAGS=3D"$QEMU_CFLAGS $($pkg_config --cflags capstone)" LIBS=3D"$($pkg_config --libs capstone) $LIBS" + if check_include capstone/capstone.h; then + capstone_capstone_h=3Dyes + fi ;; =20 no) @@ -7197,6 +7200,9 @@ if test "$ivshmem" =3D "yes" ; then fi if test "$capstone" !=3D "no" ; then echo "CONFIG_CAPSTONE=3Dy" >> $config_host_mak + if test "$capstone_capstone_h" !=3D "no" ; then + echo "CONFIG_CAPSTONE_CAPSTONE_H=3Dy" >> $config_host_mak + fi fi if test "$debug_mutex" =3D "yes" ; then echo "CONFIG_DEBUG_MUTEX=3Dy" >> $config_host_mak --=20 2.17.1 From nobody Mon Apr 29 18:43:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1558579987; cv=none; d=zoho.com; s=zohoarc; b=UxxTuYvxPfjbrFd82O9wZMIL8cpl4Bqrl4NbAPX2hUJMWBOmCvafUa1812zEpLdaGlgcHrJta7JGzLUQxZVVkXjDoSYW7urNFxnxwoIw0QFPgPmNm97A3EyIe+8QR9HHqbT5cmpYfw80CWf3+Ld2UUDANDCizjhZLaL5t9rpAM8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558579987; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=8kd0zJ7pX2a58yAUvy9tQqu3+GflEz08T0/34sUM+/A=; b=YD6Sk3pk9F5wpG83Z1Z1rjxVJvzO6KE71LDQQrPq22D8x1DrUYXDjJ++sALNoPZak2KQ3b2EjFR9sauQ5TXawflpTYk2h7z9/XOpCJKIbgd0rTsLtTpQ+wOsqf8qDrfzWwx3a2/3+df9cnaiQJ9kLTFrGXPSHHC9ZeHsJT61yiA= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail 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 1558579987183165.3293291863156; Wed, 22 May 2019 19:53:07 -0700 (PDT) Received: from localhost ([127.0.0.1]:56557 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTdqA-0006j9-Gg for importer@patchew.org; Wed, 22 May 2019 22:52:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTdoY-0005Qx-3m for qemu-devel@nongnu.org; Wed, 22 May 2019 22:50:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTdgg-0001sF-U5 for qemu-devel@nongnu.org; Wed, 22 May 2019 22:42:35 -0400 Received: from mail-yw1-xc44.google.com ([2607:f8b0:4864:20::c44]:33722) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTdgg-0001ru-Pv for qemu-devel@nongnu.org; Wed, 22 May 2019 22:42:34 -0400 Received: by mail-yw1-xc44.google.com with SMTP id v81so1697769ywe.0 for ; Wed, 22 May 2019 19:42:34 -0700 (PDT) Received: from localhost.localdomain ([71.46.56.17]) by smtp.gmail.com with ESMTPSA id n12sm7559320ywn.81.2019.05.22.19.42.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 19:42:33 -0700 (PDT) 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; bh=8kd0zJ7pX2a58yAUvy9tQqu3+GflEz08T0/34sUM+/A=; b=QABtF/Jp0I6Hk9ojEdIqCwJXu+R+Q+xjpgknF47zdeI4E++UWXDw/6IMIQSwcAejVi GrJN9k7lXdxbb7swTqbi5Jsm5TkspwDwq+A3PJF2qg8Zm1bIOBlxO58IZYjago7fvrVJ HB3CrNZo01H2cT7FHwKSwaYvvyjWC1kpbj1aDE20rEYMSyXBqj4WA3J++7KWCTsce83B sH/GhMlvzuWxBuCQFlicvf7aoS/f044awBIlslXHYCch19+rgIW4LawIaVwIvGGLJhgT 7HTfcr2zBDj2Z6Vew4jGXttF1igawk2wxJMWJiQlH4S80rmS/9We1C9rv0hePoMwOQzH 1Aaw== 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; bh=8kd0zJ7pX2a58yAUvy9tQqu3+GflEz08T0/34sUM+/A=; b=ngAjCD5bIXq2x8S9U17/BMLWMtFtTSU3ix9QcCYsGABlnh0ZGSjE39G+STvCeEIIXh HR3msQEPD8sABlKHLOwsfeKBS75hvmuWy9PzD+3TqEg4JkFJpwPnfL9pvN+w4Zg83CUL NUh8oFDOn14a+ZC5xBOdXQscNKX+ixBoLLSe3E8fGONwy1sONCWsgVZjVWFXsGLPPYIB HrmT8PNqzemnsTT++hvaAQPiE7Z3QLuCPolK9lK3JiNyEmO1OosqV/DJkE0W7jaiEOf/ G4hfAjsquJ+RuqezEcV8tLv3Z2WEgLj7g+EJu+nr7AVgzw1qIZxMNXY5+v1P/1U5Oxg8 avfg== X-Gm-Message-State: APjAAAWQceOxj53ecCH0lSodOMhV0g7ogcZdWiIT+rBcQhMYhqFuzeRD S1VYHlVSqG7ObLs2CuVU9Ue5yhtKQgc= X-Google-Smtp-Source: APXvYqx+LL0O4r3qY7SNttPc7IzkhqhVp4i2gY0a6rpJcf/v5dy5zEDRRvuLNgQA+fovWmm1zUTQ9g== X-Received: by 2002:a81:a183:: with SMTP id y125mr46192680ywg.249.1558579353887; Wed, 22 May 2019 19:42:33 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 22:42:28 -0400 Message-Id: <20190523024229.1158-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190523024229.1158-1-richard.henderson@linaro.org> References: <20190523024229.1158-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c44 Subject: [Qemu-devel] [PATCH 2/3] capstone: Update to master X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, david@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Update to fbb20ea83c5a. Choose this over the 4.0.1 tag because master now includes the s390x z13 vector opcodes. Signed-off-by: Richard Henderson Acked-by: David Hildenbrand Reviewed-by: Philippe Mathieu-Daud=C3=A9 Tested-by: Philippe Mathieu-Daud=C3=A9 --- capstone | 2 +- configure | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/capstone b/capstone index 22ead3e0bf..fbb20ea83c 160000 --- a/capstone +++ b/capstone @@ -1 +1 @@ -Subproject commit 22ead3e0bfdb87516656453336160e0a37b066bf +Subproject commit fbb20ea83c5af4f29b40c17fbadb1f71b0a08fae diff --git a/configure b/configure index eec7f061c3..a2e4636a34 100755 --- a/configure +++ b/configure @@ -5016,6 +5016,7 @@ case "$capstone" in LIBCAPSTONE=3Dlibcapstone.a fi LIBS=3D"-L\$(BUILD_DIR)/capstone -lcapstone $LIBS" + capstone_capstone_h=3Dyes ;; =20 system) --=20 2.17.1 From nobody Mon Apr 29 18:43:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1558579984; cv=none; d=zoho.com; s=zohoarc; b=fSWu2monUyQa0s6bW7aVTH5h5zYgfUsA9UP3tB7p1mdSyJ4a21V0Iks41ZdCzFm2U17euFPy8rPpMsL3RwVWVgY/N+a0UKMFaFEgYtNfau+KUt2/kLMW2jmwHxq1WmY/kCDzgAQaAw6jb9tjfW4SlP2WWb3GNO80KNUluby/iNI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558579984; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=L3cNq6YyAPNbUfiuj9aFVufaRYm1fCVGRTm5ygWeeXI=; b=M/QRwNgkcf7IIEafDAIqsiPVT5bEbho4ksCNrMuYkDNcHlGpKTZUWKLvi3gkkpKyahim90BGkTroj5rN1MrFWs7LTjSkXT4+LmwuUQS1foShLG7okVE5e2Xw2FTFaR62kJly/E4//q7WHIXZKiu4Ph6txsfbzPZtzP8x30+DfEI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 155857998413343.82288908674866; Wed, 22 May 2019 19:53:04 -0700 (PDT) Received: from localhost ([127.0.0.1]:56559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTdqA-0006jj-Fb for importer@patchew.org; Wed, 22 May 2019 22:52:22 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTdoW-0005Qx-Ru for qemu-devel@nongnu.org; Wed, 22 May 2019 22:50:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTdgh-0001t3-PM for qemu-devel@nongnu.org; Wed, 22 May 2019 22:42:36 -0400 Received: from mail-yw1-xc41.google.com ([2607:f8b0:4864:20::c41]:34879) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTdgh-0001sk-K9 for qemu-devel@nongnu.org; Wed, 22 May 2019 22:42:35 -0400 Received: by mail-yw1-xc41.google.com with SMTP id k128so1694639ywf.2 for ; Wed, 22 May 2019 19:42:35 -0700 (PDT) Received: from localhost.localdomain ([71.46.56.17]) by smtp.gmail.com with ESMTPSA id n12sm7559320ywn.81.2019.05.22.19.42.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 May 2019 19:42:34 -0700 (PDT) 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; bh=L3cNq6YyAPNbUfiuj9aFVufaRYm1fCVGRTm5ygWeeXI=; b=Q6HrrMrNJm0cOKjwpnwqAoomARUSCbZGpMi0xgXEFi7ApLzsyuwOUpM5iBvxQVZLjx q05Nm4mxKwjOIYIVVOIHxSaIGhQ4Rh2Lw8yoLxt0Qg3mvBARtO/wr9pu8I0iqSpTP8Ar 9WIZxgf7N5p534yFFn/zq4h2cwr25/Oscq8HR/sHx/fofuiPiPrMmSmRPNR+MZ73hVJ2 +aOMghSmJihsscwxiU436jekxvCOZZJMEIBLYg/Gbd+hG7ZCqnWkBUXbUKIJepFZ7kXM 2cV5+EG/s1UUoRfg3PVawhn6SSHe2lzhcsOoj07qY1kdOo6aPtG+8Y4orAyFbCWGEkur RLLw== 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; bh=L3cNq6YyAPNbUfiuj9aFVufaRYm1fCVGRTm5ygWeeXI=; b=Y5KofZMQaAH3oOg1mQzT+CiyQvy+yfBK8j6DuBVWO59guvWGhvymB3/MScJ8Awozr7 ymnqY/6L1DtGpCXwOGSlqWAmGMI+S15dGLxjaE8yIeUPWjbZU6biuNB0hlFnT8yTqj4B xqsab/II0wgvcVLOAmgMnTFWFxjPh796G5/y2y0MIE5JCkeKwa4zNJIbWwAaY/GtJb4C +L0NJNRsUzAeCFiWtjBBCNcmCRguUlxFmHm6XRfUJ3KB3/d5J4HFYieHJivkVmM3pojC Glx4RmZvpV7Z8vGmtiHLbLSPCfDscwE7a0d61R3lMt6EAMZyvF1aA2njZ/xu8SblubjO kUkA== X-Gm-Message-State: APjAAAWPeWN1tVZ+MB+vlDdhf4WEsVCv7U0jdO/7rFN7+l21C9xm+bvl PXrwvkAbK4wikTIFlqhlkibn6O2ZL2c= X-Google-Smtp-Source: APXvYqwl0PwXnd7vcfExm2eDE+gnaGej1fmWtWLEkxffbAM8F7YL0vxesciyJKIv6HEIraBT1YvXVA== X-Received: by 2002:a81:3c83:: with SMTP id j125mr21399048ywa.226.1558579354836; Wed, 22 May 2019 19:42:34 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 22 May 2019 22:42:29 -0400 Message-Id: <20190523024229.1158-4-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190523024229.1158-1-richard.henderson@linaro.org> References: <20190523024229.1158-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::c41 Subject: [Qemu-devel] [PATCH 3/3] capstone: Enable disassembly for s390x X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alex.bennee@linaro.org, david@redhat.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Enable s390x, aka SYSZ, in the git submodule build. Set the capstone parameters for both s390x host and guest. Install a skipdata hook to keep capstone in sync with the instruction stream for unknown opcodes. Signed-off-by: Richard Henderson --- Makefile | 1 + disas.c | 40 ++++++++++++++++++++++++++++++++++++++++ target/s390x/cpu.c | 4 ++++ 3 files changed, 45 insertions(+) diff --git a/Makefile b/Makefile index 155f066a20..a37e872825 100644 --- a/Makefile +++ b/Makefile @@ -477,6 +477,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 subdir-capstone: .git-submodule-status diff --git a/disas.c b/disas.c index 41ad0102e2..c1ecd2d769 100644 --- a/disas.c +++ b/disas.c @@ -179,6 +179,39 @@ static int print_insn_od_target(bfd_vma pc, disassembl= e_info *info) to share this across calls and across host vs target disassembly. */ static __thread cs_insn *cap_insn; =20 +/* + * The capstone library always skips 2 bytes for S390X. + * This is less than ideal, since we can tell from the first two bits + * the size of the insn and thus stay in sync with the insn stream. + */ +static size_t CAPSTONE_API +cap_skipdata_s390x_cb(const uint8_t *code, size_t code_size, + size_t offset, void *user_data) +{ + size_t ilen; + + /* See get_ilen() in target/s390x/internal.h. */ + switch (code[offset] >> 6) { + case 0: + ilen =3D 2; + break; + case 1: + case 2: + ilen =3D 4; + break; + default: + ilen =3D 6; + break; + } + + return ilen; +} + +static const cs_opt_skipdata cap_skipdata_s390x =3D { + .mnemonic =3D ".byte", + .callback =3D cap_skipdata_s390x_cb +}; + /* Initialize the Capstone library. */ /* ??? It would be nice to cache this. We would need one handle for the host and one for the target. For most targets we can reset specific @@ -209,6 +242,10 @@ static cs_err cap_disas_start(disassemble_info *info, = csh *handle) =20 /* "Disassemble" unknown insns as ".byte W,X,Y,Z". */ cs_option(*handle, CS_OPT_SKIPDATA, CS_OPT_ON); + if (info->cap_arch =3D=3D CS_ARCH_SYSZ) { + cs_option(*handle, CS_OPT_SKIPDATA_SETUP, + (uintptr_t)&cap_skipdata_s390x); + } =20 /* Allocate temp space for cs_disasm_iter. */ if (cap_insn =3D=3D NULL) { @@ -551,6 +588,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 b1df63d82c..553571d86b 100644 --- a/target/s390x/cpu.c +++ b/target/s390x/cpu.c @@ -41,6 +41,7 @@ #include "sysemu/sysemu.h" #endif #include "fpu/softfloat.h" +#include "disas/capstone.h" =20 #define CR0_RESET 0xE0UL #define CR14_RESET 0xC2000000UL; @@ -175,6 +176,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.17.1