From cebaf7434b4af059caca053ee1ec7ed8df91c2a7 Mon Sep 17 00:00:00 2001 From: stove Date: Wed, 27 Aug 2025 13:36:17 -0700 Subject: [PATCH] target/riscv: use riscv_csrr in riscv_csr_read Commit 38c83e8d3a33 ("target/riscv: raise an exception when CSRRS/CSRRC writes a read-only CSR") changed the behavior of riscv_csrrw, which would formerly be treated as read-only if the write mask were set to 0. Fixes an exception being raised when accessing read-only vector CSRs like vtype. Fixes: 38c83e8d3a33 ("target/riscv: raise an exception when CSRRS/CSRRC writes a read-only CSR") Signed-off-by: stove Reviewed-by: Daniel Henrique Barboza Message-ID: <20250827203617.79947-1-stove@rivosinc.com> Signed-off-by: Alistair Francis --- target/riscv/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/riscv/cpu.h b/target/riscv/cpu.h index 738e68fa6e2..2c2266415ec 100644 --- a/target/riscv/cpu.h +++ b/target/riscv/cpu.h @@ -874,7 +874,7 @@ static inline void riscv_csr_write(CPURISCVState *env, int csrno, static inline target_ulong riscv_csr_read(CPURISCVState *env, int csrno) { target_ulong val = 0; - riscv_csrrw(env, csrno, &val, 0, 0, 0); + riscv_csrr(env, csrno, &val); return val; } -- 2.47.3