From patchwork Wed Oct 25 12:30:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 117122 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp1695713edm; Wed, 25 Oct 2017 05:36:50 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RJpoDHHbbsJa0U2XmD3HJnJdGNbiDSUnlyltnQfY9rI2Hp9fnGtPlc+P2fZEoLo6di84JJ X-Received: by 10.37.135.76 with SMTP id e12mr1144585ybn.279.1508935010378; Wed, 25 Oct 2017 05:36:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508935010; cv=none; d=google.com; s=arc-20160816; b=lHze/LXfufj3WT1HvIesgV0lkVS+nQlvV7iZSbGr5RttDE83wPTApq+6NGoCt7G81n r+sHX9Xnlv5WeaYpG4S2qBb4PIOPLSVP7s3HqhdvDM2UdGcjgPL21qk242eM3z/8nHbM 1C7+GiL9ZBteHtq7wU99cR8Gmk4xsD9vcXj8eiulecFQLXlle6pGqrk2Qd9bZbehOU9S 7/AodwTJhLdZT6NeTybTH05MGST9S+wuTZ0Oe+111ZNs0w6G+nPMnqZS01wc9B8RN93F n02/cXtCtenL2UdL51huFYNIbRWVP/XB6O+8odLurdNU7gOp4755qiwZ/R3YU4bIDOQT uq3g== 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=2iMMn6n97w6gqxrsVza5ry/hdw0ZDWk0Pu8fMUSHJVI=; b=xJrcRhjTjS8woKo8cUxQgDWgKyEKvRsoQ02n7LfkoEpg/sw1LqMYoVlJsIomrkWe8z aCkNT9lxOZfBnEZPEjbEyqVa8O63EtPLkUgJupOrsoZ/oc0NwfBLMgaEilCs0RbgtTZ1 m+rVzHNK22tIG/uUIhiDSRrx2zPiWVNL/iB9BXcOS7SSKj3VDFjDACiyYtyBXoZux+/Z ffZi+y/yyeLji6hPhmyyteCSASD8HJsrl0Z3ezNS0CjlLRX7uDaVU1EPe+CxEERhyRzN mROTNBdJ69Mc+4GRXfADGvDd3GI3U778M/ddAwX9SAVu8gn6yPmrw3Mj/7BsTIzjbR/j S01w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Gi9JZfbo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c85si410693ybf.647.2017.10.25.05.36.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 25 Oct 2017 05:36:50 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Gi9JZfbo; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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]:48105 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7KvR-0003IH-Ow for patch@linaro.org; Wed, 25 Oct 2017 08:36:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42916) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e7Kq3-0007WX-AT for qemu-devel@nongnu.org; Wed, 25 Oct 2017 08:31:20 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e7Kq2-00083R-7x for qemu-devel@nongnu.org; Wed, 25 Oct 2017 08:31:15 -0400 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]:54239) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e7Kq2-00082r-15 for qemu-devel@nongnu.org; Wed, 25 Oct 2017 08:31:14 -0400 Received: by mail-wm0-x244.google.com with SMTP id r196so1625100wmf.2 for ; Wed, 25 Oct 2017 05:31:13 -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=2iMMn6n97w6gqxrsVza5ry/hdw0ZDWk0Pu8fMUSHJVI=; b=Gi9JZfboic5UNxlfFtai6qzCa52j4vdTKGy0aZ9xeP8nk/SAVE8Zo2B41B96UhtzEC jb41aLo2CVdV96Y3wzhej+ZZ2JDY39FTyRYS3J8a86gls6wcxn494uVuP2ckfdJM/Aut eEazcof43oTUM5oSJFEcd1kJ/SQ9ohGsFvWns= 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=2iMMn6n97w6gqxrsVza5ry/hdw0ZDWk0Pu8fMUSHJVI=; b=H5esWvuHARWVMYph1b540JeDUPUeppwc7Rsr94KoTNjgZw3gXs5Iqo5krawHsrU3Oz MjVJ3X+tFDkC5A4teLwf1BNKsKc4NSg+0LKF+SwKIxpdYaXeKtfbZMg3W+1pMQENq3p1 knAtKPPTg0TS0dLWHXmqeLpDlaH9klKK+k4i/SuQdQf8alHLYzEQBJXqUen0rhdqRqtm kB1+xRwqTikkLgCi5E32TJlKzIBKq+Zyxwm+9hAC2XHLnUXhlPnau/vkAGZcv6VulYae cec5iEXndhkqCGy6VKSnTmtzm7iFIidLr28wf4JmmeiborXGVLPSljh0fL+YgXtcXHye Ed7A== X-Gm-Message-State: AMCzsaWUYm3hf5KMuCH2UILeuW74PnAn7nYiuZSToLUFke8iNNvtJk9s Ra6ZVOSTJmF0IDc1hR0nHEUdLndRPhk= X-Received: by 10.28.55.2 with SMTP id e2mr1774896wma.60.1508934672832; Wed, 25 Oct 2017 05:31:12 -0700 (PDT) Received: from cloudburst.twiddle.net ([62.168.35.105]) by smtp.gmail.com with ESMTPSA id 61sm2263446wrg.58.2017.10.25.05.31.11 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 25 Oct 2017 05:31:11 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 25 Oct 2017 14:30:52 +0200 Message-Id: <20171025123056.3165-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171025123056.3165-1-richard.henderson@linaro.org> References: <20171025123056.3165-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: 2a00:1450:400c:c09::244 Subject: [Qemu-devel] [PULL 07/11] 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Tested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé 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.6 diff --git a/disas.c b/disas.c index e392a2926e..63dc573e9f 100644 --- a/disas.c +++ b/disas.c @@ -438,9 +438,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[] = {