dart-t8110: dumping appears to work completely

Signed-off-by: R <[email protected]>

Author: ArcaneNibble

proxyclient/m1n1/hw/dart8110.py

@@ -349,48 +349,49 @@ def get_pt(self, addr, uncached=False):
     def invalidate_cache(self):
         self.pt_cache = {}
 
-#     def dump_table2(self, base, l1_addr):
-
-#         def print_block(base, pte, start, last):
-#             pgcount = last - start
-#             pte.OFFSET -= pgcount
-#             print("    page (%4d): %08x ... %08x -> %016x [%d%d]" % (
-#                     start, base + start*0x4000, base + (start+1)*0x4000,
-#                     pte.OFFSET << self.PAGE_BITS, pte.SP_PROT_DIS, pte.VALID))
-#             if start < last:
-#                 print("     ==> (%4d):          ... %08x -> %016x size: %08x" % (
-#                     last, base + (last+1)*0x4000,
-#                     (pte.OFFSET + pgcount - 1) << self.PAGE_BITS, pgcount << self.PAGE_BITS))
-
-#         cached, tbl = self.get_pt(l1_addr)
-
-#         unmapped = False
-#         start = 0
-#         next_pte = self.ptecls(VALID=0)
-
-#         for i, pte in enumerate(tbl):
-#             pte = self.ptecls(pte)
-#             if not pte.VALID:
-#                 if not unmapped:
-#                     if next_pte.VALID:
-#                         print_block(base, next_pte, start, i)
-#                     print("  ...")
-#                     unmapped = True
-#                     next_pte = pte
-#                 continue
+    def dump_table2(self, base, l1_addr):
+
+        def print_block(base, pte, start, last):
+            pgcount = last - start
+            pte.OFFSET -= pgcount
+            print("    page (%4d): %09x ... %09x -> %016x [%d%d%d%d]" % (
+                    start, base + start*0x4000, base + (start+1)*0x4000,
+                    pte.OFFSET << self.PAGE_BITS,
+                    pte.RDPROT, pte.WRPROT, pte.UNCACHABLE, pte.VALID))
+            if start < last:
+                print("     ==> (%4d):           ... %09x -> %016x size: %08x" % (
+                    last, base + (last+1)*0x4000,
+                    (pte.OFFSET + pgcount - 1) << self.PAGE_BITS, pgcount << self.PAGE_BITS))
+
+        cached, tbl = self.get_pt(l1_addr)
+
+        unmapped = False
+        start = 0
+        next_pte = PTE(VALID=0)
+
+        for i, pte in enumerate(tbl):
+            pte = PTE(pte)
+            if not pte.VALID:
+                if not unmapped:
+                    if next_pte.VALID:
+                        print_block(base, next_pte, start, i)
+                    print("  ...")
+                    unmapped = True
+                    next_pte = pte
+                continue
 
-#             unmapped = False
+            unmapped = False
 
-#             if int(pte) != int(next_pte):
-#                 if next_pte.VALID:
-#                     print_block(base, next_pte, start, i)
-#                 start = i
+            if int(pte) != int(next_pte):
+                if next_pte.VALID:
+                    print_block(base, next_pte, start, i)
+                start = i
 
-#             next_pte = pte
-#             next_pte.OFFSET += 1
+            next_pte = pte
+            next_pte.OFFSET += 1
 
-#         if next_pte.VALID:
-#             print_block(base, next_pte, start, 2048)
+        if next_pte.VALID:
+            print_block(base, next_pte, start, 2048)
 
     def dump_table(self, base, l1_addr):
         cached, tbl = self.get_pt(l1_addr)
@@ -410,7 +411,7 @@ def dump_table(self, base, l1_addr):
                 i, base + i*0x2000000, base + (i+1)*0x2000000,
                 pte.OFFSET << self.PAGE_BITS,
                 pte.RDPROT, pte.WRPROT, pte.UNCACHABLE, pte.VALID))
-            # self.dump_table2(base + i*0x2000000, pte.OFFSET << self.PAGE_BITS)
+            self.dump_table2(base + i*0x2000000, pte.OFFSET << self.PAGE_BITS)
 
     def dump_ttbr(self, ttbr):
         if not ttbr.VALID: