From patchwork Tue Sep 19 15:03:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 113022 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp5049729qgf; Tue, 19 Sep 2017 08:26:50 -0700 (PDT) X-Received: by 10.55.10.76 with SMTP id 73mr1267250qkk.205.1505834810761; Tue, 19 Sep 2017 08:26:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505834810; cv=none; d=google.com; s=arc-20160816; b=MhiawsHogGqJW39ieGXF+kY7oNGpSMFbL6ycPBSEhEZJvZJi5WyiAkJ7ZTOexwk5Vm 0uqBdKI8ybaUT6AoepMaJHLFxnHaZs+TlTQy2hOUoN+EZIZkfBIZRcYV1QR22ZytXdk0 tvKkS4+WR43MyOWGGHoU+o9mvoasCrhU9iOk4Y/Y1MdZLKkzAjjzGsWh0erb10n5w1zX GXWuDwidNoFAR5OW7bf6utA7/wrT89tUWnPU6p+kb8X7fipQROrgxeDOuLvndwJR4z/J i8t1tczu/OLdGUniUmClgHpdBh55mbd+xtHtyfzFHNZ3aeKStmS5pr2e2g2enXdWEqBX q8Wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=D05ocLF3DDPZHRFYgbB4AY+m28Wbjh2YtHzDvE6LG+g=; b=THGZSdEma1HAvmpRnq4X5o06yq9IGWQ6YSRMuQlS1KjZy+1zpIJOAMBCgPOrZ0qeko BSy0bGk8M8blt3uh6XhN8ewwTTjnRHfGp9FAJ3GGNImuaSMDipC8dlMWEivZpJJqwgvc uFafzDukIASweewI5E95VYte228oO9JB2sby+Q0WcXYbNda/r6s7VtJHjB3/1/O4vWP7 Z5uPBdopUvdgNhqX2FVBkuOJbB5aSg6eh7dSm2td6kzCey5Sk99Ar1Q1DovfGBWvA++X XJA+OLKG25GuKVmlibEHH4jAww75tlcFPSORsE4hoy97H9kBjYAVPch9adnydftj1FiM nhYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=iPTsXqyU; 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 s2si1381718qti.449.2017.09.19.08.26.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Sep 2017 08:26: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=iPTsXqyU; 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]:43531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duKQC-0003RA-CC for patch@linaro.org; Tue, 19 Sep 2017 11:26:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49059) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duK3d-00083i-IU for qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duK3c-0003hC-Ju for qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:29 -0400 Received: from mail-io0-x233.google.com ([2607:f8b0:4001:c06::233]:47579) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1duK3c-0003gk-Fb for qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:28 -0400 Received: by mail-io0-x233.google.com with SMTP id e189so735673ioa.4 for ; Tue, 19 Sep 2017 08:03:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=D05ocLF3DDPZHRFYgbB4AY+m28Wbjh2YtHzDvE6LG+g=; b=iPTsXqyU21o+0lJyVhBkdrrY7SeRJzng93SrKbu7vAJFBXXfKdrGKC+i05bggAO24K wbbcMet5ApzIhXHA0OI6FUe7aX8ej4e1XpYRt0YzgMs5nx3p3HgSinyFRQWI+VPhDTBg X3TrmkE9i7FH1oPLlC7Wnt3O7lGyj9N8JPcYw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=D05ocLF3DDPZHRFYgbB4AY+m28Wbjh2YtHzDvE6LG+g=; b=SaEiueHr8HQx5+16PSgSnfFyB5xmaPX31wa3RP+uTeZEX98TgUOBRZnOXBiYfDgL7X 1NVec4jlzkz1JAJ7Kx97YJbhqvxkO8GH6GIBH0ePdb8jIXOY9GhkLKnO1UEDPnJ/ll2D HFwcwJHOUvL+AyJmvrQxhIlLpQ+EyPkt8hBolil+3Bg+/rXKF9CJevzVgUCOrbVqIbt+ NB0paR5683A2Eaz6oY0l3qsY1mz9LTft5NQuOkDfO6itj6+8M76XAZxaDV7NfwfVTWET nT8BTe/GRNG4xEmwcW8OqrmIVVlJdEdBRj6QsTeqqUPItQUtGl367DaTs/nsRXn5+0/S NBiA== X-Gm-Message-State: AHPjjUjttJ+6HoLPu2U5qeM7fc8ooTkdZ3EFvl1rbWZhq8wMaiHgSCJz NbIBjLNZtpSDoVKvBFBp0rhApv+Lkb4= X-Google-Smtp-Source: AOwi7QDgtUxwTNWc4X13NOxo8mt3il/VTTnSPDcEg0BjmxjiS1cWYWOMNufhzJwbNMaKRkuGYNdjRg== X-Received: by 10.202.114.16 with SMTP id p16mr1883845oic.209.1505833407396; Tue, 19 Sep 2017 08:03:27 -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.25 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Sep 2017 08:03:26 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 19 Sep 2017 10:03:10 -0500 Message-Id: <20170919150313.10833-6-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::233 Subject: [Qemu-devel] [PATCH v2 5/8] 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson --- disas.c | 4 ++++ target/i386/cpu.c | 7 +++++++ 2 files changed, 11 insertions(+) -- 2.13.5 Reviewed-by: Alex Bennée diff --git a/disas.c b/disas.c index 4dbb492219..42fae735ee 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 b869a69c53..c3980b3864 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: */ @@ -4108,6 +4110,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[] = {