from Common.Misc import SaveFileOnChange\r
from Common.Misc import GuidStructureByteArrayToGuidString\r
from Common.Misc import GuidStructureStringToGuidString\r
-from Common.InfClassObject import gComponentType2ModuleType\r
from Common.BuildToolError import FILE_WRITE_FAILURE\r
from Common.BuildToolError import CODE_ERROR\r
from Common.BuildToolError import COMMAND_FAILURE\r
import Common.GlobalData as GlobalData\r
from AutoGen.AutoGen import ModuleAutoGen\r
from Common.Misc import PathClass\r
-from Common.String import NormPath\r
+from Common.StringUtils import NormPath\r
from Common.DataType import *\r
import collections\r
from Common.Expression import *\r
\r
## The look up table to map PCD type to pair of report display type and DEC type\r
gPcdTypeMap = {\r
- 'FixedAtBuild' : ('FIXED', 'FixedAtBuild'),\r
- 'PatchableInModule': ('PATCH', 'PatchableInModule'),\r
- 'FeatureFlag' : ('FLAG', 'FeatureFlag'),\r
- 'Dynamic' : ('DYN', 'Dynamic'),\r
- 'DynamicHii' : ('DYNHII', 'Dynamic'),\r
- 'DynamicVpd' : ('DYNVPD', 'Dynamic'),\r
- 'DynamicEx' : ('DEX', 'DynamicEx'),\r
- 'DynamicExHii' : ('DEXHII', 'DynamicEx'),\r
- 'DynamicExVpd' : ('DEXVPD', 'DynamicEx'),\r
+ TAB_PCDS_FIXED_AT_BUILD : ('FIXED', TAB_PCDS_FIXED_AT_BUILD),\r
+ TAB_PCDS_PATCHABLE_IN_MODULE: ('PATCH', TAB_PCDS_PATCHABLE_IN_MODULE),\r
+ TAB_PCDS_FEATURE_FLAG : ('FLAG', TAB_PCDS_FEATURE_FLAG),\r
+ TAB_PCDS_DYNAMIC : ('DYN', TAB_PCDS_DYNAMIC),\r
+ TAB_PCDS_DYNAMIC_HII : ('DYNHII', TAB_PCDS_DYNAMIC),\r
+ TAB_PCDS_DYNAMIC_VPD : ('DYNVPD', TAB_PCDS_DYNAMIC),\r
+ TAB_PCDS_DYNAMIC_EX : ('DEX', TAB_PCDS_DYNAMIC_EX),\r
+ TAB_PCDS_DYNAMIC_EX_HII : ('DEXHII', TAB_PCDS_DYNAMIC_EX),\r
+ TAB_PCDS_DYNAMIC_EX_VPD : ('DEXVPD', TAB_PCDS_DYNAMIC_EX),\r
}\r
\r
## The look up table to map module type to driver type\r
gDriverTypeMap = {\r
- 'SEC' : '0x3 (SECURITY_CORE)',\r
- 'PEI_CORE' : '0x4 (PEI_CORE)',\r
- 'PEIM' : '0x6 (PEIM)',\r
- 'DXE_CORE' : '0x5 (DXE_CORE)',\r
- 'DXE_DRIVER' : '0x7 (DRIVER)',\r
- 'DXE_SAL_DRIVER' : '0x7 (DRIVER)',\r
- 'DXE_SMM_DRIVER' : '0x7 (DRIVER)',\r
- 'DXE_RUNTIME_DRIVER': '0x7 (DRIVER)',\r
- 'UEFI_DRIVER' : '0x7 (DRIVER)',\r
- 'UEFI_APPLICATION' : '0x9 (APPLICATION)',\r
- 'SMM_CORE' : '0xD (SMM_CORE)',\r
+ SUP_MODULE_SEC : '0x3 (SECURITY_CORE)',\r
+ SUP_MODULE_PEI_CORE : '0x4 (PEI_CORE)',\r
+ SUP_MODULE_PEIM : '0x6 (PEIM)',\r
+ SUP_MODULE_DXE_CORE : '0x5 (DXE_CORE)',\r
+ SUP_MODULE_DXE_DRIVER : '0x7 (DRIVER)',\r
+ SUP_MODULE_DXE_SAL_DRIVER : '0x7 (DRIVER)',\r
+ SUP_MODULE_DXE_SMM_DRIVER : '0x7 (DRIVER)',\r
+ SUP_MODULE_DXE_RUNTIME_DRIVER: '0x7 (DRIVER)',\r
+ SUP_MODULE_UEFI_DRIVER : '0x7 (DRIVER)',\r
+ SUP_MODULE_UEFI_APPLICATION : '0x9 (APPLICATION)',\r
+ SUP_MODULE_SMM_CORE : '0xD (SMM_CORE)',\r
'SMM_DRIVER' : '0xA (SMM)', # Extension of module type to support PI 1.1 SMM drivers\r
- 'MM_STANDALONE' : '0xE (MM_STANDALONE)',\r
- 'MM_CORE_STANDALONE' : '0xF (MM_CORE_STANDALONE)'\r
+ SUP_MODULE_MM_STANDALONE : '0xE (MM_STANDALONE)',\r
+ SUP_MODULE_MM_CORE_STANDALONE : '0xF (MM_CORE_STANDALONE)'\r
}\r
\r
## The look up table of the supported opcode in the dependency expression binaries\r
FileName = "Protocol/%(Key)s/%(Key)s.h" % {"Key" : Key}\r
elif "PPI" in Type:\r
FileName = "Ppi/%(Key)s/%(Key)s.h" % {"Key" : Key}\r
- elif "GUID" in Type:\r
+ elif TAB_GUID in Type:\r
FileName = "Guid/%(Key)s/%(Key)s.h" % {"Key" : Key}\r
else:\r
continue\r
Statement = gOpCodeList[struct.unpack("B", OpCode)[0]]\r
if Statement in ["BEFORE", "AFTER", "PUSH"]:\r
GuidValue = "%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X" % \\r
- struct.unpack("=LHHBBBBBBBB", DepexFile.read(16))\r
+ struct.unpack(PACK_PATTERN_GUID, DepexFile.read(16))\r
GuidString = self._GuidDb.get(GuidValue, GuidValue)\r
Statement = "%s %s" % (Statement, GuidString)\r
DepexStatement.append(Statement)\r
self._DepexFileName = os.path.join(M.BuildDir, "OUTPUT", M.Module.BaseName + ".depex")\r
ModuleType = M.ModuleType\r
if not ModuleType:\r
- ModuleType = gComponentType2ModuleType.get(M.ComponentType, "")\r
+ ModuleType = COMPONENT_TO_MODULE_MAP_DICT.get(M.ComponentType, "")\r
\r
- if ModuleType in ["SEC", "PEI_CORE", "DXE_CORE", "SMM_CORE", "MM_CORE_STANDALONE", "UEFI_APPLICATION"]:\r
+ if ModuleType in [SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_DXE_CORE, SUP_MODULE_SMM_CORE, SUP_MODULE_MM_CORE_STANDALONE, SUP_MODULE_UEFI_APPLICATION]:\r
return\r
\r
for Source in M.SourceFileList:\r
if not M.IsLibrary:\r
ModuleType = M.ModuleType\r
if not ModuleType:\r
- ModuleType = gComponentType2ModuleType.get(M.ComponentType, "")\r
+ ModuleType = COMPONENT_TO_MODULE_MAP_DICT.get(M.ComponentType, "")\r
#\r
# If a module complies to PI 1.1, promote Module type to "SMM_DRIVER"\r
#\r
- if ModuleType == "DXE_SMM_DRIVER":\r
+ if ModuleType == SUP_MODULE_DXE_SMM_DRIVER:\r
PiSpec = M.Module.Specification.get("PI_SPECIFICATION_VERSION", "0x00010000")\r
if int(PiSpec, 0) >= 0x0001000A:\r
ModuleType = "SMM_DRIVER"\r
Pcd = Pa.Platform.Pcds[item]\r
if not Pcd.Type:\r
# check the Pcd in FDF file, whether it is used in module first\r
- for T in ["FixedAtBuild", "PatchableInModule", "FeatureFlag", "Dynamic", "DynamicEx"]:\r
+ for T in PCD_TYPE_LIST:\r
PcdList = self.AllPcds.setdefault(Pcd.TokenSpaceGuidCName, {}).setdefault(T, [])\r
if Pcd in PcdList:\r
Pcd.Type = T\r
if not Pcd.Type:\r
PcdTypeFlag = False\r
for package in Pa.PackageList:\r
- for T in ["FixedAtBuild", "PatchableInModule", "FeatureFlag", "Dynamic", "DynamicEx"]:\r
+ for T in PCD_TYPE_LIST:\r
if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, T) in package.Pcds:\r
Pcd.Type = T\r
PcdTypeFlag = True\r
if not Pcd.DatumType:\r
PcdType = Pcd.Type\r
# Try to remove Hii and Vpd suffix\r
- if PcdType.startswith("DynamicEx"):\r
- PcdType = "DynamicEx"\r
- elif PcdType.startswith("Dynamic"):\r
- PcdType = "Dynamic"\r
+ if PcdType.startswith(TAB_PCDS_DYNAMIC_EX):\r
+ PcdType = TAB_PCDS_DYNAMIC_EX\r
+ elif PcdType.startswith(TAB_PCDS_DYNAMIC):\r
+ PcdType = TAB_PCDS_DYNAMIC\r
for package in Pa.PackageList:\r
if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, PcdType) in package.Pcds:\r
Pcd.DatumType = package.Pcds[(Pcd.TokenCName, Pcd.TokenSpaceGuidCName, PcdType)].DatumType\r
for PcdItem in GlobalData.gConditionalPcds:\r
if '.' in PcdItem:\r
(TokenSpaceGuidCName, TokenCName) = PcdItem.split('.')\r
- if (TokenCName, TokenSpaceGuidCName) in Pa.Platform.Pcds.keys():\r
+ if (TokenCName, TokenSpaceGuidCName) in Pa.Platform.Pcds:\r
Pcd = Pa.Platform.Pcds[(TokenCName, TokenSpaceGuidCName)]\r
PcdList = self.ConditionalPcds.setdefault(Pcd.TokenSpaceGuidCName, {}).setdefault(Pcd.Type, [])\r
if Pcd not in PcdList:\r
self.DscPcdDefault[(TokenCName, TokenSpaceGuidCName)] = DscDefaultValue\r
\r
def GenerateReport(self, File, ModulePcdSet):\r
- if self.ConditionalPcds:\r
- self.GenerateReportDetail(File, ModulePcdSet, 1)\r
- if self.UnusedPcds:\r
- self.GenerateReportDetail(File, ModulePcdSet, 2)\r
+ if not ModulePcdSet:\r
+ if self.ConditionalPcds:\r
+ self.GenerateReportDetail(File, ModulePcdSet, 1)\r
+ if self.UnusedPcds:\r
+ self.GenerateReportDetail(File, ModulePcdSet, 2)\r
self.GenerateReportDetail(File, ModulePcdSet)\r
\r
##\r
elif ReportSubType == 2:\r
PcdDict = self.UnusedPcds\r
\r
- if ModulePcdSet is None:\r
+ if not ModulePcdSet:\r
FileWrite(File, gSectionStart)\r
if ReportSubType == 1:\r
FileWrite(File, "Conditional Directives used by the build system")\r
if (Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Type) not in ModulePcdSet:\r
continue\r
InfDefault, PcdValue = ModulePcdSet[Pcd.TokenCName, Pcd.TokenSpaceGuidCName, Type]\r
+ Pcd.DefaultValue = PcdValue\r
if InfDefault == "":\r
InfDefault = None\r
\r
First = False\r
\r
\r
- if Pcd.DatumType in ('UINT8', 'UINT16', 'UINT32', 'UINT64'):\r
+ if Pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES:\r
PcdValueNumber = int(PcdValue.strip(), 0)\r
if DecDefaultValue is None:\r
DecMatch = True\r
DscMatch = (DscDefaultValue.strip() == PcdValue.strip())\r
\r
IsStructure = False\r
- if GlobalData.gStructurePcd and (self.Arch in GlobalData.gStructurePcd.keys()) and ((Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.gStructurePcd[self.Arch]):\r
+ if GlobalData.gStructurePcd and (self.Arch in GlobalData.gStructurePcd) and ((Pcd.TokenCName, Pcd.TokenSpaceGuidCName) in GlobalData.gStructurePcd[self.Arch]):\r
IsStructure = True\r
if TypeName in ('DYNVPD', 'DEXVPD'):\r
SkuInfoList = Pcd.SkuInfoList\r
ModuleOverride = self.ModulePcdOverride.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName), {})\r
for ModulePath in ModuleOverride:\r
ModuleDefault = ModuleOverride[ModulePath]\r
- if Pcd.DatumType in ('UINT8', 'UINT16', 'UINT32', 'UINT64'):\r
+ if Pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES:\r
ModulePcdDefaultValueNumber = int(ModuleDefault.strip(), 0)\r
Match = (ModulePcdDefaultValueNumber == PcdValueNumber)\r
else:\r
# their source code to find PPI/Protocol produce or consume\r
# information.\r
#\r
- if Module.ModuleType == "BASE":\r
+ if Module.ModuleType == SUP_MODULE_BASE:\r
continue\r
#\r
# Add module referenced source files\r
if Wa.FdfProfile:\r
for Fd in Wa.FdfProfile.FdDict:\r
for FdRegion in Wa.FdfProfile.FdDict[Fd].RegionList:\r
- if FdRegion.RegionType != "FV":\r
+ if FdRegion.RegionType != BINARY_FILE_TYPE_FV:\r
continue\r
for FvName in FdRegion.RegionDataList:\r
if FvName in self._FvList:\r
# If the input FdRegion is not a firmware volume,\r
# we are done.\r
#\r
- if self.Type != "FV":\r
+ if self.Type != BINARY_FILE_TYPE_FV:\r
return\r
\r
#\r
FileWrite(File, "Type: %s" % Type)\r
FileWrite(File, "Base Address: 0x%X" % BaseAddress)\r
\r
- if self.Type == "FV":\r
+ if self.Type == BINARY_FILE_TYPE_FV:\r
FvTotalSize = 0\r
FvTakenSize = 0\r
FvFreeSize = 0\r
if (len(self.FvList) > 0):\r
for FvItem in self.FvList:\r
Info = self.FvInfo[FvItem]\r
- self._GenerateReport(File, Info[0], "FV", Info[1], Info[2], FvItem)\r
+ self._GenerateReport(File, Info[0], TAB_FV_DIRECTORY, Info[1], Info[2], FvItem)\r
else:\r
self._GenerateReport(File, "FD Region", self.Type, self.BaseAddress, self.Size)\r
\r
self.BaseAddress = Fd.BaseAddress\r
self.Size = Fd.Size\r
self.FdRegionList = [FdRegionReport(FdRegion, Wa) for FdRegion in Fd.RegionList]\r
- self.FvPath = os.path.join(Wa.BuildDir, "FV")\r
+ self.FvPath = os.path.join(Wa.BuildDir, TAB_FV_DIRECTORY)\r
self.VpdFilePath = os.path.join(self.FvPath, "%s.map" % Wa.Platform.VpdToolGuid)\r
self.VPDBaseAddress = 0\r
self.VPDSize = 0\r
projects / mirror_edk2.git / blobdiff