X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2FTLB%2Fariane%2Ftlb_content.py;h=4010e3775e4a980f19beeb9cd55425f773c50a89;hb=24f824be042a6720c5c9ee621e1e3f09efda322e;hp=c4f03ed337e41ed5ce2e78e67dfe4b2b1b995d3b;hpb=d218dd551d59dab7d5714047071c5324b5f71ce0;p=soc.git

diff --git a/src/TLB/ariane/tlb_content.py b/src/TLB/ariane/tlb_content.py
index c4f03ed3..4010e377 100644
--- a/src/TLB/ariane/tlb_content.py
+++ b/src/TLB/ariane/tlb_content.py
@@ -5,17 +5,17 @@ from TLB.ariane.ptw import TLBUpdate, PTE
 
 class TLBEntry:
     def __init__(self, asid_width):
-        self.asid = Signal(asid_width)
+        self.asid = Signal(asid_width,name="ent_asid")
         # SV48 defines four levels of page tables
-        self.vpn0 = Signal(9)
-        self.vpn1 = Signal(9)
-        self.vpn2 = Signal(9)
-        self.vpn3 = Signal(9)
-        #TODO_PLATEN: use that signal
-        self.is_2M = Signal()
-        self.is_1G = Signal()
-        self.valid = Signal()
-
+        self.vpn0 = Signal(9,name="ent_vpn0")
+        self.vpn1 = Signal(9,name="ent_vpn1")
+        self.vpn2 = Signal(9,name="ent_vpn2")
+        self.vpn3 = Signal(9,name="ent_vpn3")
+        self.is_2M = Signal(name="ent_is_2M")
+        self.is_1G = Signal(name="ent_is_1G")
+        self.is_512G = Signal(name="ent_is_512G")
+        self.valid = Signal(name="ent_valid")
+        
     def flatten(self):
         return Cat(*self.ports())
 
@@ -25,6 +25,7 @@ class TLBEntry:
     def ports(self):
         return [self.asid, self.vpn0, self.vpn1, self.vpn2,
                 self.is_2M, self.is_1G, self.valid]
+        
 
 class TLBContent(Elaboratable):
     def __init__(self, pte_width, asid_width):
@@ -33,6 +34,7 @@ class TLBContent(Elaboratable):
         self.flush_i = Signal()  # Flush signal
         # Update TLB
         self.update_i = TLBUpdate(asid_width)
+        self.vpn3 = Signal(9)
         self.vpn2 = Signal(9)
         self.vpn1 = Signal(9)
         self.vpn0 = Signal(9)
@@ -41,6 +43,7 @@ class TLBContent(Elaboratable):
         # Lookup signals
         self.lu_asid_i = Signal(asid_width)
         self.lu_content_o = Signal(pte_width)
+        self.lu_is_512G_o = Signal()
         self.lu_is_2M_o = Signal()
         self.lu_is_1G_o = Signal()
         self.lu_hit_o = Signal()
@@ -49,6 +52,11 @@ class TLBContent(Elaboratable):
         m = Module()
 
         tags = TLBEntry(self.asid_width)
+        #TODO signal names, RecordObject
+        print("TAGS:")
+        #print(tags)
+        
+        
         content = Signal(self.pte_width)
 
         m.d.comb += [self.lu_hit_o.eq(0),
@@ -73,6 +81,8 @@ class TLBContent(Elaboratable):
                      tags_2M.eq(tags.is_2M),
                      vpn0_ok.eq(self.vpn0 == tags.vpn0),
                      vpn0_or_2M.eq(tags_2M | vpn0_ok)]
+        # TODO temporaries for 3rd level match
+        
         # first level match, this may be a giga page,
         # check the ASID flags as well
         with m.If(vpn2_hit):
@@ -110,9 +120,11 @@ class TLBContent(Elaboratable):
         with m.Elif(replace_valid):
             m.d.sync += [ # update tag array
                           tags.asid.eq(self.update_i.asid),
+                          tags.vpn3.eq(self.update_i.vpn[27:36]),
                           tags.vpn2.eq(self.update_i.vpn[18:27]),
                           tags.vpn1.eq(self.update_i.vpn[9:18]),
                           tags.vpn0.eq(self.update_i.vpn[0:9]),
+                          tags.is_512G.eq(self.update_i.is_512G),
                           tags.is_1G.eq(self.update_i.is_1G),
                           tags.is_2M.eq(self.update_i.is_2M),
                           tags.valid.eq(1),
@@ -124,5 +136,5 @@ class TLBContent(Elaboratable):
     def ports(self):
         return [self.flush_i,
                  self.lu_asid_i,
-                 self.lu_is_2M_o, self.lu_is_1G_o, self.lu_hit_o,
+                 self.lu_is_2M_o, self.lu_is_1G_o,self.lu_is_512G_o, self.lu_hit_o,
                 ] + self.update_i.content.ports() + self.update_i.ports()