X-Git-Url: https://scm.lunaixsky.com/lunaix-os.git/blobdiff_plain/9eed27f6f2f002145667fb4abfc5e476b53630e5..c166bd62fbb907f95f79f621e2a2fb4fdde08e01:/lunaix-os/scripts/gdb/lunadbg/region_dump.py

diff --git a/lunaix-os/scripts/gdb/lunadbg/region_dump.py b/lunaix-os/scripts/gdb/lunadbg/region_dump.py
index 92ee65d..752dc9d 100644
--- a/lunaix-os/scripts/gdb/lunadbg/region_dump.py
+++ b/lunaix-os/scripts/gdb/lunadbg/region_dump.py
@@ -1,49 +1,31 @@
 import gdb
-from .utils import pid_argument
+from .utils import pid_argument, llist_foreach
+from .structs.region import MemRegion
+from .pp import MyPrettyPrinter
 
 class MemoryRegionDump(gdb.Command):
     """Dump virtual memory regions associated with a process"""
     def __init__(self) -> None:
         super().__init__("vmrs", gdb.COMMAND_USER)
 
+    def region_callback(self, pp, idx, region):
+        pp.print(f"VMR #{idx}:")
+        ppp = pp.next_level()
+        vmr = MemRegion(region)
+        vmr.print_detailed(ppp)
+
     def invoke(self, argument: str, from_tty: bool) -> None:
         argument = pid_argument(argument)
         
         pid = gdb.parse_and_eval(f"{argument}->pid")
 
-        argument = f"&{argument}->mm.regions"
+        argument = f"&{argument}->mm->regions"
         val = gdb.parse_and_eval(argument)
-        head = val
-
         region_t = gdb.lookup_type("struct mm_region").pointer()
         
-        print("VMRS (pid: %d)"%(pid))
-
-        i = 0
-        while(val["next"] != head):
-            region = val["next"].cast(region_t)
-            print(f"VMR #{i}:")
-            print( "  0x%x...0x%x [0x%x]"%(
-                region['start'], region['end'], 
-                region['end'] - region['start']))
-            
-            attr = region["attr"]
-            attr_str = []
-            if (attr & (1 << 2)):
-                attr_str.append("R")
-            if (attr & (1 << 3)):
-                attr_str.append("W")
-            if (attr & (1 << 4)):
-                attr_str.append("X")
-            print( "  attr: 0x%x (%s)"%(attr, "".join(attr_str)))
-            
-            file = region["mfile"]
-            if file == 0:
-                print( "  anonymous region")
-            else:
-                print( "  file mapped:")
-                print( "     dnode: %s @0x%x"%(file["dnode"]["name"]["value"].string(), file))
-                print( "     frange: 0x%x+0x%x"%(region["foff"], region["flen"]))
-
-            val = val["next"]
-            i+=1
+        pp = MyPrettyPrinter()
+        pp.print("VMRS (pid: %d)"%(pid))
+        
+        num = llist_foreach(val, region_t, "head", lambda a,b: self.region_callback(pp, a,b), inclusive=False)
+        if not num:
+            pp.print("no regions")