From afbc6cf35bbd3c4f051d6d0e45860d9fa730ad46 Mon Sep 17 00:00:00 2001 From: colepoirier Date: Tue, 2 Jun 2020 17:07:39 -0700 Subject: [PATCH] Attempted to fix OP_RFID in TRAP pipeline --- src/soc/fu/trap/main_stage.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/soc/fu/trap/main_stage.py b/src/soc/fu/trap/main_stage.py index 03e5c2e4..d165aefb 100644 --- a/src/soc/fu/trap/main_stage.py +++ b/src/soc/fu/trap/main_stage.py @@ -163,8 +163,12 @@ class TrapMainStage(PipeModBase): ctrl_tmp.msr(MSR_DR) <= '1'; end if; """ - comb += self.o.msr.data.eq(Cat(b[63:31], b[26:22], b[15:0])) - comb += self.o.msr.ok.eq(a) + comb += self.o.msr.data[:16].eq(b[:16]) + comb += self.o.msr.data[22:27].eq(b[22:27]) + comb += self.o.msr.data[31:] + comb += self.o.msr.ok.eq(1) + comb += self.o.msr.data.eq(b) + comb += self.o.msr.ok.eq(1) # TODO with m.Case(InternalOp.OP_SC): -- 2.30.2