{"id":815615,"url":"http://patchwork.ozlabs.org/api/patches/815615/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919150313.10833-6-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-6-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-19T15:03:10","name":"[v2,5/8] i386: Support Capstone in disas_set_info","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"995589ffa7c9251b4657286dded796ebda208ef8","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-6-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/815615/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815615/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=\"iPTsXqyU\"; 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 3xxRZ56HfRz9s7g\n\tfor ;\n\tWed, 20 Sep 2017 01:27:09 +1000 (AEST)","from localhost ([::1]:43531 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duKQV-0003RA-Um\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 11:27:07 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49059)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duK3d-00083i-IU\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:30 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duK3c-0003hC-Ju\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:29 -0400","from mail-io0-x233.google.com ([2607:f8b0:4001:c06::233]:47579)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1duK3c-0003gk-Fb\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:28 -0400","by mail-io0-x233.google.com with SMTP id e189so735673ioa.4\n\tfor ; Tue, 19 Sep 2017 08:03:28 -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.25 for \n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 19 Sep 2017 08:03:26 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;\n\th=from:to:subject:date:message-id:in-reply-to:references;\n\tbh=D05ocLF3DDPZHRFYgbB4AY+m28Wbjh2YtHzDvE6LG+g=;\n\tb=iPTsXqyU21o+0lJyVhBkdrrY7SeRJzng93SrKbu7vAJFBXXfKdrGKC+i05bggAO24K\n\twbbcMet5ApzIhXHA0OI6FUe7aX8ej4e1XpYRt0YzgMs5nx3p3HgSinyFRQWI+VPhDTBg\n\tX3TrmkE9i7FH1oPLlC7Wnt3O7lGyj9N8JPcYw=","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:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=D05ocLF3DDPZHRFYgbB4AY+m28Wbjh2YtHzDvE6LG+g=;\n\tb=SaEiueHr8HQx5+16PSgSnfFyB5xmaPX31wa3RP+uTeZEX98TgUOBRZnOXBiYfDgL7X\n\t1NVec4jlzkz1JAJ7Kx97YJbhqvxkO8GH6GIBH0ePdb8jIXOY9GhkLKnO1UEDPnJ/ll2D\n\tHFwcwJHOUvL+AyJmvrQxhIlLpQ+EyPkt8hBolil+3Bg+/rXKF9CJevzVgUCOrbVqIbt+\n\tNB0paR5683A2Eaz6oY0l3qsY1mz9LTft5NQuOkDfO6itj6+8M76XAZxaDV7NfwfVTWET\n\tnT8BTe/GRNG4xEmwcW8OqrmIVVlJdEdBRj6QsTeqqUPItQUtGl367DaTs/nsRXn5+0/S\n\tNBiA==","X-Gm-Message-State":"AHPjjUjttJ+6HoLPu2U5qeM7fc8ooTkdZ3EFvl1rbWZhq8wMaiHgSCJz\n\tNbIBjLNZtpSDoVKvBFBp0rhApv+Lkb4=","X-Google-Smtp-Source":"AOwi7QDgtUxwTNWc4X13NOxo8mt3il/VTTnSPDcEg0BjmxjiS1cWYWOMNufhzJwbNMaKRkuGYNdjRg==","X-Received":"by 10.202.114.16 with SMTP id p16mr1883845oic.209.1505833407396; \n\tTue, 19 Sep 2017 08:03:27 -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\n\trecognized.","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":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Signed-off-by: Richard Henderson \n---\n disas.c | 4 ++++\n target/i386/cpu.c | 7 +++++++\n 2 files changed, 11 insertions(+)","diff":"diff --git a/disas.c b/disas.c\nindex 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;\ndiff --git a/target/i386/cpu.c b/target/i386/cpu.c\nindex 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","prefixes":["v2","5/8"]}