diff --git a/riscv/riscv_state.h b/riscv/riscv_state.h
index bc7b2e8..60dffd2 100644
--- a/riscv/riscv_state.h
+++ b/riscv/riscv_state.h
@@ -413,6 +413,9 @@
   RiscVCsrInterface* scause() const { return scause_; }
   RiscVCsrInterface* sideleg() const { return sideleg_; }
 
+ protected:
+  RiscVMStatus* mstatus_ = nullptr;
+
  private:
   InterruptCode PickInterrupt(uint32_t interrupts);
   RiscVXlen xlen_;
@@ -448,7 +451,6 @@
   bool branch_ = false;
 
   // Handles to frequently used CSRs.
-  RiscVMStatus* mstatus_ = nullptr;
   RiscVMIsa* misa_ = nullptr;
   RiscVMIp* mip_ = nullptr;
   RiscVMIe* mie_ = nullptr;