## @file\r
# parse FDF file\r
#\r
-# Copyright (c) 2007, Intel Corporation\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
#\r
-# All rights reserved. This program and the accompanying materials\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
# Import Modules\r
#\r
import re\r
-import os\r
+import Common.LongFilePathOs as os\r
\r
import CommonDataClass.FdfClass\r
+from Common.LongFilePathSupport import OpenLongFilePath as open\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
+from Common.RangeExpression import RangeExpression\r
+from Common.GlobalData import *\r
+import string\r
\r
##define T_CHAR_SPACE ' '\r
##define T_CHAR_NULL '\0'\r
# All Macro values when parsing file, not replace existing Macro\r
AllMacroList = []\r
\r
+FileExtensionPattern = re.compile(r'([a-zA-Z][a-zA-Z0-9]*)')\r
+TokenFindPattern = re.compile(r'([a-zA-Z0-9\-]+|\$\(TARGET\)|\*)_([a-zA-Z0-9\-]+|\$\(TOOL_CHAIN_TAG\)|\*)_([a-zA-Z0-9\-]+|\$\(ARCH\)|\*)')\r
+\r
def GetRealFileLine (File, Line):\r
\r
InsertedLines = 0\r
# @param File The FDF name\r
# @param Line The Line number that error occurs\r
#\r
- def __init__(self, Str, File = None, Line = None):\r
- \r
+ def __init__(self, Str, File=None, Line=None):\r
+\r
FileLineTuple = GetRealFileLine(File, Line)\r
self.FileName = FileLineTuple[0]\r
self.LineNumber = FileLineTuple[1]\r
if Profile.FileName == File and Profile.MacroName == Name and Profile.DefinedAtLine <= Line:\r
Value = Profile.MacroValue\r
\r
- if Value != None:\r
+ if Value is not None:\r
Str = Str.replace('$(' + Name + ')', Value)\r
MacroEnd = MacroStart + len(Value) \r
\r
else:\r
raise Warning("Macro not complete At Line ", self.FileName, self.CurrentLineNumber)\r
return Str\r
- \r
- def __ReplaceFragment(self, StartPos, EndPos, Value = ' '):\r
+\r
+ def __ReplaceFragment(self, StartPos, EndPos, Value=' '):\r
if StartPos[0] == EndPos[0]:\r
Offset = StartPos[1]\r
while Offset <= EndPos[1]:\r
while Offset <= EndPos[1]:\r
self.Profile.FileLinesList[EndPos[0]][Offset] = Value\r
Offset += 1\r
- \r
+\r
+\r
+ def __GetMacroName(self):\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+ MacroName = self.__Token\r
+ NotFlag = False\r
+ if MacroName.startswith('!'):\r
+ NotFlag = True\r
+ MacroName = MacroName[1:].strip()\r
+ \r
+ if not MacroName.startswith('$(') or not MacroName.endswith(')'):\r
+ raise Warning("Macro name expected(Please use '$(%(Token)s)' if '%(Token)s' is a macro.)" % {"Token" : MacroName},\r
+ self.FileName, self.CurrentLineNumber)\r
+ MacroName = MacroName[2:-1]\r
+ return MacroName, NotFlag\r
\r
## PreprocessFile() method\r
#\r
IncFileName = self.__Token\r
if not os.path.isabs(IncFileName):\r
if IncFileName.startswith('$(WORKSPACE)'):\r
- Str = IncFileName.replace('$(WORKSPACE)', os.environ.get('WORKSPACE'))\r
+ Str = mws.handleWsMacro(IncFileName)\r
+ Str = Str.replace('$(WORKSPACE)', os.environ.get('WORKSPACE'))\r
if os.path.exists(Str):\r
if not os.path.isabs(Str):\r
Str = os.path.abspath(Str)\r
# file is in the same dir with FDF file\r
FullFdf = self.FileName\r
if not os.path.isabs(self.FileName):\r
- FullFdf = os.path.join(os.environ.get('WORKSPACE'), self.FileName)\r
+ FullFdf = mws.join(os.environ.get('WORKSPACE'), self.FileName)\r
\r
IncFileName = os.path.join(os.path.dirname(FullFdf), IncFileName)\r
\r
IfList.append([IfStartPos, None, None])\r
CondLabel = self.__Token\r
\r
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name At Line ", self.FileName, self.CurrentLineNumber)\r
- MacroName = self.__Token\r
- NotFlag = False\r
- if MacroName.startswith('!'):\r
- NotFlag = True\r
- MacroName = MacroName[1:]\r
-\r
+ MacroName, NotFlag = self.__GetMacroName() \r
NotDefineFlag = False\r
if CondLabel == '!ifndef':\r
NotDefineFlag = True\r
self.__WipeOffArea.append((IfList[-1][0], ElseStartPos))\r
IfList[-1] = [ElseStartPos, True, IfList[-1][2]]\r
if self.__Token == '!elseif':\r
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name At Line ", self.FileName, self.CurrentLineNumber)\r
- MacroName = self.__Token\r
- NotFlag = False\r
- if MacroName.startswith('!'):\r
- NotFlag = True\r
- MacroName = MacroName[1:]\r
-\r
+ MacroName, NotFlag = self.__GetMacroName() \r
if not self.__GetNextOp():\r
raise Warning("expected !endif At Line ", self.FileName, self.CurrentLineNumber)\r
\r
FileLineTuple = GetRealFileLine(self.FileName, Line)\r
if Name in InputMacroDict:\r
MacroValue = InputMacroDict[Name]\r
- if Op == None:\r
- if Value == 'Bool' and MacroValue == None or MacroValue.upper() == 'FALSE':\r
+ if Op is None:\r
+ if Value == 'Bool' and MacroValue is None or MacroValue.upper() == 'FALSE':\r
return False\r
return True\r
elif Op == '!=':\r
else:\r
return False\r
else:\r
- if (self.__IsHex(Value) or Value.isdigit()) and (self.__IsHex(MacroValue) or (MacroValue != None and MacroValue.isdigit())):\r
+ if (self.__IsHex(Value) or Value.isdigit()) and (self.__IsHex(MacroValue) or (MacroValue is not None and MacroValue.isdigit())):\r
InputVal = long(Value, 0)\r
MacroVal = long(MacroValue, 0)\r
if Op == '>':\r
\r
for Profile in AllMacroList:\r
if Profile.FileName == FileLineTuple[0] and Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:\r
- if Op == None:\r
- if Value == 'Bool' and Profile.MacroValue == None or Profile.MacroValue.upper() == 'FALSE':\r
+ if Op is None:\r
+ if Value == 'Bool' and Profile.MacroValue is None or Profile.MacroValue.upper() == 'FALSE':\r
return False\r
return True\r
elif Op == '!=':\r
else:\r
return False\r
else:\r
- if (self.__IsHex(Value) or Value.isdigit()) and (self.__IsHex(Profile.MacroValue) or (Profile.MacroValue != None and Profile.MacroValue.isdigit())):\r
+ if (self.__IsHex(Value) or Value.isdigit()) and (self.__IsHex(Profile.MacroValue) or (Profile.MacroValue is not None and Profile.MacroValue.isdigit())):\r
InputVal = long(Value, 0)\r
MacroVal = long(Profile.MacroValue, 0)\r
if Op == '>':\r
\r
if not self.__GetNextToken():\r
return False\r
- p = re.compile('[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}')\r
- if p.match(self.__Token) != None:\r
+ if gGuidPattern.match(self.__Token) is not None:\r
return True\r
else:\r
self.__UndoToken()\r
\r
self.__GetOneChar()\r
\r
- ## __HexDigit() method\r
- #\r
- # Whether char input is a Hex data bit\r
- #\r
- # @param self The object pointer\r
- # @param TempChar The char to test\r
- # @retval True The char is a Hex data bit\r
- # @retval False The char is NOT a Hex data bit\r
- #\r
- def __HexDigit(self, TempChar):\r
- if (TempChar >= 'a' and TempChar <= 'f') or (TempChar >= 'A' and TempChar <= 'F') \\r
- or (TempChar >= '0' and TempChar <= '9'):\r
- return True\r
- else:\r
- return False\r
- \r
def __IsHex(self, HexStr):\r
if not HexStr.upper().startswith("0X"):\r
return False\r
if len(self.__Token) <= 2:\r
return False\r
- charList = [c for c in HexStr[2 : ] if not self.__HexDigit( c)]\r
- if len(charList) == 0:\r
- return True\r
- else:\r
- return False \r
+ return True if all(x in string.hexdigits for x in HexStr[2:]) else False\r
+\r
## __GetNextHexNumber() method\r
#\r
# Get next HEX data before a seperator\r
def __GetBlockStatements(self, Obj):\r
\r
if not self.__GetBlockStatement(Obj):\r
- raise Warning("expected block statement At Line ", self.FileName, self.CurrentLineNumber)\r
- \r
+ #set default block size is 1\r
+ Obj.BlockSizeList.append((1, Obj.Size, None))\r
+ return True\r
+\r
while self.__GetBlockStatement(Obj):\r
pass\r
+ \r
+ for Item in Obj.BlockSizeList:\r
+ if Item[0] is None or Item[1] is None:\r
+ raise Warning("expected block statement for Fd Section", self.FileName, self.CurrentLineNumber)\r
+\r
return True\r
\r
## __GetBlockStatement() method\r
if not self.__GetNextWord():\r
return True\r
\r
- if not self.__Token in ("SET", "FV", "FILE", "DATA"):\r
+ if not self.__Token in ("SET", "FV", "FILE", "DATA", "CAPSULE"):\r
self.__UndoToken()\r
RegionObj.PcdOffset = self.__GetNextPcdName()\r
self.Profile.PcdDict[RegionObj.PcdOffset] = RegionObj.Offset + long(Fd.BaseAddress, 0)\r
if not self.__GetNextWord():\r
return True\r
\r
- if self.__Token == "FV":\r
+ elif self.__Token == "FV":\r
self.__UndoToken()\r
self.__GetRegionFvType( RegionObj)\r
\r
+ elif self.__Token == "CAPSULE":\r
+ self.__UndoToken()\r
+ self.__GetRegionCapType( RegionObj)\r
+\r
elif self.__Token == "FILE":\r
self.__UndoToken()\r
self.__GetRegionFileType( RegionObj)\r
raise Warning("expected FV name At Line ", self.FileName, self.CurrentLineNumber)\r
\r
RegionObj.RegionDataList.append(self.__Token)\r
- \r
+\r
+ ## __GetRegionCapType() method\r
+ #\r
+ # Get region capsule data for region\r
+ #\r
+ # @param self The object pointer\r
+ # @param RegionObj for whom region data is got\r
+ #\r
+ def __GetRegionCapType(self, RegionObj):\r
+\r
+ if not self.__IsKeyword("CAPSULE"):\r
+ raise Warning("expected Keyword 'CAPSULE' at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '=' at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected CAPSULE name at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ RegionObj.RegionType = "CAPSULE"\r
+ RegionObj.RegionDataList.append(self.__Token)\r
+\r
+ while self.__IsKeyword("CAPSULE"):\r
+\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '=' at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected CAPSULE name at line", self.FileName, self.CurrentLineNumber)\r
+\r
+ RegionObj.RegionDataList.append(self.__Token)\r
+\r
## __GetRegionFileType() method\r
#\r
# Get region file data for region\r
if not self.__GetNextHexNumber():\r
raise Warning("expected Hex byte At Line ", self.FileName, self.CurrentLineNumber)\r
\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long At Line ", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 18:\r
+ raise Warning("Hex string can't be converted to a valid UINT64 value", self.FileName, self.CurrentLineNumber)\r
\r
DataString = self.__Token\r
DataString += ","\r
if not self.__GetNextHexNumber():\r
raise Warning("expected Hex byte At Line ", self.FileName, self.CurrentLineNumber)\r
\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long At Line ", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 18:\r
+ raise Warning("Hex string can't be converted to a valid UINT64 value", self.FileName, self.CurrentLineNumber)\r
\r
DataString = self.__Token\r
DataString += ","\r
\r
\r
if self.__GetNextToken():\r
- p = re.compile(r'([a-zA-Z0-9\-]+|\$\(TARGET\)|\*)_([a-zA-Z0-9\-]+|\$\(TOOL_CHAIN_TAG\)|\*)_([a-zA-Z0-9\-]+|\$\(ARCH\)|\*)')\r
- if p.match(self.__Token):\r
+ if TokenFindPattern.match(self.__Token):\r
FfsInfObj.KeyStringList.append(self.__Token)\r
if not self.__IsToken(","):\r
return\r
return\r
\r
while self.__GetNextToken():\r
- if not p.match(self.__Token):\r
+ if not TokenFindPattern.match(self.__Token):\r
raise Warning("expected KeyString \"Target_Tag_Arch\" At Line ", self.FileName, self.CurrentLineNumber)\r
FfsInfObj.KeyStringList.append(self.__Token)\r
\r
def __GetFileOpts(self, FfsFileObj):\r
\r
if self.__GetNextToken():\r
- Pattern = re.compile(r'([a-zA-Z0-9\-]+|\$\(TARGET\)|\*)_([a-zA-Z0-9\-]+|\$\(TOOL_CHAIN_TAG\)|\*)_([a-zA-Z0-9\-]+|\$\(ARCH\)|\*)')\r
- if Pattern.match(self.__Token):\r
+ if TokenFindPattern.match(self.__Token):\r
FfsFileObj.KeyStringList.append(self.__Token)\r
if self.__IsToken(","):\r
while self.__GetNextToken():\r
- if not Pattern.match(self.__Token):\r
+ if not TokenFindPattern.match(self.__Token):\r
raise Warning("expected KeyString \"Target_Tag_Arch\" At Line ", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.KeyStringList.append(self.__Token)\r
\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
+ "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
BuildNum = None\r
BuildNum = self.__Token\r
\r
if self.__IsKeyword( "VERSION"):\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
raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
Obj.SectionList.append(VerSectionObj)\r
\r
elif self.__IsKeyword( "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
raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
Obj.SectionList.append(UiSectionObj)\r
\r
elif self.__IsKeyword( "FV_IMAGE"):\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
raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextWord():\r
\r
FvImageSectionObj = CommonDataClass.FdfClass.FvImageSectionClassObject()\r
FvImageSectionObj.Alignment = AlignValue\r
- if FvObj != None:\r
+ if FvObj is not None:\r
FvImageSectionObj.Fv = FvObj\r
FvImageSectionObj.FvName = None\r
else:\r
\r
Obj.SectionList.append(FvImageSectionObj) \r
\r
- elif self.__IsKeyword("PEI_DEPEX_EXP") or self.__IsKeyword("DXE_DEPEX_EXP"):\r
+ elif self.__IsKeyword("PEI_DEPEX_EXP") or self.__IsKeyword("DXE_DEPEX_EXP") or self.__IsKeyword("SMM_DEPEX_EXP"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
DepexSectionObj = CommonDataClass.FdfClass.DepexSectionClassObject()\r
DepexSectionObj.Alignment = AlignValue\r
DepexSectionObj.DepexType = self.__Token\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
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
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
# DataSection\r
DataSectionObj = CommonDataClass.FdfClass.DataSectionClassObject()\r
DataSectionObj.Alignment = AlignValue\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
+ "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
if not self.__GetCglSection(FfsFileObj, AlignValue):\r
raise Warning("expected '.' At Line ", self.FileName, self.CurrentLineNumber)\r
\r
Arch = self.__SkippedChars.rstrip(".")\r
- if Arch.upper() not in ("IA32", "X64", "IPF", "EBC", "ARM", "COMMON"):\r
- raise Warning("Unknown Arch At line ", self.FileName, self.CurrentLineNumber)\r
+ if Arch.upper() not in ("IA32", "X64", "IPF", "EBC", "ARM", "AARCH64", "COMMON"):\r
+ raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber)\r
\r
ModuleType = self.__GetModuleType()\r
\r
"DXE_SMM_DRIVER", "DXE_RUNTIME_DRIVER", \\r
"UEFI_DRIVER", "UEFI_APPLICATION", "USER_DEFINED", "DEFAULT", "BASE", \\r
"SECURITY_CORE", "COMBINED_PEIM_DRIVER", "PIC_PEIM", "RELOCATABLE_PEIM", \\r
- "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_RT_DRIVER", "APPLICATION"):\r
+ "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_RT_DRIVER", "APPLICATION", "ACPITABLE", "SMM_CORE", "MM_STANDALONE", "MM_CORE_STANDALONE"):\r
raise Warning("Unknown Module type At line ", self.FileName, self.CurrentLineNumber)\r
return self.__Token\r
\r
\r
Ext = ""\r
if self.__GetNextToken():\r
- Pattern = re.compile(r'([a-zA-Z][a-zA-Z0-9]*)')\r
- if Pattern.match(self.__Token):\r
+ if FileExtensionPattern.match(self.__Token):\r
Ext = self.__Token \r
return '.' + Ext \r
else:\r
raise Warning("expected FILE At Line ", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__GetNextWord():\r
- raise Warning("expected FV type At Line ", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("expected FFS type At Line ", self.FileName, self.CurrentLineNumber)\r
\r
Type = self.__Token.strip().upper()\r
if Type not in ("RAW", "FREEFORM", "SEC", "PEI_CORE", "PEIM",\\r
- "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLICATION", "FV_IMAGE"):\r
+ "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLICATION", "FV_IMAGE", "SMM", "SMM_CORE", "MM_STANDALONE"):\r
raise Warning("Unknown FV type At line ", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__IsToken("="):\r
\r
KeyStringList = []\r
if self.__GetNextToken():\r
- Pattern = re.compile(r'([a-zA-Z0-9\-]+|\$\(TARGET\)|\*)_([a-zA-Z0-9\-]+|\$\(TOOL_CHAIN_TAG\)|\*)_([a-zA-Z0-9\-]+|\$\(ARCH\)|\*)')\r
- if Pattern.match(self.__Token):\r
+ if TokenFindPattern.match(self.__Token):\r
KeyStringList.append(self.__Token)\r
if self.__IsToken(","):\r
while self.__GetNextToken():\r
- if not Pattern.match(self.__Token):\r
+ if not TokenFindPattern.match(self.__Token):\r
raise Warning("expected KeyString \"Target_Tag_Arch\" At Line ", self.FileName, self.CurrentLineNumber)\r
KeyStringList.append(self.__Token)\r
\r
\r
AlignValue = ""\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\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 At Line ", self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
Rule.CheckSum = CheckSum\r
Rule.Fixed = Fixed\r
Rule.KeyStringList = KeyStringList\r
- if KeepReloc != None:\r
+ if KeepReloc is not None:\r
Rule.KeepReloc = KeepReloc\r
\r
while True:\r
Rule.Fixed = Fixed\r
Rule.FileExtension = Ext\r
Rule.KeyStringList = KeyStringList\r
- if KeepReloc != None:\r
+ if KeepReloc is not None:\r
Rule.KeepReloc = KeepReloc\r
\r
return Rule\r
CheckSum = True\r
\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\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 At Line ", self.FileName, self.CurrentLineNumber)\r
+ if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
if not self.__GetNextToken():\r
Rule.Fixed = Fixed\r
Rule.FileName = self.__Token\r
Rule.KeyStringList = KeyStringList\r
- if KeepReloc != None:\r
+ if KeepReloc is not None:\r
Rule.KeepReloc = KeepReloc\r
return Rule\r
\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"):\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 At Line ", self.FileName, self.CurrentLineNumber)\r
FvImageSectionObj.Alignment = self.__Token\r
\r
- if self.__IsKeyword("FV"):\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"):\r
- raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)\r
- FvImageSectionObj.Alignment = self.__Token\r
- \r
if self.__IsToken('|'):\r
FvImageSectionObj.FvFileExtension = self.__GetFileExtension()\r
elif self.__GetNextToken():\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
+ "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
+ 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.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'):\r
EfiSectionObj.KeepReloc = False\r
else:\r
EfiSectionObj.KeepReloc = True\r
- if Obj.KeepReloc != None and Obj.KeepReloc != EfiSectionObj.KeepReloc:\r
+ if Obj.KeepReloc is not None and Obj.KeepReloc != EfiSectionObj.KeepReloc:\r
raise Warning("Section type %s has reloc strip flag conflict with Rule At Line %d" % (EfiSectionObj.SectionType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber)\r
else:\r
raise Warning("Section type %s could not have reloc strip flag At Line %d" % (EfiSectionObj.SectionType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber)\r
elif SectionType == "RAW":\r
if FileType not in ("BIN", "SEC_BIN", "RAW", "ASL", "ACPI"):\r
raise Warning("Incorrect section file type At Line ", self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "DXE_DEPEX":\r
- if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX"):\r
+ elif SectionType == "DXE_DEPEX" or SectionType == "SMM_DEPEX":\r
+ if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX", "SMM_DEPEX"):\r
raise Warning("Incorrect section file type At Line ", self.FileName, self.CurrentLineNumber)\r
elif SectionType == "UI":\r
if FileType not in ("UI", "SEC_UI"):\r
raise Warning("expected '.' At Line ", self.FileName, self.CurrentLineNumber)\r
\r
Arch = self.__SkippedChars.rstrip(".").upper()\r
- if Arch not in ("IA32", "X64", "IPF", "ARM"):\r
+ if Arch not in ("IA32", "X64", "IPF", "ARM", "AARCH64"):\r
raise Warning("Unknown Arch At line ", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__GetNextWord():\r
if self.__IsToken(","):\r
if not self.__GetNextWord():\r
raise Warning("expected Arch list At Line ", self.FileName, self.CurrentLineNumber)\r
- if self.__Token.upper() not in ("IA32", "X64", "IPF", "ARM"):\r
+ if self.__Token.upper() not in ("IA32", "X64", "IPF", "ARM", "AARCH64"):\r
raise Warning("Unknown Arch At line ", self.FileName, self.CurrentLineNumber)\r
VtfObj.ArchList = self.__Token.upper()\r
\r
raise Warning("expected Component type At Line ", self.FileName, self.CurrentLineNumber)\r
if self.__Token not in ("FIT", "PAL_B", "PAL_A", "OEM"):\r
if not self.__Token.startswith("0x") or len(self.__Token) < 3 or len(self.__Token) > 4 or \\r
- not self.__HexDigit(self.__Token[2]) or not self.__HexDigit(self.__Token[-1]):\r
+ not self.__Token[2] in string.hexdigits or not self.__Token[-1] in string.hexdigits:\r
raise Warning("Unknown location type At line ", self.FileName, self.CurrentLineNumber)\r
CompStatementObj.CompType = self.__Token\r
\r
raise Warning("expected Component version At Line ", self.FileName, self.CurrentLineNumber)\r
\r
Pattern = re.compile('-$|[0-9]{0,1}[0-9]{1}\.[0-9]{0,1}[0-9]{1}')\r
- if Pattern.match(self.__Token) == None:\r
+ if Pattern.match(self.__Token) is None:\r
raise Warning("Unknown version format At line ", self.FileName, self.CurrentLineNumber)\r
CompStatementObj.CompVer = self.__Token\r
\r
for elementRegion in FdObj.RegionList:\r
if elementRegion.RegionType == 'FV':\r
for elementRegionData in elementRegion.RegionDataList:\r
- if elementRegionData != None and elementRegionData.upper() not in FvList:\r
+ if elementRegionData is not None and elementRegionData.upper() not in FvList:\r
FvList.append(elementRegionData.upper())\r
return FvList\r
\r
\r
for FfsObj in FvObj.FfsList:\r
if isinstance(FfsObj, FfsFileStatement.FileStatement):\r
- if FfsObj.FvName != None and FfsObj.FvName.upper() not in RefFvList:\r
+ if FfsObj.FvName is not None and FfsObj.FvName.upper() not in RefFvList:\r
RefFvList.append(FfsObj.FvName.upper())\r
- elif FfsObj.FdName != None and FfsObj.FdName.upper() not in RefFdList:\r
+ elif FfsObj.FdName is not None and FfsObj.FdName.upper() not in RefFdList:\r
RefFdList.append(FfsObj.FdName.upper())\r
else:\r
self.__GetReferencedFdFvTupleFromSection(FfsObj, RefFdList, RefFvList) \r
while SectionStack != []:\r
SectionObj = SectionStack.pop()\r
if isinstance(SectionObj, FvImageSection.FvImageSection):\r
- if SectionObj.FvName != None and SectionObj.FvName.upper() not in FvList:\r
+ if SectionObj.FvName is not None and SectionObj.FvName.upper() not in FvList:\r
FvList.append(SectionObj.FvName.upper())\r
- if SectionObj.Fv != None and SectionObj.Fv.UiFvName != None and SectionObj.Fv.UiFvName.upper() not in FvList:\r
+ if SectionObj.Fv is not None and SectionObj.Fv.UiFvName is not None and SectionObj.Fv.UiFvName.upper() not in FvList:\r
FvList.append(SectionObj.Fv.UiFvName.upper())\r
self.__GetReferencedFdFvTuple(SectionObj.Fv, FdList, FvList)\r
\r
return CycleRefExists\r
\r
if __name__ == "__main__":\r
- parser = FdfParser("..\LakeportX64Pkg.fdf")\r
+ import sys\r
+ try:\r
+ test_file = sys.argv[1]\r
+ except IndexError, 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