yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-06-04 04:08:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

target-sparc: allow priveleged ASIs in hyperprivileged mode

Browse source 
Backports commit 7cd39ef234a7e2eea45a08cd15f920da5f1ba008 from qemu
This commit is contained in:
Artyom Tarasenko 2018-03-01 21:14:38 -05:00 committed by Lioncash
parent 3a5a9dd6cd
commit 0c5a21230f
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
qemu/target-sparc/ldst_helper.c
View file

@ -250,7 +250,21 @@ static void replace_tlb_1bit_lru(SparcTLBEntry *tlb,
#endif #endif
/* error state? */ /* error state? */
} }
#ifndef CONFIG_USER_ONLY
static inline void do_check_asi(CPUSPARCState *env, int asi, uintptr_t ra)
{
/* ASIs >= 0x80 are user mode.
* ASIs >= 0x30 are hyper mode (or super if hyper is not available).
* ASIs <= 0x2f are super mode.
*/
if (asi < 0x80
&& !cpu_hypervisor_mode(env)
&& (!cpu_supervisor_mode(env)
|| (asi >= 0x30 && cpu_has_hypervisor(env)))) {
cpu_raise_exception_ra(env, TT_PRIV_ACT, ra);
}
}
#endif /* !CONFIG_USER_ONLY */
#endif #endif
static void do_check_align(CPUSPARCState *env, target_ulong addr, static void do_check_align(CPUSPARCState *env, target_ulong addr,
@ -1127,13 +1141,7 @@ uint64_t helper_ld_asi(CPUSPARCState *env, target_ulong addr,
asi &= 0xff; asi &= 0xff;
if ((asi < 0x80 && (env->pstate & PS_PRIV) == 0) do_check_asi(env, asi, GETPC());
|| (cpu_has_hypervisor(env)
&& asi >= 0x30 && asi < 0x80
&& !(env->hpstate & HS_PRIV))) {
cpu_raise_exception_ra(env, TT_PRIV_ACT, GETPC());
}
do_check_align(env, addr, size - 1, GETPC()); do_check_align(env, addr, size - 1, GETPC());
addr = asi_address_mask(env, asi, addr); addr = asi_address_mask(env, asi, addr);
@ -1435,13 +1443,7 @@ void helper_st_asi(CPUSPARCState *env, target_ulong addr, target_ulong val,
asi &= 0xff; asi &= 0xff;
if ((asi < 0x80 && (env->pstate & PS_PRIV) == 0) do_check_asi(env, asi, GETPC());
|| (cpu_has_hypervisor(env)
&& asi >= 0x30 && asi < 0x80
&& !(env->hpstate & HS_PRIV))) {
cpu_raise_exception_ra(env, TT_PRIV_ACT, GETPC());
}
do_check_align(env, addr, size - 1, GETPC()); do_check_align(env, addr, size - 1, GETPC());
addr = asi_address_mask(env, asi, addr); addr = asi_address_mask(env, asi, addr);