-int csr = validate_csr(insn.csr(), true);
-WRITE_RD(p->set_pcr(csr, p->get_pcr(csr) | insn.rs1()));
+bool write = insn.rs1() != 0;
+int csr = validate_csr(insn.csr(), write);
+reg_t old = p->get_csr(csr);
+if (write) {
+ p->set_csr(csr, old | insn.rs1());
+}
+WRITE_RD(sext_xlen(old));