From 47711f7f20a7e08c6ec61faf32bbd4220ae666f0 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Tue, 16 Jun 2020 13:57:41 +0100 Subject: [PATCH] refer to signals directly in Test Core --- src/soc/simple/core.py | 6 +++++- src/soc/simple/test/test_core.py | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/soc/simple/core.py b/src/soc/simple/core.py index 68c30790..c013ed2a 100644 --- a/src/soc/simple/core.py +++ b/src/soc/simple/core.py @@ -57,7 +57,7 @@ class NonProductionCore(Elaboratable): self.l0 = TstL0CacheBuffer(n_units=1, regwid=64, addrwid=addrwid) pi = self.l0.l0.dports[0].pi - # Instruction memory + # Test Instruction memory self.imem = TestMemory(32, idepth) # function units (only one each) @@ -75,6 +75,10 @@ class NonProductionCore(Elaboratable): self.issue_i = Signal(reset_less=True) self.busy_o = Signal(reset_less=True) + # instruction input + self.bigendian_i = self.pdecode2.dec.bigendian + self.raw_opcode_i = self.pdecode2.dec.raw_opcode_in + def elaborate(self, platform): m = Module() diff --git a/src/soc/simple/test/test_core.py b/src/soc/simple/test/test_core.py index ccc7f7de..c2a0692e 100644 --- a/src/soc/simple/test/test_core.py +++ b/src/soc/simple/test/test_core.py @@ -68,7 +68,7 @@ class TestRunner(FHDLTestCase): pdecode2 = core.pdecode2 l0 = core.l0 - comb += pdecode2.dec.raw_opcode_in.eq(instruction) + comb += core.raw_opcode_i.eq(instruction) comb += core.ivalid_i.eq(ivalid_i) # temporary hack: says "go" immediately for both address gen and ST @@ -137,7 +137,7 @@ class TestRunner(FHDLTestCase): print(code) # ask the decoder to decode this binary data (endian'd) - yield pdecode2.dec.bigendian.eq(0) # little / big? + yield core.bigendian_i.eq(0) # little / big? yield instruction.eq(ins) # raw binary instr. yield ivalid_i.eq(1) yield Settle() -- 2.30.2