[{"id":1772882,"web_url":"http://patchwork.ozlabs.org/comment/1772882/","msgid":"<87efr0cdju.fsf@linaro.org>","list_archive_url":null,"date":"2017-09-21T14:49:09","subject":"Re: [Qemu-devel] [PATCH v2 5/8] i386: Support Capstone in\n\tdisas_set_info","submitter":{"id":39532,"url":"http://patchwork.ozlabs.org/api/people/39532/","name":"Alex Bennée","email":"alex.bennee@linaro.org"},"content":"Richard Henderson writes:\n\n> Signed-off-by: Richard Henderson \n\nReviewed-by: Alex Bennée \n\n> ---\n> disas.c | 4 ++++\n> target/i386/cpu.c | 7 +++++++\n> 2 files changed, 11 insertions(+)\n>\n> diff --git a/disas.c b/disas.c\n> index 4dbb492219..42fae735ee 100644\n> --- a/disas.c\n> +++ b/disas.c\n> @@ -439,9 +439,13 @@ void disas(FILE *out, void *code, unsigned long size)\n> #elif defined(__i386__)\n> s.info.mach = bfd_mach_i386_i386;\n> print_insn = print_insn_i386;\n> + s.info.cap_arch = CS_ARCH_X86;\n> + s.info.cap_mode = CS_MODE_32;\n> #elif defined(__x86_64__)\n> s.info.mach = bfd_mach_x86_64;\n> print_insn = print_insn_i386;\n> + s.info.cap_arch = CS_ARCH_X86;\n> + s.info.cap_mode = CS_MODE_64;\n> #elif defined(_ARCH_PPC)\n> s.info.disassembler_options = (char *)\"any\";\n> print_insn = print_insn_ppc;\n> diff --git a/target/i386/cpu.c b/target/i386/cpu.c\n> index b869a69c53..c3980b3864 100644\n> --- a/target/i386/cpu.c\n> +++ b/target/i386/cpu.c\n> @@ -51,6 +51,8 @@\n> #include \"hw/i386/apic_internal.h\"\n> #endif\n>\n> +#include \"disas/capstone.h\"\n> +\n>\n> /* Cache topology CPUID constants: */\n>\n> @@ -4108,6 +4110,11 @@ static void x86_disas_set_info(CPUState *cs, disassemble_info *info)\n> : env->hflags & HF_CS32_MASK ? bfd_mach_i386_i386\n> : bfd_mach_i386_i8086);\n> info->print_insn = print_insn_i386;\n> +\n> + info->cap_arch = CS_ARCH_X86;\n> + info->cap_mode = (env->hflags & HF_CS64_MASK ? CS_MODE_64\n> + : env->hflags & HF_CS32_MASK ? CS_MODE_32\n> + : CS_MODE_16);\n> }\n>\n> static Property x86_cpu_properties[] = {\n\n\n--\nAlex Bennée","headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"SdwuPDzC\"; dkim-atps=neutral"],"Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xyfdr4tj0z9t3w\n\tfor ;\n\tFri, 22 Sep 2017 00:49:36 +1000 (AEST)","from localhost ([::1]:54075 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dv2nG-0003SP-Ot\n\tfor incoming@patchwork.ozlabs.org; Thu, 21 Sep 2017 10:49:34 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:54278)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dv2mu-0003S1-0F\n\tfor qemu-devel@nongnu.org; Thu, 21 Sep 2017 10:49:12 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dv2mq-0005op-1d\n\tfor qemu-devel@nongnu.org; Thu, 21 Sep 2017 10:49:12 -0400","from mail-wr0-x22b.google.com ([2a00:1450:400c:c0c::22b]:53174)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dv2mp-0005oI-RQ\n\tfor qemu-devel@nongnu.org; Thu, 21 Sep 2017 10:49:07 -0400","by mail-wr0-x22b.google.com with SMTP id c23so4762295wrg.9\n\tfor ; Thu, 21 Sep 2017 07:49:07 -0700 (PDT)","from zen.linaro.local ([81.128.185.34])\n\tby smtp.gmail.com with ESMTPSA id\n\tf10sm1197161wrg.20.2017.09.21.07.49.05\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tThu, 21 Sep 2017 07:49:05 -0700 (PDT)","from zen (localhost [127.0.0.1])\n\tby zen.linaro.local (Postfix) with ESMTPS id 32CCF3E05A7;\n\tThu, 21 Sep 2017 15:49:09 +0100 (BST)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=references:user-agent:from:to:cc:subject:in-reply-to:date\n\t:message-id:mime-version:content-transfer-encoding;\n\tbh=Z2vnJDd/hIiCVYrz5EI/Gx2iSfK5gatpjkjy5D/9//g=;\n\tb=SdwuPDzC9fhbCPGeQWud+1gkeydOT0VuYJH8yB0pGtpgorxQHehaX6G4hhidXjACXI\n\t47HtyfrhedMVE4Rug7HV0JuGBcBZI7zEnbl9OhYNjlBB2pdH1T1Y0ZNMQMLD+55X3gBj\n\t1uCkKsa9iHv3OIMZDwmAcEfFw5IzDqU2/0Wlc=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:references:user-agent:from:to:cc:subject\n\t:in-reply-to:date:message-id:mime-version:content-transfer-encoding; \n\tbh=Z2vnJDd/hIiCVYrz5EI/Gx2iSfK5gatpjkjy5D/9//g=;\n\tb=mg6YK9t8dEKUlGu8hULKTlKd30FZXNvD22glYaIlcrrUa+zTEOOK8yNhUCnrIAuEhb\n\t6QkvXQX2SdI5iVHgN5+/im64c/E4zTPGYH6e/b0pOSc0SfuQUBHOxyDb1MfsY/CT5Ly7\n\t4flm0otoxUpwXO6rlkBtFWhrjgLA669I1qu7gPndVp2xRC/zBV2qZr9pOWtTXdldHa8n\n\t2Xz1drHfF4YRSkqrG3wslFWayl+BFZ9X49WI/X8Uooh/FEvDBexu75wonnjnL2S11nAn\n\tBxP5jp3695dLLaJQAKFCF0ZWKdMRJ4vQapAxwInzkRQVi6qnkkgeOMFGvPeZ+Nti6MlU\n\tH2fA==","X-Gm-Message-State":"AHPjjUgQ9HNaZRa9ZHCfpWYt9jn5lJMpAam/u/QQ/RLz0kf5B9gIDgXG\n\tjk6tSqVbKSEPEym46fHE4YkZLw==","X-Google-Smtp-Source":"AOwi7QB3AGOkrHu793Id1wuhmvfVWjGFasJCmwWRYw7u0F61PpWQfm3axofSkKkX2UJW1w30cYcAaw==","X-Received":"by 10.223.157.139 with SMTP id p11mr2344609wre.28.1506005346497; \n\tThu, 21 Sep 2017 07:49:06 -0700 (PDT)","References":"<20170919150313.10833-1-richard.henderson@linaro.org>\n\t<20170919150313.10833-6-richard.henderson@linaro.org>","User-agent":"mu4e 0.9.19; emacs 25.3.50.1","From":"Alex =?utf-8?q?Benn=C3=A9e?= ","To":"Richard Henderson ","In-reply-to":"<20170919150313.10833-6-richard.henderson@linaro.org>","Date":"Thu, 21 Sep 2017 15:49:09 +0100","Message-ID":"<87efr0cdju.fsf@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=utf-8","Content-Transfer-Encoding":"8bit","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2a00:1450:400c:c0c::22b","Subject":"Re: [Qemu-devel] [PATCH v2 5/8] i386: Support Capstone in\n\tdisas_set_info","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"qemu-devel@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"}}]