From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sun, 24 May 2020 19:00:07 +0000 (+0100)
Subject: add untested OP_MTMSR and OP_MFMSR
X-Git-Tag: div_pipeline~871
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c997aabe49499942da6e893ca6306a0ea1631a8d;p=soc.git

add untested OP_MTMSR and OP_MFMSR
---

diff --git a/src/soc/fu/trap/main_stage.py b/src/soc/fu/trap/main_stage.py
index 105060c7..4efbff00 100644
--- a/src/soc/fu/trap/main_stage.py
+++ b/src/soc/fu/trap/main_stage.py
@@ -77,19 +77,27 @@ class TrapMainStage(PipeModBase):
 
         # TODO: some #defines for the bits n stuff.
         with m.Switch(op):
+            #### trap ####
             with m.Case(InternalOp.OP_TRAP):
                 with m.If(should_trap):
                     comb += self.o.nia.data.eq(0x700)         # trap address
                     comb += self.o.nia.ok.eq(1)
                     comb += self.o.srr1.data.eq(self.i.msr)   # old MSR
-                    comb += self.o.srr1[63-46].eq(1)     # XXX which bit?
+                    comb += self.o.srr1.data[63-46].eq(1)     # XXX which bit?
                     comb += self.o.srr1.ok.eq(1)
                     comb += self.o.srr0.data.eq(self.i.cia)   # old PC
                     comb += self.o.srr0.ok.eq(1)
 
-            # XXX TODO, needs the lines adding to the CSV files first
-            #with m.Case(InternalOp.OP_MTMSR):
-            #with m.Case(InternalOp.OP_MFMSR):
+            # XXX TODO, lines have now been added to the CSV files 
+            with m.Case(InternalOp.OP_MTMSR):
+                # TODO: some of the bits need zeroing?
+                comb += self.o.msr.data.eq(a)
+                comb += self.o.msr.ok.eq(1)
+            with m.Case(InternalOp.OP_MFMSR):
+                # TODO: some of the bits need zeroing?
+                comb += self.o.o.data.eq(self.i.msr)
+                comb += self.o.o.ok.eq(1)
+
         comb += self.o.ctx.eq(self.i.ctx)
 
         return m