{"id":815616,"url":"http://patchwork.ozlabs.org/api/patches/815616/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170919150313.10833-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":"<20170919150313.10833-3-richard.henderson@linaro.org>","list_archive_url":null,"date":"2017-09-19T15:03:07","name":"[v2,2/8] 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/20170919150313.10833-3-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/815616/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815616/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=\"TAVYO0Vq\"; 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 3xxRZC5sMTz9s7g\n\tfor ;\n\tWed, 20 Sep 2017 01:27:15 +1000 (AEST)","from localhost ([::1]:43534 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1duKQb-0003Wt-SH\n\tfor incoming@patchwork.ozlabs.org; Tue, 19 Sep 2017 11:27:13 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49032)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1duK3c-00082g-Cm\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:29 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1duK3X-0003dY-Ev\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:28 -0400","from mail-io0-x232.google.com ([2607:f8b0:4001:c06::232]:52408)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1duK3X-0003cz-9l\n\tfor qemu-devel@nongnu.org; Tue, 19 Sep 2017 11:03:23 -0400","by mail-io0-x232.google.com with SMTP id i197so714487ioe.9\n\tfor ; Tue, 19 Sep 2017 08:03:23 -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.20\n\t(version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256);\n\tTue, 19 Sep 2017 08:03:21 -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=O/5b9DfX6J7dTrC82SbvRXaCWKuYVvKs9Y7LcoX1zsg=;\n\tb=TAVYO0Vqf37+KTeCm0NuU41vNl3h6O0gatYd8L4tFjVhu9IZZoD2+g3lBewyldWURp\n\t1QEHX18BMGwa2L22+XopxQhbD1MbmgU73/uEpRJ9ENImq2TOu903kBwoptdn+FdhfJiS\n\tTmzanvyCSjPPqe6VYt9KufHmq6AiilcCP7wNQ=","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=O/5b9DfX6J7dTrC82SbvRXaCWKuYVvKs9Y7LcoX1zsg=;\n\tb=JFIlsQz1TaQ7JruadQrcjLibZGIxLNMjQpg2BfSOjDuX0LSvMs9sRen6azDQmHSg7v\n\tXjvm8zVwSVEVrVlaT/7L5oas4nmt+GuSDZDVJXc86iuNwv5QwxBynS7xRW/++16aADHm\n\t+wN6ezMuB1NljrgE3YEhU5aagSjT2UKMgD3v1idM9mm2lwiTKhWL906hEc+TjQQyZuuy\n\tMG81JKNu5xHkKpziseMR3Fit/Gk8U/+LFNW8P8ainkoMbet1ba+6oHfemamSHwf9FoTJ\n\tD1h/kgGDH+5lnq45WkoEbLVtMpSk5PAyegdmKq0cT5ujRptCJy1VZm9yglYhiC6lbMqP\n\tOd8g==","X-Gm-Message-State":"AHPjjUg1g/9h4Ra9Ev3iS/QTod67NkprruXAHvWWBnM7MQbwRcObAUZz\n\t27toy44ga2bsU11J9OIXyFFDXjdc9aQ=","X-Google-Smtp-Source":"AOwi7QBkGGluaLt0pghoX9KF+GFxFtDACo+QCtph3HMsUubV+2swuZO9z/HKY+5NpmZakxGcWGNNzQ==","X-Received":"by 10.202.108.3 with SMTP id h3mr1896865oic.53.1505833402222;\n\tTue, 19 Sep 2017 08:03:22 -0700 (PDT)","From":"Richard Henderson ","To":"qemu-devel@nongnu.org","Date":"Tue, 19 Sep 2017 10:03:07 -0500","Message-Id":"<20170919150313.10833-3-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::232","Subject":"[Qemu-devel] [PATCH v2 2/8] 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":"David Gibson ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Cc: David Gibson \nReviewed-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 d9d364bb9e..23fda1c0d2 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 c827d1e388..c7b4a7c02a 100644\n--- a/target/ppc/translate_init.c\n+++ b/target/ppc/translate_init.c\n@@ -10644,6 +10644,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@@ -10705,6 +10725,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":["v2","2/8"]}