use different way to pass instructions to test_issuer ISACaller
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 18 Jun 2020 10:29:29 +0000 (11:29 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Thu, 18 Jun 2020 10:29:29 +0000 (11:29 +0100)
src/soc/simple/test/test_issuer.py

index 953525e333098bcd13cd8d1bf7f33e36da3303e8..f5fc6dc8971b1108fac31547eece8fad01dc529f 100644 (file)
@@ -81,10 +81,13 @@ class TestRunner(FHDLTestCase):
                 print ("mem", test.mem)
                 print ("msr", test.msr)
                 print ("assem", program.assembly)
-                sim = ISA(pdecode2, test.regs, test.sprs, test.cr, test.mem,
-                          test.msr)
                 gen = list(program.generate_instructions())
-                instructions = list(zip(gen, program.assembly.splitlines()))
+                insncode = program.assembly.splitlines()
+                instructions = list(zip(gen, insncode))
+                sim = ISA(pdecode2, test.regs, test.sprs, test.cr, test.mem,
+                          test.msr,
+                          initial_insns=gen, respect_pc=True,
+                          disassembly=insncode)
 
                 pc = 0 # start address