From 97100e7200b5494f50620263ae49a26038b7acca Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Tue, 13 Feb 2024 17:30:40 -0800
Subject: [PATCH] Bump to latest spike

---
 .github/workflows/build-and-test.yml |  2 +-
 pspike/pspike.cc                     | 18 +++---------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 4d322a3..71e89cb 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -44,7 +44,7 @@ jobs:
         run: |
           git clone https://github.com/riscv-software-src/riscv-isa-sim.git
           cd riscv-isa-sim
-          git reset --hard 5a1145742e701597eb45825855311dfad21232a6
+          git reset --hard 3a53c80ade3336b1d46c9db3a6c6be8311c32cc5
           mkdir build
           cd build
           ../configure --prefix=${{ github.workspace }}/riscv
diff --git a/pspike/pspike.cc b/pspike/pspike.cc
index 563d154..3f2250a 100644
--- a/pspike/pspike.cc
+++ b/pspike/pspike.cc
@@ -58,19 +58,7 @@ class magic_extension_t : public extension_t {
 int main(int argc, char** argv) {
   std::vector<mem_cfg_t> mem_cfg { mem_cfg_t(0x80000000, 0x10000000) };
   std::vector<size_t> hartids = {0};
-  cfg_t cfg(std::make_pair(0, 0),
-            nullptr,
-            "rv64gcv",
-            "MSU",
-            "vlen:128,elen:64",
-            false,
-            endianness_little,
-            16,
-            mem_cfg,
-            hartids,
-            false,
-            4);
-
+  cfg_t cfg;
   option_parser_t parser;
   parser.option(0, "isa", 1, [&](const char* s){cfg.isa = s;});
   parser.option(0, "varch", 1, [&](const char* s){cfg.varch = s;});
@@ -89,8 +77,8 @@ int main(int argc, char** argv) {
     .support_haltgroups = true,
     .support_impebreak = true
   };
-  std::vector<std::pair<reg_t, abstract_mem_t*>> mems = make_mems(cfg.mem_layout());
-  std::vector<const device_factory_t*> plugin_devices;
+  std::vector<std::pair<reg_t, abstract_mem_t*>> mems = make_mems(cfg.mem_layout);
+  std::vector<device_factory_t*> plugin_devices;
   sim_t sim(&cfg, false,
             mems,
             plugin_devices,