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

target/riscv: Fix read and write accesses to vsip and vsie

Browse source 
The previous implementation was broken in many ways:
- Used mideleg instead of hideleg to mask accesses
- Used MIP_VSSIP instead of VS_MODE_INTERRUPTS to mask writes to vsie
- Did not shift between S bits and VS bits (VSEIP <-> SEIP, ...)

Backports 9d5451e077cd84809bcdf460c39b5f4fec17fc79
This commit is contained in:
Georg Kotheimer 2021-03-30 15:16:09 -04:00 committed by Lioncash
parent e74588a57f
commit d18b402732
1 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
qemu/target/riscv/csr.c
View file

@ -702,30 +702,42 @@ static int write_sstatus(CPURISCVState *env, int csrno, target_ulong val)
return write_mstatus(env, CSR_MSTATUS, newval); return write_mstatus(env, CSR_MSTATUS, newval);
} }
static int read_vsie(CPURISCVState *env, int csrno, target_ulong *val)
{
/* Shift the VS bits to their S bit location in vsie */
*val = (env->mie & env->hideleg & VS_MODE_INTERRUPTS) >> 1;
return 0;
}
static int read_sie(CPURISCVState *env, int csrno, target_ulong *val) static int read_sie(CPURISCVState *env, int csrno, target_ulong *val)
{ {
if (riscv_cpu_virt_enabled(env)) { if (riscv_cpu_virt_enabled(env)) {
/* Tell the guest the VS bits, shifted to the S bit locations */ read_vsie(env, CSR_VSIE, val);
*val = (env->mie & env->mideleg & VS_MODE_INTERRUPTS) >> 1;
} else { } else {
*val = env->mie & env->mideleg; *val = env->mie & env->mideleg;
} }
return 0; return 0;
} }
static int write_sie(CPURISCVState *env, int csrno, target_ulong val) static int write_vsie(CPURISCVState *env, int csrno, target_ulong val)
{ {
target_ulong newval; /* Shift the S bits to their VS bit location in mie */
target_ulong newval = (env->mie & ~VS_MODE_INTERRUPTS) |
if (riscv_cpu_virt_enabled(env)) { ((val << 1) & env->hideleg & VS_MODE_INTERRUPTS);
/* Shift the guests S bits to VS */ return write_mie(env, CSR_MIE, newval);
newval = (env->mie & ~VS_MODE_INTERRUPTS) |
((val << 1) & VS_MODE_INTERRUPTS);
} else {
newval = (env->mie & ~S_MODE_INTERRUPTS) | (val & S_MODE_INTERRUPTS);
} }
return write_mie(env, CSR_MIE, newval); static int write_sie(CPURISCVState *env, int csrno, target_ulong val)
{
if (riscv_cpu_virt_enabled(env)) {
write_vsie(env, CSR_VSIE, val);
} else {
target_ulong newval = (env->mie & ~S_MODE_INTERRUPTS) |
(val & S_MODE_INTERRUPTS);
write_mie(env, CSR_MIE, newval);
}
return 0;
} }
static int read_stvec(CPURISCVState *env, int csrno, target_ulong *val) static int read_stvec(CPURISCVState *env, int csrno, target_ulong *val)
@ -806,17 +818,25 @@ static int write_sbadaddr(CPURISCVState *env, int csrno, target_ulong val)
return 0; return 0;
} }
static int rmw_vsip(CPURISCVState *env, int csrno, target_ulong *ret_value,
target_ulong new_value, target_ulong write_mask)
{
/* Shift the S bits to their VS bit location in mip */
int ret = rmw_mip(env, 0, ret_value, new_value << 1,
(write_mask << 1) & vsip_writable_mask & env->hideleg);
*ret_value &= VS_MODE_INTERRUPTS;
/* Shift the VS bits to their S bit location in vsip */
*ret_value >>= 1;
return ret;
}
static int rmw_sip(CPURISCVState *env, int csrno, target_ulong *ret_value, static int rmw_sip(CPURISCVState *env, int csrno, target_ulong *ret_value,
target_ulong new_value, target_ulong write_mask) target_ulong new_value, target_ulong write_mask)
{ {
int ret; int ret;
if (riscv_cpu_virt_enabled(env)) { if (riscv_cpu_virt_enabled(env)) {
/* Shift the new values to line up with the VS bits */ ret = rmw_vsip(env, CSR_VSIP, ret_value, new_value, write_mask);
ret = rmw_mip(env, CSR_MSTATUS, ret_value, new_value << 1,
(write_mask & sip_writable_mask) << 1 & env->mideleg);
ret &= vsip_writable_mask;
ret >>= 1;
} else { } else {
ret = rmw_mip(env, CSR_MSTATUS, ret_value, new_value, ret = rmw_mip(env, CSR_MSTATUS, ret_value, new_value,
write_mask & env->mideleg & sip_writable_mask); write_mask & env->mideleg & sip_writable_mask);
@ -1075,26 +1095,6 @@ static int write_vsstatus(CPURISCVState *env, int csrno, target_ulong val)
return 0; return 0;
} }
static int rmw_vsip(CPURISCVState *env, int csrno, target_ulong *ret_value,
target_ulong new_value, target_ulong write_mask)
{
int ret = rmw_mip(env, 0, ret_value, new_value,
write_mask & env->mideleg & vsip_writable_mask);
return ret;
}
static int read_vsie(CPURISCVState *env, int csrno, target_ulong *val)
{
*val = env->mie & env->mideleg & VS_MODE_INTERRUPTS;
return 0;
}
static int write_vsie(CPURISCVState *env, int csrno, target_ulong val)
{
target_ulong newval = (env->mie & ~env->mideleg) | (val & env->mideleg & MIP_VSSIP);
return write_mie(env, CSR_MIE, newval);
}
static int read_vstvec(CPURISCVState *env, int csrno, target_ulong *val) static int read_vstvec(CPURISCVState *env, int csrno, target_ulong *val)
{ {
*val = env->vstvec; *val = env->vstvec;