ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target-sparc: allow priveleged ASIs in hyperprivileged mode 

Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
This commit is contained in:
Artyom Tarasenko 2016-06-09 11:03:33 +02:00
parent 84f8f58766
commit 7cd39ef234
No known key found for this signature in database
GPG Key ID: 3360C3F7411A125F
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
target/sparc/ldst_helper.c
View File

@ -293,6 +293,22 @@ static inline target_ulong asi_address_mask(CPUSPARCState *env,
} }
return addr; return addr;
} }
#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,
@ -1118,13 +1134,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);
@ -1423,13 +1433,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);