debug: add pretty printer for boot modules registry

5 files changed, 51 insertions, 12 deletions

diff --git a/kapi/gdb/__init__.py b/kapi/gdb/__init__.py
index 88b1d05..1b36753 100644
--- a/kapi/gdb/__init__.py
+++ b/kapi/gdb/__init__.py
@@ -23,6 +23,11 @@ def build_pretty_printers():
         "^kapi::boot_modules::boot_module$",
         KapiBootModulesBootModulePrinter,
     )
+    pp.add_printer(
+        "kapi_boot_modules_boot_module_registry",
+        "^kapi::boot_modules::boot_module_registry$",
+        KapiBootModulesBootModuleRegistryPrinter,
+    )
     return pp
 
 
diff --git a/kapi/gdb/boot_modules/__init__.py b/kapi/gdb/boot_modules/__init__.py
index fedab65..2a54136 100644
--- a/kapi/gdb/boot_modules/__init__.py
+++ b/kapi/gdb/boot_modules/__init__.py
@@ -1 +1,2 @@
 from .boot_module import KapiBootModulesBootModulePrinter
+from .boot_module_registry import KapiBootModulesBootModuleRegistryPrinter
diff --git a/kapi/gdb/boot_modules/boot_module.py b/kapi/gdb/boot_modules/boot_module.py
index f0d558b..b26ecf1 100644
--- a/kapi/gdb/boot_modules/boot_module.py
+++ b/kapi/gdb/boot_modules/boot_module.py
@@ -9,10 +9,10 @@ class KapiBootModulesBootModulePrinter(gdb.ValuePrinter):
         self.__start = val["start_address"]
         self.__size = val["size"]
         self.__pointer_type = gdb.lookup_type("std::byte").pointer()
-        self.__pretty_name = self.__name if str(self.__name) != '""' else "<no name>"
+        self.__pretty_name = " " + str(self.__name) if str(self.__name) != '""' else ""
 
     def to_string(self):
-        return f"boot module {self.__pretty_name} of size {format_size(int(self.__size))}, at {self.__start.cast(self.__pointer_type)}"
+        return f"boot module{self.__pretty_name} of size {format_size(int(self.__size))}, at {self.__start.cast(self.__pointer_type)}"
 
     def children(self):
         yield ("name", self.__name)
diff --git a/kapi/gdb/boot_modules/boot_module_registry.py b/kapi/gdb/boot_modules/boot_module_registry.py
new file mode 100644
index 0000000..599a823
--- /dev/null
+++ b/kapi/gdb/boot_modules/boot_module_registry.py
@@ -0,0 +1,20 @@
+import gdb
+from teachos import format_size
+
+
+class KapiBootModulesBootModuleRegistryPrinter(gdb.ValuePrinter):
+    def __init__(self, val: gdb.Value):
+        self.__val = val
+        self.__modules = val["m_modules"]
+        self.__size = int(self.__modules["m_size"])
+        self.__element_type = gdb.lookup_type("kapi::boot_modules::boot_module")
+
+    def to_string(self):
+        return f"boot module registry of size {self.__size}"
+
+    def children(self):
+        yield ("[size]", self.__size)
+        yield ("m_modules", self.__modules)
+
+    def display_hint(self):
+        return None
diff --git a/libs/kstd/gdb/vector.py b/libs/kstd/gdb/vector.py
index 69f8ca2..f11e064 100644
--- a/libs/kstd/gdb/vector.py
+++ b/libs/kstd/gdb/vector.py
@@ -2,24 +2,37 @@ import gdb
 
 
 class KstdVectorPrinter(gdb.ValuePrinter):
-    def __init__(self, val):
+    class Iterator:
+        def __init__(self, begin: gdb.Value, end: gdb.Value):
+            self._item = begin
+            self._end = end
+            self._count = 0
+
+        def __iter__(self):
+            return self
+
+        def __next__(self):
+            count = self._count
+            self._count = count + 1
+
+            if self._item == self._end:
+                raise StopIteration
+
+            element = self._item.dereference()
+            self._item = self._item + 1
+            return (f"[{count}]", element)
+
+    def __init__(self, val: gdb.Value):
         self.__val = val
         self.__size = int(val["m_size"])
         self.__capacity = int(val["m_capacity"])
+        self.__data = val["m_data"]
 
     def to_string(self):
         return f"vector of length {self.__size}, capacity {self.__capacity}"
 
     def children(self):
-        data_pointer = self.__val["m_data"]
-        for i in range(self.__size):
-            yield (f"[{i}]", (data_pointer + i).dereference())
-
-    def child(self, n):
-        if n < self.__size:
-            return (f"[{n}]", (self.__val["m_data"] + n).dereference())
-        else:
-            raise gdb.MemoryError("Index out of range")
+        return self.Iterator(self.__data, self.__data + self.__size)
 
     def display_hint(self):
         return "array"