##\r
# Import Modules\r
#\r
+from __future__ import print_function\r
import re\r
\r
import Fd\r
from Common.BuildToolError import *\r
from Common import EdkLogger\r
from Common.Misc import PathClass\r
-from Common.String import NormPath\r
+from Common.StringUtils import NormPath\r
import Common.GlobalData as GlobalData\r
from Common.Expression import *\r
from Common import GlobalData\r
from Common.DataType import *\r
-from Common.String import ReplaceMacro\r
+from Common.StringUtils import ReplaceMacro\r
import uuid\r
from Common.Misc import tdict\r
from Common.MultipleWorkspace import MultipleWorkspace as mws\r
return MacroDict\r
\r
def __EvaluateConditional(self, Expression, Line, Op = None, Value = None):\r
- FileLineTuple = GetRealFileLine(self.FileName, Line)\r
MacroPcdDict = self.__CollectMacroPcd()\r
if Op == 'eval':\r
try:\r
return ValueExpression(Expression, MacroPcdDict)(True)\r
else:\r
return ValueExpression(Expression, MacroPcdDict)()\r
- except WrnExpression, Excpt:\r
+ except WrnExpression as Excpt:\r
# \r
# Catch expression evaluation warning here. We need to report\r
# the precise number of line and return the evaluation result\r
File=self.FileName, ExtraData=self.__CurrentLine(), \r
Line=Line)\r
return Excpt.result\r
- except Exception, Excpt:\r
+ except Exception as Excpt:\r
if hasattr(Excpt, 'Pcd'):\r
if Excpt.Pcd in GlobalData.gPlatformOtherPcds:\r
Info = GlobalData.gPlatformOtherPcds[Excpt.Pcd]\r
" it must be defined in a [PcdsFixedAtBuild] or [PcdsFeatureFlag] section"\r
" of the DSC file (%s), and it is currently defined in this section:"\r
" %s, line #: %d." % (Excpt.Pcd, GlobalData.gPlatformOtherPcds['DSCFILE'], Info[0], Info[1]),\r
- *FileLineTuple)\r
+ self.FileName, Line)\r
else:\r
raise Warning("PCD (%s) is not defined in DSC file (%s)" % (Excpt.Pcd, GlobalData.gPlatformOtherPcds['DSCFILE']),\r
- *FileLineTuple)\r
+ self.FileName, Line)\r
else:\r
- raise Warning(str(Excpt), *FileLineTuple)\r
+ raise Warning(str(Excpt), self.FileName, Line)\r
else:\r
if Expression.startswith('$(') and Expression[-1] == ')':\r
Expression = Expression[2:-1] \r
\r
@staticmethod\r
def __Verify(Name, Value, Scope):\r
- if Scope in [TAB_UINT64, TAB_UINT8]:\r
- ValueNumber = 0\r
- try:\r
- ValueNumber = int (Value, 0)\r
- except:\r
- EdkLogger.error("FdfParser", FORMAT_INVALID, "The value is not valid dec or hex number for %s." % Name)\r
- if ValueNumber < 0:\r
- EdkLogger.error("FdfParser", FORMAT_INVALID, "The value can't be set to negative value for %s." % Name)\r
- if Scope == TAB_UINT64:\r
- if ValueNumber >= 0x10000000000000000:\r
- EdkLogger.error("FdfParser", FORMAT_INVALID, "Too large value for %s." % Name)\r
- if Scope == TAB_UINT8:\r
- if ValueNumber >= 0x100:\r
- EdkLogger.error("FdfParser", FORMAT_INVALID, "Too large value for %s." % Name)\r
- return True\r
+ # value verification only applies to numeric values.\r
+ if Scope not in TAB_PCD_NUMERIC_TYPES:\r
+ return\r
+\r
+ ValueNumber = 0\r
+ try:\r
+ ValueNumber = int(Value, 0)\r
+ except:\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, "The value is not valid dec or hex number for %s." % Name)\r
+ if ValueNumber < 0:\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, "The value can't be set to negative value for %s." % Name)\r
+ if ValueNumber > MAX_VAL_TYPE[Scope]:\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, "Too large value for %s." % Name)\r
+ return True\r
\r
## __UndoToken() method\r
#\r
\r
try:\r
self.Preprocess()\r
+ self.__GetError()\r
#\r
# Keep processing sections of the FDF until no new sections or a syntax error is found\r
#\r
while self.__GetFd() or self.__GetFv() or self.__GetFmp() or self.__GetCapsule() or self.__GetVtf() or self.__GetRule() or self.__GetOptionRom():\r
pass\r
\r
- except Warning, X:\r
+ except Warning as X:\r
self.__UndoToken()\r
#'\n\tGot Token: \"%s\" from File %s\n' % (self.__Token, FileLineTuple[0]) + \\r
# At this point, the closest parent would be the included file itself\r
\r
return False\r
\r
+ ##__GetError() method\r
+ def __GetError(self):\r
+ #save the Current information\r
+ CurrentLine = self.CurrentLineNumber\r
+ CurrentOffset = self.CurrentOffsetWithinLine\r
+ while self.__GetNextToken():\r
+ if self.__Token == TAB_ERROR:\r
+ EdkLogger.error('FdfParser', ERROR_STATEMENT, self.__CurrentLine().replace(TAB_ERROR, '', 1), File=self.FileName, Line=self.CurrentLineNumber)\r
+ self.CurrentLineNumber = CurrentLine\r
+ self.CurrentOffsetWithinLine = CurrentOffset\r
+\r
## __GetFd() method\r
#\r
# Get FD section contents and store its data into FD dictionary of self.Profile\r
return long(\r
ValueExpression(Expr,\r
self.__CollectMacroPcd()\r
- )(True),0)\r
+ )(True), 0)\r
except Exception:\r
self.SetFileBufferPos(StartPos)\r
return None\r
if not self.__GetNextWord():\r
return True\r
\r
- if not self.__Token in ("SET", "FV", "FILE", "DATA", "CAPSULE", "INF"):\r
+ if not self.__Token in ("SET", BINARY_FILE_TYPE_FV, "FILE", "DATA", "CAPSULE", "INF"):\r
#\r
# If next token is a word which is not a valid FV type, it might be part of [PcdOffset[|PcdSize]]\r
# Or it might be next region's offset described by an expression which starts with a PCD.\r
if not self.__GetNextWord():\r
return True\r
\r
- elif self.__Token == "FV":\r
+ elif self.__Token == BINARY_FILE_TYPE_FV:\r
self.__UndoToken()\r
self.__GetRegionFvType( RegionObj)\r
\r
#\r
def __GetRegionFvType(self, RegionObj):\r
\r
- if not self.__IsKeyword( "FV"):\r
- raise Warning("expected Keyword 'FV'", self.FileName, self.CurrentLineNumber)\r
+ if not self.__IsKeyword( BINARY_FILE_TYPE_FV):\r
+ raise Warning("expected Keyword BINARY_FILE_TYPE_FV", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)\r
\r
- RegionObj.RegionType = "FV"\r
+ RegionObj.RegionType = BINARY_FILE_TYPE_FV\r
RegionObj.RegionDataList.append((self.__Token).upper())\r
\r
- while self.__IsKeyword( "FV"):\r
+ while self.__IsKeyword( BINARY_FILE_TYPE_FV):\r
\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextHexNumber() and not self.__GetNextDecimalNumber():\r
raise Warning("expected Hex FV extension entry type value At Line ", self.FileName, self.CurrentLineNumber)\r
\r
- FvObj.FvExtEntryTypeValue += [self.__Token]\r
+ FvObj.FvExtEntryTypeValue.append(self.__Token)\r
\r
if not self.__IsToken( "{"):\r
raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
if not self.__IsKeyword ("FILE") and not self.__IsKeyword ("DATA"):\r
raise Warning("expected 'FILE' or 'DATA'", self.FileName, self.CurrentLineNumber)\r
\r
- FvObj.FvExtEntryType += [self.__Token]\r
+ FvObj.FvExtEntryType.append(self.__Token)\r
\r
if self.__Token == 'DATA':\r
\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
\r
DataString = DataString.rstrip(",")\r
- FvObj.FvExtEntryData += [DataString]\r
+ FvObj.FvExtEntryData.append(DataString)\r
\r
if self.__Token == 'FILE':\r
\r
if not self.__GetNextToken():\r
raise Warning("expected FV Extension Entry file path At Line ", self.FileName, self.CurrentLineNumber)\r
\r
- FvObj.FvExtEntryData += [self.__Token]\r
+ FvObj.FvExtEntryData.append(self.__Token)\r
\r
if not self.__IsToken( "}"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
if self.__GetStringData():\r
FfsInfObj.Version = self.__Token\r
\r
- if self.__IsKeyword( "UI"):\r
+ if self.__IsKeyword( BINARY_FILE_TYPE_UI):\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
#\r
@staticmethod\r
def __SectionCouldHaveRelocFlag (SectionType):\r
- if SectionType in ('TE', 'PE32'):\r
+ if SectionType in (BINARY_FILE_TYPE_TE, BINARY_FILE_TYPE_PE32):\r
return True\r
else:\r
return False\r
if not self.__GetNextToken():\r
raise Warning("expected File name or section data", self.FileName, self.CurrentLineNumber)\r
\r
- if self.__Token == "FV":\r
+ if self.__Token == BINARY_FILE_TYPE_FV:\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
while True:\r
AlignValue = None\r
if self.__GetAlignment():\r
- if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",\r
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
#For FFS, Auto is default option same to ""\r
FfsFileObj.CheckSum = True\r
\r
if self.__GetAlignment():\r
- if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",\r
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
#For FFS, Auto is default option same to ""\r
\r
AlignValue = None\r
if self.__GetAlignment():\r
- if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",\r
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
VerSectionObj.FileName = self.__Token\r
Obj.SectionList.append(VerSectionObj)\r
\r
- elif self.__IsKeyword( "UI"):\r
+ elif self.__IsKeyword( BINARY_FILE_TYPE_UI):\r
if AlignValue == 'Auto':\r
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
self.SetFileBufferPos(OldPos)\r
return False\r
\r
- if self.__Token not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\\r
- "UI", "VERSION", "PEI_DEPEX", "SUBTYPE_GUID", "SMM_DEPEX"):\r
+ if self.__Token not in ("COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\\r
+ BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, "SUBTYPE_GUID", BINARY_FILE_TYPE_SMM_DEPEX):\r
raise Warning("Unknown section type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
- if AlignValue == 'Auto'and (not self.__Token == 'PE32') and (not self.__Token == 'TE'):\r
+ if AlignValue == 'Auto'and (not self.__Token == BINARY_FILE_TYPE_PE32) and (not self.__Token == BINARY_FILE_TYPE_TE):\r
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
\r
# DataSection\r
\r
AlignValue = None\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",\r
+ if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",\r
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
#\r
def __GetFvStatement(self, CapsuleObj, FMPCapsule = False):\r
\r
- if not self.__IsKeyword("FV"):\r
+ if not self.__IsKeyword(BINARY_FILE_TYPE_FV):\r
return False\r
\r
if not self.__IsToken("="):\r
AfileName = self.__Token\r
AfileBaseName = os.path.basename(AfileName)\r
\r
- if os.path.splitext(AfileBaseName)[1] not in [".bin",".BIN",".Bin",".dat",".DAT",".Dat",".data",".DATA",".Data"]:\r
- raise Warning('invalid binary file type, should be one of "bin","BIN","Bin","dat","DAT","Dat","data","DATA","Data"', \\r
+ if os.path.splitext(AfileBaseName)[1] not in [".bin", ".BIN", ".Bin", ".dat", ".DAT", ".Dat", ".data", ".DATA", ".Data"]:\r
+ raise Warning('invalid binary file type, should be one of "bin",BINARY_FILE_TYPE_BIN,"Bin","dat","DAT","Dat","data","DATA","Data"', \\r
self.FileName, self.CurrentLineNumber)\r
\r
if not os.path.isabs(AfileName):\r
\r
AlignValue = ""\r
if self.__GetAlignment():\r
- if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",\r
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
#For FFS, Auto is default option same to ""\r
\r
SectionName = self.__Token\r
\r
- if SectionName not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\\r
- "UI", "PEI_DEPEX", "VERSION", "SUBTYPE_GUID", "SMM_DEPEX"):\r
+ if SectionName not in ("COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\\r
+ BINARY_FILE_TYPE_UI, BINARY_FILE_TYPE_PEI_DEPEX, "VERSION", "SUBTYPE_GUID", BINARY_FILE_TYPE_SMM_DEPEX):\r
raise Warning("Unknown leaf section name '%s'" % SectionName, self.FileName, self.CurrentLineNumber)\r
\r
\r
\r
SectAlignment = ""\r
if self.__GetAlignment():\r
- if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",\r
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
- if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+ if self.__Token == 'Auto' and (not SectionName == BINARY_FILE_TYPE_PE32) and (not SectionName == BINARY_FILE_TYPE_TE):\r
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
SectAlignment = self.__Token\r
\r
return False\r
SectionName = self.__Token\r
\r
- if SectionName not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\\r
- "UI", "VERSION", "PEI_DEPEX", "GUID", "SMM_DEPEX"):\r
+ if SectionName not in ("COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\\r
+ BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, BINARY_FILE_TYPE_GUID, BINARY_FILE_TYPE_SMM_DEPEX):\r
self.__UndoToken()\r
return False\r
\r
FvImageSectionObj.FvName = None\r
\r
else:\r
- if not self.__IsKeyword("FV"):\r
- raise Warning("expected 'FV'", self.FileName, self.CurrentLineNumber)\r
+ if not self.__IsKeyword(BINARY_FILE_TYPE_FV):\r
+ raise Warning("expected BINARY_FILE_TYPE_FV", self.FileName, self.CurrentLineNumber)\r
FvImageSectionObj.FvFileType = self.__Token\r
\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",\r
+ if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",\r
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
FvImageSectionObj.Alignment = self.__Token\r
if self.__IsToken('|'):\r
FvImageSectionObj.FvFileExtension = self.__GetFileExtension()\r
elif self.__GetNextToken():\r
- if self.__Token not in ("}", "COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\\r
- "UI", "VERSION", "PEI_DEPEX", "GUID", "SMM_DEPEX"):\r
+ if self.__Token not in ("}", "COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\\r
+ BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, BINARY_FILE_TYPE_GUID, BINARY_FILE_TYPE_SMM_DEPEX):\r
FvImageSectionObj.FvFileName = self.__Token\r
else:\r
self.__UndoToken()\r
EfiSectionObj.BuildNum = self.__Token\r
\r
if self.__GetAlignment():\r
- if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K", "128K",\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K", "64K", "128K",\r
"256K", "512K", "1M", "2M", "4M", "8M", "16M"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
- if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+ if self.__Token == 'Auto' and (not SectionName == BINARY_FILE_TYPE_PE32) and (not SectionName == BINARY_FILE_TYPE_TE):\r
raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
EfiSectionObj.Alignment = self.__Token\r
\r
if self.__IsToken('|'):\r
EfiSectionObj.FileExtension = self.__GetFileExtension()\r
elif self.__GetNextToken():\r
- if self.__Token not in ("}", "COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\\r
- "UI", "VERSION", "PEI_DEPEX", "GUID", "SMM_DEPEX"):\r
+ if self.__Token not in ("}", "COMPAT16", BINARY_FILE_TYPE_PE32, BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_TE, "FV_IMAGE", "RAW", BINARY_FILE_TYPE_DXE_DEPEX,\\r
+ BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, BINARY_FILE_TYPE_GUID, BINARY_FILE_TYPE_SMM_DEPEX):\r
\r
if self.__Token.startswith('PCD'):\r
self.__UndoToken()\r
#\r
@staticmethod\r
def __RuleSectionCouldBeOptional(SectionType):\r
- if SectionType in ("DXE_DEPEX", "UI", "VERSION", "PEI_DEPEX", "RAW", "SMM_DEPEX"):\r
+ if SectionType in (BINARY_FILE_TYPE_DXE_DEPEX, BINARY_FILE_TYPE_UI, "VERSION", BINARY_FILE_TYPE_PEI_DEPEX, "RAW", BINARY_FILE_TYPE_SMM_DEPEX):\r
return True\r
else:\r
return False\r
#\r
@staticmethod\r
def __RuleSectionCouldHaveString(SectionType):\r
- if SectionType in ("UI", "VERSION"):\r
+ if SectionType in (BINARY_FILE_TYPE_UI, "VERSION"):\r
return True\r
else:\r
return False\r
if SectionType == "COMPAT16":\r
if FileType not in ("COMPAT16", "SEC_COMPAT16"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "PE32":\r
- if FileType not in ("PE32", "SEC_PE32"):\r
+ elif SectionType == BINARY_FILE_TYPE_PE32:\r
+ if FileType not in (BINARY_FILE_TYPE_PE32, "SEC_PE32"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "PIC":\r
- if FileType not in ("PIC", "PIC"):\r
+ elif SectionType == BINARY_FILE_TYPE_PIC:\r
+ if FileType not in (BINARY_FILE_TYPE_PIC, BINARY_FILE_TYPE_PIC):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "TE":\r
- if FileType not in ("TE", "SEC_TE"):\r
+ elif SectionType == BINARY_FILE_TYPE_TE:\r
+ if FileType not in (BINARY_FILE_TYPE_TE, "SEC_TE"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == "RAW":\r
- if FileType not in ("BIN", "SEC_BIN", "RAW", "ASL", "ACPI"):\r
+ if FileType not in (BINARY_FILE_TYPE_BIN, "SEC_BIN", "RAW", "ASL", "ACPI"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "DXE_DEPEX" or SectionType == "SMM_DEPEX":\r
- if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX", "SMM_DEPEX"):\r
+ elif SectionType == BINARY_FILE_TYPE_DXE_DEPEX or SectionType == BINARY_FILE_TYPE_SMM_DEPEX:\r
+ if FileType not in (BINARY_FILE_TYPE_DXE_DEPEX, "SEC_DXE_DEPEX", BINARY_FILE_TYPE_SMM_DEPEX):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "UI":\r
- if FileType not in ("UI", "SEC_UI"):\r
+ elif SectionType == BINARY_FILE_TYPE_UI:\r
+ if FileType not in (BINARY_FILE_TYPE_UI, "SEC_UI"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == "VERSION":\r
if FileType not in ("VERSION", "SEC_VERSION"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "PEI_DEPEX":\r
- if FileType not in ("PEI_DEPEX", "SEC_PEI_DEPEX"):\r
+ elif SectionType == BINARY_FILE_TYPE_PEI_DEPEX:\r
+ if FileType not in (BINARY_FILE_TYPE_PEI_DEPEX, "SEC_PEI_DEPEX"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "GUID":\r
- if FileType not in ("PE32", "SEC_GUID"):\r
+ elif SectionType == BINARY_FILE_TYPE_GUID:\r
+ if FileType not in (BINARY_FILE_TYPE_PE32, "SEC_GUID"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
\r
## __GetRuleEncapsulationSection() method\r
\r
FfsFileObj = OptRomFileStatement.OptRomFileStatement()\r
\r
- if not self.__IsKeyword("EFI") and not self.__IsKeyword("BIN"):\r
+ if not self.__IsKeyword("EFI") and not self.__IsKeyword(BINARY_FILE_TYPE_BIN):\r
raise Warning("expected Binary type (EFI/BIN)", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.FileType = self.__Token\r
\r
if FdName.upper() in self.Profile.FdDict:\r
FdObj = self.Profile.FdDict[FdName.upper()]\r
for elementRegion in FdObj.RegionList:\r
- if elementRegion.RegionType == 'FV':\r
+ if elementRegion.RegionType == BINARY_FILE_TYPE_FV:\r
for elementRegionData in elementRegion.RegionDataList:\r
if elementRegionData.endswith(".fv"):\r
continue\r
FvInFdList = self.__GetFvInFd(RefFdName)\r
if FvInFdList != []:\r
for FvNameInFd in FvInFdList:\r
- LogStr += "FD %s contains FV %s\n" % (RefFdName,FvNameInFd)\r
+ LogStr += "FD %s contains FV %s\n" % (RefFdName, FvNameInFd)\r
if FvNameInFd not in RefFvStack:\r
RefFvStack.append(FvNameInFd)\r
\r
CapInFdList = self.__GetCapInFd(RefFdName)\r
if CapInFdList != []:\r
for CapNameInFd in CapInFdList:\r
- LogStr += "FD %s contains Capsule %s\n" % (RefFdName,CapNameInFd)\r
+ LogStr += "FD %s contains Capsule %s\n" % (RefFdName, CapNameInFd)\r
if CapNameInFd not in RefCapStack:\r
RefCapStack.append(CapNameInFd)\r
\r
FvInFdList = self.__GetFvInFd(RefFdName)\r
if FvInFdList != []:\r
for FvNameInFd in FvInFdList:\r
- LogStr += "FD %s contains FV %s\n" % (RefFdName,FvNameInFd)\r
+ LogStr += "FD %s contains FV %s\n" % (RefFdName, FvNameInFd)\r
if FvNameInFd not in RefFvList:\r
RefFvList.append(FvNameInFd)\r
\r
import sys\r
try:\r
test_file = sys.argv[1]\r
- except IndexError, v:\r
- print "Usage: %s filename" % sys.argv[0]\r
+ except IndexError as v:\r
+ print("Usage: %s filename" % sys.argv[0])\r
sys.exit(1)\r
\r
parser = FdfParser(test_file)\r
try:\r
parser.ParseFile()\r
parser.CycleReferenceCheck()\r
- except Warning, X:\r
- print str(X)\r
+ except Warning as X:\r
+ print(str(X))\r
else:\r
- print "Success!"\r
+ print("Success!")\r
\r
projects / mirror_edk2.git / blobdiff