From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Wed, 24 Jun 2020 15:40:08 +0000 (+0100)
Subject: import minerva and use LoadStoreUnitInterface
X-Git-Tag: div_pipeline~289
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=35b3bb92eb295af0d11ea04997ba2ff1d6d84b53;p=soc.git

import minerva and use LoadStoreUnitInterface
---

diff --git a/src/soc/experiment/lsmem.py b/src/soc/experiment/lsmem.py
index bff64776..4594be89 100644
--- a/src/soc/experiment/lsmem.py
+++ b/src/soc/experiment/lsmem.py
@@ -1,24 +1,2 @@
+from soc.minerva.units.loadstore import LoadStoreUnitInterface
 from nmigen import Signal
-
-class LoadStoreUnitInterface:
-    def __init__(self):
-
-        #self.dbus = Record(wishbone_layout)
-
-        self.x_addr = Signal(32)    # The address used for loads/stores
-        self.x_mask = Signal(4)     # Mask of which bytes to write
-        self.x_load = Signal()      # set to do a memory load
-        self.x_store = Signal()     # set to do a memory store
-        self.x_store_data = Signal(32) # The data to write when storing
-        self.x_stall = Signal()        # input - do nothing until low
-        self.x_valid = Signal()
-        self.m_stall = Signal() # input - do nothing until low
-        self.m_valid = Signal() # when this is high and m_busy is
-        # low, the data for the memory load can be read from m_load_data
-
-        self.x_busy = Signal()  # set when the memory is busy
-        self.m_busy = Signal()  # set when the memory is busy
-        self.m_load_data = Signal(32)  # Data returned from a memory read
-        self.m_load_error = Signal()   # Whether there was an error when loading
-        self.m_store_error = Signal()  # Whether there was an error when storing
-        self.m_badaddr = Signal(30)    # The address of the load/store error