refer to srr0/1 not a/b
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Fri, 5 Jun 2020 03:53:52 +0000 (04:53 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Fri, 5 Jun 2020 03:53:52 +0000 (04:53 +0100)
src/soc/fu/trap/main_stage.py

index 67061cb47b3d0b2f18dd6d0f6c0b5e48b89949ad..964cd6b76f18cdb180fb891842ff9ba49a4a90a2 100644 (file)
@@ -214,10 +214,10 @@ class TrapMainStage(PipeModBase):
                     ctrl_tmp.msr(MSR_DR) <= '1';
                 end if;
                 """
-                comb += nia_o.data.eq(br_ext(a_i[2:]))
+                comb += nia_o.data.eq(br_ext(srr0_i[2:]))
                 comb += nia_o.ok.eq(1)
                 comb += msr_copy(msr_o.data, srr1_i, zero_me=False) # don't zero
-                with m.If(a[MSR_PR]):
+                with m.If(srr1_i[MSR_PR]):
                         msr_o[MSR_EE].eq(1)
                         msr_o[MSR_IR].eq(1)
                         msr_o[MSR_DR].eq(1)