Use structure packing instead of padding manualy

Author: elicn

qiling/os/uefi/UefiSpec.py

@@ -38,17 +38,19 @@ class EFI_LOCATE_SEARCH_TYPE(ENUM):
 ]
 
 class EFI_TIME_CAPABILITIES(STRUCT):
+	_pack_ = 8
+
 	_fields_ = [
 		('Resolution',	UINT32),
 		('Accuracy',	UINT32),
 		('SetsToZero',	BOOLEAN),
-		('PADDING_0',	UINT8 * 3)
 	]
 
 class EFI_MEMORY_DESCRIPTOR(STRUCT):
+	_pack_ = 8
+
 	_fields_ = [
 		('Type',			UINT32),
-		('PADDING_0',		UINT8 * 4),
 		('PhysicalStart',	EFI_PHYSICAL_ADDRESS),
 		('VirtualStart',	EFI_VIRTUAL_ADDRESS),
 		('NumberOfPages',	UINT64),
@@ -223,11 +225,12 @@ class EFI_CONFIGURATION_TABLE(STRUCT):
 EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL = STRUCT
 
 class EFI_SYSTEM_TABLE(STRUCT):
+	_pack_ = 8
+
 	_fields_ = [
 		('Hdr',						EFI_TABLE_HEADER),
 		('FirmwareVendor',			PTR(CHAR16)),
 		('FirmwareRevision',		UINT32),
-		('PADDING_0',				UINT8 * 4),
 		('ConsoleInHandle',			EFI_HANDLE),
 		('ConIn',					PTR(EFI_SIMPLE_TEXT_INPUT_PROTOCOL)),
 		('ConsoleOutHandle',		EFI_HANDLE),

qiling/os/uefi/ds.py

@@ -25,13 +25,14 @@ class EFI_GCD_MEMORY_TYPE(ENUM):
 	]
 
 class EFI_GCD_MEMORY_SPACE_DESCRIPTOR(STRUCT):
+	_pack_ = 8
+
 	_fields_ = [
 		('BaseAddress',		EFI_PHYSICAL_ADDRESS),
 		('Length',			UINT64),
 		('Capabilities',	UINT64),
 		('Attributes',		UINT64),
 		('GcdMemoryType',	EFI_GCD_MEMORY_TYPE),
-		('PADDING_0',		UINT8 * 4),
 		('ImageHandle',		EFI_HANDLE),
 		('DeviceHandle',	EFI_HANDLE)
 	]
@@ -45,11 +46,12 @@ class EFI_GCD_IO_TYPE(ENUM):
 	]
 
 class EFI_GCD_IO_SPACE_DESCRIPTOR(STRUCT):
+	_pack_ = 8
+
 	_fields_ = [
 		('BaseAddress',		EFI_PHYSICAL_ADDRESS),
 		('Length',			UINT64),
 		('GcdIoType',		EFI_GCD_IO_TYPE),
-		('PADDING_0',		UINT8 * 4),
 		('ImageHandle',		EFI_HANDLE),
 		('DeviceHandle',	EFI_HANDLE)
 	]

qiling/os/uefi/protocols/EfiLoadedImageProtocol.py

@@ -9,16 +9,16 @@
 from ..UefiMultiPhase import EFI_MEMORY_TYPE
 
 class EFI_LOADED_IMAGE_PROTOCOL(STRUCT):
+	_pack_ = 8
+
 	_fields_ = [
 		('Revision',		UINT32),
-		('PADDING_0',		UINT8 * 4),
 		('ParentHandle',	EFI_HANDLE),
 		('SystemTable',		PTR(EFI_SYSTEM_TABLE)),
 		('DeviceHandle',	EFI_HANDLE),
 		('FilePath',		PTR(EFI_DEVICE_PATH_PROTOCOL)),
 		('Reserved', 		PTR(VOID)),
 		('LoadOptionsSize',	UINT32),
-		('PADDING_1',		UINT8 * 4),
 		('LoadOptions',		PTR(VOID)),
 		('ImageBase',		PTR(VOID)),
 		('ImageSize',		UINT64),

qiling/os/uefi/protocols/EfiSmmAccess2Protocol.py

@@ -24,15 +24,15 @@ class EFI_MMRAM_DESCRIPTOR(STRUCT):
 # @see: MdePkg\Include\Protocol\MmAccess.h
 class EFI_SMM_ACCESS2_PROTOCOL(STRUCT):
 	EFI_SMM_ACCESS2_PROTOCOL = STRUCT
+	_pack_ = 8
 
 	_fields_ = [
 		('Open',			FUNCPTR(EFI_STATUS, PTR(EFI_SMM_ACCESS2_PROTOCOL))),
 		('Close',			FUNCPTR(EFI_STATUS, PTR(EFI_SMM_ACCESS2_PROTOCOL))),
 		('Lock',			FUNCPTR(EFI_STATUS, PTR(EFI_SMM_ACCESS2_PROTOCOL))),
 		('GetCapabilities',	FUNCPTR(EFI_STATUS, PTR(EFI_SMM_ACCESS2_PROTOCOL), PTR(UINTN), PTR(EFI_MMRAM_DESCRIPTOR))),
 		('LockState',		BOOLEAN),
-		('OpenState',		BOOLEAN),
-		('PADDING_0',		CHAR8 * 6)
+		('OpenState',		BOOLEAN)
 	]
 
 @dxeapi(params = {

qiling/os/uefi/protocols/EfiSmmSwDispatch2Protocol.py

@@ -14,6 +14,8 @@
 MAXIMUM_SWI_VALUE = 0xff
 
 class EFI_SMM_SW_CONTEXT(STRUCT):
+	_pack_ = 8
+
 	_fields_ = [
 		('SwSmiCpuIndex',	UINTN),	# index of the cpu which generated the swsmi
 		('CommandPort',		UINT8),	# port number used to trigger the swsmi

qiling/os/uefi/smst.py

@@ -45,12 +45,12 @@ class EFI_SMM_CPU_IO2_PROTOCOL(STRUCT):
 
 class EFI_SMM_SYSTEM_TABLE2(STRUCT):
 	EFI_SMM_SYSTEM_TABLE2 = STRUCT
+	_pack_ = 8
 
 	_fields_ = [
 		('Hdr',								EFI_TABLE_HEADER),
 		('SmmFirmwareVendor',				PTR(CHAR16)),
 		('SmmFirmwareRevision',				UINT32),
-		('PADDING_0',						UINT8 * 4),
 		('SmmInstallConfigurationTable',	FUNCPTR(EFI_STATUS, PTR(EFI_SMM_SYSTEM_TABLE2), PTR(EFI_GUID), PTR(VOID), UINTN)),
 		('SmmIo',							EFI_SMM_CPU_IO2_PROTOCOL),
 		('SmmAllocatePool',					FUNCPTR(EFI_STATUS, EFI_MEMORY_TYPE, UINTN, PTR(PTR(VOID)))),
@@ -244,7 +244,6 @@ def initialize(ql: Qiling, context, gSmst: int):
 			('Hdr',								None),
 			('SmmFirmwareVendor',				None),
 			('SmmFirmwareRevision',				None),
-			('PADDING_0',						None),
 			('SmmInstallConfigurationTable',	hook_SmmInstallConfigurationTable),
 			('SmmIo',							None),
 			('SmmAllocatePool',					hook_SmmAllocatePool),