From 094a886d36fbe6a924ae92cba5adc583d9e058df Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Thu, 18 Jun 2020 11:29:29 +0100 Subject: [PATCH] use different way to pass instructions to test_issuer ISACaller --- src/soc/simple/test/test_issuer.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/soc/simple/test/test_issuer.py b/src/soc/simple/test/test_issuer.py index 953525e3..f5fc6dc8 100644 --- a/src/soc/simple/test/test_issuer.py +++ b/src/soc/simple/test/test_issuer.py @@ -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 -- 2.30.2