{"id":815618,"url":"http://patchwork.ozlabs.org/api/patches/815618/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919150313.10833-2-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-2-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-19T15:03:06","name":"[v2,1/8] target/i386: Convert to disas_set_info hook","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"900340bd97ebe08eb393150a451129ed2befd8c2","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-2-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/815618/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815618/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=\"XrXWyZxs\"; 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 3xxRbc6Z0fz9sBZ\n\tfor ;\n\tWed, 20 Sep 2017 01:28:28 +1000 (AEST)","from localhost ([::1]:43536 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duKRm-0004gd-UQ\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 11:28:26 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49029)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duK3c-00082S-5w\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:32 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duK3W-0003cW-61\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:28 -0400","from mail-io0-x230.google.com ([2607:f8b0:4001:c06::230]:47577)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1duK3W-0003c4-1V\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:22 -0400","by mail-io0-x230.google.com with SMTP id e189so734672ioa.4\n\tfor ; Tue, 19 Sep 2017 08:03:21 -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.18 for \n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 19 Sep 2017 08:03:19 -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:mime-version\n\t:content-transfer-encoding;\n\tbh=wUy5W+2Nte8dxKORnbQ0Agu2JQTPfGPZyHFDURjrEOE=;\n\tb=XrXWyZxsl0bSyleBXKVSqE91Z6dJPUDJz36rVdokK41FBAapA7mn+LwuRvz+e+pUpf\n\tUUU8bAY1vVGvXod4Tq/MRvm9NXwceoqaZmbenDju6K69zAf821DBQq6hHyuI8wpM2Cyn\n\tYZPYBc5QKgv+wtrEgrGvF7V5J3DsfNkwl1uw0=","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:mime-version:content-transfer-encoding;\n\tbh=wUy5W+2Nte8dxKORnbQ0Agu2JQTPfGPZyHFDURjrEOE=;\n\tb=T9FzQbhCAA9J0qA174iSAMATy73bxmeKn4JzPclSP2RLYMX6VGhZkjDwJyHmmEdPNI\n\tTrIP69oEJLdA22pVRfjho5JQEk6V0xXiKIGUopefXgAdDzhUcldeFaqWxeSKm3vS+mkV\n\thN8CztR9q3IoezNosRCPINiP6EKGz+CZcSlRMrlZkO6FcSnGw5/FvbwpDZ1jddXMeNhM\n\tt6d6YqSX57Y/H9TC3fTADxIdlwmB4EIlbIdzz6nfGueNKmM62noTUuX1+W9ikvSa8hfc\n\tXWIjdGE+DHjT/oBmlEkQCOVb1cWeO+bSAEcQbwrCMb+gIB7Yoxnws/jgbHYYfsX5z4ga\n\tlvrQ==","X-Gm-Message-State":"AHPjjUizmSbVgSH05fX3RJH2sgc0F725E/Ne9ziYPRhIgmfVDYGqfkPi\n\toybUDekTe177W8JmsXbw8WITRUBFVHg=","X-Google-Smtp-Source":"AOwi7QCyg/0HJNZ3hZ11Y6j4VhngLdyTFLDh8ZC4jERZDWmF3yy78dR06oBBkT3/Slh2KF1F1tsudQ==","X-Received":"by 10.202.75.211 with SMTP id y202mr1849918oia.66.1505833400643; \n\tTue, 19 Sep 2017 08:03:20 -0700 (PDT)","From":"Richard Henderson ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 10:03:06 -0500","Message-Id":"<20170919150313.10833-2-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>","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:4001:c06::230","Subject":"[Qemu-devel] [PATCH v2 1/8] target/i386: Convert to disas_set_info\n\thook","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":"Reviewed-by: Alex Bennée \nSigned-off-by: Richard Henderson \n---\n disas.c | 22 ++--------------------\n monitor.c | 21 ---------------------\n target/i386/cpu.c | 12 ++++++++++++\n target/i386/translate.c | 8 +-------\n 4 files changed, 15 insertions(+), 48 deletions(-)","diff":"diff --git a/disas.c b/disas.c\nindex d6a1eb9c8e..2be716fdb2 100644\n--- a/disas.c\n+++ b/disas.c\n@@ -205,16 +205,7 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code,\n cc->disas_set_info(cpu, &s.info);\n }\n \n-#if defined(TARGET_I386)\n- if (flags == 2) {\n- s.info.mach = bfd_mach_x86_64;\n- } else if (flags == 1) {\n- s.info.mach = bfd_mach_i386_i8086;\n- } else {\n- s.info.mach = bfd_mach_i386_i386;\n- }\n- s.info.print_insn = print_insn_i386;\n-#elif defined(TARGET_PPC)\n+#if defined(TARGET_PPC)\n if ((flags >> 16) & 1) {\n s.info.endian = BFD_ENDIAN_LITTLE;\n }\n@@ -390,16 +381,7 @@ void monitor_disas(Monitor *mon, CPUState *cpu,\n cc->disas_set_info(cpu, &s.info);\n }\n \n-#if defined(TARGET_I386)\n- if (flags == 2) {\n- s.info.mach = bfd_mach_x86_64;\n- } else if (flags == 1) {\n- s.info.mach = bfd_mach_i386_i8086;\n- } else {\n- s.info.mach = bfd_mach_i386_i386;\n- }\n- s.info.print_insn = print_insn_i386;\n-#elif defined(TARGET_PPC)\n+#if defined(TARGET_PPC)\n if (flags & 0xFFFF) {\n /* If we have a precise definition of the instruction set, use it. */\n s.info.mach = flags & 0xFFFF;\ndiff --git a/monitor.c b/monitor.c\nindex 058045b3cb..d9d364bb9e 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -1310,27 +1310,6 @@ static void memory_dump(Monitor *mon, int count, int format, int wsize,\n \n if (format == 'i') {\n int flags = 0;\n-#ifdef TARGET_I386\n- CPUArchState *env = mon_get_cpu_env();\n- if (wsize == 2) {\n- flags = 1;\n- } else if (wsize == 4) {\n- flags = 0;\n- } else {\n- /* as default we use the current CS size */\n- flags = 0;\n- if (env) {\n-#ifdef TARGET_X86_64\n- if ((env->efer & MSR_EFER_LMA) &&\n- (env->segs[R_CS].flags & DESC_L_MASK))\n- flags = 2;\n- else\n-#endif\n- if (!(env->segs[R_CS].flags & DESC_B_MASK))\n- flags = 1;\n- }\n- }\n-#endif\n #ifdef TARGET_PPC\n CPUArchState *env = mon_get_cpu_env();\n flags = msr_le << 16;\ndiff --git a/target/i386/cpu.c b/target/i386/cpu.c\nindex 69676e13e1..b869a69c53 100644\n--- a/target/i386/cpu.c\n+++ b/target/i386/cpu.c\n@@ -4099,6 +4099,17 @@ static bool x86_cpu_has_work(CPUState *cs)\n !(env->hflags & HF_SMM_MASK));\n }\n \n+static void x86_disas_set_info(CPUState *cs, disassemble_info *info)\n+{\n+ X86CPU *cpu = X86_CPU(cs);\n+ CPUX86State *env = &cpu->env;\n+\n+ info->mach = (env->hflags & HF_CS64_MASK ? bfd_mach_x86_64\n+ : env->hflags & HF_CS32_MASK ? bfd_mach_i386_i386\n+ : bfd_mach_i386_i8086);\n+ info->print_insn = print_insn_i386;\n+}\n+\n static Property x86_cpu_properties[] = {\n #ifdef CONFIG_USER_ONLY\n /* apic_id = 0 by default for *-user, see commit 9886e834 */\n@@ -4204,6 +4215,7 @@ static void x86_cpu_common_class_init(ObjectClass *oc, void *data)\n #endif\n cc->cpu_exec_enter = x86_cpu_exec_enter;\n cc->cpu_exec_exit = x86_cpu_exec_exit;\n+ cc->disas_set_info = x86_disas_set_info;\n \n dc->user_creatable = true;\n }\ndiff --git a/target/i386/translate.c b/target/i386/translate.c\nindex de0c989763..06c2cb9e64 100644\n--- a/target/i386/translate.c\n+++ b/target/i386/translate.c\n@@ -8526,15 +8526,9 @@ static void i386_tr_disas_log(const DisasContextBase *dcbase,\n CPUState *cpu)\n {\n DisasContext *dc = container_of(dcbase, DisasContext, base);\n- int disas_flags = !dc->code32;\n \n qemu_log(\"IN: %s\\n\", lookup_symbol(dc->base.pc_first));\n-#ifdef TARGET_X86_64\n- if (dc->code64) {\n- disas_flags = 2;\n- }\n-#endif\n- log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, disas_flags);\n+ log_target_disas(cpu, dc->base.pc_first, dc->base.tb->size, 0);\n }\n \n static const TranslatorOps i386_tr_ops = {\n","prefixes":["v2","1/8"]}