Give sstatus_csr_t handles to its base_status_csr_t constituents

So I can add specialized methods to base_status_csr_t next, for use
from within sstatus_csr_t.

2 files changed, 10 insertions, 3 deletions

diff --git a/riscv/csrs.cc b/riscv/csrs.cc
index df54361..82a46ab 100644
--- a/riscv/csrs.cc
+++ b/riscv/csrs.cc
@@ -460,8 +460,10 @@ bool mstatush_csr_t::unlogged_write(const reg_t val) noexcept {
 }
 
 // implement class sstatus_csr_t
-sstatus_csr_t::sstatus_csr_t(processor_t* const proc, csr_t_p orig, csr_t_p virt):
-  virtualized_csr_t(proc, orig, virt) {
+sstatus_csr_t::sstatus_csr_t(processor_t* const proc, base_status_csr_t_p orig, base_status_csr_t_p virt):
+  virtualized_csr_t(proc, orig, virt),
+  orig_sstatus(orig),
+  virt_sstatus(virt) {
 }
 
 void sstatus_csr_t::dirty(const reg_t dirties) {
diff --git a/riscv/csrs.h b/riscv/csrs.h
index cfd766e..3eb6bf5 100644
--- a/riscv/csrs.h
+++ b/riscv/csrs.h
@@ -190,6 +190,8 @@ class base_status_csr_t: public csr_t {
   reg_t compute_sstatus_write_mask() const noexcept;
 };
 
+typedef std::shared_ptr<base_status_csr_t> base_status_csr_t_p;
+
 
 // For vsstatus, which is its own separate architectural register
 // (unlike sstatus)
@@ -245,12 +247,15 @@ class mstatush_csr_t: public csr_t {
 
 class sstatus_csr_t: public virtualized_csr_t {
  public:
-  sstatus_csr_t(processor_t* const proc, csr_t_p orig, csr_t_p virt);
+  sstatus_csr_t(processor_t* const proc, base_status_csr_t_p orig, base_status_csr_t_p virt);
 
   // Set FS, VS, or XS bits to dirty
   void dirty(const reg_t dirties);
   // Return true if the specified bits are not 00 (Off)
   bool enabled(const reg_t which);
+ private:
+  base_status_csr_t_p orig_sstatus;
+  base_status_csr_t_p virt_sstatus;
 };
 
 typedef std::shared_ptr<sstatus_csr_t> sstatus_csr_t_p;