adds a memory for each space to memory_with_htif

Author: EAlexJ

src/iss/mem/memory_with_htif.h

@@ -36,8 +36,10 @@
 #define _MEMORY_WITH_HTIF_
 
 #include "iss/arch/riscv_hart_common.h"
+#include "iss/arch/traits.h"
 #include "iss/vm_types.h"
 #include "memory_if.h"
+#include <array>
 #include <cstdlib>
 #include <util/logging.h>
 #include <util/sparse_array.h>
@@ -67,6 +69,7 @@ template <typename PLAT> struct memory_with_htif : public memory_elem {
         // for(auto offs = 0U; offs < length; ++offs) {
         //     *(data + offs) = mem[(addr + offs) % mem.size()];
         // }
+        mem_type mem = memories[space];
         if(mem.is_allocated(addr)) {
             const auto& p = mem(addr / mem.page_size);
             auto offs = addr & mem.page_addr_mask;
@@ -87,6 +90,7 @@ template <typename PLAT> struct memory_with_htif : public memory_elem {
     }
 
     iss::status write_mem(iss::access_type access, uint32_t space, uint64_t addr, unsigned length, uint8_t const* data) {
+        mem_type mem = memories[space];
         auto& p = mem(addr / mem.page_size);
         auto offs = addr & mem.page_addr_mask;
         if((offs + length) > mem.page_size) {
@@ -106,8 +110,11 @@ template <typename PLAT> struct memory_with_htif : public memory_elem {
     }
 
 protected:
-    using mem_type = util::sparse_array<uint8_t, 1ULL << 32>;
-    mem_type mem;
+    // Currently no type erasure for the sparse_array is available, so all memories
+    // have the largest possible size. Memory footprint should still be small as it
+    // a sparse array
+    using mem_type = util::sparse_array<uint8_t, arch::traits<PLAT>::max_mem_size>;
+    std::array<mem_type, arch::traits<PLAT>::mem_sizes.size()> memories;
     arch::priv_if<reg_t> hart_if;
 };
 } // namespace mem