Some bugfixes for CSR reading and setting FS for fflags updates (#43)

[riscv-isa-sim.git] / riscv / insns / csrrsi.h

diff --git a/riscv/insns/csrrsi.h b/riscv/insns/csrrsi.h
index 90a44368b3344e67d13e36d1c3e8247cb204ea03..aa44dcca8543ac374400450e4cc4326fc24652bc 100644 (file)
--- a/riscv/insns/csrrsi.h
+++ b/riscv/insns/csrrsi.h
@@ -1,4 +1,7 @@
-int csr = validate_csr(insn.csr(), true);
+bool write = insn.rs1() != 0;
+int csr = validate_csr(insn.csr(), write);
 reg_t old = p->get_csr(csr);
-p->set_csr(csr, old | insn.rs1());
+if (write) {
+  p->set_csr(csr, old | insn.rs1());
+}
 WRITE_RD(sext_xlen(old));