From 15b08e14ddfc9521cea57cb2476f3f76aee8489e Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Sat, 12 Mar 2022 14:13:15 +0000 Subject: [PATCH] Revert "store cur_state.pc+4 in separate register to help reduce" This reverts commit d9b58d594ede33db2b0290d7edf8e062f5e91460. --- src/soc/simple/issuer.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/soc/simple/issuer.py b/src/soc/simple/issuer.py index 4a3eb402..cfad831a 100644 --- a/src/soc/simple/issuer.py +++ b/src/soc/simple/issuer.py @@ -815,10 +815,6 @@ class TestIssuerInternal(TestIssuerBase): fetch_failed = Const(0, 1) flush_needed = False - # create a register with pc+4 as a way to reduce combinatorial chains - pc4 = Signal.like(cur_state.pc) - sync += pc4.eq(cur_state.pc + 4) - # set priv / virt mode on I-Cache, sigh if isinstance(self.imem, ICache): comb += self.imem.i_in.priv_mode.eq(~msr[MSR.PR]) @@ -902,7 +898,7 @@ class TestIssuerInternal(TestIssuerBase): m.next = "INSN_READY" with m.Else(): # fetch the rest of the instruction from memory - comb += self.imem.a_pc_i.eq(pc4) + comb += self.imem.a_pc_i.eq(cur_state.pc + 4) comb += self.imem.a_i_valid.eq(1) comb += self.imem.f_i_valid.eq(1) m.next = "INSN_READ2" @@ -929,7 +925,7 @@ class TestIssuerInternal(TestIssuerBase): # blech, icache returns actual instruction insn = self.imem.f_instr_o else: - insn = get_insn(self.imem.f_instr_o, pc4) + insn = get_insn(self.imem.f_instr_o, cur_state.pc+4) sync += dec_opcode_i.eq(insn) m.next = "INSN_READY" # TODO: probably can start looking at pdecode2.rm_dec -- 2.30.2