1 files changed, 58 insertions, 26 deletions

diff --git a/uarch/core.cpp b/uarch/core.cpp
index 12f8b5b..7304442 100644
--- a/uarch/core.cpp
+++ b/uarch/core.cpp
@@ -74,9 +74,16 @@ void decode_stage::clock() {
         pc = r.new_pc;
         interrupt |= r.interrupt;
         icount = c.icount;
+        speculative_stores_sent = r.stores_sent;
     }
 
-    if (c.fetch_bundlep.can_read() && c.decode_mem_commandp.can_write() && c.indir_instp.can_write() && c.decode_to_exec_instp.can_write()) {
+    if (c.decode_store_completep.can_read()) {
+        ++stores_done;
+        assert((int)(speculative_stores_sent - stores_done) >= 0);
+        c.decode_store_completep.discard();
+    }
+
+    if (speculative_stores_sent == stores_done && c.fetch_bundlep.can_read() && c.decode_mem_commandp.can_write() && c.indir_instp.can_write() && c.decode_to_exec_instp.can_write()) {
         auto b = c.fetch_bundlep.peek();
 
         if (b.gen != c.gen) {
@@ -118,6 +125,9 @@ void decode_stage::clock() {
 
         pc = i.inst.next_pc;
 
+        speculative_stores_sent += i.inst.need_autoinc_store;
+        speculative_stores_sent += i.inst.need_exec_store;
+
         if (i.inst.need_indirect_load) {
             memory::dram::command fr;
             fr.transaction = i.tr;
@@ -180,6 +190,7 @@ void indir_stage::clock() {
                 sr.mask.fill(false);
                 sr.mask[*i.inst.init_address & memory::LINE_BYTE_OFFSET_MASK] = true;
                 sr.write = true;
+                sr.responsep = &c.decode_store_completep;
                 c.indir_mem_store_commandp.write(std::move(sr));
             } else {
                 pte(i.tr, "I");
@@ -207,6 +218,7 @@ void exec_stage::clock() {
     c.restarto.reset();
 
     std::optional<infra::transaction> restarttr;
+    std::optional<instruction_context> insto;
 
     bool progress = ctlregs[HALTED];
 
@@ -226,7 +238,9 @@ void exec_stage::clock() {
                     sr.mask.fill(false);
                     sr.mask[*i.inst.init_address & memory::LINE_BYTE_OFFSET_MASK] = true;
                     sr.write = true;
+                    sr.responsep = &c.decode_store_completep;
                     c.exec_mem_commandp.write(std::move(sr));
+                    stores_sent += 2; // Original store sent by Indir stage plus unstore here
                 }
                 c.decode_to_exec_instp.discard();
             } else if (i.icount == c.icount) {
@@ -247,7 +261,9 @@ void exec_stage::clock() {
                     sr.mask.fill(false);
                     sr.mask[*i.inst.init_address & memory::LINE_BYTE_OFFSET_MASK] = true;
                     sr.write = true;
+                    sr.responsep = &c.decode_store_completep;
                     c.exec_mem_commandp.write(std::move(sr));
+                    stores_sent += 2; // Original store sent by Indir stage plus unstore here
                 }
                 c.indir_to_exec_instp.discard();
             } else if (i.icount == c.icount) {
@@ -277,49 +293,58 @@ void exec_stage::clock() {
             pte(i.tr, "", fmt::format("loaddata={:04o}", *i.inst.data));
         }
 
+        // We are committed to complete execution of this instruction this cycle.
+
+        insto = std::move(i.inst);
+        auto &inst = *insto;
+
         pte(i.tr, "E");
         progress = true;
 
         assert(i.pc == pc);
 
-        auto next_pc = i.inst.next_pc;
+        auto next_pc = inst.next_pc;
 
-        if (i.inst.need_read_acc)
-            i.inst.acc = acc;
-        if (i.inst.need_read_link)
-            i.inst.link = link;
-        if (i.inst.need_read_mq)
-            i.inst.mq = mq;
-        if (i.inst.read_ctlreg.has_value())
-            i.inst.ctlval = ctlregs[*i.inst.read_ctlreg];
+        if (inst.need_autoinc_store)
+            ++stores_sent; // It was sent by Indir stage
+        if (inst.need_read_acc)
+            inst.acc = acc;
+        if (inst.need_read_link)
+            inst.link = link;
+        if (inst.need_read_mq)
+            inst.mq = mq;
+        if (inst.read_ctlreg.has_value())
+            inst.ctlval = ctlregs[*inst.read_ctlreg];
 
-        i.inst.execute();
+        inst.execute();
 
-        if (i.inst.need_write_acc)
-            acc = i.inst.acc.value();
-        if (i.inst.need_write_link)
-            link = i.inst.link.value();
-        if (i.inst.need_write_mq)
-            mq = i.inst.mq.value();
-        if (i.inst.write_ctlreg.has_value()) {
-            ctlregs[*i.inst.write_ctlreg] = i.inst.ctlval.value();
+        if (inst.need_write_acc)
+            acc = inst.acc.value();
+        if (inst.need_write_link)
+            link = inst.link.value();
+        if (inst.need_write_mq)
+            mq = inst.mq.value();
+        if (inst.write_ctlreg.has_value()) {
+            ctlregs[*inst.write_ctlreg] = inst.ctlval.value();
             restarttr = i.tr;
         }
 
-        if (i.inst.need_exec_store) {
-            pte(i.tr, "", fmt::format("store={:05o} storedata={:04o}", *i.inst.final_address, *i.inst.data));
+        if (inst.need_exec_store) {
+            pte(i.tr, "", fmt::format("store={:05o} storedata={:04o}", *inst.final_address, *inst.data));
             memory::dram::command sr;
             sr.transaction = i.tr;
-            sr.line_address = *i.inst.final_address >> memory::LINE_BYTES_LOG2;
-            sr.data[*i.inst.final_address & memory::LINE_BYTE_OFFSET_MASK] = *i.inst.data;
+            sr.line_address = *inst.final_address >> memory::LINE_BYTES_LOG2;
+            sr.data[*inst.final_address & memory::LINE_BYTE_OFFSET_MASK] = *inst.data;
             sr.mask.fill(false);
-            sr.mask[*i.inst.final_address & memory::LINE_BYTE_OFFSET_MASK] = true;
+            sr.mask[*inst.final_address & memory::LINE_BYTE_OFFSET_MASK] = true;
             sr.write = true;
+            sr.responsep = &c.decode_store_completep;
             c.exec_mem_commandp.write(std::move(sr));
+            ++stores_sent;
         }
 
-        assert(i.inst.next_pc == next_pc || i.inst.possibly_redirects);
-        pc = i.inst.next_pc;
+        assert(inst.next_pc == next_pc || inst.possibly_redirects);
+        pc = inst.next_pc;
 
         if (pc != next_pc) {
             pte(i.tr, "", fmt::format("jump={:05o}", pc));
@@ -345,6 +370,7 @@ bail_out:
         r.tr = *restarttr;
         r.new_pc = pc;
         r.interrupt = interrupt;
+        r.stores_sent = stores_sent;
         gen = ++c.gen;
         c.restarto = std::move(r);
     }
@@ -356,6 +382,12 @@ bail_out:
         assert(c.checker.icount == c.icount);
 //        std::cerr << fmt::format("icount={:} pc={:05o} checkerpc={:05o}\n", c.icount, pc, c.checker.pc);
         assert(pc == c.checker.pc);
+
+        if (insto.has_value()) {
+            auto &inst = *insto;
+            assert(inst == c.checker.inst);
+        }
+
         assert(acc == c.checker.acc);
         assert(link == c.checker.link);
         assert(mq == c.checker.mq);