diff options
| author | Felix Morgner <felix.morgner@ost.ch> | 2026-05-07 11:41:31 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@ost.ch> | 2026-05-07 11:41:31 +0200 |
| commit | 35829497bdc0e00aa8f32b1855079fa5e2e0b084 (patch) | |
| tree | b224f653d53adbf17c4491d320dae4925fae61ab | |
| parent | 0ea43527332b7e5f1cfec6007506aa54e8f628cb (diff) | |
| download | kernel-35829497bdc0e00aa8f32b1855079fa5e2e0b084.tar.xz kernel-35829497bdc0e00aa8f32b1855079fa5e2e0b084.zip | |
debug: align kstd printers with std ones
| -rw-r--r-- | libs/kstd/gdb/smart_pointers.py | 13 | ||||
| -rw-r--r-- | libs/kstd/gdb/vector.py | 10 |
2 files changed, 10 insertions, 13 deletions
diff --git a/libs/kstd/gdb/smart_pointers.py b/libs/kstd/gdb/smart_pointers.py index 3e5da02..0c14c77 100644 --- a/libs/kstd/gdb/smart_pointers.py +++ b/libs/kstd/gdb/smart_pointers.py @@ -16,7 +16,7 @@ class KstdUniquePtrPrinter(TeachOSBasePrinter): def children(self): pointer = self.value["pointer"] if int(pointer) != 0: - yield ("[object]", pointer.dereference()) + yield ("get()", pointer.dereference()) yield from super().children() @@ -31,21 +31,20 @@ class KstdSharedPtrPrinter(TeachOSBasePrinter): control_block = self.value["control"] if int(pointer) == 0 or int(control_block) == 0: - return f"kstd::shared_ptr<{self.__type}> (empty)" + return f"shared_ptr<{self.__type}> (empty)" strong_refs = int(control_block["shared_count"]["_M_i"]) weak_refs = int(control_block["weak_count"]["_M_i"]) - return f"kstd::shared_ptr<{self.__type}> (use_count={strong_refs}, weak_count={weak_refs})" + return ( + f"shared_ptr<{self.__type}> use count {strong_refs}, weak count {weak_refs}" + ) def children(self): pointer = self.value["pointer"] control_block = self.value["control"] if int(pointer) != 0: - yield ("[object]", pointer.dereference()) - - if int(control_block) != 0: - yield ("[control_block]", control_block.dereference()) + yield ("get()", pointer.dereference()) yield from super().children() diff --git a/libs/kstd/gdb/vector.py b/libs/kstd/gdb/vector.py index 4340ef4..b3604de 100644 --- a/libs/kstd/gdb/vector.py +++ b/libs/kstd/gdb/vector.py @@ -3,17 +3,12 @@ from teachos import TeachOSBasePrinter class KstdVectorPrinter(TeachOSBasePrinter): - def __init__(self, val): - super().__init__(val) - self.__type = val.type.template_argument(0) - def to_string(self): size = int(self.value["m_size"]) capacity = int(self.value["m_capacity"]) - return f"kstd::vector<{self.__type}> (size={size}, capacity={capacity})" + return f"vector of length {size}, capacity {capacity}" def children(self): - yield from super().children() size = int(self.value["m_size"]) data_pointer = self.value["m_data"] for i in range(size): @@ -21,3 +16,6 @@ class KstdVectorPrinter(TeachOSBasePrinter): def display_hint(self): return "array" + + def num_children(self): + return int(self.value["m_size"]) |
