From 1246e00478fb5ab2a357de17066fd8738395d9f1 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Mon, 4 May 2026 08:20:42 +0200 Subject: debug: split gdb modules --- kapi/gdb/__init__.py | 15 +++++++++++++++ kapi/gdb/address.py | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 kapi/gdb/__init__.py create mode 100644 kapi/gdb/address.py (limited to 'kapi/gdb') diff --git a/kapi/gdb/__init__.py b/kapi/gdb/__init__.py new file mode 100644 index 0000000..c37c7b7 --- /dev/null +++ b/kapi/gdb/__init__.py @@ -0,0 +1,15 @@ +import gdb.printing + +from .address import KapiMemoryAddressPrinter + + +def build_pretty_printers(): + pp = gdb.printing.RegexpCollectionPrettyPrinter("kapi") + pp.add_printer( + "kapi_memory_address", "^kapi::memory::address<.*>$", KapiMemoryAddressPrinter + ) + return pp + + +def register_printers(objfile): + gdb.printing.register_pretty_printer(objfile, build_pretty_printers(), replace=True) diff --git a/kapi/gdb/address.py b/kapi/gdb/address.py new file mode 100644 index 0000000..677c9aa --- /dev/null +++ b/kapi/gdb/address.py @@ -0,0 +1,33 @@ +import gdb + + +class KapiMemoryAddressPrinter: + """Print kapi::MemoryAddress.""" + + def __init__(self, val): + self.val = val + self.address_type = val.type.template_argument(0) + + def to_string(self): + try: + raw_address = int(self.val["m_value"]) + type_string = str(self.address_type) + + if "linear" in type_string: + suffix = "%lin" + elif "physical" in type_string: + suffix = "%phy" + else: + suffix = "%???" + + return f"{raw_address:#018x}{suffix}" + except Exception as e: + return f"{self.val}: {e}" + + def children(self): + if "linear" in str(self.address_type): + yield ( + "std::byte *", + self.val["m_value"].cast(gdb.lookup_type("std::byte").pointer()), + ) + yield ("m_value", self.val["m_value"]) -- cgit v1.2.3 From 78e42a1b6e0a857865be1e60f82871ac13c91bb1 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Mon, 4 May 2026 12:01:01 +0200 Subject: debug: improve pretty printer implementations --- kapi/gdb/__init__.py | 4 ++++ kapi/gdb/address.py | 25 +++++++++++-------------- kapi/gdb/device.py | 9 +++++++++ 3 files changed, 24 insertions(+), 14 deletions(-) create mode 100644 kapi/gdb/device.py (limited to 'kapi/gdb') diff --git a/kapi/gdb/__init__.py b/kapi/gdb/__init__.py index c37c7b7..ce95628 100644 --- a/kapi/gdb/__init__.py +++ b/kapi/gdb/__init__.py @@ -1,6 +1,7 @@ import gdb.printing from .address import KapiMemoryAddressPrinter +from .device import KapiDevicesDevicePrinter def build_pretty_printers(): @@ -8,6 +9,9 @@ def build_pretty_printers(): pp.add_printer( "kapi_memory_address", "^kapi::memory::address<.*>$", KapiMemoryAddressPrinter ) + pp.add_printer( + "kapi_devices_device", "^kapi::devices::device$", KapiDevicesDevicePrinter + ) return pp diff --git a/kapi/gdb/address.py b/kapi/gdb/address.py index 677c9aa..24fe681 100644 --- a/kapi/gdb/address.py +++ b/kapi/gdb/address.py @@ -1,17 +1,16 @@ import gdb +from teachos import TeachOSBasePrinter -class KapiMemoryAddressPrinter: - """Print kapi::MemoryAddress.""" - +class KapiMemoryAddressPrinter(TeachOSBasePrinter): def __init__(self, val): - self.val = val - self.address_type = val.type.template_argument(0) + super().__init__(val) + self.__type = val.type.template_argument(0) def to_string(self): try: - raw_address = int(self.val["m_value"]) - type_string = str(self.address_type) + raw_address = int(self.value["m_value"]) + type_string = str(self.__type) if "linear" in type_string: suffix = "%lin" @@ -22,12 +21,10 @@ class KapiMemoryAddressPrinter: return f"{raw_address:#018x}{suffix}" except Exception as e: - return f"{self.val}: {e}" + return f"{self.value}: {e}" def children(self): - if "linear" in str(self.address_type): - yield ( - "std::byte *", - self.val["m_value"].cast(gdb.lookup_type("std::byte").pointer()), - ) - yield ("m_value", self.val["m_value"]) + if "linear" in str(self.__type): + pointer_type = gdb.lookup_type("std::byte").pointer() + yield ("[bytes]", self.value["m_value"].cast(pointer_type)) + yield from super().children() diff --git a/kapi/gdb/device.py b/kapi/gdb/device.py new file mode 100644 index 0000000..b655972 --- /dev/null +++ b/kapi/gdb/device.py @@ -0,0 +1,9 @@ +import gdb +from teachos import TeachOSBasePrinter + + +class KapiDevicesDevicePrinter(TeachOSBasePrinter): + def to_string(self): + return ( + f"{self.value['m_name']} @ {self.value['m_major']}:{self.value['m_minor']}" + ) -- cgit v1.2.3 From 6ac1537d07dffa3482bbccf710a77a7316191c2e Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 7 May 2026 12:09:27 +0200 Subject: debug: use gdb.ValuePrinter base class --- kapi/gdb/address.py | 15 ++++++++------- kapi/gdb/device.py | 17 ++++++++++++++--- 2 files changed, 22 insertions(+), 10 deletions(-) (limited to 'kapi/gdb') diff --git a/kapi/gdb/address.py b/kapi/gdb/address.py index 24fe681..429db1d 100644 --- a/kapi/gdb/address.py +++ b/kapi/gdb/address.py @@ -1,15 +1,14 @@ import gdb -from teachos import TeachOSBasePrinter -class KapiMemoryAddressPrinter(TeachOSBasePrinter): +class KapiMemoryAddressPrinter(gdb.ValuePrinter): def __init__(self, val): - super().__init__(val) + self.__val = val self.__type = val.type.template_argument(0) def to_string(self): try: - raw_address = int(self.value["m_value"]) + raw_address = int(self.__val["m_value"]) type_string = str(self.__type) if "linear" in type_string: @@ -21,10 +20,12 @@ class KapiMemoryAddressPrinter(TeachOSBasePrinter): return f"{raw_address:#018x}{suffix}" except Exception as e: - return f"{self.value}: {e}" + return f"{self.__val}: {e}" def children(self): if "linear" in str(self.__type): pointer_type = gdb.lookup_type("std::byte").pointer() - yield ("[bytes]", self.value["m_value"].cast(pointer_type)) - yield from super().children() + yield ("[bytes]", self.__val["m_value"].cast(pointer_type)) + + def display_hint(self): + return None diff --git a/kapi/gdb/device.py b/kapi/gdb/device.py index b655972..8e515ef 100644 --- a/kapi/gdb/device.py +++ b/kapi/gdb/device.py @@ -1,9 +1,20 @@ import gdb -from teachos import TeachOSBasePrinter -class KapiDevicesDevicePrinter(TeachOSBasePrinter): +class KapiDevicesDevicePrinter(gdb.ValuePrinter): + def __init__(self, val): + self.__val = val + def to_string(self): return ( - f"{self.value['m_name']} @ {self.value['m_major']}:{self.value['m_minor']}" + f"{self.__val['m_name']} @ {self.__val['m_major']}:{self.__val['m_minor']}" ) + + def children(self): + yield ("major", self.__val["m_major"]) + yield ("minor", self.__val["m_minor"]) + yield ("name", self.__val["m_name"]) + yield ("parent", self.__val["m_parent"]) + + def display_hint(self): + return None -- cgit v1.2.3 From 07fb219869099c719b0fbfeae81b95512487639e Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 8 May 2026 17:12:24 +0200 Subject: debug: add page and frame formatters --- kapi/gdb/__init__.py | 9 +++++++-- kapi/gdb/address.py | 31 ------------------------------- kapi/gdb/device.py | 20 -------------------- kapi/gdb/devices/__init__.py | 1 + kapi/gdb/devices/device.py | 20 ++++++++++++++++++++ kapi/gdb/memory/__init__.py | 4 ++++ kapi/gdb/memory/address.py | 31 +++++++++++++++++++++++++++++++ kapi/gdb/memory/chunk.py | 41 +++++++++++++++++++++++++++++++++++++++++ 8 files changed, 104 insertions(+), 53 deletions(-) delete mode 100644 kapi/gdb/address.py delete mode 100644 kapi/gdb/device.py create mode 100644 kapi/gdb/devices/__init__.py create mode 100644 kapi/gdb/devices/device.py create mode 100644 kapi/gdb/memory/__init__.py create mode 100644 kapi/gdb/memory/address.py create mode 100644 kapi/gdb/memory/chunk.py (limited to 'kapi/gdb') diff --git a/kapi/gdb/__init__.py b/kapi/gdb/__init__.py index ce95628..afb68f8 100644 --- a/kapi/gdb/__init__.py +++ b/kapi/gdb/__init__.py @@ -1,7 +1,7 @@ import gdb.printing -from .address import KapiMemoryAddressPrinter -from .device import KapiDevicesDevicePrinter +from .memory import * +from .devices import * def build_pretty_printers(): @@ -9,6 +9,11 @@ def build_pretty_printers(): pp.add_printer( "kapi_memory_address", "^kapi::memory::address<.*>$", KapiMemoryAddressPrinter ) + pp.add_printer( + "kapi_memory_chunk", "^kapi::memory::chunk<.*>$", KapiMemoryChunkPrinter + ) + pp.add_printer("kapi_memory_frame", "^kapi::memory::frame$", KapiMemoryFramePrinter) + pp.add_printer("kapi_memory_page", "^kapi::memory::page$", KapiMemoryPagePrinter) pp.add_printer( "kapi_devices_device", "^kapi::devices::device$", KapiDevicesDevicePrinter ) diff --git a/kapi/gdb/address.py b/kapi/gdb/address.py deleted file mode 100644 index 429db1d..0000000 --- a/kapi/gdb/address.py +++ /dev/null @@ -1,31 +0,0 @@ -import gdb - - -class KapiMemoryAddressPrinter(gdb.ValuePrinter): - def __init__(self, val): - self.__val = val - self.__type = val.type.template_argument(0) - - def to_string(self): - try: - raw_address = int(self.__val["m_value"]) - type_string = str(self.__type) - - if "linear" in type_string: - suffix = "%lin" - elif "physical" in type_string: - suffix = "%phy" - else: - suffix = "%???" - - return f"{raw_address:#018x}{suffix}" - except Exception as e: - return f"{self.__val}: {e}" - - def children(self): - if "linear" in str(self.__type): - pointer_type = gdb.lookup_type("std::byte").pointer() - yield ("[bytes]", self.__val["m_value"].cast(pointer_type)) - - def display_hint(self): - return None diff --git a/kapi/gdb/device.py b/kapi/gdb/device.py deleted file mode 100644 index 8e515ef..0000000 --- a/kapi/gdb/device.py +++ /dev/null @@ -1,20 +0,0 @@ -import gdb - - -class KapiDevicesDevicePrinter(gdb.ValuePrinter): - def __init__(self, val): - self.__val = val - - def to_string(self): - return ( - f"{self.__val['m_name']} @ {self.__val['m_major']}:{self.__val['m_minor']}" - ) - - def children(self): - yield ("major", self.__val["m_major"]) - yield ("minor", self.__val["m_minor"]) - yield ("name", self.__val["m_name"]) - yield ("parent", self.__val["m_parent"]) - - def display_hint(self): - return None diff --git a/kapi/gdb/devices/__init__.py b/kapi/gdb/devices/__init__.py new file mode 100644 index 0000000..3bab1ea --- /dev/null +++ b/kapi/gdb/devices/__init__.py @@ -0,0 +1 @@ +from .device import KapiDevicesDevicePrinter diff --git a/kapi/gdb/devices/device.py b/kapi/gdb/devices/device.py new file mode 100644 index 0000000..8e515ef --- /dev/null +++ b/kapi/gdb/devices/device.py @@ -0,0 +1,20 @@ +import gdb + + +class KapiDevicesDevicePrinter(gdb.ValuePrinter): + def __init__(self, val): + self.__val = val + + def to_string(self): + return ( + f"{self.__val['m_name']} @ {self.__val['m_major']}:{self.__val['m_minor']}" + ) + + def children(self): + yield ("major", self.__val["m_major"]) + yield ("minor", self.__val["m_minor"]) + yield ("name", self.__val["m_name"]) + yield ("parent", self.__val["m_parent"]) + + def display_hint(self): + return None diff --git a/kapi/gdb/memory/__init__.py b/kapi/gdb/memory/__init__.py new file mode 100644 index 0000000..2aa6564 --- /dev/null +++ b/kapi/gdb/memory/__init__.py @@ -0,0 +1,4 @@ +from .address import KapiMemoryAddressPrinter +from .chunk import KapiMemoryFramePrinter +from .chunk import KapiMemoryPagePrinter +from .chunk import KapiMemoryChunkPrinter diff --git a/kapi/gdb/memory/address.py b/kapi/gdb/memory/address.py new file mode 100644 index 0000000..429db1d --- /dev/null +++ b/kapi/gdb/memory/address.py @@ -0,0 +1,31 @@ +import gdb + + +class KapiMemoryAddressPrinter(gdb.ValuePrinter): + def __init__(self, val): + self.__val = val + self.__type = val.type.template_argument(0) + + def to_string(self): + try: + raw_address = int(self.__val["m_value"]) + type_string = str(self.__type) + + if "linear" in type_string: + suffix = "%lin" + elif "physical" in type_string: + suffix = "%phy" + else: + suffix = "%???" + + return f"{raw_address:#018x}{suffix}" + except Exception as e: + return f"{self.__val}: {e}" + + def children(self): + if "linear" in str(self.__type): + pointer_type = gdb.lookup_type("std::byte").pointer() + yield ("[bytes]", self.__val["m_value"].cast(pointer_type)) + + def display_hint(self): + return None diff --git a/kapi/gdb/memory/chunk.py b/kapi/gdb/memory/chunk.py new file mode 100644 index 0000000..74b1407 --- /dev/null +++ b/kapi/gdb/memory/chunk.py @@ -0,0 +1,41 @@ +import gdb +from teachos import format_size + + +class KapiMemoryChunkPrinter(gdb.ValuePrinter): + + def __init__(self, val: gdb.Value, typename="chunk"): + self.__val = val + try: + self.__number = int(val["m_number"]) + except gdb.error: + self.__number = "" + + try: + self.__size = int(gdb.parse_and_eval(f"{val.type.name}::size")["value"]) + except gdb.error: + self.__size = "" + + self.__typename = typename + + def to_string(self): + return f"{self.__typename} {self.__number} of size {format_size(self.__size)}" + + def children(self): + yield ("number", self.__number) + yield ("size", self.__size) + + def display_hint(self): + return None + + +class KapiMemoryFramePrinter(KapiMemoryChunkPrinter): + + def __init__(self, val): + super().__init__(val, "frame") + + +class KapiMemoryPagePrinter(KapiMemoryChunkPrinter): + + def __init__(self, val): + super().__init__(val, "page") -- cgit v1.2.3 From 8ec011d9f5ad79c1e951127d3906a08e282649d1 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 8 May 2026 18:14:08 +0200 Subject: debug: add pretty printer for boot modules --- kapi/gdb/__init__.py | 8 +++++++- kapi/gdb/boot_modules/__init__.py | 1 + kapi/gdb/boot_modules/boot_module.py | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 kapi/gdb/boot_modules/__init__.py create mode 100644 kapi/gdb/boot_modules/boot_module.py (limited to 'kapi/gdb') diff --git a/kapi/gdb/__init__.py b/kapi/gdb/__init__.py index afb68f8..88b1d05 100644 --- a/kapi/gdb/__init__.py +++ b/kapi/gdb/__init__.py @@ -1,7 +1,8 @@ import gdb.printing -from .memory import * +from .boot_modules import * from .devices import * +from .memory import * def build_pretty_printers(): @@ -17,6 +18,11 @@ def build_pretty_printers(): pp.add_printer( "kapi_devices_device", "^kapi::devices::device$", KapiDevicesDevicePrinter ) + pp.add_printer( + "kapi_boot_modules_boot_module", + "^kapi::boot_modules::boot_module$", + KapiBootModulesBootModulePrinter, + ) return pp diff --git a/kapi/gdb/boot_modules/__init__.py b/kapi/gdb/boot_modules/__init__.py new file mode 100644 index 0000000..fedab65 --- /dev/null +++ b/kapi/gdb/boot_modules/__init__.py @@ -0,0 +1 @@ +from .boot_module import KapiBootModulesBootModulePrinter diff --git a/kapi/gdb/boot_modules/boot_module.py b/kapi/gdb/boot_modules/boot_module.py new file mode 100644 index 0000000..f0d558b --- /dev/null +++ b/kapi/gdb/boot_modules/boot_module.py @@ -0,0 +1,23 @@ +import gdb +from teachos import format_size + + +class KapiBootModulesBootModulePrinter(gdb.ValuePrinter): + def __init__(self, val): + self.__val = val + self.__name = val["name"] + 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 "" + + 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)}" + + def children(self): + yield ("name", self.__name) + yield ("start_address", self.__start) + yield ("size", self.__size) + + def display_hint(self): + return None -- cgit v1.2.3 From 2cb7a2575e8eb46df36dae108fae661b91801540 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sun, 10 May 2026 12:18:01 +0200 Subject: debug: add pretty printer for boot modules registry --- kapi/gdb/__init__.py | 5 +++++ kapi/gdb/boot_modules/__init__.py | 1 + kapi/gdb/boot_modules/boot_module.py | 4 ++-- kapi/gdb/boot_modules/boot_module_registry.py | 20 ++++++++++++++++++++ 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 kapi/gdb/boot_modules/boot_module_registry.py (limited to 'kapi/gdb') 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 "" + 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 -- cgit v1.2.3 From f3b75be5725a5a975cf73926e73aa63efe928026 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sun, 10 May 2026 12:27:16 +0200 Subject: debug: show data in boot modules --- kapi/gdb/boot_modules/boot_module.py | 35 ++++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) (limited to 'kapi/gdb') diff --git a/kapi/gdb/boot_modules/boot_module.py b/kapi/gdb/boot_modules/boot_module.py index b26ecf1..97e6584 100644 --- a/kapi/gdb/boot_modules/boot_module.py +++ b/kapi/gdb/boot_modules/boot_module.py @@ -3,21 +3,42 @@ from teachos import format_size class KapiBootModulesBootModulePrinter(gdb.ValuePrinter): + 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 += 1 + return (f"[{count}]", element) + def __init__(self, val): + self.__pointer_type = gdb.lookup_type("std::byte").pointer() + self.__val = val self.__name = val["name"] self.__start = val["start_address"] - self.__size = val["size"] - self.__pointer_type = gdb.lookup_type("std::byte").pointer() + self.__size = int(val["size"]) + self.__begin = val["start_address"]["m_value"].cast(self.__pointer_type) + self.__end = self.__begin + self.__size 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(self.__size)}, at {self.__start.cast(self.__pointer_type)}" def children(self): - yield ("name", self.__name) - yield ("start_address", self.__start) - yield ("size", self.__size) + return self.Iterator(self.__begin, self.__end) def display_hint(self): - return None + return "array" -- cgit v1.2.3