yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-03-24 10:35:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Fix select for aa64_va_parameters_both

Browse source 
Select should always be 0 for a regime with one range.

Backports commit 71d181640a1a9470f074fa28600ca85587e2ca6b from qemu
This commit is contained in:
Richard Henderson 2020-03-21 18:00:13 -04:00 committed by Lioncash
parent 3183349f1c
commit f3fa39829d
1 changed files with 24 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
qemu/target/arm/helper.c
View file

@ -10096,13 +10096,8 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va,
bool tbi, tbid, epd, hpd, using16k, using64k; bool tbi, tbid, epd, hpd, using16k, using64k;
int select, tsz; int select, tsz;
/*
* Bit 55 is always between the two regions, and is canonical for
* determining if address tagging is enabled.
*/
select = extract64(va, 55, 1);
if (!regime_has_2_ranges(mmu_idx)) { if (!regime_has_2_ranges(mmu_idx)) {
select = 0;
tsz = extract32(tcr, 0, 6); tsz = extract32(tcr, 0, 6);
using64k = extract32(tcr, 14, 1); using64k = extract32(tcr, 14, 1);
using16k = extract32(tcr, 15, 1); using16k = extract32(tcr, 15, 1);
@ -10115,23 +10110,30 @@ ARMVAParameters aa64_va_parameters_both(CPUARMState *env, uint64_t va,
tbid = extract32(tcr, 29, 1); tbid = extract32(tcr, 29, 1);
} }
epd = false; epd = false;
} else if (!select) {
tsz = extract32(tcr, 0, 6);
epd = extract32(tcr, 7, 1);
using64k = extract32(tcr, 14, 1);
using16k = extract32(tcr, 15, 1);
tbi = extract64(tcr, 37, 1);
hpd = extract64(tcr, 41, 1);
tbid = extract64(tcr, 51, 1);
} else { } else {
int tg = extract32(tcr, 30, 2); /*
using16k = tg == 1; * Bit 55 is always between the two regions, and is canonical for
using64k = tg == 3; * determining if address tagging is enabled.
tsz = extract32(tcr, 16, 6); */
epd = extract32(tcr, 23, 1); select = extract64(va, 55, 1);
tbi = extract64(tcr, 38, 1); if (!select) {
hpd = extract64(tcr, 42, 1); tsz = extract32(tcr, 0, 6);
tbid = extract64(tcr, 52, 1); epd = extract32(tcr, 7, 1);
using64k = extract32(tcr, 14, 1);
using16k = extract32(tcr, 15, 1);
tbi = extract64(tcr, 37, 1);
hpd = extract64(tcr, 41, 1);
tbid = extract64(tcr, 51, 1);
} else {
int tg = extract32(tcr, 30, 2);
using16k = tg == 1;
using64k = tg == 3;
tsz = extract32(tcr, 16, 6);
epd = extract32(tcr, 23, 1);
tbi = extract64(tcr, 38, 1);
hpd = extract64(tcr, 42, 1);
tbid = extract64(tcr, 52, 1);
}
} }
tsz = MIN(tsz, 39); /* TODO: ARMv8.4-TTST */ tsz = MIN(tsz, 39); /* TODO: ARMv8.4-TTST */
tsz = MAX(tsz, 16); /* TODO: ARMv8.2-LVA */ tsz = MAX(tsz, 16); /* TODO: ARMv8.2-LVA */