From 31653b379a89d57be795cc0d8a12b4ae4af34721 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Mon, 15 Jun 2020 15:33:35 +0100 Subject: [PATCH] whoops LDSTCompUnit was identified as a Function.ALU not a Function.LDST --- src/soc/fu/compunits/compunits.py | 2 +- src/soc/simple/core.py | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) 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 -- 2.30.2