yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-23 05:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

target/arm: Update ctr_el0_access for EL2

Browse source 
Update to include checks against HCR_EL2.TID2.

Backports commit 97475a89375d62a7722e04ced9fbdf0b992f4b83 from qemu
This commit is contained in:
Richard Henderson 2020-03-21 15:31:47 -04:00 committed by Lioncash
parent 6886ba66d0
commit 8e2ac48ad0
1 changed files with 21 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5058,11 +5058,27 @@ static const ARMCPRegInfo el3_cp_reginfo[] = {
static CPAccessResult ctr_el0_access(CPUARMState *env, const ARMCPRegInfo *ri,
bool isread)
{
/* Only accessible in EL0 if SCTLR.UCT is set (and only in AArch64,
* but the AArch32 CTR has its own reginfo struct)
*/
if (arm_current_el(env) == 0 && !(env->cp15.sctlr_el[1] & SCTLR_UCT)) {
return CP_ACCESS_TRAP;
int cur_el = arm_current_el(env);
if (cur_el < 2) {
uint64_t hcr = arm_hcr_el2_eff(env);
if (cur_el == 0) {
if ((hcr & (HCR_E2H | HCR_TGE)) == (HCR_E2H | HCR_TGE)) {
if (!(env->cp15.sctlr_el[2] & SCTLR_UCT)) {
return CP_ACCESS_TRAP_EL2;
}
} else {
if (!(env->cp15.sctlr_el[1] & SCTLR_UCT)) {
return CP_ACCESS_TRAP;
}
if (hcr & HCR_TID2) {
return CP_ACCESS_TRAP_EL2;
}
}
} else if (hcr & HCR_TID2) {
return CP_ACCESS_TRAP_EL2;
}
}
if (arm_current_el(env) < 2 && arm_hcr_el2_eff(env) & HCR_TID2) {