yuzu-emu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-10-20 12:48:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Replicate TBI/TBID bits for single range regimes

Browse Source 
Replicate the single TBI bit from TCR_EL2 and TCR_EL3 so that
we can unconditionally use pointer bit 55 to index into our
composite TBI1:TBI0 field.

Backports commit 3e270f67f0f05277021763af119a6ce195f8ed51 from qemu
This commit is contained in:
Richard Henderson 2020-03-22 03:20:03 -04:00 committed by Lioncash
parent cc32a96183
commit d3a5843aeb
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qemu/target/arm/helper.c
View File

@ -10329,7 +10329,8 @@ static int aa64_va_parameter_tbi(uint64_t tcr, ARMMMUIdx mmu_idx)
} else if (mmu_idx == ARMMMUIdx_Stage2) { } else if (mmu_idx == ARMMMUIdx_Stage2) {
return 0; /* VTCR_EL2 */ return 0; /* VTCR_EL2 */
} else { } else {
return extract32(tcr, 20, 1); /* Replicate the single TBI bit so we always have 2 bits. */
return extract32(tcr, 20, 1) * 3;
} }
} }
@ -10340,7 +10341,8 @@ static int aa64_va_parameter_tbid(uint64_t tcr, ARMMMUIdx mmu_idx)
} else if (mmu_idx == ARMMMUIdx_Stage2) { } else if (mmu_idx == ARMMMUIdx_Stage2) {
return 0; /* VTCR_EL2 */ return 0; /* VTCR_EL2 */
} else { } else {
return extract32(tcr, 29, 1); /* Replicate the single TBID bit so we always have 2 bits. */
return extract32(tcr, 29, 1) * 3;
} }
} }