From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Mon, 15 Jun 2020 14:33:35 +0000 (+0100)
Subject: whoops LDSTCompUnit was identified as a Function.ALU not a Function.LDST
X-Git-Tag: div_pipeline~376
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=31653b379a89d57be795cc0d8a12b4ae4af34721;p=soc.git

whoops LDSTCompUnit was identified as a Function.ALU not a Function.LDST
---

diff --git a/src/soc/fu/compunits/compunits.py b/src/soc/fu/compunits/compunits.py
index cfc7c80c..a3893b89 100644
--- a/src/soc/fu/compunits/compunits.py
+++ b/src/soc/fu/compunits/compunits.py
@@ -130,7 +130,7 @@ class ShiftRotFunctionUnit(FunctionUnitBaseSingle):
 
 # special-case
 class LDSTFunctionUnit(LDSTCompUnit):
-    fnunit = Function.ALU
+    fnunit = Function.LDST
     def __init__(self, pi, awid):
         pspec = LDSTPipeSpec(id_wid=2)           # spec (NNNPipeSpec instance)
         opsubset = pspec.opsubsetkls             # get the operand subset class
diff --git a/src/soc/simple/core.py b/src/soc/simple/core.py
index 19ffc46f..5edc508b 100644
--- a/src/soc/simple/core.py
+++ b/src/soc/simple/core.py
@@ -55,8 +55,7 @@ class NonProductionCore(Elaboratable):
         self.l0 = TstL0CacheBuffer(n_units=1, regwid=64, addrwid=addrwid)
         pi = self.l0.l0.dports[0].pi
 
-        #self.fus = AllFunctionUnits(pilist=[pi], addrwid=addrwid)
-        self.fus = AllFunctionUnits(pilist=None, addrwid=addrwid)
+        self.fus = AllFunctionUnits(pilist=[pi], addrwid=addrwid)
         self.regs = RegFiles()
         self.pdecode = pdecode = create_pdecode()
         self.pdecode2 = PowerDecode2(pdecode)   # instruction decoder