From: Cole Poirier <colepoirier@gmail.com>
Date: Sat, 15 Aug 2020 23:14:00 +0000 (-0700)
Subject: mmu.py fixes https://bugs.libre-soc.org/show_bug.cgi?id=450#c52
X-Git-Tag: semi_working_ecp5~331
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=abd3b3cc83ac78d663ac9d3a17753291dadba366;p=soc.git

mmu.py fixes https://bugs.libre-soc.org/show_bug.cgi?id=450#c52
---

diff --git a/src/soc/experiment/mmu.py b/src/soc/experiment/mmu.py
index 8b811068..d68a9fae 100644
--- a/src/soc/experiment/mmu.py
+++ b/src/soc/experiment/mmu.py
@@ -961,13 +961,16 @@ class MMU1(Elaboratable):
         comb += pgtable_addr.eq(
                  Cat(
                   Cat(
-                   Const(0b000, 3),
-                   (
-                    (r.pgbase[3:19] & ~mask)
-                    | (addrsh       &  mask)
-                   )
+                   Cat(
+                    Const(0b000, 3),
+                    (
+                     (r.pgbase[3:19] & ~mask)
+                     | (addrsh       &  mask)
+                    )
+                   ),
+                   r.pgbase[19:56]
                   ),
-                  Const(0x00, 8)
+                 Const(0x00, 8)
                  )
                 )