Message ID | 20220113114004.286796-23-zhiwei_liu@c-sky.com |
---|---|
State | New |
Headers | show |
Series | Support UXL filed in xstatus | expand |
On Thu, Jan 13, 2022 at 10:23 PM LIU Zhiwei <zhiwei_liu@c-sky.com> wrote: > > Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/riscv/csr.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/target/riscv/csr.c b/target/riscv/csr.c > index d944ee9caf..1037c6b15d 100644 > --- a/target/riscv/csr.c > +++ b/target/riscv/csr.c > @@ -580,7 +580,7 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno, > MSTATUS_MPP | MSTATUS_MXR | MSTATUS_TVM | MSTATUS_TSR | > MSTATUS_TW | MSTATUS_VS; > > - if (xl != MXL_RV32) { > + if (xl != MXL_RV32 || env->debugger) { > /* > * RV32: MPV and GVA are not in mstatus. The current plan is to > * add them to mstatush. For now, we just don't support it. > @@ -905,7 +905,7 @@ static RISCVException read_sstatus(CPURISCVState *env, int csrno, > target_ulong *val) > { > target_ulong mask = (sstatus_v1_10_mask); > - if (env->xl != MXL_RV32) { > + if (env->xl != MXL_RV32 || env->debugger) { > mask |= SSTATUS64_UXL; > } > /* TODO: Use SXL not MXL. */ > @@ -917,7 +917,8 @@ static RISCVException write_sstatus(CPURISCVState *env, int csrno, > target_ulong val) > { > target_ulong mask = (sstatus_v1_10_mask); > - if (env->xl != MXL_RV32) { > + > + if (env->xl != MXL_RV32 || env->debugger) { > mask |= SSTATUS64_UXL; > } > target_ulong newval = (env->mstatus & ~mask) | (val & mask); > -- > 2.25.1 > >
diff --git a/target/riscv/csr.c b/target/riscv/csr.c index d944ee9caf..1037c6b15d 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -580,7 +580,7 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno, MSTATUS_MPP | MSTATUS_MXR | MSTATUS_TVM | MSTATUS_TSR | MSTATUS_TW | MSTATUS_VS; - if (xl != MXL_RV32) { + if (xl != MXL_RV32 || env->debugger) { /* * RV32: MPV and GVA are not in mstatus. The current plan is to * add them to mstatush. For now, we just don't support it. @@ -905,7 +905,7 @@ static RISCVException read_sstatus(CPURISCVState *env, int csrno, target_ulong *val) { target_ulong mask = (sstatus_v1_10_mask); - if (env->xl != MXL_RV32) { + if (env->xl != MXL_RV32 || env->debugger) { mask |= SSTATUS64_UXL; } /* TODO: Use SXL not MXL. */ @@ -917,7 +917,8 @@ static RISCVException write_sstatus(CPURISCVState *env, int csrno, target_ulong val) { target_ulong mask = (sstatus_v1_10_mask); - if (env->xl != MXL_RV32) { + + if (env->xl != MXL_RV32 || env->debugger) { mask |= SSTATUS64_UXL; } target_ulong newval = (env->mstatus & ~mask) | (val & mask);
Signed-off-by: LIU Zhiwei <zhiwei_liu@c-sky.com> --- target/riscv/csr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)