## @file\r
# process FFS generation from INF statement\r
#\r
-# Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
# Copyright (c) 2014-2016 Hewlett-Packard Development Company, L.P.<BR>\r
#\r
# This program and the accompanying materials\r
import Common.GlobalData as GlobalData\r
from DepexSection import DepexSection\r
from Common.Misc import SaveFileOnChange\r
+from Common.Expression import *\r
+from Common.DataType import *\r
\r
## generate FFS from INF\r
#\r
#\r
class FfsInfStatement(FfsInfStatementClassObject):\r
- ## The mapping dictionary from datum type to its maximum number.\r
- _MAX_SIZE_TYPE = {"BOOLEAN":0x01, "UINT8":0xFF, "UINT16":0xFFFF, "UINT32":0xFFFFFFFF, "UINT64":0xFFFFFFFFFFFFFFFF}\r
## The constructor\r
#\r
# @param self The object pointer\r
InfLowerPath = str(PathClassObj).lower()\r
if self.OverrideGuid:\r
PathClassObj = ProcessDuplicatedInf(PathClassObj, self.OverrideGuid, GenFdsGlobalVariable.WorkSpaceDir)\r
- if self.CurrentArch != None:\r
+ if self.CurrentArch is not None:\r
\r
Inf = GenFdsGlobalVariable.WorkSpace.BuildObject[PathClassObj, self.CurrentArch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
#\r
self.BaseName = Inf.BaseName\r
self.ModuleGuid = Inf.Guid\r
self.ModuleType = Inf.ModuleType\r
- if Inf.Specification != None and 'PI_SPECIFICATION_VERSION' in Inf.Specification:\r
+ if Inf.Specification is not None and 'PI_SPECIFICATION_VERSION' in Inf.Specification:\r
self.PiSpecVersion = Inf.Specification['PI_SPECIFICATION_VERSION']\r
if Inf.AutoGenVersion < 0x00010005:\r
self.ModuleType = Inf.ComponentType\r
self.VersionString = Inf.Version\r
self.BinFileList = Inf.Binaries\r
self.SourceFileList = Inf.Sources\r
- if self.KeepReloc == None and Inf.Shadow:\r
+ if self.KeepReloc is None and Inf.Shadow:\r
self.ShadowFromInfFile = Inf.Shadow\r
\r
else:\r
- Inf = GenFdsGlobalVariable.WorkSpace.BuildObject[PathClassObj, 'COMMON', GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
+ Inf = GenFdsGlobalVariable.WorkSpace.BuildObject[PathClassObj, TAB_COMMON, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
self.BaseName = Inf.BaseName\r
self.ModuleGuid = Inf.Guid\r
self.ModuleType = Inf.ModuleType\r
- if Inf.Specification != None and 'PI_SPECIFICATION_VERSION' in Inf.Specification:\r
+ if Inf.Specification is not None and 'PI_SPECIFICATION_VERSION' in Inf.Specification:\r
self.PiSpecVersion = Inf.Specification['PI_SPECIFICATION_VERSION']\r
self.VersionString = Inf.Version\r
self.BinFileList = Inf.Binaries\r
if self.ModuleType == 'MM_CORE_STANDALONE' and int(self.PiSpecVersion, 16) < 0x00010032:\r
EdkLogger.error("GenFds", FORMAT_NOT_SUPPORTED, "MM_CORE_STANDALONE module type can't be used in the module with PI_SPECIFICATION_VERSION less than 0x00010032", File=self.InfFileName)\r
\r
- if Inf._Defs != None and len(Inf._Defs) > 0:\r
+ if Inf._Defs is not None and len(Inf._Defs) > 0:\r
self.OptRomDefs.update(Inf._Defs)\r
\r
self.PatchPcds = []\r
if GlobalData.BuildOptionPcd:\r
for pcd in GlobalData.BuildOptionPcd:\r
if PcdKey == (pcd[1], pcd[0]):\r
- DefaultValue = pcd[2]\r
+ if pcd[2]:\r
+ continue\r
+ DefaultValue = pcd[3]\r
BuildOptionOverride = True\r
break\r
\r
if not DscOverride and not FdfOverride and not BuildOptionOverride:\r
continue\r
+\r
+ # Support Flexible PCD format\r
+ if DefaultValue:\r
+ try:\r
+ DefaultValue = ValueExpressionEx(DefaultValue, Pcd.DatumType, Platform._GuidDict)(True)\r
+ except BadExpression:\r
+ EdkLogger.error("GenFds", GENFDS_ERROR, 'PCD [%s.%s] Value "%s"' %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, DefaultValue), File=self.InfFileName)\r
+\r
+ if Pcd.InfDefaultValue:\r
+ try:\r
+ Pcd.InfDefaultValue = ValueExpressionEx(Pcd.InfDefaultValue, Pcd.DatumType, Platform._GuidDict)(True)\r
+ except BadExpression:\r
+ EdkLogger.error("GenFds", GENFDS_ERROR, 'PCD [%s.%s] Value "%s"' %(Pcd.TokenSpaceGuidCName, Pcd.TokenCName, Pcd.DefaultValue),File=self.InfFileName)\r
+\r
# Check value, if value are equal, no need to patch\r
if Pcd.DatumType == "VOID*":\r
- if Pcd.DefaultValue == DefaultValue or DefaultValue in [None, '']:\r
+ if Pcd.InfDefaultValue == DefaultValue or DefaultValue in [None, '']:\r
continue\r
# Get the string size from FDF or DSC\r
if DefaultValue[0] == 'L':\r
Pcd.MaxDatumSize = PatchPcd.MaxDatumSize\r
# If no defined the maximum size in DSC, try to get current size from INF\r
if Pcd.MaxDatumSize in ['', None]:\r
- Pcd.MaxDatumSize = str(len(Pcd.DefaultValue.split(',')))\r
+ Pcd.MaxDatumSize = str(len(Pcd.InfDefaultValue.split(',')))\r
else:\r
Base1 = Base2 = 10\r
- if Pcd.DefaultValue.upper().startswith('0X'):\r
+ if Pcd.InfDefaultValue.upper().startswith('0X'):\r
Base1 = 16\r
if DefaultValue.upper().startswith('0X'):\r
Base2 = 16\r
try:\r
- PcdValueInImg = int(Pcd.DefaultValue, Base1)\r
+ PcdValueInImg = int(Pcd.InfDefaultValue, Base1)\r
PcdValueInDscOrFdf = int(DefaultValue, Base2)\r
if PcdValueInImg == PcdValueInDscOrFdf:\r
continue\r
EdkLogger.error("GenFds", GENFDS_ERROR, "The size of VOID* type PCD '%s.%s' exceeds its maximum size %d bytes." \\r
% (Pcd.TokenSpaceGuidCName, Pcd.TokenCName, int(MaxDatumSize) - int(Pcd.MaxDatumSize)))\r
else:\r
- if PcdValueInDscOrFdf > FfsInfStatement._MAX_SIZE_TYPE[Pcd.DatumType] \\r
- or PcdValueInImg > FfsInfStatement._MAX_SIZE_TYPE[Pcd.DatumType]:\r
+ if PcdValueInDscOrFdf > MAX_VAL_TYPE[Pcd.DatumType] \\r
+ or PcdValueInImg > MAX_VAL_TYPE[Pcd.DatumType]:\r
EdkLogger.error("GenFds", GENFDS_ERROR, "The size of %s type PCD '%s.%s' doesn't match its data type." \\r
% (Pcd.DatumType, Pcd.TokenSpaceGuidCName, Pcd.TokenCName))\r
self.PatchPcds.append((Pcd, DefaultValue))\r
# Allow binary type module not specify override rule in FDF file.\r
# \r
if len(self.BinFileList) > 0:\r
- if self.Rule == None or self.Rule == "":\r
+ if self.Rule is None or self.Rule == "":\r
self.Rule = "BINARY"\r
\r
if not IsMakefile and GenFdsGlobalVariable.EnableGenfdsMultiThread and self.Rule != 'BINARY':\r
# For the rule only has simpleFile\r
#\r
MakefilePath = None\r
+ if self.IsBinaryModule:\r
+ IsMakefile = False\r
if IsMakefile:\r
MakefilePath = self.InfFileName, Arch\r
- if isinstance (Rule, RuleSimpleFile.RuleSimpleFile) :\r
+ if isinstance (Rule, RuleSimpleFile.RuleSimpleFile):\r
SectionOutputList = self.__GenSimpleFileSection__(Rule, IsMakefile=IsMakefile)\r
FfsOutput = self.__GenSimpleFileFfs__(Rule, SectionOutputList, MakefilePath=MakefilePath)\r
return FfsOutput\r
#\r
def __GetRule__ (self) :\r
CurrentArchList = []\r
- if self.CurrentArch == None:\r
+ if self.CurrentArch is None:\r
CurrentArchList = ['common']\r
else:\r
CurrentArchList.append(self.CurrentArch)\r
CurrentArch.upper() + \\r
'.' + \\r
self.ModuleType.upper()\r
- if self.Rule != None:\r
+ if self.Rule is not None:\r
RuleName = RuleName + \\r
'.' + \\r
self.Rule.upper()\r
\r
Rule = GenFdsGlobalVariable.FdfParser.Profile.RuleDict.get(RuleName)\r
- if Rule != None:\r
+ if Rule is not None:\r
GenFdsGlobalVariable.VerboseLogger ("Want To Find Rule Name is : " + RuleName)\r
return Rule\r
\r
RuleName = 'RULE' + \\r
'.' + \\r
- 'COMMON' + \\r
+ TAB_COMMON + \\r
'.' + \\r
self.ModuleType.upper()\r
\r
- if self.Rule != None:\r
+ if self.Rule is not None:\r
RuleName = RuleName + \\r
'.' + \\r
self.Rule.upper()\r
GenFdsGlobalVariable.VerboseLogger ('Trying to apply common rule %s for INF %s' % (RuleName, self.InfFileName))\r
\r
Rule = GenFdsGlobalVariable.FdfParser.Profile.RuleDict.get(RuleName)\r
- if Rule != None:\r
+ if Rule is not None:\r
GenFdsGlobalVariable.VerboseLogger ("Want To Find Rule Name is : " + RuleName)\r
return Rule\r
\r
- if Rule == None :\r
+ if Rule is None :\r
EdkLogger.error("GenFds", GENFDS_ERROR, 'Don\'t Find common rule %s for INF %s' \\r
% (RuleName, self.InfFileName))\r
\r
DscArchList = []\r
for Arch in GenFdsGlobalVariable.ArchList :\r
PlatformDataBase = GenFdsGlobalVariable.WorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
- if PlatformDataBase != None:\r
+ if PlatformDataBase is not None:\r
if InfFileKey in PlatformDataBase.Modules:\r
DscArchList.append (Arch)\r
else:\r
# the file name FILE_GUIDmodule.inf, then PlatformDataBase.Modules use FILE_GUIDmodule.inf as key,\r
# but the path (self.MetaFile.Path) is the real path\r
#\r
- for key in PlatformDataBase.Modules.keys():\r
+ for key in PlatformDataBase.Modules:\r
if InfFileKey == str((PlatformDataBase.Modules[key]).MetaFile.Path):\r
DscArchList.append (Arch)\r
break\r
ArchList = CurArchList\r
\r
UseArchList = TargetArchList\r
- if self.UseArch != None:\r
+ if self.UseArch is not None:\r
UseArchList = []\r
UseArchList.append(self.UseArch)\r
ArchList = list(set (UseArchList) & set (ArchList))\r
if self.OverrideGuid:\r
FileName = self.OverrideGuid\r
Arch = "NoneArch"\r
- if self.CurrentArch != None:\r
+ if self.CurrentArch is not None:\r
Arch = self.CurrentArch\r
\r
OutputPath = os.path.join(GenFdsGlobalVariable.OutputDirDict[Arch],\r
FileList = []\r
OutputFileList = []\r
GenSecInputFile = None\r
- if Rule.FileName != None:\r
+ if Rule.FileName is not None:\r
GenSecInputFile = self.__ExtendMacro__(Rule.FileName)\r
if os.path.isabs(GenSecInputFile):\r
GenSecInputFile = os.path.normpath(GenSecInputFile)\r
EdkLogger.error("GenFds", FORMAT_NOT_SUPPORTED, "Framework SMM module doesn't support SMM_DEPEX section type", File=self.InfFileName)\r
NoStrip = True\r
if self.ModuleType in ('SEC', 'PEI_CORE', 'PEIM'):\r
- if self.KeepReloc != None:\r
+ if self.KeepReloc is not None:\r
NoStrip = self.KeepReloc\r
- elif Rule.KeepReloc != None:\r
+ elif Rule.KeepReloc is not None:\r
NoStrip = Rule.KeepReloc\r
- elif self.ShadowFromInfFile != None:\r
+ elif self.ShadowFromInfFile is not None:\r
NoStrip = self.ShadowFromInfFile\r
\r
if FileList != [] :\r
InputSection.append(InputFile)\r
SectionAlignments.append(Rule.SectAlignment)\r
\r
- if Rule.NameGuid != None and Rule.NameGuid.startswith('PCD('):\r
+ if Rule.NameGuid is not None and Rule.NameGuid.startswith('PCD('):\r
PcdValue = GenFdsGlobalVariable.GetPcdValue(Rule.NameGuid)\r
if len(PcdValue) == 0:\r
EdkLogger.error("GenFds", GENFDS_ERROR, '%s NOT defined.' \\r
#\r
def __GenComplexFileSection__(self, Rule, FvChildAddr, FvParentAddr, IsMakefile = False):\r
if self.ModuleType in ('SEC', 'PEI_CORE', 'PEIM'):\r
- if Rule.KeepReloc != None:\r
+ if Rule.KeepReloc is not None:\r
self.KeepRelocFromRule = Rule.KeepReloc\r
SectFiles = []\r
SectAlignments = []\r
Sect.FvAddr = FvChildAddr.pop(0)\r
elif isinstance(Sect, GuidSection):\r
Sect.FvAddr = FvChildAddr\r
- if FvParentAddr != None and isinstance(Sect, GuidSection):\r
+ if FvParentAddr is not None and isinstance(Sect, GuidSection):\r
Sect.FvParentAddr = FvParentAddr\r
\r
if Rule.KeyStringList != []:\r
if VfrUniOffsetList:\r
UniVfrOffsetFileName = os.path.join(self.OutputPath, self.BaseName + '.offset')\r
UniVfrOffsetFileSection = os.path.join(self.OutputPath, self.BaseName + 'Offset' + '.raw')\r
- self.__GenUniVfrOffsetFile (VfrUniOffsetList, UniVfrOffsetFileName)\r
+ FfsInfStatement.__GenUniVfrOffsetFile (VfrUniOffsetList, UniVfrOffsetFileName)\r
UniVfrOffsetFileNameList = []\r
UniVfrOffsetFileNameList.append(UniVfrOffsetFileName)\r
"""Call GenSection"""\r
#\r
def __GenComplexFileFfs__(self, Rule, InputFile, Alignments, MakefilePath = None):\r
\r
- if Rule.NameGuid != None and Rule.NameGuid.startswith('PCD('):\r
+ if Rule.NameGuid is not None and Rule.NameGuid.startswith('PCD('):\r
PcdValue = GenFdsGlobalVariable.GetPcdValue(Rule.NameGuid)\r
if len(PcdValue) == 0:\r
EdkLogger.error("GenFds", GENFDS_ERROR, '%s NOT defined.' \\r
)\r
return FfsOutput\r
\r
- ## __GetGenFfsCmdParameter__() method\r
- #\r
- # Create parameter string for GenFfs\r
- #\r
- # @param self The object pointer\r
- # @param Rule The rule object used to generate section\r
- # @retval tuple (FileType, Fixed, CheckSum, Alignment)\r
- #\r
- def __GetGenFfsCmdParameter__(self, Rule):\r
- result = tuple()\r
- result += ('-t', Ffs.Ffs.FdfFvFileTypeToFileType[Rule.FvFileType])\r
- if Rule.Fixed != False:\r
- result += ('-x',)\r
- if Rule.CheckSum != False:\r
- result += ('-s',)\r
-\r
- if Rule.Alignment != None and Rule.Alignment != '':\r
- result += ('-a', Rule.Alignment)\r
-\r
- return result\r
- \r
## __GetBuildOutputMapFileVfrUniInfo() method\r
#\r
# Find the offset of UNI/INF object offset in the EFI image file.\r
#\r
# Generate the offset file for the module which contain VFR or UNI file.\r
#\r
- # @param self The object pointer\r
# @param VfrUniOffsetList A list contain the VFR/UNI offsets in the EFI image file.\r
# @param UniVfrOffsetFileName The output offset file name.\r
#\r
- def __GenUniVfrOffsetFile(self, VfrUniOffsetList, UniVfrOffsetFileName):\r
+ @staticmethod\r
+ def __GenUniVfrOffsetFile(VfrUniOffsetList, UniVfrOffsetFileName):\r
\r
# Use a instance of StringIO to cache data\r
fStringIO = StringIO.StringIO('') \r
projects / mirror_edk2.git / blobdiff