{"id":818818,"url":"http://patchwork.ozlabs.org/api/patches/818818/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170926201427.2833-7-richard.henderson@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170926201427.2833-7-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-26T20:14:24","name":"[v3,6/9] arm: Support Capstone in disas_set_info","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"ac05fd3c80a523c7b56cd6f971c057c186d96895","submitter":{"id":72104,"url":"http://patchwork.ozlabs.org/api/people/72104/?format=json","name":"Richard Henderson","email":"richard.henderson@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170926201427.2833-7-richard.henderson@linaro.org/mbox/","series":[{"id":5223,"url":"http://patchwork.ozlabs.org/api/series/5223/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=5223","date":"2017-09-26T20:14:18","name":"Support the Capstone disassembler","version":3,"mbox":"http://patchwork.ozlabs.org/series/5223/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818818/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818818/checks/","tags":{},"related":[],"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;\n\tdkim=fail reason=\"signature verification failed\" (1024-bit key;\n\tunprotected) header.d=linaro.org header.i=@linaro.org\n\theader.b=\"kWsFTzPG\"; 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 3y1sq21HGZz9t3R\n\tfor ;\n\tWed, 27 Sep 2017 06:23:42 +1000 (AEST)","from localhost ([::1]:51022 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dwwOK-0001U0-73\n\tfor incoming@patchwork.ozlabs.org; Tue, 26 Sep 2017 16:23:40 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:44020)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dwwFf-0002xI-8R\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:44 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dwwFc-0003El-Kr\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:43 -0400","from mail-pg0-x236.google.com ([2607:f8b0:400e:c05::236]:46433)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dwwFc-0003EB-Fi\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:40 -0400","by mail-pg0-x236.google.com with SMTP id i130so6514097pgc.3\n\tfor ; Tue, 26 Sep 2017 13:14:40 -0700 (PDT)","from bigtime.twiddle.net ([70.35.39.2])\n\tby smtp.gmail.com with ESMTPSA id\n\tr138sm15582470pgr.12.2017.09.26.13.14.38\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 26 Sep 2017 13:14:38 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references\n\t:mime-version:content-transfer-encoding;\n\tbh=zMC0NKR2kUHL8+PcGxOPQFS0+lj7R04nlWLL0JapJto=;\n\tb=kWsFTzPG7z7fGpL4vVm61fPSZsbyhd6xiw3kQ15pkIQJXHEIKHnmejeL8MqYE0dx2R\n\toGKD9IOjZD3oxKrPhddcrzBXOyNKSwcIwvEK9EjQTpLYoZCF/QOYiHTSPhvI900a2mcM\n\tMLjpwCR4ayg9RChOtDNCQi+edM8SG35bPB9pc=","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references:mime-version:content-transfer-encoding;\n\tbh=zMC0NKR2kUHL8+PcGxOPQFS0+lj7R04nlWLL0JapJto=;\n\tb=daoTJc6QSCjLqc3N8o7c4aeUvXajaQl7n1b0NI+EwyzggEQ1bpeGZH2a6Z6GmqmOX2\n\tLLhn4xtDISVkOTtmzr9YU4cd2cNcvmUSIDPvQYQlHoPlUwNtneIfxwbvIaynjni3xkwT\n\t8hvJQkfdQOJjc9kt2JGw7tH9qdYDhrubwHe3RY8AIZdQ08mhrwoJ8MXW2XH6Nri43/q+\n\tLGf9cfmgobKihjNLFv/1h8nhIhDN7ZZam0U5gvQDBGSKmx5N3tTL0JVQaEsElMT9jOt1\n\t7oopvu7Ru7j+e+ST3YD4TDpf0zCFju++6fEkl+uHvq+VcNJTBNIsXlRsfTNZRpwvBZqm\n\tsXrw==","X-Gm-Message-State":"AHPjjUj3dHqSUfKbRj91ZBNvizFid8IpFSVMBrvxgvFvq0BfCiAf1+Sv\n\tVPjM2Ve5dyOhlGguGuY4MJvfp4DtscU=","X-Google-Smtp-Source":"AOwi7QC5k6Agcp6oWQr7Lb4SEutoLoGuxrHMAXsm5sxAU42853AuL0TR+uWjsBK4mKgv609MDTzsPA==","X-Received":"by 10.84.238.142 with SMTP id v14mr11825802plk.388.1506456879353;\n\tTue, 26 Sep 2017 13:14:39 -0700 (PDT)","From":"Richard Henderson ","To":"qemu-devel@nongnu.org","Date":"Tue, 26 Sep 2017 13:14:24 -0700","Message-Id":"<20170926201427.2833-7-richard.henderson@linaro.org>","X-Mailer":"git-send-email 2.13.5","In-Reply-To":"<20170926201427.2833-1-richard.henderson@linaro.org>","References":"<20170926201427.2833-1-richard.henderson@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":"2607:f8b0:400e:c05::236","Subject":"[Qemu-devel] [PATCH v3 6/9] arm: Support Capstone in disas_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":"peter.maydell@linaro.org, qemu-ppc@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Tested-by: Alex Bennée \nReviewed-by: Alex Bennée \nSigned-off-by: Richard Henderson \n---\n disas.c | 3 +++\n target/arm/cpu.c | 21 ++++++++++++++++++---\n 2 files changed, 21 insertions(+), 3 deletions(-)","diff":"diff --git a/disas.c b/disas.c\nindex 1c44514254..23c4742f8d 100644\n--- a/disas.c\n+++ b/disas.c\n@@ -451,6 +451,7 @@ void disas(FILE *out, void *code, unsigned long size)\n print_insn = print_insn_ppc;\n #elif defined(__aarch64__) && defined(CONFIG_ARM_A64_DIS)\n print_insn = print_insn_arm_a64;\n+ s.info.cap_arch = CS_ARCH_ARM64;\n #elif defined(__alpha__)\n print_insn = print_insn_alpha;\n #elif defined(__sparc__)\n@@ -458,6 +459,8 @@ void disas(FILE *out, void *code, unsigned long size)\n s.info.mach = bfd_mach_sparc_v9b;\n #elif defined(__arm__)\n print_insn = print_insn_arm;\n+ s.info.cap_arch = CS_ARCH_ARM;\n+ /* TCG only generates code for arm mode. */\n #elif defined(__MIPSEB__)\n print_insn = print_insn_big_mips;\n #elif defined(__MIPSEL__)\ndiff --git a/target/arm/cpu.c b/target/arm/cpu.c\nindex 4300de66e2..e5f84066b4 100644\n--- a/target/arm/cpu.c\n+++ b/target/arm/cpu.c\n@@ -33,6 +33,7 @@\n #include \"sysemu/sysemu.h\"\n #include \"sysemu/hw_accel.h\"\n #include \"kvm_arm.h\"\n+#include \"disas/capstone.h\"\n \n static void arm_cpu_set_pc(CPUState *cs, vaddr value)\n {\n@@ -489,10 +490,24 @@ static void arm_disas_set_info(CPUState *cpu, disassemble_info *info)\n #if defined(CONFIG_ARM_A64_DIS)\n info->print_insn = print_insn_arm_a64;\n #endif\n- } else if (env->thumb) {\n- info->print_insn = print_insn_thumb1;\n+ info->cap_arch = CS_ARCH_ARM64;\n } else {\n- info->print_insn = print_insn_arm;\n+ int cap_mode;\n+ if (env->thumb) {\n+ info->print_insn = print_insn_thumb1;\n+ cap_mode = CS_MODE_THUMB;\n+ } else {\n+ info->print_insn = print_insn_arm;\n+ cap_mode = CS_MODE_ARM;\n+ }\n+ if (arm_feature(env, ARM_FEATURE_V8)) {\n+ cap_mode |= CS_MODE_V8;\n+ }\n+ if (arm_feature(env, ARM_FEATURE_M)) {\n+ cap_mode |= CS_MODE_MCLASS;\n+ }\n+ info->cap_arch = CS_ARCH_ARM;\n+ info->cap_mode = cap_mode;\n }\n if (bswap_code(arm_sctlr_b(env))) {\n #ifdef TARGET_WORDS_BIGENDIAN\n","prefixes":["v3","6/9"]}