From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 2 Mar 2021 16:24:50 +0000 (+0000)
Subject: sort out SPR setting in MMU
X-Git-Tag: convert-csv-opcode-to-binary~132
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d16a91f43b224bbb1f045af9f0b2b67ddf4938fe;p=soc.git

sort out SPR setting in MMU
---

diff --git a/src/soc/fu/mmu/test/test_issuer_mmu_rom.py b/src/soc/fu/mmu/test/test_issuer_mmu_rom.py
index 640f8ed8..9f5e786d 100644
--- a/src/soc/fu/mmu/test/test_issuer_mmu_rom.py
+++ b/src/soc/fu/mmu/test/test_issuer_mmu_rom.py
@@ -48,9 +48,8 @@ class MMUTestCase(TestAccumulatorBase):
         prtbl = 0x1000000
         initial_regs[1] = prtbl
         
-        
-
-        initial_sprs = {}
+        initial_sprs = {'DSISR': 0, 'DAR': 0,
+                         720: 0}
         self.add_case(Program(lst, bigendian),
                       initial_regs, initial_sprs)
 
diff --git a/src/soc/regfile/util.py b/src/soc/regfile/util.py
index 79effa7c..5ccc4c54 100644
--- a/src/soc/regfile/util.py
+++ b/src/soc/regfile/util.py
@@ -24,7 +24,7 @@ def fast_reg_to_spr(spr_num):
 def spr_to_fast_reg(spr_num):
     if not isinstance(spr_num, str):
         spr_num = spr_dict[spr_num].SPR
-    return sprstr_to_fast[spr_num]
+    return sprstr_to_fast.get(spr_num, None)
 
 
 def slow_reg_to_spr(slow_reg):
diff --git a/src/soc/simple/test/test_core.py b/src/soc/simple/test/test_core.py
index 6f7c8ffd..0bf1ee42 100644
--- a/src/soc/simple/test/test_core.py
+++ b/src/soc/simple/test/test_core.py
@@ -100,9 +100,9 @@ def setup_regs(pdecode2, core, test):
             # match behaviour of SPRMap in power_decoder2.py
             for i, x in enumerate(SPR):
                 if sprname == x.name:
-                    yield sregs[i].reg.eq(val)
                     print("setting slow SPR %d (%s) to %x" %
                           (i, sprname, val))
+                    yield sregs.memory._array[i].eq(val)
         else:
             yield fregs.regs[fast].reg.eq(val)
             print("setting fast reg %d (%s) to %x" %