From patchwork Fri Feb 12 21:14:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1440075 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DcmYd1P2vz9s1l for ; Sat, 13 Feb 2021 08:17:57 +1100 (AEDT) Received: from localhost ([::1]:36718 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAfp5-0003jU-06 for incoming@patchwork.ozlabs.org; Fri, 12 Feb 2021 16:17:55 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41416) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAfmG-0001vo-Av for qemu-devel@nongnu.org; Fri, 12 Feb 2021 16:15:00 -0500 Received: from mout.kundenserver.de ([212.227.126.130]:54833) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAfmE-0003SX-Ah for qemu-devel@nongnu.org; Fri, 12 Feb 2021 16:15:00 -0500 Received: from localhost.localdomain ([82.252.149.54]) by mrelayeu.kundenserver.de (mreue009 [212.227.15.167]) with ESMTPSA (Nemesis) id 1N7iKo-1lwIGN3Q6k-014jCg; Fri, 12 Feb 2021 22:14:54 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PULL 3/7] m68k: improve comments on m68k_move_to/from helpers Date: Fri, 12 Feb 2021 22:14:44 +0100 Message-Id: <20210212211448.413489-4-laurent@vivier.eu> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210212211448.413489-1-laurent@vivier.eu> References: <20210212211448.413489-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:0OlYTqtgMbrsj7YRkbGU4kJQMP8QwRHKHAX/HQOlpocw7S3lo41 Kw2mzX+ldv2gvZ105ofmcpaMK6a16Zp1XuZiDBS4rcyz+0avsKI49QEOnYCBOP/FrGNjX7t kLEmBWPZSdNzXFjI1mooJwVmqlEK0GmnNXNlSnJXKaJo3APMx/pdo2G1uRDSg+xbYCRLtxR PZVCjhuF+jby6tblaeCOQ== X-UI-Out-Filterresults: notjunk:1;V03:K0:ALF7jnxdctU=:AQevrfZ+5ueuEKsMwEHgV1 tRERCzifxMSv1OVyz/HFNyS/auyBPReeh1vtip+Z9e7ajczo9lMtOkyoKlB8VqGewoVRep4mX Ju4zXb1+6Gz/14PeCAcLnxvIRsyzn0pyQF6i9Hkf5PnvJzdYR7liZHfAFLpGyIVO71xJb/TG/ 7EXZ+zH+WRywBTmQjlAAXa+QfVgppOQvWvQr1JM8I1NsIHy5XJoWF2mIWrjbIFAOJZkaQFVw7 OSDc/gSKcVNf9h11dgLaBvCU8W9rWPtcTnI1YzCruNOuFmAQF/TdYKmAJfCMna49IjUvAiwUV zskU0mG0uqOSZhcAeNNiVnLN8CIZvXJxs9gpZQmbQ2nYVG3n67UjEpZqq+hygZTda0Qy5JszF RAkad5bpIbS/LZrObax+mGQMwpqC/SNInJynWOFNqaFC/eNSqJXsFnuh3uQnT4zrmhp0VXNEx 69WxPdi1zA== Received-SPF: none client-ip=212.227.126.130; envelope-from=laurent@vivier.eu; helo=mout.kundenserver.de X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Lucien Murray-Pitts Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Lucien Murray-Pitts Add more detailed comments to each case of m68k_move_to/from helpers to list the supported CPUs for that CR as they were wrong in some cases, and missing some cpu classes in other cases. Signed-off-by: Lucien Murray-Pitts Signed-off-by: BALATON Zoltan Message-Id: Signed-off-by: Laurent Vivier --- target/m68k/helper.c | 39 ++++++++++++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 9 deletions(-) diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 3ff57657958c..9e81ee53ad8b 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -187,13 +187,15 @@ void HELPER(cf_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) { switch (reg) { - /* MC680[1234]0 */ + /* MC680[12346]0 */ case M68K_CR_SFC: env->sfc = val & 7; return; + /* MC680[12346]0 */ case M68K_CR_DFC: env->dfc = val & 7; return; + /* MC680[12346]0 */ case M68K_CR_VBR: env->vbr = val; return; @@ -210,25 +212,30 @@ void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) } m68k_switch_sp(env); return; - /* MC680[34]0 */ + /* MC680[46]0 */ case M68K_CR_TC: env->mmu.tcr = val; return; + /* MC68040 */ case M68K_CR_MMUSR: env->mmu.mmusr = val; return; + /* MC680[46]0 */ case M68K_CR_SRP: env->mmu.srp = val; return; case M68K_CR_URP: env->mmu.urp = val; return; + /* MC680[46]0 */ case M68K_CR_USP: env->sp[M68K_USP] = val; return; + /* MC680[234]0 */ case M68K_CR_MSP: env->sp[M68K_SSP] = val; return; + /* MC680[234]0 */ case M68K_CR_ISP: env->sp[M68K_ISP] = val; return; @@ -236,12 +243,15 @@ void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) case M68K_CR_ITT0: env->mmu.ttr[M68K_ITTR0] = val; return; + /* MC68040/MC68LC040 */ case M68K_CR_ITT1: env->mmu.ttr[M68K_ITTR1] = val; return; + /* MC68040/MC68LC040 */ case M68K_CR_DTT0: env->mmu.ttr[M68K_DTTR0] = val; return; + /* MC68040/MC68LC040 */ case M68K_CR_DTT1: env->mmu.ttr[M68K_DTTR1] = val; return; @@ -254,39 +264,50 @@ void HELPER(m68k_movec_to)(CPUM68KState *env, uint32_t reg, uint32_t val) uint32_t HELPER(m68k_movec_from)(CPUM68KState *env, uint32_t reg) { switch (reg) { - /* MC680[1234]0 */ + /* MC680[12346]0 */ case M68K_CR_SFC: return env->sfc; + /* MC680[12346]0 */ case M68K_CR_DFC: return env->dfc; + /* MC680[12346]0 */ case M68K_CR_VBR: return env->vbr; - /* MC680[234]0 */ + /* MC680[2346]0 */ case M68K_CR_CACR: return env->cacr; - /* MC680[34]0 */ + /* MC680[46]0 */ case M68K_CR_TC: return env->mmu.tcr; + /* MC68040 */ case M68K_CR_MMUSR: return env->mmu.mmusr; + /* MC680[46]0 */ case M68K_CR_SRP: return env->mmu.srp; + /* MC680[46]0 */ case M68K_CR_USP: return env->sp[M68K_USP]; + /* MC680[234]0 */ case M68K_CR_MSP: return env->sp[M68K_SSP]; + /* MC680[234]0 */ case M68K_CR_ISP: return env->sp[M68K_ISP]; /* MC68040/MC68LC040 */ case M68K_CR_URP: return env->mmu.urp; - case M68K_CR_ITT0: + /* MC68040/MC68LC040 */ + case M68K_CR_ITT0: /* MC68EC040 only: M68K_CR_IACR0 */ return env->mmu.ttr[M68K_ITTR0]; - case M68K_CR_ITT1: + /* MC68040/MC68LC040 */ + case M68K_CR_ITT1: /* MC68EC040 only: M68K_CR_IACR1 */ return env->mmu.ttr[M68K_ITTR1]; - case M68K_CR_DTT0: + /* MC68040/MC68LC040 */ + case M68K_CR_DTT0: /* MC68EC040 only: M68K_CR_DACR0 */ return env->mmu.ttr[M68K_DTTR0]; - case M68K_CR_DTT1: + /* MC68040/MC68LC040 */ + case M68K_CR_DTT1: /* MC68EC040 only: M68K_CR_DACR1 */ return env->mmu.ttr[M68K_DTTR1]; } cpu_abort(env_cpu(env), "Unimplemented control register read 0x%x\n",