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 cfc7c80c14f8ed44697cc400d6b38af7e2a7274c..a3893b895303c1f3ef91743c1d0dff4ed895d240 100644 (file)
--- 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 19ffc46f77e1b5884552c5877bfd9ee6e5e5c6f1..5edc508b4ce05837225f4917c96a5087249111dc 100644 (file)
--- 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