# Routines for generating AutoGen.h and AutoGen.c\r
#\r
# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution. The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
#\r
\r
## Import Modules\r
gLibraryStructorCall = {\r
SUP_MODULE_BASE : TemplateString("""${BEGIN}\r
Status = ${Function} ();\r
- ASSERT_EFI_ERROR (Status);${END}\r
+ ASSERT_RETURN_ERROR (Status);${END}\r
"""),\r
\r
'PEI' : TemplateString("""${BEGIN}\r
VOID\r
)\r
{\r
-${BEGIN} EFI_STATUS Status;\r
+${BEGIN} RETURN_STATUS Status;\r
${FunctionCall}${END}\r
}\r
"""),\r
gBasicHeaderFile = "Base.h"\r
\r
gModuleTypeHeaderFile = {\r
- SUP_MODULE_BASE : [gBasicHeaderFile],\r
+ SUP_MODULE_BASE : [gBasicHeaderFile, "Library/DebugLib.h"],\r
SUP_MODULE_SEC : ["PiPei.h", "Library/DebugLib.h"],\r
SUP_MODULE_PEI_CORE : ["PiPei.h", "Library/DebugLib.h", "Library/PeiCoreEntryPoint.h"],\r
SUP_MODULE_PEIM : ["PiPei.h", "Library/DebugLib.h", "Library/PeimEntryPoint.h"],\r
SUP_MODULE_SMM_CORE : ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiDriverEntryPoint.h"],\r
SUP_MODULE_MM_STANDALONE : ["PiMm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/StandaloneMmDriverEntryPoint.h"],\r
SUP_MODULE_MM_CORE_STANDALONE : ["PiMm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/StandaloneMmCoreEntryPoint.h"],\r
- SUP_MODULE_USER_DEFINED : [gBasicHeaderFile]\r
+ SUP_MODULE_USER_DEFINED : [gBasicHeaderFile, "Library/DebugLib.h"]\r
}\r
\r
## Autogen internal worker macro to define DynamicEx PCD name includes both the TokenSpaceGuidName\r
try:\r
if Value.upper().endswith('L'):\r
Value = Value[:-1]\r
+ if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 1 and Value.lstrip('0'):\r
+ Value = Value.lstrip('0')\r
ValueNumber = int (Value, 0)\r
except:\r
EdkLogger.error("build", AUTOGEN_ERROR,\r
else:\r
NewValue = NewValue + str(ord(Value[Index]) % 0x100) + ', '\r
if Unicode:\r
- ArraySize = ArraySize / 2\r
+ ArraySize = ArraySize // 2\r
Value = NewValue + '0 }'\r
if ArraySize < ValueSize:\r
if Pcd.MaxSizeUserSet:\r
else:\r
ArraySize = Pcd.GetPcdSize()\r
if Unicode:\r
- ArraySize = ArraySize / 2\r
+ ArraySize = ArraySize // 2\r
Array = '[%d]' % ArraySize\r
#\r
# skip casting for fixed at build since it breaks ARM assembly.\r
if Lib.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:\r
ConstructorPrototypeString.Append(gLibraryStructorPrototype[SUP_MODULE_BASE].Replace(Dict))\r
ConstructorCallingString.Append(gLibraryStructorCall[SUP_MODULE_BASE].Replace(Dict))\r
- elif Lib.ModuleType in SUP_MODULE_SET_PEI:\r
- ConstructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))\r
- ConstructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))\r
- elif Lib.ModuleType in [SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER,\r
- SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEFI_DRIVER, SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_SMM_CORE]:\r
- ConstructorPrototypeString.Append(gLibraryStructorPrototype['DXE'].Replace(Dict))\r
- ConstructorCallingString.Append(gLibraryStructorCall['DXE'].Replace(Dict))\r
- elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CORE_STANDALONE]:\r
- ConstructorPrototypeString.Append(gLibraryStructorPrototype['MM'].Replace(Dict))\r
- ConstructorCallingString.Append(gLibraryStructorCall['MM'].Replace(Dict))\r
+ if Info.ModuleType not in [SUP_MODULE_BASE, SUP_MODULE_USER_DEFINED]:\r
+ if Lib.ModuleType in SUP_MODULE_SET_PEI:\r
+ ConstructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))\r
+ ConstructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))\r
+ elif Lib.ModuleType in [SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER,\r
+ SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEFI_DRIVER, SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_SMM_CORE]:\r
+ ConstructorPrototypeString.Append(gLibraryStructorPrototype['DXE'].Replace(Dict))\r
+ ConstructorCallingString.Append(gLibraryStructorCall['DXE'].Replace(Dict))\r
+ elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CORE_STANDALONE]:\r
+ ConstructorPrototypeString.Append(gLibraryStructorPrototype['MM'].Replace(Dict))\r
+ ConstructorCallingString.Append(gLibraryStructorCall['MM'].Replace(Dict))\r
\r
if str(ConstructorPrototypeString) == '':\r
ConstructorPrototypeList = []\r
if Info.IsLibrary:\r
AutoGenH.Append("${BEGIN}${FunctionPrototype}${END}", Dict)\r
else:\r
- if Info.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:\r
+ if Info.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC, SUP_MODULE_USER_DEFINED]:\r
AutoGenC.Append(gLibraryString[SUP_MODULE_BASE].Replace(Dict))\r
elif Info.ModuleType in SUP_MODULE_SET_PEI:\r
AutoGenC.Append(gLibraryString['PEI'].Replace(Dict))\r
if Lib.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:\r
DestructorPrototypeString.Append(gLibraryStructorPrototype[SUP_MODULE_BASE].Replace(Dict))\r
DestructorCallingString.Append(gLibraryStructorCall[SUP_MODULE_BASE].Replace(Dict))\r
- elif Lib.ModuleType in SUP_MODULE_SET_PEI:\r
- DestructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))\r
- DestructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))\r
- elif Lib.ModuleType in [SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER,\r
- SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEFI_DRIVER, SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_SMM_CORE]:\r
- DestructorPrototypeString.Append(gLibraryStructorPrototype['DXE'].Replace(Dict))\r
- DestructorCallingString.Append(gLibraryStructorCall['DXE'].Replace(Dict))\r
- elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CORE_STANDALONE]:\r
- DestructorPrototypeString.Append(gLibraryStructorPrototype['MM'].Replace(Dict))\r
- DestructorCallingString.Append(gLibraryStructorCall['MM'].Replace(Dict))\r
+ if Info.ModuleType not in [SUP_MODULE_BASE, SUP_MODULE_USER_DEFINED]:\r
+ if Lib.ModuleType in SUP_MODULE_SET_PEI:\r
+ DestructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))\r
+ DestructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))\r
+ elif Lib.ModuleType in [SUP_MODULE_DXE_CORE, SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER,\r
+ SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_UEFI_DRIVER, SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_SMM_CORE]:\r
+ DestructorPrototypeString.Append(gLibraryStructorPrototype['DXE'].Replace(Dict))\r
+ DestructorCallingString.Append(gLibraryStructorCall['DXE'].Replace(Dict))\r
+ elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CORE_STANDALONE]:\r
+ DestructorPrototypeString.Append(gLibraryStructorPrototype['MM'].Replace(Dict))\r
+ DestructorCallingString.Append(gLibraryStructorCall['MM'].Replace(Dict))\r
\r
if str(DestructorPrototypeString) == '':\r
DestructorPrototypeList = []\r
if Info.IsLibrary:\r
AutoGenH.Append("${BEGIN}${FunctionPrototype}${END}", Dict)\r
else:\r
- if Info.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:\r
+ if Info.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC, SUP_MODULE_USER_DEFINED]:\r
AutoGenC.Append(gLibraryString[SUP_MODULE_BASE].Replace(Dict))\r
elif Info.ModuleType in SUP_MODULE_SET_PEI:\r
AutoGenC.Append(gLibraryString['PEI'].Replace(Dict))\r
# @param AutoGenH The TemplateString object for header file\r
#\r
def CreateModuleUnloadImageCode(Info, AutoGenC, AutoGenH):\r
- if Info.IsLibrary or Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_SEC]:\r
+ if Info.IsLibrary or Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE, SUP_MODULE_SEC]:\r
return\r
#\r
# Unload Image Handlers\r
TempBuffer += Buffer\r
elif File.Ext.upper() == '.JPG':\r
ImageType, = struct.unpack('4s', Buffer[6:10])\r
- if ImageType != 'JFIF':\r
+ if ImageType != b'JFIF':\r
EdkLogger.error("build", FILE_TYPE_MISMATCH, "The file %s is not a standard JPG file." % File.Path)\r
TempBuffer = pack('B', EFI_HII_IIBT_IMAGE_JPEG)\r
TempBuffer += pack('I', len(Buffer))\r
\r
def BmpImageDecoder(File, Buffer, PaletteIndex, TransParent):\r
ImageType, = struct.unpack('2s', Buffer[0:2])\r
- if ImageType!= 'BM': # BMP file type is 'BM'\r
+ if ImageType!= b'BM': # BMP file type is 'BM'\r
EdkLogger.error("build", FILE_TYPE_MISMATCH, "The file %s is not a standard BMP file." % File.Path)\r
BMP_IMAGE_HEADER = collections.namedtuple('BMP_IMAGE_HEADER', ['bfSize', 'bfReserved1', 'bfReserved2', 'bfOffBits', 'biSize', 'biWidth', 'biHeight', 'biPlanes', 'biBitCount', 'biCompression', 'biSizeImage', 'biXPelsPerMeter', 'biYPelsPerMeter', 'biClrUsed', 'biClrImportant'])\r
BMP_IMAGE_HEADER_STRUCT = struct.Struct('IHHIIIIHHIIIIII')\r
else:\r
ImageBuffer = pack('B', EFI_HII_IIBT_IMAGE_1BIT)\r
ImageBuffer += pack('B', PaletteIndex)\r
- Width = (BmpHeader.biWidth + 7)/8\r
+ Width = (BmpHeader.biWidth + 7)//8\r
if BmpHeader.bfOffBits > BMP_IMAGE_HEADER_STRUCT.size + 2:\r
PaletteBuffer = Buffer[BMP_IMAGE_HEADER_STRUCT.size + 2 : BmpHeader.bfOffBits]\r
elif BmpHeader.biBitCount == 4:\r
else:\r
ImageBuffer = pack('B', EFI_HII_IIBT_IMAGE_4BIT)\r
ImageBuffer += pack('B', PaletteIndex)\r
- Width = (BmpHeader.biWidth + 1)/2\r
+ Width = (BmpHeader.biWidth + 1)//2\r
if BmpHeader.bfOffBits > BMP_IMAGE_HEADER_STRUCT.size + 2:\r
PaletteBuffer = Buffer[BMP_IMAGE_HEADER_STRUCT.size + 2 : BmpHeader.bfOffBits]\r
elif BmpHeader.biBitCount == 8:\r
for Index in range(0, len(PaletteBuffer)):\r
if Index % 4 == 3:\r
continue\r
- PaletteTemp += PaletteBuffer[Index]\r
+ PaletteTemp += PaletteBuffer[Index:Index+1]\r
PaletteBuffer = PaletteTemp[1:]\r
return ImageBuffer, PaletteBuffer\r
\r
if Guid in Info.Module.GetGuidsUsedByPcd():\r
continue\r
GuidMacros.append('#define %s %s' % (Guid, Info.Module.Guids[Guid]))\r
- for Guid, Value in Info.Module.Protocols.items() + Info.Module.Ppis.items():\r
+ for Guid, Value in list(Info.Module.Protocols.items()) + list(Info.Module.Ppis.items()):\r
GuidMacros.append('#define %s %s' % (Guid, Value))\r
# supports FixedAtBuild and FeaturePcd usage in VFR file\r
if Info.VfrFileList and Info.ModulePcdList:\r
projects / mirror_edk2.git / blobdiff