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

target-arm: Make arm_current_el() return sensible values for M profile

Browse source 
Although M profile doesn't have the same concept of exception level
as A profile, it does have a notion of privileged versus not, which
we currently track in the privmode TB flag. Support returning this
information if arm_current_el() is called on an M profile core, so
that we can identify the correct MMU index to use (and put the MMU
index in the TB flags) without having to special-case M profile.

Backports commit 6d54ed3c93f1e05a483201b087142998381c9be8 from qemu
This commit is contained in:
Peter Maydell 2018-02-12 11:07:24 -05:00 committed by Lioncash
parent d45ea1ba3b
commit ec4dae08e4
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
qemu/target-arm/cpu.h
View file

@ -1234,6 +1234,10 @@ static inline bool cptype_valid(int cptype)
*/ */
static inline int arm_current_el(CPUARMState *env) static inline int arm_current_el(CPUARMState *env)
{ {
if (arm_feature(env, ARM_FEATURE_M)) {
return !((env->v7m.exception == 0) && (env->v7m.control & 1));
}
if (is_a64(env)) { if (is_a64(env)) {
return extract32(env->pstate, 2, 2); return extract32(env->pstate, 2, 2);
} }