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

target/arm: Support EL0 v7m msr/mrs for CONFIG_USER_ONLY

Browse source 
Simply moving the non-stub helper_v7m_mrs/msr outside of
!CONFIG_USER_ONLY is not an option, because of all of the
other system-mode helpers that are called.

But we can split out a few subroutines to handle the few
EL0 accessible registers without duplicating code.

Backports commit 04c9c81b8fa2ee33f59a26265700fae6fc646062 from qemu
This commit is contained in:
Richard Henderson 2019-11-21 16:19:54 -05:00 committed by Lioncash
parent df5929cb69
commit f2ec6bc22d
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qemu/target/arm/cpu.h
View file

@ -1236,6 +1236,7 @@ static inline void xpsr_write(CPUARMState *env, uint32_t val, uint32_t mask)
if (mask & XPSR_GE) { if (mask & XPSR_GE) {
env->GE = (val & XPSR_GE) >> 16; env->GE = (val & XPSR_GE) >> 16;
} }
#ifndef CONFIG_USER_ONLY
if (mask & XPSR_T) { if (mask & XPSR_T) {
env->thumb = ((val & XPSR_T) != 0); env->thumb = ((val & XPSR_T) != 0);
} }
@ -1251,6 +1252,7 @@ static inline void xpsr_write(CPUARMState *env, uint32_t val, uint32_t mask)
/* Note that this only happens on exception exit */ /* Note that this only happens on exception exit */
write_v7m_exception(env, val & XPSR_EXCP); write_v7m_exception(env, val & XPSR_EXCP);
} }
#endif
} }
#define HCR_VM (1ULL << 0) #define HCR_VM (1ULL << 0)