From nobody Fri Dec 19 04:33:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1542043332719760.1789056520562; Mon, 12 Nov 2018 09:22:12 -0800 (PST) Received: from localhost ([::1]:49836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMFud-0006SP-4h for importer@patchew.org; Mon, 12 Nov 2018 12:22:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gMFhm-0003xW-Mq for qemu-devel@nongnu.org; Mon, 12 Nov 2018 12:08:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gMFhl-0000bc-49 for qemu-devel@nongnu.org; Mon, 12 Nov 2018 12:08:54 -0500 Received: from orth.archaic.org.uk ([2001:8b0:1d0::2]:52546) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gMFhk-0008MG-Od for qemu-devel@nongnu.org; Mon, 12 Nov 2018 12:08:53 -0500 Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1gMFhS-0005u1-L4 for qemu-devel@nongnu.org; Mon, 12 Nov 2018 17:08:34 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 12 Nov 2018 17:08:15 +0000 Message-Id: <20181112170816.500-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181112170816.500-1-peter.maydell@linaro.org> References: <20181112170816.500-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2001:8b0:1d0::2 Subject: [Qemu-devel] [PULL 15/16] target/arm: Hyp mode R14 is shared with User and System X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Hyp mode is an exception to the general rule that each AArch32 mode has its own r13, r14 and SPSR -- it has a banked r13 and SPSR but shares its r14 with User and System mode. We were incorrectly implementing it as banked, which meant that on entry to Hyp mode r14 was 0 rather than the USR/SYS r14. We provide a new function r14_bank_number() which is like the existing bank_number() but provides the index into env->banked_r14[]; bank_number() provides the index to use for env->banked_r13[] and env->banked_cpsr[]. All the points in the code that were using bank_number() to index into env->banked_r14[] are updated for consintency: * switch_mode() -- this is the only place where we fix an actual bug * aarch64_sync_32_to_64() and aarch64_sync_64_to_32(): no behavioural change as we already special-cased Hyp R14 * kvm32.c: no behavioural change since the guest can't ever be in Hyp mode, but conceptually the right thing to do * msr_banked()/mrs_banked(): we can never get to the case that accesses banked_r14[] with tgtmode =3D=3D ARM_CPU_MODE_HYP, so no behavioural change Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Edgar E. Iglesias Reviewed-by: Alex Benn=C3=A9e Message-id: 20181109173553.22341-2-peter.maydell@linaro.org --- target/arm/internals.h | 16 ++++++++++++++++ target/arm/helper.c | 29 +++++++++++++++-------------- target/arm/kvm32.c | 4 ++-- target/arm/op_helper.c | 4 ++-- 4 files changed, 35 insertions(+), 18 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index a32d359dd03..d208b70a64f 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -145,6 +145,22 @@ static inline int bank_number(int mode) g_assert_not_reached(); } =20 +/** + * r14_bank_number: Map CPU mode onto register bank for r14 + * + * Given an AArch32 CPU mode, return the index into the saved register + * banks to use for the R14 (LR) in that mode. This is the same as + * bank_number(), except for the special case of Hyp mode, where + * R14 is shared with USR and SYS, unlike its R13 and SPSR. + * This should be used as the index into env->banked_r14[], and + * bank_number() used for the index into env->banked_r13[] and + * env->banked_spsr[]. + */ +static inline int r14_bank_number(int mode) +{ + return (mode =3D=3D ARM_CPU_MODE_HYP) ? BANK_USRSYS : bank_number(mode= ); +} + void arm_cpu_register_gdb_regs_for_features(ARMCPU *cpu); void arm_translate_init(void); =20 diff --git a/target/arm/helper.c b/target/arm/helper.c index 0ebe4d1b4ad..0da1424f72d 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6432,13 +6432,14 @@ static void switch_mode(CPUARMState *env, int mode) =20 i =3D bank_number(old_mode); env->banked_r13[i] =3D env->regs[13]; - env->banked_r14[i] =3D env->regs[14]; env->banked_spsr[i] =3D env->spsr; =20 i =3D bank_number(mode); env->regs[13] =3D env->banked_r13[i]; - env->regs[14] =3D env->banked_r14[i]; env->spsr =3D env->banked_spsr[i]; + + env->banked_r14[r14_bank_number(old_mode)] =3D env->regs[14]; + env->regs[14] =3D env->banked_r14[r14_bank_number(mode)]; } =20 /* Physical Interrupt Target EL Lookup Table @@ -8017,7 +8018,7 @@ void aarch64_sync_32_to_64(CPUARMState *env) if (mode =3D=3D ARM_CPU_MODE_HYP) { env->xregs[14] =3D env->regs[14]; } else { - env->xregs[14] =3D env->banked_r14[bank_number(ARM_CPU_MODE_US= R)]; + env->xregs[14] =3D env->banked_r14[r14_bank_number(ARM_CPU_MOD= E_USR)]; } } =20 @@ -8031,7 +8032,7 @@ void aarch64_sync_32_to_64(CPUARMState *env) env->xregs[16] =3D env->regs[14]; env->xregs[17] =3D env->regs[13]; } else { - env->xregs[16] =3D env->banked_r14[bank_number(ARM_CPU_MODE_IRQ)]; + env->xregs[16] =3D env->banked_r14[r14_bank_number(ARM_CPU_MODE_IR= Q)]; env->xregs[17] =3D env->banked_r13[bank_number(ARM_CPU_MODE_IRQ)]; } =20 @@ -8039,7 +8040,7 @@ void aarch64_sync_32_to_64(CPUARMState *env) env->xregs[18] =3D env->regs[14]; env->xregs[19] =3D env->regs[13]; } else { - env->xregs[18] =3D env->banked_r14[bank_number(ARM_CPU_MODE_SVC)]; + env->xregs[18] =3D env->banked_r14[r14_bank_number(ARM_CPU_MODE_SV= C)]; env->xregs[19] =3D env->banked_r13[bank_number(ARM_CPU_MODE_SVC)]; } =20 @@ -8047,7 +8048,7 @@ void aarch64_sync_32_to_64(CPUARMState *env) env->xregs[20] =3D env->regs[14]; env->xregs[21] =3D env->regs[13]; } else { - env->xregs[20] =3D env->banked_r14[bank_number(ARM_CPU_MODE_ABT)]; + env->xregs[20] =3D env->banked_r14[r14_bank_number(ARM_CPU_MODE_AB= T)]; env->xregs[21] =3D env->banked_r13[bank_number(ARM_CPU_MODE_ABT)]; } =20 @@ -8055,7 +8056,7 @@ void aarch64_sync_32_to_64(CPUARMState *env) env->xregs[22] =3D env->regs[14]; env->xregs[23] =3D env->regs[13]; } else { - env->xregs[22] =3D env->banked_r14[bank_number(ARM_CPU_MODE_UND)]; + env->xregs[22] =3D env->banked_r14[r14_bank_number(ARM_CPU_MODE_UN= D)]; env->xregs[23] =3D env->banked_r13[bank_number(ARM_CPU_MODE_UND)]; } =20 @@ -8072,7 +8073,7 @@ void aarch64_sync_32_to_64(CPUARMState *env) env->xregs[i] =3D env->fiq_regs[i - 24]; } env->xregs[29] =3D env->banked_r13[bank_number(ARM_CPU_MODE_FIQ)]; - env->xregs[30] =3D env->banked_r14[bank_number(ARM_CPU_MODE_FIQ)]; + env->xregs[30] =3D env->banked_r14[r14_bank_number(ARM_CPU_MODE_FI= Q)]; } =20 env->pc =3D env->regs[15]; @@ -8122,7 +8123,7 @@ void aarch64_sync_64_to_32(CPUARMState *env) if (mode =3D=3D ARM_CPU_MODE_HYP) { env->regs[14] =3D env->xregs[14]; } else { - env->banked_r14[bank_number(ARM_CPU_MODE_USR)] =3D env->xregs[= 14]; + env->banked_r14[r14_bank_number(ARM_CPU_MODE_USR)] =3D env->xr= egs[14]; } } =20 @@ -8136,7 +8137,7 @@ void aarch64_sync_64_to_32(CPUARMState *env) env->regs[14] =3D env->xregs[16]; env->regs[13] =3D env->xregs[17]; } else { - env->banked_r14[bank_number(ARM_CPU_MODE_IRQ)] =3D env->xregs[16]; + env->banked_r14[r14_bank_number(ARM_CPU_MODE_IRQ)] =3D env->xregs[= 16]; env->banked_r13[bank_number(ARM_CPU_MODE_IRQ)] =3D env->xregs[17]; } =20 @@ -8144,7 +8145,7 @@ void aarch64_sync_64_to_32(CPUARMState *env) env->regs[14] =3D env->xregs[18]; env->regs[13] =3D env->xregs[19]; } else { - env->banked_r14[bank_number(ARM_CPU_MODE_SVC)] =3D env->xregs[18]; + env->banked_r14[r14_bank_number(ARM_CPU_MODE_SVC)] =3D env->xregs[= 18]; env->banked_r13[bank_number(ARM_CPU_MODE_SVC)] =3D env->xregs[19]; } =20 @@ -8152,7 +8153,7 @@ void aarch64_sync_64_to_32(CPUARMState *env) env->regs[14] =3D env->xregs[20]; env->regs[13] =3D env->xregs[21]; } else { - env->banked_r14[bank_number(ARM_CPU_MODE_ABT)] =3D env->xregs[20]; + env->banked_r14[r14_bank_number(ARM_CPU_MODE_ABT)] =3D env->xregs[= 20]; env->banked_r13[bank_number(ARM_CPU_MODE_ABT)] =3D env->xregs[21]; } =20 @@ -8160,7 +8161,7 @@ void aarch64_sync_64_to_32(CPUARMState *env) env->regs[14] =3D env->xregs[22]; env->regs[13] =3D env->xregs[23]; } else { - env->banked_r14[bank_number(ARM_CPU_MODE_UND)] =3D env->xregs[22]; + env->banked_r14[r14_bank_number(ARM_CPU_MODE_UND)] =3D env->xregs[= 22]; env->banked_r13[bank_number(ARM_CPU_MODE_UND)] =3D env->xregs[23]; } =20 @@ -8177,7 +8178,7 @@ void aarch64_sync_64_to_32(CPUARMState *env) env->fiq_regs[i - 24] =3D env->xregs[i]; } env->banked_r13[bank_number(ARM_CPU_MODE_FIQ)] =3D env->xregs[29]; - env->banked_r14[bank_number(ARM_CPU_MODE_FIQ)] =3D env->xregs[30]; + env->banked_r14[r14_bank_number(ARM_CPU_MODE_FIQ)] =3D env->xregs[= 30]; } =20 env->regs[15] =3D env->pc; diff --git a/target/arm/kvm32.c b/target/arm/kvm32.c index 0f1e94c7b5e..cb3fb73a961 100644 --- a/target/arm/kvm32.c +++ b/target/arm/kvm32.c @@ -318,8 +318,8 @@ int kvm_arch_put_registers(CPUState *cs, int level) memcpy(env->usr_regs, env->regs + 8, 5 * sizeof(uint32_t)); } env->banked_r13[bn] =3D env->regs[13]; - env->banked_r14[bn] =3D env->regs[14]; env->banked_spsr[bn] =3D env->spsr; + env->banked_r14[r14_bank_number(mode)] =3D env->regs[14]; =20 /* Now we can safely copy stuff down to the kernel */ for (i =3D 0; i < ARRAY_SIZE(regs); i++) { @@ -430,8 +430,8 @@ int kvm_arch_get_registers(CPUState *cs) memcpy(env->regs + 8, env->usr_regs, 5 * sizeof(uint32_t)); } env->regs[13] =3D env->banked_r13[bn]; - env->regs[14] =3D env->banked_r14[bn]; env->spsr =3D env->banked_spsr[bn]; + env->regs[14] =3D env->banked_r14[r14_bank_number(mode)]; =20 /* VFP registers */ r.id =3D KVM_REG_ARM | KVM_REG_SIZE_U64 | KVM_REG_ARM_VFP; diff --git a/target/arm/op_helper.c b/target/arm/op_helper.c index 90741f6331d..eb6fb82fb81 100644 --- a/target/arm/op_helper.c +++ b/target/arm/op_helper.c @@ -694,7 +694,7 @@ void HELPER(msr_banked)(CPUARMState *env, uint32_t valu= e, uint32_t tgtmode, env->banked_r13[bank_number(tgtmode)] =3D value; break; case 14: - env->banked_r14[bank_number(tgtmode)] =3D value; + env->banked_r14[r14_bank_number(tgtmode)] =3D value; break; case 8 ... 12: switch (tgtmode) { @@ -725,7 +725,7 @@ uint32_t HELPER(mrs_banked)(CPUARMState *env, uint32_t = tgtmode, uint32_t regno) case 13: return env->banked_r13[bank_number(tgtmode)]; case 14: - return env->banked_r14[bank_number(tgtmode)]; + return env->banked_r14[r14_bank_number(tgtmode)]; case 8 ... 12: switch (tgtmode) { case ARM_CPU_MODE_USR: --=20 2.19.1