From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sun, 28 Mar 2021 22:57:45 +0000 (+0100)
Subject: svp64-enable passed through to PowerDecoderSubsets in core.py
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2a52c1748740038af3b001163622f4b38116f886;p=soc.git

svp64-enable passed through to PowerDecoderSubsets in core.py
---

diff --git a/src/soc/simple/core.py b/src/soc/simple/core.py
index f69fda4e..91e639a5 100644
--- a/src/soc/simple/core.py
+++ b/src/soc/simple/core.py
@@ -71,6 +71,9 @@ class NonProductionCore(Elaboratable):
     def __init__(self, pspec):
         self.pspec = pspec
 
+        # test is SVP64 is to be enabled
+        self.svp64_en = hasattr(pspec, "svp64") and (pspec.svp64 == True)
+
         # test to see if regfile ports should be reduced
         self.regreduce_en = (hasattr(pspec, "regreduce") and
                              (pspec.regreduce == True))
@@ -87,7 +90,8 @@ class NonProductionCore(Elaboratable):
         self.regs = RegFiles(pspec)
 
         # instruction decoder - needs a Trap-capable Record (captures EINT etc.)
-        self.e = Decode2ToExecute1Type("core", opkls=IssuerDecode2ToOperand)
+        self.e = Decode2ToExecute1Type("core", opkls=IssuerDecode2ToOperand,
+                                regreduce_en=self.regreduce_en)
 
         # SVP64 RA_OR_ZERO needs to know if the relevant EXTRA2/3 field is zero
         self.sv_a_nz = Signal()
@@ -119,7 +123,9 @@ class NonProductionCore(Elaboratable):
                 continue
             self.decoders[funame] = PowerDecodeSubset(None, opkls, f_name,
                                                       final=True,
-                                                      state=self.state)
+                                                      state=self.state,
+                                            svp64_en=self.svp64_en,
+                                            regreduce_en=self.regreduce_en)
             self.des[funame] = self.decoders[funame].do
 
         if "mmu0" in self.decoders: