1 files changed, 10 insertions, 9 deletions

diff --git a/uarch/core.h b/uarch/core.h
index ebfd388..a4ad0fe 100644
--- a/uarch/core.h
+++ b/uarch/core.h
@@ -38,8 +38,6 @@ struct inst_bundle {
 struct fetch_stage : public infra::sim {
     core &c;
 
-    memory::inline_cache<8, 2> cache;
-
     unsigned int pc;
 
     bool didrestart = false;
@@ -99,6 +97,10 @@ struct core {
     iomodel &system;
     funcchecker checker;
 
+    // <SETS_LOG2, WAYS>
+    memory::inline_cache<8, 2> icache;
+    memory::inline_cache<8, 2> dcache;
+
     std::optional<restart> restarto;
     unsigned int gen = 0;
 
@@ -113,8 +115,6 @@ struct core {
     infra::port<memory::dram::response> fetch_mem_responsep;
     infra::port<fetch_bundle> fetch_bundlep;
 
-    infra::port<memory::dram::command> decode_mem_commandp;
-    infra::port<memory::dram::response> decode_mem_responsep;
     infra::port<inst_bundle> decode_to_exec_instp;
 
     infra::port<inst_bundle> indir_instp;
@@ -123,7 +123,8 @@ struct core {
     infra::port<memory::dram::response> indir_mem_responsep;
     infra::port<inst_bundle> indir_to_exec_instp;
 
-    infra::port<memory::dram::command> exec_mem_commandp;
+    infra::port<memory::dram::command> exec_mem_load_commandp;
+    infra::port<memory::dram::command> exec_mem_store_commandp;
     infra::port<memory::dram::response> exec_mem_responsep;
 
     // Global counters (should be Gray code in FPGA implementation, only do == comparisons)
@@ -142,10 +143,10 @@ struct core {
     {
         mem.commandp = &mem_commandp;
         mem_command_arb.outp = &mem_commandp;
-        mem_command_arb.peerp[0] = &exec_mem_commandp;
-        mem_command_arb.peerp[1] = &indir_mem_store_commandp;
-        mem_command_arb.peerp[2] = &indir_mem_load_commandp;
-        mem_command_arb.peerp[3] = &decode_mem_commandp;
+        mem_command_arb.peerp[0] = &exec_mem_store_commandp;
+        mem_command_arb.peerp[1] = &exec_mem_load_commandp;
+        mem_command_arb.peerp[2] = &indir_mem_store_commandp;
+        mem_command_arb.peerp[3] = &indir_mem_load_commandp;
         mem_command_arb.peerp[4] = &fetch_mem_commandp;
     }
 };