| Message ID | 20230228104035.1879882-17-bmeng@tinylab.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target/riscv: Various fixes to gdbstub and CSR access | expand |
On 2023/2/28 21:45, Bin Meng wrote: > From: Bin Meng <bmeng@tinylab.org> > > At present with a debugger attached sstc CSRs can only be accssed > when CPU is in M-mode, or configured correctly. > > Fix it by adjusting their predicate() routine logic so that the > static config check comes before the run-time check, as well as > adding a debugger check. > > Signed-off-by: Bin Meng <bmeng@tinylab.org> > Reviewed-by: Weiwei Li <liweiwei@iscas.ac.cn> > --- > > (no changes since v1) > > target/riscv/csr.c | 19 ++++++++++++++----- > 1 file changed, 14 insertions(+), 5 deletions(-) > > diff --git a/target/riscv/csr.c b/target/riscv/csr.c > index a0e70f5ba0..020c3f524f 100644 > --- a/target/riscv/csr.c > +++ b/target/riscv/csr.c > @@ -952,6 +952,19 @@ static RISCVException sstc(CPURISCVState *env, int csrno) > return RISCV_EXCP_ILLEGAL_INST; > } > > + if ((csrno == CSR_VSTIMECMP) || (csrno == CSR_VSTIMECMPH)) { > + hmode_check = true; > + } > + > + RISCVException ret = hmode_check ? hmode(env, csrno) : smode(env, csrno); > + if (ret != RISCV_EXCP_NONE) { > + return ret; > + } > + > + if (env->debugger) { > + return RISCV_EXCP_NONE; > + } > + > if (env->priv == PRV_M) { > return RISCV_EXCP_NONE; > } > @@ -972,11 +985,7 @@ static RISCVException sstc(CPURISCVState *env, int csrno) > } > } > > - if ((csrno == CSR_VSTIMECMP) || (csrno == CSR_VSTIMECMPH)) { > - hmode_check = true; > - } > - > - return hmode_check ? hmode(env, csrno) : smode(env, csrno); > + return RISCV_EXCP_NONE; Reviewed-by: LIU Zhiwei <zhiwei_liu@linux.alibaba.com> Zhiwei > } > > static RISCVException sstc_32(CPURISCVState *env, int csrno)
diff --git a/target/riscv/csr.c b/target/riscv/csr.c index a0e70f5ba0..020c3f524f 100644 --- a/target/riscv/csr.c +++ b/target/riscv/csr.c @@ -952,6 +952,19 @@ static RISCVException sstc(CPURISCVState *env, int csrno) return RISCV_EXCP_ILLEGAL_INST; } + if ((csrno == CSR_VSTIMECMP) || (csrno == CSR_VSTIMECMPH)) { + hmode_check = true; + } + + RISCVException ret = hmode_check ? hmode(env, csrno) : smode(env, csrno); + if (ret != RISCV_EXCP_NONE) { + return ret; + } + + if (env->debugger) { + return RISCV_EXCP_NONE; + } + if (env->priv == PRV_M) { return RISCV_EXCP_NONE; } @@ -972,11 +985,7 @@ static RISCVException sstc(CPURISCVState *env, int csrno) } } - if ((csrno == CSR_VSTIMECMP) || (csrno == CSR_VSTIMECMPH)) { - hmode_check = true; - } - - return hmode_check ? hmode(env, csrno) : smode(env, csrno); + return RISCV_EXCP_NONE; } static RISCVException sstc_32(CPURISCVState *env, int csrno)