From patchwork Tue Sep 19 15:03:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 9959413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9F42F6056D for ; Tue, 19 Sep 2017 15:32:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9543723B34 for ; Tue, 19 Sep 2017 15:32:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8A11D26E16; Tue, 19 Sep 2017 15:32:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A22AE281F9 for ; Tue, 19 Sep 2017 15:32:26 +0000 (UTC) Received: from localhost ([::1]:43558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duKUr-0007iT-5f for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Sep 2017 11:31:37 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duK3j-0008A9-LW for qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duK3e-0003jt-SV for qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:35 -0400 Received: from mail-io0-x231.google.com ([2607:f8b0:4001:c06::231]:52410) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1duK3e-0003j8-Oa for qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:30 -0400 Received: by mail-io0-x231.google.com with SMTP id i197so715549ioe.9 for ; Tue, 19 Sep 2017 08:03:30 -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=ho6Nr7OxqVnfQnw1KrdzKdigx/0D5Zw/N3pClcZNIz0=; b=FeHrzFvuXd7pN9zYjhHjqB9vl/y044igRlLhqHwhn1jhl3jJ7IDN8wP9omE1UHs8tQ F9xVkEl8mY3M/4/2QnHiBBxq6GKMTcQMk44b5B0vCXr31YJD/FYnjJ2CnZ69ixYPeDFx CaYSq8Br2Szc9cqqiknSxTtTOm6KyJJSECE9Q= 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=ho6Nr7OxqVnfQnw1KrdzKdigx/0D5Zw/N3pClcZNIz0=; b=smqvsHFHWJMqa1/M+ghxT2QptPIZEdqL+a/LNA88DyC8D2mtUbauwsKetRh1aFQNrm cgqzC4Pn8APuA46WDYaLJHHSeiRvBe1y6XwUvHK+F+xJPtdRTIlwTFOOFD2F4Cxbne7Y a0PJjhKuFqvU6GfCbcn/mNt4g0jR9PkZuucRyR8MX4s/qaulaNdnVt5sbdsdP4vGAiDJ CuH15kWRk0haNO+P7F5XJgnNb2xGM0gEpB/7TpCvRUfRmS60eVohp531NSU0fFXIMhiA 7WJtb5ylIibwfhDc8Rkgstdu0jFJtsf4REKsMmWOIbqsl4f8LdtsqbA8enzhSmUbsgho FSTg== X-Gm-Message-State: AHPjjUhKapiYOg4QSFvxNBVZ/sYXFQW3VMJiqya7N+lcCIW7fPmgf1cX 2y3ZrqT2xuIAHvjDvFUbjv208AUokFo= X-Google-Smtp-Source: AOwi7QCYzLH2L01dWnZoO7ohYLh6yAlZ39KS5PKTHNS4WbEgZba3i14Zht7cs4zbnt+E7xI3w7bsnw== X-Received: by 10.202.84.11 with SMTP id i11mr1711781oib.152.1505833409607; Tue, 19 Sep 2017 08:03:29 -0700 (PDT) Received: from bigtime.twiddle.net (162.189-204-159.bestel.com.mx. [189.204.159.162]) by smtp.gmail.com with ESMTPSA id h63sm360621otb.59.2017.09.19.08.03.27 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Sep 2017 08:03:28 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 10:03:11 -0500 Message-Id: <20170919150313.10833-7-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170919150313.10833-1-richard.henderson@linaro.org> References: <20170919150313.10833-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4001:c06::231 Subject: [Qemu-devel] [PATCH v2 6/8] arm: Support Capstone in disas_set_info 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: qemu-arm@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Cc: qemu-arm@nongnu.org Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Tested-by: Alex Bennée --- disas.c | 3 +++ target/arm/cpu.c | 21 ++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/disas.c b/disas.c index 42fae735ee..ea295f9cfc 100644 --- a/disas.c +++ b/disas.c @@ -451,6 +451,7 @@ void disas(FILE *out, void *code, unsigned long size) print_insn = print_insn_ppc; #elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS) print_insn = print_insn_arm_a64; + s.info.cap_arch = CS_ARCH_ARM64; #elif defined(__alpha__) print_insn = print_insn_alpha; #elif defined(__sparc__) @@ -458,6 +459,8 @@ void disas(FILE *out, void *code, unsigned long size) s.info.mach = bfd_mach_sparc_v9b; #elif defined(__arm__) print_insn = print_insn_arm; + s.info.cap_arch = CS_ARCH_ARM; + /* TCG only generates code for arm mode. */ #elif defined(__MIPSEB__) print_insn = print_insn_big_mips; #elif defined(__MIPSEL__) diff --git a/target/arm/cpu.c b/target/arm/cpu.c index 412e94c7ad..53320709ac 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -33,6 +33,7 @@ #include "sysemu/sysemu.h" #include "sysemu/hw_accel.h" #include "kvm_arm.h" +#include "disas/capstone.h" static void arm_cpu_set_pc(CPUState *cs, vaddr value) { @@ -482,10 +483,24 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info) #if defined(CONFIG_ARM_A64_DIS) info->print_insn = print_insn_arm_a64; #endif - } else if (env->thumb) { - info->print_insn = print_insn_thumb1; + info->cap_arch = CS_ARCH_ARM64; } else { - info->print_insn = print_insn_arm; + int cap_mode; + if (env->thumb) { + info->print_insn = print_insn_thumb1; + cap_mode = CS_MODE_THUMB; + } else { + info->print_insn = print_insn_arm; + cap_mode = CS_MODE_ARM; + } + if (arm_feature(env, ARM_FEATURE_V8)) { + cap_mode |= CS_MODE_V8; + } + if (arm_feature(env, ARM_FEATURE_M)) { + cap_mode |= CS_MODE_MCLASS; + } + info->cap_arch = CS_ARCH_ARM; + info->cap_mode = cap_mode; } if (bswap_code(arm_sctlr_b(env))) { #ifdef TARGET_WORDS_BIGENDIAN