Merge pull request #28 from Minres/feature/better_mstatus

reworks mstatus handling,

Author: eyck

.github/workflows/ci-compile.yml

@@ -31,6 +31,12 @@ jobs:
 
       - name: Update submodules
         run: git submodule update --init --recursive
+        
+      - name: Cache Conan
+        uses: actions/cache@v4
+        with:
+          path: ~/.conan2
+          key: conan-${{ runner.os }}-unit-cpp${{ matrix.cpp_std }}-${{ hashFiles('conanfile.py') }}
 
       - name: Install dependencies
         run: |

src/iss/arch/mstatus.h

@@ -73,6 +73,8 @@ template <typename T> struct status<T, typename std::enable_if<std::is_same<T, u
     static inline unsigned FS(T v) { return bit_sub<13, 2>(v); };
     // machine previous privilege
     static inline unsigned MPP(T v) { return bit_sub<11, 2>(v); };
+    // vector unit status Off/Initial/Clean/Dirty
+    static inline unsigned VS(T v) { return bit_sub<9, 2>(v); };
     // supervisor previous privilege
     static inline unsigned SPP(T v) { return bit_sub<8, 1>(v); };
     // previous machine interrupt-enable
@@ -121,6 +123,8 @@ template <typename T> struct status<T, typename std::enable_if<std::is_same<T, u
     static inline unsigned FS(T v) { return bit_sub<13, 2>(v); };
     // machine previous privilege
     static inline unsigned MPP(T v) { return bit_sub<11, 2>(v); };
+    // vector unit status Off/Initial/Clean/Dirty
+    static inline unsigned VS(T v) { return bit_sub<9, 2>(v); };
     // supervisor previous privilege
     static inline unsigned SPP(T v) { return bit_sub<8, 1>(v); };
     // previous machine interrupt-enable
@@ -165,6 +169,8 @@ template <typename T> class hart_state<T, typename std::enable_if<std::is_same<T
     BF_FIELD(FS, 13, 2);
     // machine previous privilege
     BF_FIELD(MPP, 11, 2);
+    // vector unit status Off/Initial/Clean/Dirty
+    BF_FIELD(VS, 9, 2);
     // supervisor previous privilege
     BF_FIELD(SPP, 8, 1);
     // previous machine interrupt-enable
@@ -220,6 +226,8 @@ template <typename T> class hart_state<T, typename std::enable_if<std::is_same<T
     BF_FIELD(FS, 13, 2);
     // machine previous privilege
     BF_FIELD(MPP, 11, 2);
+    // vector unit status Off/Initial/Clean/Dirty
+    BF_FIELD(VS, 9, 2);
     // supervisor previous privilege
     BF_FIELD(SPP, 8, 1);
     // previous machine interrupt-enable
@@ -238,7 +246,7 @@ template <typename T> class hart_state<T, typename std::enable_if<std::is_same<T
 
     mstatus_t mstatus;
 
-    static const T mstatus_reset_val = 0x500001800;
+    static const T mstatus_reset_val = 0x1800;
 };
 } // namespace arch
 } // namespace iss

src/iss/arch/riscv_hart_msu_vp.h

@@ -127,6 +127,10 @@ template <typename BASE, features_e FEAT>
 riscv_hart_msu_vp<BASE, FEAT>::riscv_hart_msu_vp()
 : mmu(base::get_priv_if())
 , default_mem(base::get_priv_if()) {
+    if constexpr(sizeof(reg_t) == 8)
+        // set UXL and SXL to indicate 64 bits
+        // FIXME: this value is not preserved in resets
+        this->state.mstatus.backing.val |= 0x500000000;
     // common regs
     const std::array<unsigned, 16> rwaddrs{
         {mepc, mtvec, mscratch, mcause, mtval, sepc, stvec, sscratch, scause, stval, sscratch, uepc, utvec, uscratch, ucause, utval}};