Debug: Fix lldb and gdb support borked by d40fe9af

Debug/Scripts/common_uefi.py

@@ -168,5 +168,5 @@ class UefiMisc():
     # Returns a UTF16 string corresponding to a (CHAR16 *) value in EFI.
     @classmethod
     def parse_guid(cls, value):
-        guid = f"<{value['Data1']:08X}-{value['Data2']:04X}-{value['Data3']:04X}-{value['Data4'][0]:02X}{value['Data4'][1]:02X}-{value['Data4'][2]:02X}{value['Data4'][3]:02X}{value['Data4'][4]:02X}{value['Data4'][5]:02X}{value['Data4'][6]:02X}{value['Data4'][7]:02X}>"
+        guid = f"<{int(value['Data1']):08X}-{int(value['Data2']):04X}-{int(value['Data3']):04X}-{int(value['Data4'][0]):02X}{int(value['Data4'][1]):02X}-{int(value['Data4'][2]):02X}{int(value['Data4'][3]):02X}{int(value['Data4'][4]):02X}{int(value['Data4'][5]):02X}{int(value['Data4'][6]):02X}{int(value['Data4'][7]):02X}>"
         return guid

Debug/Scripts/gdb_uefi.py

@@ -31,10 +31,10 @@ import re
 import sys
 import os
 import subprocess
-from common_uefi import UefiMisc
 
 sys.path.append(os.path.dirname(__file__))
 
+from common_uefi import UefiMisc
 
 __license__ = 'BSD'
 __version__ = '1.0.0'
@@ -77,7 +77,7 @@ class ReloadUefi(gdb.Command):
     # Returns gdb.Type for a type.
     #
 
-    def lookup_type(self, typename):
+    def type(self, typename):
         return gdb.lookup_type(typename)
 
     #
@@ -103,7 +103,7 @@ class ReloadUefi(gdb.Command):
     #
 
     def set_field(self, value, field_name, data):
-        gdb.execute(f'set *({str(value[field_name].type)} *) 0x{int(value[field_name].address):x} = 0x{data}')
+        gdb.execute(f'set *({str(value[field_name].type)} *) 0x{int(value[field_name].address):x} = 0x{data:x}')
 
     #
     # Returns data backing a gdb.Value as an array.
@@ -262,7 +262,7 @@ class ReloadUefi(gdb.Command):
             cmd += f' 0x{fallack_base:x}'
             return cmd
 
-        cmd += f" 0x{int(orgbase):x}{sections['.text']}"
+        cmd += f" 0x{int(orgbase) + sections['.text']:x}"
 
         if not macho or not os.path.exists(file):
             # Another fallback, try to load data at least.
@@ -310,9 +310,9 @@ class ReloadUefi(gdb.Command):
         }
 
         # 3. Rebase.
-        for entry in mapping.items():
-            if machsections.get(entry):
-                cmd += f' -s {mapping[entry]} 0x{int(orgbase) + machsections[entry]:x}'
+        for section, new_section in mapping.items():
+            if machsections.get(section):
+                cmd += f' -s {new_section} 0x{int(orgbase) + machsections[section]:x}'
 
         return cmd
 
@@ -380,7 +380,7 @@ class ReloadUefi(gdb.Command):
     def parse_dh(self, dh):
         dh_t = self.ptype('EFI_DEBUG_IMAGE_INFO_TABLE_HEADER')
         dh = dh.cast(dh_t)
-        print(f"DebugImageInfoTable @ 0x{int(dh['EfiDebugImageInfoTable']):x}, 0x{dh['TableSize']:x} entries")
+        print(f"DebugImageInfoTable @ 0x{int(dh['EfiDebugImageInfoTable']):x}, 0x{int(dh['TableSize']):x} entries")
         if dh['UpdateStatus'] & self.DEBUG_IS_UPDATING:
             print('EfiDebugImageInfoTable update in progress, retry later')
             return
@@ -393,8 +393,8 @@ class ReloadUefi(gdb.Command):
     def parse_est(self, est):
         est_t = self.ptype('EFI_SYSTEM_TABLE')
         est = est.cast(est_t)
-        print(f"Connected to {UefiMisc.parse_utf16(est['FirmwareVendor'])}(Rev. 0x{int(est['FirmwareRevision']):x})")
-        print(f"ConfigurationTable @ 0x{int(est['ConfigurationTable']):x}, 0x{est['NumberOfTableEntries']:x} entries")
+        print(f"Connected to {UefiMisc.parse_utf16(est['FirmwareVendor'])} (Rev. 0x{int(est['FirmwareRevision']):x})")
+        print(f"ConfigurationTable @ 0x{int(est['ConfigurationTable']):x}, 0x{int(est['NumberOfTableEntries']):x} entries")
 
         dh = self.search_config(est['ConfigurationTable'], est['NumberOfTableEntries'], self.DEBUG_GUID)
         if dh == self.EINVAL:
@@ -452,7 +452,7 @@ class UefiStringPrinter:
         self.val = val
 
     def to_string(self):
-        return 'NULL' if not self.val else f"L'{UefiMisc.parse_utf16(self.val)}'"
+        return 'NULL' if not self.val else f'L"{UefiMisc.parse_utf16(self.val)}"'
 
 
 class UefiEfiStatusPrinter:

Debug/Scripts/lldb_uefi.py

@@ -210,7 +210,6 @@ class ReloadUefi:
         head_t = self.ptype('EFI_IMAGE_OPTIONAL_HEADER_UNION')
         dosh = self.typed_ptr(dosh_t, imagebase)
         h_addr = imagebase
-        h_addr = h_addr + self.get_field(dosh, 'e_lfanew') if self.get_field(dosh, 'e_magic') == self.DOS_MAGIC else self.typed_ptr(head_t, h_addr)
         if self.get_field(dosh, 'e_magic') == self.DOS_MAGIC:
             h_addr = h_addr + self.get_field(dosh, 'e_lfanew')
         return self.typed_ptr(head_t, h_addr)
@@ -501,5 +500,5 @@ class ReloadUefi:
             print('No EFI_SYSTEM_TABLE...')
             return
 
-        print(f'EFI_SYSTEM_TABLE @ 0x{est.GetValueAsUnisgned():x}')
+        print(f'EFI_SYSTEM_TABLE @ 0x{est.GetValueAsUnsigned():x}')
         self.parse_est(est)