SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/arm: Hoist read of *is_secure in S1_ptw_translate

Browse Source 
Rename the argument to is_secure_ptr, and introduce a
local variable is_secure with the value.  We only write
back to the pointer toward the end of the function.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20221001162318.153420-15-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2022-10-01 09:22:50 -07:00 committed by Peter Maydell
parent b74c04431d
commit ab1f78859d
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
target/arm/ptw.c
View File

@ -207,24 +207,25 @@ static bool ptw_attrs_are_device(CPUARMState *env, ARMCacheAttrs cacheattrs)
/* Translate a S1 pagetable walk through S2 if needed. */ /* Translate a S1 pagetable walk through S2 if needed. */
static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx, static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx,
hwaddr addr, bool *is_secure, hwaddr addr, bool *is_secure_ptr,
ARMMMUFaultInfo *fi) ARMMMUFaultInfo *fi)
{ {
ARMMMUIdx s2_mmu_idx = *is_secure ? ARMMMUIdx_Stage2_S : ARMMMUIdx_Stage2; bool is_secure = *is_secure_ptr;
ARMMMUIdx s2_mmu_idx = is_secure ? ARMMMUIdx_Stage2_S : ARMMMUIdx_Stage2;
if (arm_mmu_idx_is_stage1_of_2(mmu_idx) && if (arm_mmu_idx_is_stage1_of_2(mmu_idx) &&
!regime_translation_disabled(env, s2_mmu_idx, *is_secure)) { !regime_translation_disabled(env, s2_mmu_idx, is_secure)) {
GetPhysAddrResult s2 = {}; GetPhysAddrResult s2 = {};
int ret; int ret;
ret = get_phys_addr_lpae(env, addr, MMU_DATA_LOAD, s2_mmu_idx, ret = get_phys_addr_lpae(env, addr, MMU_DATA_LOAD, s2_mmu_idx,
*is_secure, false, &s2, fi); is_secure, false, &s2, fi);
if (ret) { if (ret) {
assert(fi->type != ARMFault_None); assert(fi->type != ARMFault_None);
fi->s2addr = addr; fi->s2addr = addr;
fi->stage2 = true; fi->stage2 = true;
fi->s1ptw = true; fi->s1ptw = true;
fi->s1ns = !*is_secure; fi->s1ns = !is_secure;
return ~0; return ~0;
} }
if ((arm_hcr_el2_eff(env) & HCR_PTW) && if ((arm_hcr_el2_eff(env) & HCR_PTW) &&
@ -237,19 +238,20 @@ static hwaddr S1_ptw_translate(CPUARMState *env, ARMMMUIdx mmu_idx,
fi->s2addr = addr; fi->s2addr = addr;
fi->stage2 = true; fi->stage2 = true;
fi->s1ptw = true; fi->s1ptw = true;
fi->s1ns = !*is_secure; fi->s1ns = !is_secure;
return ~0; return ~0;
} }
if (arm_is_secure_below_el3(env)) { if (arm_is_secure_below_el3(env)) {
/* Check if page table walk is to secure or non-secure PA space. */ /* Check if page table walk is to secure or non-secure PA space. */
if (*is_secure) { if (is_secure) {
*is_secure = !(env->cp15.vstcr_el2 & VSTCR_SW); is_secure = !(env->cp15.vstcr_el2 & VSTCR_SW);
} else { } else {
*is_secure = !(env->cp15.vtcr_el2 & VTCR_NSW); is_secure = !(env->cp15.vtcr_el2 & VTCR_NSW);
} }
*is_secure_ptr = is_secure;
} else { } else {
assert(!*is_secure); assert(!is_secure);
} }
addr = s2.phys; addr = s2.phys;