From nobody Wed Nov 19 00:12:42 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1613164752; cv=none; d=zohomail.com; s=zohoarc; b=gsdtnxpe0Kw99BcEousPgyURaiwRFn3tLQ1aD2RaTqNd6S4vHivpYQjBHIA0zE9tvHNT5ap8rXxoul9Ls9QWztWV/MiA3B+N1/CTdKFIxUUxsxhddMmZlqsQ1cp1F9MXB21q7oauFQaRClIRT9/I0yn6nKLXTHp4lfCp74cXicE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613164752; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=7+hmuaHGuRaavVyXmxwpAf1RILC18ap5cqlskwo8plw=; b=M5LUoJgt8HJK9KbOhB7GxFmorGLV3P04JNWTTdD8bE7moGxMREapdmuhl6mOGxHfzXP702QdiVV5GFsqkyYT81m8NbwnKus4sXH2F8lgEA9nT5tNRWORE+VtA/HqPmiTUNygjWEAIDzq7+X2hAxIfkOrBCD1EyVMv3cZAaoD1ts= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613164751711559.7562764322658; Fri, 12 Feb 2021 13:19:11 -0800 (PST) Received: from localhost ([::1]:40750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAfqI-0005PD-Ip for importer@patchew.org; Fri, 12 Feb 2021 16:19:10 -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 Content-Transfer-Encoding: quoted-printable 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: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" 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 =3D val & 7; return; + /* MC680[12346]0 */ case M68K_CR_DFC: env->dfc =3D val & 7; return; + /* MC680[12346]0 */ case M68K_CR_VBR: env->vbr =3D 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 =3D val; return; + /* MC68040 */ case M68K_CR_MMUSR: env->mmu.mmusr =3D val; return; + /* MC680[46]0 */ case M68K_CR_SRP: env->mmu.srp =3D val; return; case M68K_CR_URP: env->mmu.urp =3D val; return; + /* MC680[46]0 */ case M68K_CR_USP: env->sp[M68K_USP] =3D val; return; + /* MC680[234]0 */ case M68K_CR_MSP: env->sp[M68K_SSP] =3D val; return; + /* MC680[234]0 */ case M68K_CR_ISP: env->sp[M68K_ISP] =3D 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] =3D val; return; + /* MC68040/MC68LC040 */ case M68K_CR_ITT1: env->mmu.ttr[M68K_ITTR1] =3D val; return; + /* MC68040/MC68LC040 */ case M68K_CR_DTT0: env->mmu.ttr[M68K_DTTR0] =3D val; return; + /* MC68040/MC68LC040 */ case M68K_CR_DTT1: env->mmu.ttr[M68K_DTTR1] =3D 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", --=20 2.29.2