From af6e562c84c08aed8b35b8f6c0315114362ca373 Mon Sep 17 00:00:00 2001
From: jon <jonwoodruff@gmail.com>
Date: Thu, 25 Jun 2020 14:19:22 +0100
Subject: [PATCH] Deq the incoming request when sending a fast error response
 to a bad mapping.

---
 src_Core/CPU/MMIO_AXI4_Adapter.bsv | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src_Core/CPU/MMIO_AXI4_Adapter.bsv b/src_Core/CPU/MMIO_AXI4_Adapter.bsv
index 253a726..30351c2 100644
--- a/src_Core/CPU/MMIO_AXI4_Adapter.bsv
+++ b/src_Core/CPU/MMIO_AXI4_Adapter.bsv
@@ -158,15 +158,14 @@ module mkMMIO_AXI4_Adapter (MMIO_AXI4_Adapter_IFC);
                              data: newData };
       if (mem_rsp.rlast) begin
         f_rsps_to_core.enq (rsp);
+        if (cfg_verbosity > 0)
+           $display ("    Response MMIO to core: ", fshow (rsp));
         rg_rd_rsp_beat <= 0;
         rspData <= unpack(0);
       end else begin
         rg_rd_rsp_beat <= rg_rd_rsp_beat + 1;
         rspData <= newData;
       end
-
-      if (cfg_verbosity > 0)
-         $display ("    Response MMIO to core: ", fshow (rsp));
    endrule
 
    // ================================================================
@@ -256,6 +255,7 @@ module mkMMIO_AXI4_Adapter (MMIO_AXI4_Adapter_IFC);
       end else begin
          let rsp = MMIODataPRs {valid: False,
                                 data: toMemTaggedData(req.addr)};    // For debugging convenience only
+         f_reqs_from_core.deq;
          f_rsps_to_core.enq (rsp);
          if (cfg_verbosity > 0) begin
             $display ("%0d: %m.rl_handle_write_req: unmapped IO address; returning error response",