From: Weiwei Li <[email protected]> write_mstatus() can only change current xl when in debug mode. And we need update cur_pmmask/base in this case.
Signed-off-by: Weiwei Li <[email protected]> Signed-off-by: Junqiang Wang <[email protected]> Reviewed-by: LIU Zhiwei <[email protected]> Message-Id: <[email protected]> Signed-off-by: Alistair Francis <[email protected]> --- target/riscv/csr.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/target/riscv/csr.c b/target/riscv/csr.c index cf7da4f87f..ad73691878 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -1324,8 +1324,15 @@ static RISCVException write_mstatus(CPURISCVState *env, int csrno, mstatus = set_field(mstatus, MSTATUS64_SXL, xl); } env->mstatus = mstatus; - env->xl = cpu_recompute_xl(env); + /* + * Except in debug mode, UXL/SXL can only be modified by higher + * privilege mode. So xl will not be changed in normal mode. + */ + if (env->debugger) { + env->xl = cpu_recompute_xl(env); + riscv_cpu_update_mask(env); + } return RISCV_EXCP_NONE; } -- 2.40.1
