diff options
| author | Richard Henderson <richard.henderson@linaro.org> | 2019-10-23 11:00:52 -0400 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-10-24 17:16:28 +0100 |
| commit | 2e5dcf36280910b4c89662559c0db242d61ca8d0 (patch) | |
| tree | 836b88ada8b6d806f8af86aa29438da1eb0065fb /target | |
| parent | 7b2625eba208b634aa1a86642f085be10f65961a (diff) | |
| download | qemu-2e5dcf36280910b4c89662559c0db242d61ca8d0.zip qemu-2e5dcf36280910b4c89662559c0db242d61ca8d0.tar.gz qemu-2e5dcf36280910b4c89662559c0db242d61ca8d0.tar.bz2 | |
target/arm: Rebuild hflags at Xscale SCTLR writes
Continue setting, but not relying upon, env->hflags.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20191023150057.25731-20-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/helper.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index aae7b62..c55783e 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4174,6 +4174,16 @@ static void sctlr_write(CPUARMState *env, const ARMCPRegInfo *ri, /* ??? Lots of these bits are not implemented. */ /* This may enable/disable the MMU, so do a TLB flush. */ tlb_flush(CPU(cpu)); + + if (ri->type & ARM_CP_SUPPRESS_TB_END) { + /* + * Normally we would always end the TB on an SCTLR write; see the + * comment in ARMCPRegInfo sctlr initialization below for why Xscale + * is special. Setting ARM_CP_SUPPRESS_TB_END also stops the rebuild + * of hflags from the translator, so do it here. + */ + arm_rebuild_hflags(env); + } } static CPAccessResult fpexc32_access(CPUARMState *env, const ARMCPRegInfo *ri, |