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: 9959387 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 24597601E9 for ; Tue, 19 Sep 2017 15:27:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D2E528A0C for ; Tue, 19 Sep 2017 15:27:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 124AE28E9E; Tue, 19 Sep 2017 15:27:45 +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 9D01528A0C for ; Tue, 19 Sep 2017 15:27:44 +0000 (UTC) Received: from localhost ([::1]:43531 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duKR5-0003RA-7w for patchwork-qemu-devel@patchwork.kernel.org; Tue, 19 Sep 2017 11:27:43 -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+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- disas.c | 4 ++++ target/i386/cpu.c | 7 +++++++ 2 files changed, 11 insertions(+) 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[] = {