From nobody Tue Feb 10 06:58:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150863360538437.709504994838085; Sat, 21 Oct 2017 17:53:25 -0700 (PDT) Received: from localhost ([::1]:59647 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e64Vz-0006y2-AL for importer@patchew.org; Sat, 21 Oct 2017 20:53:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e64PZ-0002Hh-Kd for qemu-devel@nongnu.org; Sat, 21 Oct 2017 20:46:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e64PU-0008Kk-V4 for qemu-devel@nongnu.org; Sat, 21 Oct 2017 20:46:41 -0400 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:44753) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e64PU-0008K0-Ol for qemu-devel@nongnu.org; Sat, 21 Oct 2017 20:46:36 -0400 Received: by mail-pg0-x241.google.com with SMTP id j3so9213592pga.1 for ; Sat, 21 Oct 2017 17:46:36 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-158.tukw.qwest.net. [174.21.9.158]) by smtp.gmail.com with ESMTPSA id j12sm5766728pgs.35.2017.10.21.17.46.34 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 21 Oct 2017 17:46:34 -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:mime-version :content-transfer-encoding; bh=2iMMn6n97w6gqxrsVza5ry/hdw0ZDWk0Pu8fMUSHJVI=; b=MlC3nGiVANjPjHtEsuAtl+Ekhk9mGJhHIu3ujJeV4O6AvlvQ/nPqC6CLrQImlP4AWT b0gBEHovkeRWkWs1ePOTqlnYYyHcsB1E7yn85TsNvqF1cqOzFJCKenICZF89+8XQwffW NzNkJ20Tnp0tcoNM9aweyxwElrRBkAMn4y3tw= 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:mime-version:content-transfer-encoding; bh=2iMMn6n97w6gqxrsVza5ry/hdw0ZDWk0Pu8fMUSHJVI=; b=j0vEvcaz9kfjSnCNBPFOl4CwKKr/yFeVqaZ+WpxglXYDVT1wY5Q77SuGeQ1tCuYONS la2rDW2GZRFJt0jhc5KnpBEcZAVr2EQpDxBZQpOwtcXP3eDAtvf4APqvoKaVhTkSyYXW wGvhRHW6dLD30Fs7hr7/8yVzQl6vJOtvVvzMDlYTr8mwDiLliYAR/eOALa+ifv8pXNN+ Twp7kKth/LdJZpDXzHVbwAVjADAN26kERN9ua5raAXKl6BL2r+bz4b+i5J9Lcb94YNoL yR/hpMBSDb285EigDzQRzI3eaZ5ckqvGnmwKXZhF/K8ZpXVXEn2S1fVIPEV0U78vaqF1 OyPg== X-Gm-Message-State: AMCzsaXqpNBcWWNu5gH+tn4GwY52P03dYc+9USd801DT4ChSJI23tcvZ /OCdZtlWoNmdsmoqNlzWX1mEHiK8NQ4= X-Google-Smtp-Source: ABhQp+QEPKIjZI2WNflITYKAxe2VLScsGolEIefx9pSXbUZ/iUTwO00+TMoL8HED0MUMm/C76DkEFQ== X-Received: by 10.98.34.79 with SMTP id i76mr1835409pfi.42.1508633195543; Sat, 21 Oct 2017 17:46:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sat, 21 Oct 2017 17:46:17 -0700 Message-Id: <20171022004621.28372-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171022004621.28372-1-richard.henderson@linaro.org> References: <20171022004621.28372-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH v7 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Tested-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- disas.c | 4 ++++ target/i386/cpu.c | 7 +++++++ 2 files changed, 11 insertions(+) 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 =3D bfd_mach_i386_i386; print_insn =3D print_insn_i386; + s.info.cap_arch =3D CS_ARCH_X86; + s.info.cap_mode =3D CS_MODE_32; #elif defined(__x86_64__) s.info.mach =3D bfd_mach_x86_64; print_insn =3D print_insn_i386; + s.info.cap_arch =3D CS_ARCH_X86; + s.info.cap_mode =3D CS_MODE_64; #elif defined(_ARCH_PPC) s.info.disassembler_options =3D (char *)"any"; print_insn =3D 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 =20 +#include "disas/capstone.h" + =20 /* Cache topology CPUID constants: */ =20 @@ -4106,6 +4108,11 @@ static void x86_disas_set_info(CPUState *cs, disasse= mble_info *info) : env->hflags & HF_CS32_MASK ? bfd_mach_i386_i386 : bfd_mach_i386_i8086); info->print_insn =3D print_insn_i386; + + info->cap_arch =3D CS_ARCH_X86; + info->cap_mode =3D (env->hflags & HF_CS64_MASK ? CS_MODE_64 + : env->hflags & HF_CS32_MASK ? CS_MODE_32 + : CS_MODE_16); } =20 static Property x86_cpu_properties[] =3D { --=20 2.13.6