From: Tobias Platen <tplaten@posteo.de>
Date: Tue, 23 Mar 2021 20:09:58 +0000 (+0100)
Subject: add addrshift function (based on microwatt)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97853ed6d1ed0d0639922b081a63e6650417cf62;p=soc.git

add addrshift function (based on microwatt)
---

diff --git a/src/soc/decoder/isa/radixmmu.py b/src/soc/decoder/isa/radixmmu.py
index 9c9bdf20..dbee706c 100644
--- a/src/soc/decoder/isa/radixmmu.py
+++ b/src/soc/decoder/isa/radixmmu.py
@@ -45,6 +45,71 @@ def rpte_valid(r):
 def rpte_leaf(r):
     return bool(r[1])
 
+## Shift address bits 61--12 right by 0--47 bits and
+## supply the least significant 16 bits of the result.
+def addrshift(addr,shift):
+    # shift : unsigned(5 downto 0);
+    print("addrshift")
+    print("addr",addr)
+
+    sh1 = None    # std_ulogic_vector(30 downto 0);
+    sh2 = None    # std_ulogic_vector(18 downto 0);
+    result = None # std_ulogic_vector(15 downto 0);
+
+    n = 64
+    if shift[0:1].value==0:
+       print("s1==0")
+       sh1 = addr[n-42-1:n-12] # r.addr(42 downto 12);
+    elif shift[0:1].value==1:
+       print("s1==1")
+       sh1 = addr[n-58-1:n-28] # r.addr(58 downto 28);
+    else:
+       print("s1==else")
+       zero = SelectableInt(0,13) # "0000000000000"
+       sh1 = selectconcat(zero,addr[n-61-1:n-44]) # r.addr(61 downto 44);
+    print("sh1=",sh1)
+
+    n=31
+    assert(sh1.bits==n)
+
+    if shift[1:2].value==0:
+       print("s2==0")
+       sh2 = sh1[n-18-1:n] # sh1(18 downto 0);
+    elif shift[1:2].value==1:
+       print("s2==2")
+       sh2 = sh1[n-22-1:n-4] # sh1(22 downto 4);
+    elif shift[1:2].value==2:
+       print("s2==3")
+       sh2 = sh1[n-26-1:n-8] # sh1(26 downto 8);
+    else:
+       print("s2==else")
+       sh2 = sh1[n-30-1:n-12] # sh1(30 downto 12);
+    print("sh2=",sh2)
+
+    n=19
+    assert(sh2.bits==n)
+
+    if shift[3:4].value==0:
+       print("s3==0")
+       result = sh2[n-15-1:n]   # sh2(15 downto 0);
+       print("xxx",result)
+    elif shift[3:4].value==1:
+       print("s3==2")
+       result = sh2[n-16-1:n-1] # sh2(16 downto 1);
+    elif shift[3:4].value==2:
+       print("s3==3")
+       result = sh2[n-17-1:n-2] # sh2(17 downto 2);
+    else:
+       print("s3==else")
+       result = sh2[n-18-1:n-3] # sh2(18 downto 3);
+
+    print("result of addrshift",result)
+
+    n=16
+    assert(result.bits==n)
+
+    return result
+
 def NLB(x):
     """
     Next Level Base
@@ -406,7 +471,10 @@ class RADIX:
                 print(pgbase)  #SelectableInt(value=0x40000, bits=56)
                 print(shift)   #SelectableInt(value=0x4, bits=16) #FIXME
                 pgbase = SelectableInt(pgbase.value,64)
-                addr_next = self._get_pgtable_addr(mask, pgbase, shift)
+                addrsh = addrshift(addr,shift)
+                addr_next = self._get_pgtable_addr(mask, pgbase, addrsh)
+                print("addr_next",addr_next)
+                print("addrsh",addrsh)
                 assert(addr_next == 0x40000)
                 return "TODO verify next level"