diff options
| author | Peter Maydell | 2017-06-02 12:51:48 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-06-02 12:51:48 +0200 |
| commit | e9235c6983b261e04e897e8ff900b2b7a391e644 (patch) | |
| tree | 40b2b81ffaa069c3a328906845bf36fe0246a4b7 | |
| parent | arm: Don't let no-MPU PMSA cores write to SCTLR.M (diff) | |
| download | qemu-e9235c6983b261e04e897e8ff900b2b7a391e644.tar.gz qemu-e9235c6983b261e04e897e8ff900b2b7a391e644.tar.xz qemu-e9235c6983b261e04e897e8ff900b2b7a391e644.zip | |
arm: Remove unnecessary check on cpu->pmsav7_dregion
Now that we enforce both:
* pmsav7_dregion == 0 implies has_mpu == false
* PMSA with has_mpu == false means SCTLR.M cannot be set
we can remove a check on pmsav7_dregion from get_phys_addr_pmsav7(),
because we can only reach this code path if the MPU is enabled
(and so region_translation_disabled() returned false).
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 1493122030-32191-8-git-send-email-peter.maydell@linaro.org
| -rw-r--r-- | target/arm/helper.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/target/arm/helper.c b/target/arm/helper.c index f0f25c8ee8..5c044d021f 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8227,8 +8227,7 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address, } if (n == -1) { /* no hits */ - if (cpu->pmsav7_dregion && - (is_user || !(regime_sctlr(env, mmu_idx) & SCTLR_BR))) { + if (is_user || !(regime_sctlr(env, mmu_idx) & SCTLR_BR)) { /* background fault */ *fsr = 0; return true; |