yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2024-12-24 01:15:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-arm: Add Hyp mode checks to bad_mode_switch()

Browse source 
We don't actually support Hyp mode yet, but add the correct
checks for it to the bad_mode_switch() function for completeness.

Backports commit e6c8fc07b4fce0729bb747770756835f4b0ca7f4 from qemu
This commit is contained in:
Peter Maydell 2018-02-20 22:20:16 -05:00 committed by Lioncash
parent 339e3e340e
commit 4919c7287c
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
qemu/target-arm/helper.c
View file

@ -4521,6 +4521,9 @@ static int bad_mode_switch(CPUARMState *env, int mode)
* allows FIQ mode to be Secure-only. (In v8 this doesn't exist.) * allows FIQ mode to be Secure-only. (In v8 this doesn't exist.)
*/ */
return 0; return 0;
case ARM_CPU_MODE_HYP:
return !arm_feature(env, ARM_FEATURE_EL2)
|| arm_current_el(env) < 2 || arm_is_secure(env);
case ARM_CPU_MODE_MON: case ARM_CPU_MODE_MON:
return !arm_is_secure(env); return !arm_is_secure(env);
default: default: