Merge branch 'fmorgner/develop/kstd-string-rewrite' into 'develop'

Implement a fully-featured SSO enabled string

See merge request teachos/kernel!50

1 files changed, 6 insertions, 10 deletions

diff --git a/libs/kstd/gdb/string.py b/libs/kstd/gdb/string.py
index 73c22d64..b60cbe67 100644
--- a/libs/kstd/gdb/string.py
+++ b/libs/kstd/gdb/string.py
@@ -5,21 +5,17 @@ class KstdStringPrinter(gdb.ValuePrinter):
 
     def __init__(self, val):
         self.__val = val
+        self.__data = val["m_data"]
+        self.__length = val["m_length"]
 
     def to_string(self):
-        storage = self.__val["m_storage"]
-        storage_size = int(storage["m_size"])
-
-        if storage_size <= 0:
+        if int(self.__length) <= 0:
             return '""'
 
-        data_pointer = storage["m_data"]
-        string_length = storage_size - 1
-
         try:
-            if hasattr(data_pointer, "lazy_string"):
-                return data_pointer.lazy_string(encoding="utf-8", length=string_length)
-            return data_pointer.string(encoding="utf-8", length=string_length)
+            if hasattr(self.__data, "lazy_string"):
+                return self.__data.lazy_string(encoding="utf-8", length=self.__length)
+            return self.__data.string(encoding="utf-8", length=self.__length)
         except gdb.error:
             return "<unreadable memory>"