From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sat, 26 Sep 2020 19:57:07 +0000 (+0100)
Subject: do not use simdec2 in test_pipe_caller
X-Git-Tag: 24jan2021_ls180~305
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=12bc9ebd038336a50d7cabc87f1729f5883bb463;p=soc.git

do not use simdec2 in test_pipe_caller
---

diff --git a/src/soc/fu/branch/test/test_pipe_caller.py b/src/soc/fu/branch/test/test_pipe_caller.py
index 21c71056..cb827907 100644
--- a/src/soc/fu/branch/test/test_pipe_caller.py
+++ b/src/soc/fu/branch/test/test_pipe_caller.py
@@ -151,11 +151,6 @@ class TestRunner(unittest.TestCase):
         m.submodules.pdecode2 = pdecode2 = PowerDecode2(None, opkls, fn_name)
         pdecode = pdecode2.dec
 
-        # copy of the decoder for simulator
-        simdec = create_pdecode()
-        simdec2 = PowerDecode2(simdec)
-        m.submodules.simdec2 = simdec2  # pain in the neck
-
         pspec = BranchPipeSpec(id_wid=2)
         m.submodules.branch = branch = BranchBasePipe(pspec)
 
@@ -172,7 +167,7 @@ class TestRunner(unittest.TestCase):
                 print(test.name)
                 program = test.program
                 with self.subTest(test.name):
-                    simulator = ISA(simdec2, test.regs, test.sprs, test.cr,
+                    simulator = ISA(pdecode2, test.regs, test.sprs, test.cr,
                                     test.mem, test.msr,
                                     bigendian=bigendian)
                     initial_cia = 0x2000