From patchwork Tue Sep 26 20:14:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 114286 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp4237649qgf; Tue, 26 Sep 2017 13:15:29 -0700 (PDT) X-Received: by 10.55.24.22 with SMTP id j22mr15368292qkh.310.1506456928888; Tue, 26 Sep 2017 13:15:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506456928; cv=none; d=google.com; s=arc-20160816; b=HNqnuSvSUpB8hXM1NA+NUtRqlUzMgyxsarn+P7wfsY2vMi+fW88ZKv/huw3MPd+nCU gb6wQ8KPX3UUGtGvcC+wIDONi0ColXQNpDm8xpziqb5GV1so71VVS2V0gfTPt2SmcTzF IPWkFlEvtBcrYizbpEDwr1WPs0Jvr6QTuXkLJG8fF2Kh5iwAjJOcSTVpZb2ieUuyH6hx 3kPdCZ1uuNGwQxSu7FCECV0ORMU5ynOqLRldClQc085mWYewzNYx97pHoAC+CR9kKfI1 DkzKDDRBn/qCohuJ4gRux2AT7YwCS8AfIZvs45zVUC3MmqZv60dkPCrtdqRTZtdB0Gw7 8eBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=H1wqHIjont5qZFEBAawyVACPy8IpDxXA5bA8KuHdecE=; b=xisRKEjhafVWI2+4u0pNfueoi6/UelUomnLTuR6WhGslm+0M/x/61J/N5cpyTU3c6F gFGI8uOqyFLQjH3TLfYRUOVpjIaEFWZgihldGnucuYPv7udYpYb6entNscQNyUugB4yH vpOMdxfkIbnM3eZ645NViHK4wAI7w9OXVpA5Cjgqk/gbbZyYthq9fbfXntY3Pr/MrgV9 fea8XgINz3pI9EwVROq1qIB90yRuNUkz7pn6ZZ7tuNge0R56deOUdv+vCJk/a5VFCD9u w5pvZf86+MwyAmRYQnpq59y5UYrEGHR41AtHJREggVFCOETvYWFlMqcfutYywIM7yKcP 3CKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=O/KhGcoj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [208.118.235.17]) by mx.google.com with ESMTPS id v6si8977249qkd.438.2017.09.26.13.15.28 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 26 Sep 2017 13:15:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=O/KhGcoj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:50978 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwwGM-0003D2-Lu for patch@linaro.org; Tue, 26 Sep 2017 16:15:26 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43968) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwwFc-0002wO-0m for qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwwFb-0003DN-7M for qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:39 -0400 Received: from mail-pf0-x233.google.com ([2607:f8b0:400e:c00::233]:46177) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dwwFb-0003BO-2F for qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:39 -0400 Received: by mail-pf0-x233.google.com with SMTP id r68so6078534pfj.3 for ; Tue, 26 Sep 2017 13:14:39 -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 :mime-version:content-transfer-encoding; bh=H1wqHIjont5qZFEBAawyVACPy8IpDxXA5bA8KuHdecE=; b=O/KhGcojlmhrI000TYo9EvdiD7n+1rmCaRTThRpoUJLXHru8CYbRn9O0TOhR4h/Lq7 SaHIukBHX1+mm/U/AvHyP1ogjAllLYOnnfEodGIyJjyzgnM6A63U0FZFp2COGPH3RROh nm+m19fBz6R4TdGaTHOrYXOaj8dJy1SAq/kuY= 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=H1wqHIjont5qZFEBAawyVACPy8IpDxXA5bA8KuHdecE=; b=UDZqrHLtFl3svIrOFI35nvXDXsGczdoq34hVccfoS+/as/2TpdIHUT5pBdA7jyPVpx /V+EtkihfDIWL+WOzgsxJW9uN+8euF1pu1INgiWu8y43eKYLE7zwrrXbWCvLXsYqzwbc ntEV4dgfcMUuFdm69ajDItjhXFUFxqFefj9D/IjpVH5INHTlEsI8BR8U2IBSwsc6NgfM M+A7/I0CbC7GaliKGJIrr65vnJJWO6zUWCEd/x6TeoIcHYI7n5cFi2qr+Mj0GCg8pZvm wS3LxZ0ZLA7DIDHpqBt0R5q7kSlF/5nL6W4/rqtgT7SiYKXSXaW8e+1LwfvOAwj3tEy3 mTXQ== X-Gm-Message-State: AHPjjUhQSkcuhCSebJ4XKosSYFOL8Hx9TePJPKHO9JdO9Eu/0enk1J6P 8sVlXQZL4FfoebCEWLqEGQU+tmv6bOc= X-Google-Smtp-Source: AOwi7QDH7K+D6B+0sdadbZdyhXKUGwbkVEo7rBDmS1ujSm+lcedHtD8A2zdWfweEIMkVDPg+fTwJ6g== X-Received: by 10.84.234.137 with SMTP id n9mr11848517plk.383.1506456877885; Tue, 26 Sep 2017 13:14:37 -0700 (PDT) Received: from bigtime.twiddle.net ([70.35.39.2]) by smtp.gmail.com with ESMTPSA id r138sm15582470pgr.12.2017.09.26.13.14.36 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Sep 2017 13:14:36 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 26 Sep 2017 13:14:23 -0700 Message-Id: <20170926201427.2833-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170926201427.2833-1-richard.henderson@linaro.org> References: <20170926201427.2833-1-richard.henderson@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::233 Subject: [Qemu-devel] [PATCH v3 5/9] i386: 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: peter.maydell@linaro.org, qemu-ppc@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson --- disas.c | 4 ++++ target/i386/cpu.c | 7 +++++++ 2 files changed, 11 insertions(+) -- 2.13.5 diff --git a/disas.c b/disas.c index 746d76c07d..1c44514254 100644 --- a/disas.c +++ b/disas.c @@ -439,9 +439,13 @@ void disas(FILE *out, void *code, unsigned long size) #elif defined(__i386__) s.info.mach = bfd_mach_i386_i386; print_insn = print_insn_i386; + s.info.cap_arch = CS_ARCH_X86; + s.info.cap_mode = CS_MODE_32; #elif defined(__x86_64__) s.info.mach = bfd_mach_x86_64; print_insn = print_insn_i386; + s.info.cap_arch = CS_ARCH_X86; + s.info.cap_mode = CS_MODE_64; #elif defined(_ARCH_PPC) s.info.disassembler_options = (char *)"any"; print_insn = print_insn_ppc; diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 13b2f8fbc5..cf890b763b 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -51,6 +51,8 @@ #include "hw/i386/apic_internal.h" #endif +#include "disas/capstone.h" + /* Cache topology CPUID constants: */ @@ -4106,6 +4108,11 @@ static void x86_disas_set_info(CPUState *cs, disassemble_info *info) : env->hflags & HF_CS32_MASK ? bfd_mach_i386_i386 : bfd_mach_i386_i8086); info->print_insn = print_insn_i386; + + info->cap_arch = CS_ARCH_X86; + info->cap_mode = (env->hflags & HF_CS64_MASK ? CS_MODE_64 + : env->hflags & HF_CS32_MASK ? CS_MODE_32 + : CS_MODE_16); } static Property x86_cpu_properties[] = {