From: Luke Kenneth Casson Leighton Date: Thu, 24 Jun 2021 21:11:07 +0000 (+0100) Subject: use default decoder, do not pass one in. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e07997ad33a99d50fc9978bba19d964519c049af;p=soc.git use default decoder, do not pass one in. inside PowerDecoder2, create default decoder with new "conditions" --- diff --git a/src/soc/simple/issuer.py b/src/soc/simple/issuer.py index f28b4581..465ade0e 100644 --- a/src/soc/simple/issuer.py +++ b/src/soc/simple/issuer.py @@ -222,12 +222,14 @@ class TestIssuerInternal(Elaboratable): self.core_rst = ResetSignal("coresync") # instruction decoder. goes into Trap Record - pdecode = create_pdecode() + #pdecode = create_pdecode() self.cur_state = CoreState("cur") # current state (MSR/PC/SVSTATE) - self.pdecode2 = PowerDecode2(pdecode, state=self.cur_state, + self.pdecode2 = PowerDecode2(None, state=self.cur_state, opkls=IssuerDecode2ToOperand, svp64_en=self.svp64_en, regreduce_en=self.regreduce_en) + pdecode = self.pdecode2.dec + if self.svp64_en: self.svp64 = SVP64PrefixDecoder() # for decoding SVP64 prefix