{"id":815620,"url":"http://patchwork.ozlabs.org/api/patches/815620/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919150313.10833-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":"<20170919150313.10833-7-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-19T15:03:11","name":"[v2,6/8] 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/20170919150313.10833-7-richard.henderson@linaro.org/mbox/","series":[{"id":3911,"url":"http://patchwork.ozlabs.org/api/series/3911/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=3911","date":"2017-09-19T15:03:05","name":"Support the Capstone disassembler","version":2,"mbox":"http://patchwork.ozlabs.org/series/3911/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815620/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815620/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=\"FeHrzFvu\"; 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 3xxRfc6KhQz9sBZ\n\tfor ;\n\tWed, 20 Sep 2017 01:31:04 +1000 (AEST)","from localhost ([::1]:43558 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duKUI-0007iT-Mp\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 11:31:02 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49206)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duK3j-0008A9-LW\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:36 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duK3e-0003jt-SV\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:35 -0400","from mail-io0-x231.google.com ([2607:f8b0:4001:c06::231]:52410)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1duK3e-0003j8-Oa\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:30 -0400","by mail-io0-x231.google.com with SMTP id i197so715549ioe.9\n\tfor ; Tue, 19 Sep 2017 08:03:30 -0700 (PDT)","from bigtime.twiddle.net (162.189-204-159.bestel.com.mx.\n\t[189.204.159.162]) by smtp.gmail.com with ESMTPSA id\n\th63sm360621otb.59.2017.09.19.08.03.27\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 19 Sep 2017 08:03:28 -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\tbh=ho6Nr7OxqVnfQnw1KrdzKdigx/0D5Zw/N3pClcZNIz0=;\n\tb=FeHrzFvuXd7pN9zYjhHjqB9vl/y044igRlLhqHwhn1jhl3jJ7IDN8wP9omE1UHs8tQ\n\tF9xVkEl8mY3M/4/2QnHiBBxq6GKMTcQMk44b5B0vCXr31YJD/FYnjJ2CnZ69ixYPeDFx\n\tCaYSq8Br2Szc9cqqiknSxTtTOm6KyJJSECE9Q=","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;\n\tbh=ho6Nr7OxqVnfQnw1KrdzKdigx/0D5Zw/N3pClcZNIz0=;\n\tb=smqvsHFHWJMqa1/M+ghxT2QptPIZEdqL+a/LNA88DyC8D2mtUbauwsKetRh1aFQNrm\n\tcgqzC4Pn8APuA46WDYaLJHHSeiRvBe1y6XwUvHK+F+xJPtdRTIlwTFOOFD2F4Cxbne7Y\n\ta0PJjhKuFqvU6GfCbcn/mNt4g0jR9PkZuucRyR8MX4s/qaulaNdnVt5sbdsdP4vGAiDJ\n\tCuH15kWRk0haNO+P7F5XJgnNb2xGM0gEpB/7TpCvRUfRmS60eVohp531NSU0fFXIMhiA\n\t7WJtb5ylIibwfhDc8Rkgstdu0jFJtsf4REKsMmWOIbqsl4f8LdtsqbA8enzhSmUbsgho\n\tFSTg==","X-Gm-Message-State":"AHPjjUhKapiYOg4QSFvxNBVZ/sYXFQW3VMJiqya7N+lcCIW7fPmgf1cX\n\t2y3ZrqT2xuIAHvjDvFUbjv208AUokFo=","X-Google-Smtp-Source":"AOwi7QCYzLH2L01dWnZoO7ohYLh6yAlZ39KS5PKTHNS4WbEgZba3i14Zht7cs4zbnt+E7xI3w7bsnw==","X-Received":"by 10.202.84.11 with SMTP id i11mr1711781oib.152.1505833409607; \n\tTue, 19 Sep 2017 08:03:29 -0700 (PDT)","From":"Richard Henderson ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 10:03:11 -0500","Message-Id":"<20170919150313.10833-7-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\n\trecognized.","X-Received-From":"2607:f8b0:4001:c06::231","Subject":"[Qemu-devel] [PATCH v2 6/8] 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":"qemu-arm@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Cc: qemu-arm@nongnu.org\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 42fae735ee..ea295f9cfc 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 412e94c7ad..53320709ac 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@@ -482,10 +483,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":["v2","6/8"]}