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

target-arm: Route S2 MMU faults to EL2

Browse source 
Backports commit d759a457a144844bff259aafda093b24e92c116d from qemu
This commit is contained in:
Edgar E. Iglesias 2018-02-17 13:42:01 -05:00 committed by Lioncash
parent f779375656
commit 753a530ac8
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
qemu/target-arm/op_helper.c
View file

@ -90,13 +90,19 @@ void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
ARMCPU *cpu = ARM_CPU(cs->uc, cs); ARMCPU *cpu = ARM_CPU(cs->uc, cs);
CPUARMState *env = &cpu->env; CPUARMState *env = &cpu->env;
uint32_t syn, exc; uint32_t syn, exc;
bool same_el = (arm_current_el(env) != 0); unsigned int target_el;
bool same_el;
if (retaddr) { if (retaddr) {
/* now we have a real cpu fault */ /* now we have a real cpu fault */
cpu_restore_state(cs, retaddr); cpu_restore_state(cs, retaddr);
} }
target_el = exception_target_el(env);
if (fi.stage2) {
target_el = 2;
}
same_el = arm_current_el(env) == target_el;
/* AArch64 syndrome does not have an LPAE bit */ /* AArch64 syndrome does not have an LPAE bit */
syn = fsr & ~(1 << 9); syn = fsr & ~(1 << 9);
@ -116,7 +122,7 @@ void tlb_fill(CPUState *cs, target_ulong addr, int is_write, int mmu_idx,
env->exception.vaddress = addr; env->exception.vaddress = addr;
env->exception.fsr = fsr; env->exception.fsr = fsr;
raise_exception(env, exc, syn, exception_target_el(env)); raise_exception(env, exc, syn, target_el);
} }
} }
#endif #endif