X-Git-Url: https://git.saurik.com/apple/xnu.git/blobdiff_plain/a991bd8d3e7fe02dbca0644054bab73c5b75324a..c3c9b80d004dbbfdf763edeb97968c6997e3b45b:/tools/lldbmacros/utils.py

diff --git a/tools/lldbmacros/utils.py b/tools/lldbmacros/utils.py
index 6039f2048..b726867d5 100755
--- a/tools/lldbmacros/utils.py
+++ b/tools/lldbmacros/utils.py
@@ -305,25 +305,38 @@ def WriteInt8ToMemoryAddress(intval, addr):
     return False 
 
 _enum_cache = {}
-def GetEnumValue(name):
+def GetEnumValue(enum_name_or_combined, member_name = None):
     """ Finds the value of a particular enum define. Ex kdp_req_t::KDP_VERSION  => 0x3
         params:
-            name : str - name of enum in the format type::name
+            enum_name_or_combined: str
+                name of an enum of the format type::name (legacy)
+                name of an enum type
+            member_name: None, or the name of an enum member
+                   (then enum_name_or_combined is a type name).
         returns:
             int - value of the particular enum.
         raises:
             TypeError - if the enum is not found
     """
-    name = name.strip()
     global _enum_cache
-    if name not in _enum_cache:
-        res = lldb.SBCommandReturnObject()
-        lldb.debugger.GetCommandInterpreter().HandleCommand("p/x (`%s`)" % name, res)
-        if not res.Succeeded():
-            raise TypeError("Enum not found with name: " + name)
-        # the result is of format '(int) $481 = 0x00000003\n'
-        _enum_cache[name] = int( res.GetOutput().split('=')[-1].strip(), 16)
-    return _enum_cache[name]
+    if member_name is None:
+        enum_name, member_name = enum_name_or_combined.strip().split("::")
+    else:
+        enum_name = enum_name_or_combined
+
+    if enum_name not in _enum_cache:
+        ty = GetType(enum_name)
+        d  = {}
+
+        for e in ty.get_enum_members_array():
+            if ty.GetTypeFlags() & lldb.eTypeIsSigned:
+                d[e.GetName()] = e.GetValueAsSigned()
+            else:
+                d[e.GetName()] = e.GetValueAsUnsigned()
+
+        _enum_cache[enum_name] = d
+
+    return _enum_cache[enum_name][member_name]
 
 def ResolveFSPath(path):
     """ expand ~user directories and return absolute path.
@@ -442,12 +455,13 @@ def IsAppleInternal():
         retval = False
     return retval
 
-def print_hex_data(data, begin_offset=0, desc=""):
+def print_hex_data(data, begin_offset=0, desc="", marks={}):
     """ print on stdout "hexdump -C < data" like output
         params:
             data - bytearray or array of int where each int < 255
             begin_offset - int offset that should be printed in left column
             desc - str optional description to print on the first line to describe data
+            mark - dictionary of markers
     """
     if desc:
         print "{}:".format(desc)
@@ -456,7 +470,11 @@ def print_hex_data(data, begin_offset=0, desc=""):
     hex_buf = ""
     char_buf = ""
     while index < total_len:
-        hex_buf += " {:02x}".format(data[index])
+        if marks.has_key(begin_offset + index):
+            hex_buf += marks[begin_offset + index]
+            hex_buf += "{:02x}".format(data[index])
+        else:
+            hex_buf += " {:02x}".format(data[index])
         if data[index] < 0x20 or data[index] > 0x7e:
             char_buf += "."
         else: