{"id":818812,"url":"http://patchwork.ozlabs.org/api/patches/818812/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170926201427.2833-3-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-3-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-26T20:14:20","name":"[v3,2/9] target/ppc: Convert to disas_set_info hook","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"4787b96b4dbe02ae1492b370365fd4f764c6186b","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-3-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/818812/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818812/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=\"Sk/FPBQI\"; 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 3y1sjK0RB0z9t3Z\n\tfor ;\n\tWed, 27 Sep 2017 06:18:45 +1000 (AEST)","from localhost ([::1]:50993 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dwwJX-00063I-3d\n\tfor incoming@patchwork.ozlabs.org; Tue, 26 Sep 2017 16:18:43 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:43911)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dwwFX-0002sp-Vo\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:37 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dwwFW-00037L-Rm\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:35 -0400","from mail-pf0-x231.google.com ([2607:f8b0:400e:c00::231]:46177)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1dwwFW-00036r-JQ\n\tfor qemu-devel@nongnu.org; Tue, 26 Sep 2017 16:14:34 -0400","by mail-pf0-x231.google.com with SMTP id r68so6078448pfj.3\n\tfor ; Tue, 26 Sep 2017 13:14:34 -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.31\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 26 Sep 2017 13:14:32 -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=8gn2Vjfcpv8lszaAxHBwoyqNNNQxwByUaJ2hAt6cgTg=;\n\tb=Sk/FPBQI/Q14KWMYUKamVg0v0yKOzWgqFwL9ujRdJiV6Dnd6slo6TVIodjjRchIRbC\n\tWyyoyJIH+UWo39DMQS9x7qlJ/bVl0C+8EdjiCMhJrZZxrG4Mel6SglXwQL7bVjw5BQl/\n\toLYxUjcTr/L68ZniirImou0Sz8+0rL92S8cC4=","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=8gn2Vjfcpv8lszaAxHBwoyqNNNQxwByUaJ2hAt6cgTg=;\n\tb=BjnTCivbKf4vLMURKmTZFCLRRR6Gb+T4LS/Ry5cGMMASv0U7zoZN6gDAvT2O8l1n5G\n\tibW98gFBxhdqFpw4eAbdvoxpJH/1eTHZNmPoJRUwbCZZuQ9IQfpaiXWw/oyN8dmpuAeW\n\tjQLf9AcSyLwLiX6Cf9hWD6MtzFyCDftfBXP8/FdUh98yOk4TpzI2WgjQH0aaY/jRlq+k\n\tv7YyxH0tR3/cvx+xFBq7AqgoBw8qtbiY3G6qYhNN/jIMFIQx3UE/22pShazuIlG00OvP\n\thiJHiWORqFEnaCWbnRS+Va0g5b8IkdRPWT9XqPN5RFkQuAfRWOSzg9keLdWWq7rja002\n\tO2iw==","X-Gm-Message-State":"AHPjjUjXKX6Dca4iZ25NY8ocIx5VhIBgXL4IYkK1k4GLU6MxUQ8WnM0g\n\tErynIoFpDAL/gD4yQ3z5L6VOzniZ0xs=","X-Google-Smtp-Source":"AOwi7QDTAl+DYgY+VVkCnV1rlT6VzNETgpGZJ9Kv1q19IxaxQELggbC939VhR3+5yOPtPli4U05cNA==","X-Received":"by 10.98.87.23 with SMTP id l23mr11908315pfb.77.1506456873429;\n\tTue, 26 Sep 2017 13:14:33 -0700 (PDT)","From":"Richard Henderson ","To":"qemu-devel@nongnu.org","Date":"Tue, 26 Sep 2017 13:14:20 -0700","Message-Id":"<20170926201427.2833-3-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:c00::231","Subject":"[Qemu-devel] [PATCH v3 2/9] target/ppc: 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","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":"Reviewed-by: Alex Bennée \nSigned-off-by: Richard Henderson \n---\n disas.c | 33 ---------------------------------\n monitor.c | 5 -----\n target/ppc/translate.c | 5 +----\n target/ppc/translate_init.c | 21 +++++++++++++++++++++\n 4 files changed, 22 insertions(+), 42 deletions(-)","diff":"diff --git a/disas.c b/disas.c\nindex 2be716fdb2..3a375a3b6c 100644\n--- a/disas.c\n+++ b/disas.c\n@@ -205,23 +205,6 @@ void target_disas(FILE *out, CPUState *cpu, target_ulong code,\n cc->disas_set_info(cpu, &s.info);\n }\n \n-#if defined(TARGET_PPC)\n- if ((flags >> 16) & 1) {\n- s.info.endian = BFD_ENDIAN_LITTLE;\n- }\n- if (flags & 0xFFFF) {\n- /* If we have a precise definition of the instruction set, use it. */\n- s.info.mach = flags & 0xFFFF;\n- } else {\n-#ifdef TARGET_PPC64\n- s.info.mach = bfd_mach_ppc64;\n-#else\n- s.info.mach = bfd_mach_ppc;\n-#endif\n- }\n- s.info.disassembler_options = (char *)\"any\";\n- s.info.print_insn = print_insn_ppc;\n-#endif\n if (s.info.print_insn == NULL) {\n s.info.print_insn = print_insn_od_target;\n }\n@@ -381,22 +364,6 @@ void monitor_disas(Monitor *mon, CPUState *cpu,\n cc->disas_set_info(cpu, &s.info);\n }\n \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;\n- } else {\n-#ifdef TARGET_PPC64\n- s.info.mach = bfd_mach_ppc64;\n-#else\n- s.info.mach = bfd_mach_ppc;\n-#endif\n- }\n- if ((flags >> 16) & 1) {\n- s.info.endian = BFD_ENDIAN_LITTLE;\n- }\n- s.info.print_insn = print_insn_ppc;\n-#endif\n if (!s.info.print_insn) {\n monitor_printf(mon, \"0x\" TARGET_FMT_lx\n \": Asm output not supported on this arch\\n\", pc);\ndiff --git a/monitor.c b/monitor.c\nindex 1184bec678..d55ad61dbb 100644\n--- a/monitor.c\n+++ b/monitor.c\n@@ -1310,11 +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_PPC\n- CPUArchState *env = mon_get_cpu_env();\n- flags = msr_le << 16;\n- flags |= env->bfd_mach;\n-#endif\n monitor_disas(mon, cs, addr, count, is_physical, flags);\n return;\n }\ndiff --git a/target/ppc/translate.c b/target/ppc/translate.c\nindex 606b605ba0..bc155f1036 100644\n--- a/target/ppc/translate.c\n+++ b/target/ppc/translate.c\n@@ -7395,12 +7395,9 @@ void gen_intermediate_code(CPUState *cs, struct TranslationBlock *tb)\n #if defined(DEBUG_DISAS)\n if (qemu_loglevel_mask(CPU_LOG_TB_IN_ASM)\n && qemu_log_in_addr_range(pc_start)) {\n- int flags;\n- flags = env->bfd_mach;\n- flags |= ctx.le_mode << 16;\n qemu_log_lock();\n qemu_log(\"IN: %s\\n\", lookup_symbol(pc_start));\n- log_target_disas(cs, pc_start, ctx.nip - pc_start, flags);\n+ log_target_disas(cs, pc_start, ctx.nip - pc_start, 0);\n qemu_log(\"\\n\");\n qemu_log_unlock();\n }\ndiff --git a/target/ppc/translate_init.c b/target/ppc/translate_init.c\nindex 466bf97347..5524b171e0 100644\n--- a/target/ppc/translate_init.c\n+++ b/target/ppc/translate_init.c\n@@ -10643,6 +10643,26 @@ static gchar *ppc_gdb_arch_name(CPUState *cs)\n #endif\n }\n \n+static void ppc_disas_set_info(CPUState *cs, disassemble_info *info)\n+{\n+ PowerPCCPU *cpu = POWERPC_CPU(cs);\n+ CPUPPCState *env = &cpu->env;\n+\n+ if ((env->hflags >> MSR_LE) & 1) {\n+ info->endian = BFD_ENDIAN_LITTLE;\n+ }\n+ info->mach = env->bfd_mach;\n+ if (!env->bfd_mach) {\n+#ifdef TARGET_PPC64\n+ info->mach = bfd_mach_ppc64;\n+#else\n+ info->mach = bfd_mach_ppc;\n+#endif\n+ }\n+ info->disassembler_options = (char *)\"any\";\n+ info->print_insn = print_insn_ppc;\n+}\n+\n static Property ppc_cpu_properties[] = {\n DEFINE_PROP_BOOL(\"pre-2.8-migration\", PowerPCCPU, pre_2_8_migration, false),\n DEFINE_PROP_BOOL(\"pre-2.10-migration\", PowerPCCPU, pre_2_10_migration,\n@@ -10704,6 +10724,7 @@ static void ppc_cpu_class_init(ObjectClass *oc, void *data)\n #ifndef CONFIG_USER_ONLY\n cc->virtio_is_big_endian = ppc_cpu_is_big_endian;\n #endif\n+ cc->disas_set_info = ppc_disas_set_info;\n \n dc->fw_name = \"PowerPC,UNKNOWN\";\n }\n","prefixes":["v3","2/9"]}