Commit e9235c69 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 1493122030-32191-8-git-send-email-peter.maydell@linaro.org
parent 06312feb

target/arm/helper.c

+1 −2
Original line number Diff line number Diff line
@@ -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;