openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

target/arm: Remove ttbr1_valid check from get_phys_addr_lpae 

Now that aa64_va_parameters_both sets select based on the number
of ranges in the regime, the ttbr1_valid check is redundant.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20200216194343.21331-4-richard.henderson@linaro.org
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2020-02-16 11:43:42 -08:00 committed by Peter Maydell
parent 71d181640a
commit 03f27724df
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/arm/helper.c
View File

@ -10390,7 +10390,6 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
TCR *tcr = regime_tcr(env, mmu_idx); TCR *tcr = regime_tcr(env, mmu_idx);
int ap, ns, xn, pxn; int ap, ns, xn, pxn;
uint32_t el = regime_el(env, mmu_idx); uint32_t el = regime_el(env, mmu_idx);
bool ttbr1_valid;
uint64_t descaddrmask; uint64_t descaddrmask;
bool aarch64 = arm_el_is_aa64(env, el); bool aarch64 = arm_el_is_aa64(env, el);
bool guarded = false; bool guarded = false;
@ -10405,14 +10404,11 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
param = aa64_va_parameters(env, address, mmu_idx, param = aa64_va_parameters(env, address, mmu_idx,
access_type != MMU_INST_FETCH); access_type != MMU_INST_FETCH);
level = 0; level = 0;
ttbr1_valid = regime_has_2_ranges(mmu_idx);
addrsize = 64 - 8 * param.tbi; addrsize = 64 - 8 * param.tbi;
inputsize = 64 - param.tsz; inputsize = 64 - param.tsz;
} else { } else {
param = aa32_va_parameters(env, address, mmu_idx); param = aa32_va_parameters(env, address, mmu_idx);
level = 1; level = 1;
/* There is no TTBR1 for EL2 */
ttbr1_valid = (el != 2);
addrsize = (mmu_idx == ARMMMUIdx_Stage2 ? 40 : 32); addrsize = (mmu_idx == ARMMMUIdx_Stage2 ? 40 : 32);
inputsize = addrsize - param.tsz; inputsize = addrsize - param.tsz;
} }
@ -10429,7 +10425,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address,
if (inputsize < addrsize) { if (inputsize < addrsize) {
target_ulong top_bits = sextract64(address, inputsize, target_ulong top_bits = sextract64(address, inputsize,
addrsize - inputsize); addrsize - inputsize);
if (-top_bits != param.select || (param.select && !ttbr1_valid)) { if (-top_bits != param.select) {
/* The gap between the two regions is a Translation fault */ /* The gap between the two regions is a Translation fault */
fault_type = ARMFault_Translation; fault_type = ARMFault_Translation;
goto do_fault; goto do_fault;