## @file\r
# parse FDF file\r
#\r
-# Copyright (c) 2007 - 2010, Intel Corporation\r
+# Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2015, Hewlett Packard Enterprise Development, L.P.<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
##\r
# Import Modules\r
#\r
+from __future__ import print_function\r
+import re\r
+\r
import Fd\r
import Region\r
import Fv\r
import OptionRom\r
import OptRomInfStatement\r
import OptRomFileStatement\r
+import string\r
\r
from GenFdsGlobalVariable import GenFdsGlobalVariable\r
from Common.BuildToolError import *\r
from Common import EdkLogger\r
-\r
-import re\r
-import os\r
+from Common.Misc import PathClass\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.StringUtils import ReplaceMacro\r
+import uuid\r
+from Common.Misc import tdict\r
+from Common.MultipleWorkspace import MultipleWorkspace as mws\r
+import Common.LongFilePathOs as os\r
+from Common.LongFilePathSupport import OpenLongFilePath as open\r
+from Capsule import EFI_CERT_TYPE_PKCS7_GUID\r
+from Capsule import EFI_CERT_TYPE_RSA2048_SHA256_GUID\r
+from Common.RangeExpression import RangeExpression\r
\r
##define T_CHAR_SPACE ' '\r
##define T_CHAR_NULL '\0'\r
\r
SEPERATOR_TUPLE = ('=', '|', ',', '{', '}')\r
\r
-IncludeFileList = []\r
-# Macro passed from command line, which has greatest priority and can NOT be overridden by those in FDF\r
-InputMacroDict = {}\r
-# All Macro values when parsing file, not replace existing Macro\r
-AllMacroList = []\r
+RegionSizePattern = re.compile("\s*(?P<base>(?:0x|0X)?[a-fA-F0-9]+)\s*\|\s*(?P<size>(?:0x|0X)?[a-fA-F0-9]+)\s*")\r
+RegionSizeGuidPattern = re.compile("\s*(?P<base>\w+\.\w+[\.\w\[\]]*)\s*\|\s*(?P<size>\w+\.\w+[\.\w\[\]]*)\s*")\r
+RegionOffsetPcdPattern = re.compile("\s*(?P<base>\w+\.\w+[\.\w\[\]]*)\s*$")\r
+ShortcutPcdPattern = re.compile("\s*\w+\s*=\s*(?P<value>(?:0x|0X)?[a-fA-F0-9]+)\s*\|\s*(?P<name>\w+\.\w+)\s*")\r
+BaseAddrValuePattern = re.compile('^0[xX][0-9a-fA-F]+')\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
+AllIncludeFileList = []\r
+\r
+# Get the closest parent\r
+def GetParentAtLine (Line):\r
+ for Profile in AllIncludeFileList:\r
+ if Profile.IsLineInFile(Line):\r
+ return Profile\r
+ return None\r
+\r
+# Check include loop\r
+def IsValidInclude (File, Line):\r
+ for Profile in AllIncludeFileList:\r
+ if Profile.IsLineInFile(Line) and Profile.FileName == File:\r
+ return False\r
+\r
+ return True\r
\r
def GetRealFileLine (File, Line):\r
\r
InsertedLines = 0\r
- for Profile in IncludeFileList:\r
- if Line >= Profile.InsertStartLineNumber and Line < Profile.InsertStartLineNumber + Profile.InsertAdjust + len(Profile.FileLinesList):\r
- return (Profile.FileName, Line - Profile.InsertStartLineNumber + 1)\r
- if Line >= Profile.InsertStartLineNumber + Profile.InsertAdjust + len(Profile.FileLinesList):\r
- InsertedLines += Profile.InsertAdjust + len(Profile.FileLinesList)\r
+ for Profile in AllIncludeFileList:\r
+ if Profile.IsLineInFile(Line):\r
+ return Profile.GetLineInFile(Line)\r
+ elif Line >= Profile.InsertStartLineNumber and Profile.Level == 1:\r
+ InsertedLines += Profile.GetTotalLines()\r
\r
return (File, Line - InsertedLines)\r
\r
FileLineTuple = GetRealFileLine(File, Line)\r
self.FileName = FileLineTuple[0]\r
self.LineNumber = FileLineTuple[1]\r
+ self.OriginalLineNumber = Line\r
self.Message = Str\r
self.ToolName = 'FdfParser'\r
\r
def __str__(self):\r
return self.Message\r
\r
-## The MACRO class that used to record macro value data when parsing include file\r
-#\r
-#\r
-class MacroProfile :\r
- ## The constructor\r
- #\r
- # @param self The object pointer\r
- # @param FileName The file that to be parsed\r
- #\r
- def __init__(self, FileName, Line):\r
- self.FileName = FileName\r
- self.DefinedAtLine = Line\r
- self.MacroName = None\r
- self.MacroValue = None\r
-\r
## The Include file content class that used to record file data when parsing include file\r
#\r
# May raise Exception when opening file.\r
fsock = open(FileName, "rb", 0)\r
try:\r
self.FileLinesList = fsock.readlines()\r
+ for index, line in enumerate(self.FileLinesList):\r
+ if not line.endswith('\n'):\r
+ self.FileLinesList[index] += '\n'\r
+\r
finally:\r
fsock.close()\r
\r
\r
self.InsertStartLineNumber = None\r
self.InsertAdjust = 0\r
+ self.IncludeFileList = []\r
+ self.Level = 1 # first level include file\r
+\r
+ def GetTotalLines(self):\r
+ TotalLines = self.InsertAdjust + len(self.FileLinesList)\r
+\r
+ for Profile in self.IncludeFileList:\r
+ TotalLines += Profile.GetTotalLines()\r
+\r
+ return TotalLines\r
+\r
+ def IsLineInFile(self, Line):\r
+ if Line >= self.InsertStartLineNumber and Line < self.InsertStartLineNumber + self.GetTotalLines():\r
+ return True\r
+\r
+ return False\r
+\r
+ def GetLineInFile(self, Line):\r
+ if not self.IsLineInFile (Line):\r
+ return (self.FileName, -1)\r
+\r
+ InsertedLines = self.InsertStartLineNumber\r
+\r
+ for Profile in self.IncludeFileList:\r
+ if Profile.IsLineInFile(Line):\r
+ return Profile.GetLineInFile(Line)\r
+ elif Line >= Profile.InsertStartLineNumber:\r
+ InsertedLines += Profile.GetTotalLines()\r
+\r
+ return (self.FileName, Line - InsertedLines + 1)\r
+\r
+\r
\r
## The FDF content class that used to record file data when parsing FDF\r
#\r
except:\r
EdkLogger.error("FdfParser", FILE_OPEN_FAILURE, ExtraData=FileName)\r
\r
-\r
+ self.FileName = FileName\r
self.PcdDict = {}\r
+ self.PcdLocalDict = {}\r
self.InfList = []\r
+ self.InfDict = {'ArchTBD':[]}\r
+ # ECC will use this Dict and List information\r
+ self.PcdFileLineDict = {}\r
+ self.InfFileLineList = []\r
\r
self.FdDict = {}\r
self.FdNameNotSet = False\r
self.VtfList = []\r
self.RuleDict = {}\r
self.OptRomDict = {}\r
+ self.FmpPayloadDict = {}\r
\r
## The syntax parser for FDF\r
#\r
self.CurrentFvName = None\r
self.__Token = ""\r
self.__SkippedChars = ""\r
+ GlobalData.gFdfParser = self\r
\r
- self.__WipeOffArea = []\r
+ # Used to section info\r
+ self.__CurSection = []\r
+ # Key: [section name, UI name, arch]\r
+ # Value: {MACRO_NAME : MACRO_VALUE}\r
+ self.__MacroDict = tdict(True, 3)\r
+ self.__PcdDict = {}\r
\r
- ## __IsWhiteSpace() method\r
- #\r
- # Whether char at current FileBufferPos is whitespace\r
- #\r
- # @param self The object pointer\r
- # @param Char The char to test\r
- # @retval True The char is a kind of white space\r
- # @retval False The char is NOT a kind of white space\r
- #\r
- def __IsWhiteSpace(self, Char):\r
- if Char in (T_CHAR_NULL, T_CHAR_CR, T_CHAR_SPACE, T_CHAR_TAB, T_CHAR_LF):\r
- return True\r
- else:\r
- return False\r
+ self.__WipeOffArea = []\r
+ if GenFdsGlobalVariable.WorkSpaceDir == '':\r
+ GenFdsGlobalVariable.WorkSpaceDir = os.getenv("WORKSPACE")\r
\r
## __SkipWhiteSpace() method\r
#\r
# Reset file data buffer to the initial state\r
#\r
# @param self The object pointer\r
+ # @param DestLine Optional new destination line number.\r
+ # @param DestOffset Optional new destination offset.\r
#\r
- def Rewind(self):\r
- self.CurrentLineNumber = 1\r
- self.CurrentOffsetWithinLine = 0\r
+ def Rewind(self, DestLine = 1, DestOffset = 0):\r
+ self.CurrentLineNumber = DestLine\r
+ self.CurrentOffsetWithinLine = DestOffset\r
\r
## __UndoOneChar() method\r
#\r
#\r
def __GetOneChar(self):\r
if self.CurrentOffsetWithinLine == len(self.Profile.FileLinesList[self.CurrentLineNumber - 1]) - 1:\r
- self.CurrentLineNumber += 1\r
- self.CurrentOffsetWithinLine = 0\r
+ self.CurrentLineNumber += 1\r
+ self.CurrentOffsetWithinLine = 0\r
else:\r
- self.CurrentOffsetWithinLine += 1\r
+ self.CurrentOffsetWithinLine += 1\r
\r
## __CurrentChar() method\r
#\r
self.Profile.FileLinesList = [list(s) for s in self.Profile.FileLinesList]\r
self.Profile.FileLinesList[-1].append(' ')\r
\r
- def __ReplaceMacros(self, Str, File, Line):\r
- MacroEnd = 0\r
- while Str.find('$(', MacroEnd) >= 0:\r
- MacroStart = Str.find('$(', MacroEnd)\r
- if Str.find(')', MacroStart) > 0:\r
- MacroEnd = Str.find(')', MacroStart)\r
- Name = Str[MacroStart + 2 : MacroEnd]\r
- Value = None\r
- if Name in InputMacroDict:\r
- Value = InputMacroDict[Name]\r
-\r
- else:\r
- for Profile in AllMacroList:\r
- if Profile.FileName == File and Profile.MacroName == Name and Profile.DefinedAtLine <= Line:\r
- Value = Profile.MacroValue\r
-\r
- if Value != None:\r
- Str = Str.replace('$(' + Name + ')', Value)\r
- MacroEnd = MacroStart + len(Value)\r
-\r
- else:\r
- raise Warning("Macro not complete", self.FileName, self.CurrentLineNumber)\r
- return Str\r
-\r
def __ReplaceFragment(self, StartPos, EndPos, Value = ' '):\r
if StartPos[0] == EndPos[0]:\r
Offset = StartPos[1]\r
if MacroName.startswith('!'):\r
NotFlag = True\r
MacroName = MacroName[1:].strip()\r
- \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
+\r
+ def __SetMacroValue(self, Macro, Value):\r
+ if not self.__CurSection:\r
+ return\r
+\r
+ MacroDict = {}\r
+ if not self.__MacroDict[self.__CurSection[0], self.__CurSection[1], self.__CurSection[2]]:\r
+ self.__MacroDict[self.__CurSection[0], self.__CurSection[1], self.__CurSection[2]] = MacroDict\r
+ else:\r
+ MacroDict = self.__MacroDict[self.__CurSection[0], self.__CurSection[1], self.__CurSection[2]]\r
+ MacroDict[Macro] = Value\r
+\r
+ def __GetMacroValue(self, Macro):\r
+ # Highest priority\r
+ if Macro in GlobalData.gCommandLineDefines:\r
+ return GlobalData.gCommandLineDefines[Macro]\r
+ if Macro in GlobalData.gGlobalDefines:\r
+ return GlobalData.gGlobalDefines[Macro]\r
+\r
+ if self.__CurSection:\r
+ MacroDict = self.__MacroDict[\r
+ self.__CurSection[0],\r
+ self.__CurSection[1],\r
+ self.__CurSection[2]\r
+ ]\r
+ if MacroDict and Macro in MacroDict:\r
+ return MacroDict[Macro]\r
+\r
+ # Lowest priority\r
+ if Macro in GlobalData.gPlatformDefines:\r
+ return GlobalData.gPlatformDefines[Macro]\r
+ return None\r
+\r
+ def __SectionHeaderParser(self, Section):\r
+ # [Defines]\r
+ # [FD.UiName]: use dummy instead if UI name is optional\r
+ # [FV.UiName]\r
+ # [Capsule.UiName]\r
+ # [Rule]: don't take rule section into account, macro is not allowed in this section\r
+ # [VTF.arch.UiName, arch]\r
+ # [OptionRom.DriverName]\r
+ self.__CurSection = []\r
+ Section = Section.strip()[1:-1].upper().replace(' ', '').strip('.')\r
+ ItemList = Section.split('.')\r
+ Item = ItemList[0]\r
+ if Item == '' or Item == 'RULE':\r
+ return\r
+\r
+ if Item == TAB_COMMON_DEFINES.upper():\r
+ self.__CurSection = [TAB_COMMON, TAB_COMMON, TAB_COMMON]\r
+ elif Item == 'VTF' and len(ItemList) == 3:\r
+ UiName = ItemList[2]\r
+ Pos = UiName.find(',')\r
+ if Pos != -1:\r
+ UiName = UiName[:Pos]\r
+ self.__CurSection = ['VTF', UiName, ItemList[1]]\r
+ elif len(ItemList) > 1:\r
+ self.__CurSection = [ItemList[0], ItemList[1], TAB_COMMON]\r
+ elif len(ItemList) > 0:\r
+ self.__CurSection = [ItemList[0], 'DUMMY', TAB_COMMON]\r
+\r
## PreprocessFile() method\r
#\r
# Preprocess file contents, replace comments with spaces.\r
# @param self The object pointer\r
#\r
def PreprocessIncludeFile(self):\r
-\r
+ # nested include support\r
+ Processed = False\r
+ MacroDict = {}\r
while self.__GetNextToken():\r
\r
- if self.__Token == '!include':\r
+ if self.__Token == 'DEFINE':\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+ Macro = self.__Token\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ Value = self.__GetExpression()\r
+ MacroDict[Macro] = Value\r
+\r
+ elif self.__Token == '!include':\r
+ Processed = True\r
IncludeLine = self.CurrentLineNumber\r
IncludeOffset = self.CurrentOffsetWithinLine - len('!include')\r
if not self.__GetNextToken():\r
raise Warning("expected include file name", self.FileName, self.CurrentLineNumber)\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
- if os.path.exists(Str):\r
- if not os.path.isabs(Str):\r
- Str = os.path.abspath(Str)\r
- IncFileName = Str\r
+ PreIndex = 0\r
+ StartPos = IncFileName.find('$(', PreIndex)\r
+ EndPos = IncFileName.find(')', StartPos+2)\r
+ while StartPos != -1 and EndPos != -1:\r
+ Macro = IncFileName[StartPos+2 : EndPos]\r
+ MacroVal = self.__GetMacroValue(Macro)\r
+ if not MacroVal:\r
+ if Macro in MacroDict:\r
+ MacroVal = MacroDict[Macro]\r
+ if MacroVal is not None:\r
+ IncFileName = IncFileName.replace('$(' + Macro + ')', MacroVal, 1)\r
+ if MacroVal.find('$(') != -1:\r
+ PreIndex = StartPos\r
+ else:\r
+ PreIndex = StartPos + len(MacroVal)\r
else:\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
-\r
- IncFileName = os.path.join(os.path.dirname(FullFdf), IncFileName)\r
-\r
- if not os.path.exists(os.path.normpath(IncFileName)):\r
- raise Warning("Include file not exists", self.FileName, self.CurrentLineNumber)\r
-\r
- IncFileProfile = IncludeFileProfile(os.path.normpath(IncFileName))\r
+ raise Warning("The Macro %s is not defined" %Macro, self.FileName, self.CurrentLineNumber)\r
+ StartPos = IncFileName.find('$(', PreIndex)\r
+ EndPos = IncFileName.find(')', StartPos+2)\r
+\r
+ IncludedFile = NormPath(IncFileName)\r
+ #\r
+ # First search the include file under the same directory as FDF file\r
+ #\r
+ IncludedFile1 = PathClass(IncludedFile, os.path.dirname(self.FileName))\r
+ ErrorCode = IncludedFile1.Validate()[0]\r
+ if ErrorCode != 0:\r
+ #\r
+ # Then search the include file under the same directory as DSC file\r
+ #\r
+ PlatformDir = ''\r
+ if GenFdsGlobalVariable.ActivePlatform:\r
+ PlatformDir = GenFdsGlobalVariable.ActivePlatform.Dir\r
+ elif GlobalData.gActivePlatform:\r
+ PlatformDir = GlobalData.gActivePlatform.MetaFile.Dir\r
+ IncludedFile1 = PathClass(IncludedFile, PlatformDir)\r
+ ErrorCode = IncludedFile1.Validate()[0]\r
+ if ErrorCode != 0:\r
+ #\r
+ # Also search file under the WORKSPACE directory\r
+ #\r
+ IncludedFile1 = PathClass(IncludedFile, GlobalData.gWorkspace)\r
+ ErrorCode = IncludedFile1.Validate()[0]\r
+ if ErrorCode != 0:\r
+ raise Warning("The include file does not exist under below directories: \n%s\n%s\n%s\n"%(os.path.dirname(self.FileName), PlatformDir, GlobalData.gWorkspace),\r
+ self.FileName, self.CurrentLineNumber)\r
+\r
+ if not IsValidInclude (IncludedFile1.Path, self.CurrentLineNumber):\r
+ raise Warning("The include file {0} is causing a include loop.\n".format (IncludedFile1.Path), self.FileName, self.CurrentLineNumber)\r
+\r
+ IncFileProfile = IncludeFileProfile(IncludedFile1.Path)\r
\r
CurrentLine = self.CurrentLineNumber\r
CurrentOffset = self.CurrentOffsetWithinLine\r
# list index of the insertion, note that line number is 'CurrentLine + 1'\r
InsertAtLine = CurrentLine\r
+ ParentProfile = GetParentAtLine (CurrentLine)\r
+ if ParentProfile is not None:\r
+ ParentProfile.IncludeFileList.insert(0, IncFileProfile)\r
+ IncFileProfile.Level = ParentProfile.Level + 1\r
IncFileProfile.InsertStartLineNumber = InsertAtLine + 1\r
# deal with remaining portions after "!include filename", if exists.\r
if self.__GetNextToken():\r
self.CurrentLineNumber += 1\r
InsertAtLine += 1\r
\r
- IncludeFileList.append(IncFileProfile)\r
+ # reversely sorted to better determine error in file\r
+ AllIncludeFileList.insert(0, IncFileProfile)\r
\r
# comment out the processed include file statement\r
TempList = list(self.Profile.FileLinesList[IncludeLine - 1])\r
TempList.insert(IncludeOffset, '#')\r
self.Profile.FileLinesList[IncludeLine - 1] = ''.join(TempList)\r
-\r
+ if Processed: # Nested and back-to-back support\r
+ self.Rewind(DestLine = IncFileProfile.InsertStartLineNumber - 1)\r
+ Processed = False\r
+ # Preprocess done.\r
self.Rewind()\r
\r
- \r
- ## PreprocessIncludeFile() method\r
+ @staticmethod\r
+ def __GetIfListCurrentItemStat(IfList):\r
+ if len(IfList) == 0:\r
+ return True\r
+\r
+ for Item in IfList:\r
+ if Item[1] == False:\r
+ return False\r
+\r
+ return True\r
+\r
+ ## PreprocessConditionalStatement() method\r
#\r
- # Preprocess file contents, replace !include statements with file contents.\r
+ # Preprocess conditional statement.\r
# In the end, rewind the file buffer pointer to the beginning\r
#\r
# @param self The object pointer\r
def PreprocessConditionalStatement(self):\r
# IfList is a stack of if branches with elements of list [Pos, CondSatisfied, BranchDetermined]\r
IfList = []\r
+ RegionLayoutLine = 0\r
+ ReplacedLine = -1\r
while self.__GetNextToken():\r
+ # Determine section name and the location dependent macro\r
+ if self.__GetIfListCurrentItemStat(IfList):\r
+ if self.__Token.startswith('['):\r
+ Header = self.__Token\r
+ if not self.__Token.endswith(']'):\r
+ self.__SkipToToken(']')\r
+ Header += self.__SkippedChars\r
+ if Header.find('$(') != -1:\r
+ raise Warning("macro cannot be used in section header", self.FileName, self.CurrentLineNumber)\r
+ self.__SectionHeaderParser(Header)\r
+ continue\r
+ # Replace macros except in RULE section or out of section\r
+ elif self.__CurSection and ReplacedLine != self.CurrentLineNumber:\r
+ ReplacedLine = self.CurrentLineNumber\r
+ self.__UndoToken()\r
+ CurLine = self.Profile.FileLinesList[ReplacedLine - 1]\r
+ PreIndex = 0\r
+ StartPos = CurLine.find('$(', PreIndex)\r
+ EndPos = CurLine.find(')', StartPos+2)\r
+ while StartPos != -1 and EndPos != -1 and self.__Token not in ['!ifdef', '!ifndef', '!if', '!elseif']:\r
+ MacroName = CurLine[StartPos+2 : EndPos]\r
+ MacorValue = self.__GetMacroValue(MacroName)\r
+ if MacorValue is not None:\r
+ CurLine = CurLine.replace('$(' + MacroName + ')', MacorValue, 1)\r
+ if MacorValue.find('$(') != -1:\r
+ PreIndex = StartPos\r
+ else:\r
+ PreIndex = StartPos + len(MacorValue)\r
+ else:\r
+ PreIndex = EndPos + 1\r
+ StartPos = CurLine.find('$(', PreIndex)\r
+ EndPos = CurLine.find(')', StartPos+2)\r
+ self.Profile.FileLinesList[ReplacedLine - 1] = CurLine\r
+ continue\r
+\r
if self.__Token == 'DEFINE':\r
- DefineLine = self.CurrentLineNumber - 1\r
- DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')\r
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
- Macro = self.__Token\r
+ if self.__GetIfListCurrentItemStat(IfList):\r
+ if not self.__CurSection:\r
+ raise Warning("macro cannot be defined in Rule section or out of section", self.FileName, self.CurrentLineNumber)\r
+ DefineLine = self.CurrentLineNumber - 1\r
+ DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+ Macro = self.__Token\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ Value = self.__GetExpression()\r
+ self.__SetMacroValue(Macro, Value)\r
+ self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
+ elif self.__Token == 'SET':\r
+ if not self.__GetIfListCurrentItemStat(IfList):\r
+ continue\r
+ SetLine = self.CurrentLineNumber - 1\r
+ SetOffset = self.CurrentOffsetWithinLine - len('SET')\r
+ PcdPair = self.__GetNextPcdSettings()\r
+ PcdName = "%s.%s" % (PcdPair[1], PcdPair[0])\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__GetNextToken():\r
- raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+ Value = self.__GetExpression()\r
+ Value = self.__EvaluateConditional(Value, self.CurrentLineNumber, 'eval', True)\r
\r
- if self.__GetStringData():\r
- pass\r
- Value = self.__Token\r
- if not Macro in InputMacroDict:\r
- FileLineTuple = GetRealFileLine(self.FileName, DefineLine + 1)\r
- MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])\r
- MacProfile.MacroName = Macro\r
- MacProfile.MacroValue = Value\r
- AllMacroList.append(MacProfile)\r
- self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
+ self.__PcdDict[PcdName] = Value\r
\r
+ self.Profile.PcdDict[PcdPair] = Value\r
+ self.SetPcdLocalation(PcdPair)\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.PcdFileLineDict[PcdPair] = FileLineTuple\r
+\r
+ self.__WipeOffArea.append(((SetLine, SetOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
elif self.__Token in ('!ifdef', '!ifndef', '!if'):\r
IfStartPos = (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - len(self.__Token))\r
IfList.append([IfStartPos, None, None])\r
+\r
CondLabel = self.__Token\r
- \r
- MacroName, NotFlag = self.__GetMacroName() \r
- NotDefineFlag = False\r
- if CondLabel == '!ifndef':\r
- NotDefineFlag = True\r
- if CondLabel == '!ifdef' or CondLabel == '!ifndef':\r
- if NotFlag:\r
- raise Warning("'NOT' operation not allowed for Macro name", self.FileName, self.CurrentLineNumber)\r
+ Expression = self.__GetExpression()\r
\r
if CondLabel == '!if':\r
-\r
- if not self.__GetNextOp():\r
- raise Warning("expected !endif", self.FileName, self.CurrentLineNumber)\r
-\r
- if self.__Token in ('!=', '==', '>', '<', '>=', '<='):\r
- Op = self.__Token\r
- if not self.__GetNextToken():\r
- raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
- if self.__GetStringData():\r
- pass\r
- MacroValue = self.__Token\r
- ConditionSatisfied = self.__EvaluateConditional(MacroName, IfList[-1][0][0] + 1, Op, MacroValue)\r
- if NotFlag:\r
- ConditionSatisfied = not ConditionSatisfied\r
- BranchDetermined = ConditionSatisfied\r
- else:\r
- self.CurrentOffsetWithinLine -= len(self.__Token)\r
- ConditionSatisfied = self.__EvaluateConditional(MacroName, IfList[-1][0][0] + 1, None, 'Bool')\r
- if NotFlag:\r
- ConditionSatisfied = not ConditionSatisfied\r
- BranchDetermined = ConditionSatisfied\r
- IfList[-1] = [IfList[-1][0], ConditionSatisfied, BranchDetermined]\r
- if ConditionSatisfied:\r
- self.__WipeOffArea.append((IfList[-1][0], (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
-\r
+ ConditionSatisfied = self.__EvaluateConditional(Expression, IfList[-1][0][0] + 1, 'eval')\r
else:\r
- ConditionSatisfied = self.__EvaluateConditional(MacroName, IfList[-1][0][0] + 1)\r
- if NotDefineFlag:\r
+ ConditionSatisfied = self.__EvaluateConditional(Expression, IfList[-1][0][0] + 1, 'in')\r
+ if CondLabel == '!ifndef':\r
ConditionSatisfied = not ConditionSatisfied\r
- BranchDetermined = ConditionSatisfied\r
- IfList[-1] = [IfList[-1][0], ConditionSatisfied, BranchDetermined]\r
- if ConditionSatisfied:\r
- self.__WipeOffArea.append((IfStartPos, (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
\r
+ BranchDetermined = ConditionSatisfied\r
+ IfList[-1] = [IfList[-1][0], ConditionSatisfied, BranchDetermined]\r
+ if ConditionSatisfied:\r
+ self.__WipeOffArea.append((IfList[-1][0], (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
elif self.__Token in ('!elseif', '!else'):\r
ElseStartPos = (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - len(self.__Token))\r
if len(IfList) <= 0:\r
raise Warning("Missing !if statement", self.FileName, self.CurrentLineNumber)\r
+\r
if IfList[-1][1]:\r
IfList[-1] = [ElseStartPos, False, True]\r
self.__WipeOffArea.append((ElseStartPos, (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
self.__WipeOffArea.append((IfList[-1][0], ElseStartPos))\r
IfList[-1] = [ElseStartPos, True, IfList[-1][2]]\r
if self.__Token == '!elseif':\r
- MacroName, NotFlag = self.__GetMacroName() \r
- if not self.__GetNextOp():\r
- raise Warning("expected !endif", self.FileName, self.CurrentLineNumber)\r
-\r
- if self.__Token in ('!=', '==', '>', '<', '>=', '<='):\r
- Op = self.__Token\r
- if not self.__GetNextToken():\r
- raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
- if self.__GetStringData():\r
- pass\r
- MacroValue = self.__Token\r
- ConditionSatisfied = self.__EvaluateConditional(MacroName, IfList[-1][0][0] + 1, Op, MacroValue)\r
- if NotFlag:\r
- ConditionSatisfied = not ConditionSatisfied\r
-\r
- else:\r
- self.CurrentOffsetWithinLine -= len(self.__Token)\r
- ConditionSatisfied = self.__EvaluateConditional(MacroName, IfList[-1][0][0] + 1, None, 'Bool')\r
- if NotFlag:\r
- ConditionSatisfied = not ConditionSatisfied\r
-\r
+ Expression = self.__GetExpression()\r
+ ConditionSatisfied = self.__EvaluateConditional(Expression, IfList[-1][0][0] + 1, 'eval')\r
IfList[-1] = [IfList[-1][0], ConditionSatisfied, IfList[-1][2]]\r
\r
if IfList[-1][1]:\r
else:\r
IfList[-1][2] = True\r
self.__WipeOffArea.append((IfList[-1][0], (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
-\r
-\r
elif self.__Token == '!endif':\r
+ if len(IfList) <= 0:\r
+ raise Warning("Missing !if statement", self.FileName, self.CurrentLineNumber)\r
if IfList[-1][1]:\r
self.__WipeOffArea.append(((self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - len('!endif')), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
else:\r
self.__WipeOffArea.append((IfList[-1][0], (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
\r
IfList.pop()\r
+ elif not IfList: # Don't use PCDs inside conditional directive\r
+ if self.CurrentLineNumber <= RegionLayoutLine:\r
+ # Don't try the same line twice\r
+ continue\r
+ SetPcd = ShortcutPcdPattern.match(self.Profile.FileLinesList[self.CurrentLineNumber - 1])\r
+ if SetPcd:\r
+ self.__PcdDict[SetPcd.group('name')] = SetPcd.group('value')\r
+ RegionLayoutLine = self.CurrentLineNumber\r
+ continue\r
+ RegionSize = RegionSizePattern.match(self.Profile.FileLinesList[self.CurrentLineNumber - 1])\r
+ if not RegionSize:\r
+ RegionLayoutLine = self.CurrentLineNumber\r
+ continue\r
+ RegionSizeGuid = RegionSizeGuidPattern.match(self.Profile.FileLinesList[self.CurrentLineNumber])\r
+ if not RegionSizeGuid:\r
+ RegionLayoutLine = self.CurrentLineNumber + 1\r
+ continue\r
+ self.__PcdDict[RegionSizeGuid.group('base')] = RegionSize.group('base')\r
+ self.__PcdDict[RegionSizeGuid.group('size')] = RegionSize.group('size')\r
+ RegionLayoutLine = self.CurrentLineNumber + 1\r
\r
-\r
- if len(IfList) > 0:\r
+ if IfList:\r
raise Warning("Missing !endif", self.FileName, self.CurrentLineNumber)\r
self.Rewind()\r
\r
- def __EvaluateConditional(self, Name, Line, Op = None, Value = None):\r
+ def __CollectMacroPcd(self):\r
+ MacroDict = {}\r
+\r
+ # PCD macro\r
+ MacroDict.update(GlobalData.gPlatformPcds)\r
+ MacroDict.update(self.__PcdDict)\r
+\r
+ # Lowest priority\r
+ MacroDict.update(GlobalData.gPlatformDefines)\r
+\r
+ if self.__CurSection:\r
+ # Defines macro\r
+ ScopeMacro = self.__MacroDict[TAB_COMMON, TAB_COMMON, TAB_COMMON]\r
+ if ScopeMacro:\r
+ MacroDict.update(ScopeMacro)\r
+\r
+ # Section macro\r
+ ScopeMacro = self.__MacroDict[\r
+ self.__CurSection[0],\r
+ self.__CurSection[1],\r
+ self.__CurSection[2]\r
+ ]\r
+ if ScopeMacro:\r
+ MacroDict.update(ScopeMacro)\r
+\r
+ MacroDict.update(GlobalData.gGlobalDefines)\r
+ MacroDict.update(GlobalData.gCommandLineDefines)\r
+ if GlobalData.BuildOptionPcd:\r
+ for Item in GlobalData.BuildOptionPcd:\r
+ if isinstance(Item, tuple):\r
+ continue\r
+ PcdName, TmpValue = Item.split("=")\r
+ TmpValue = BuildOptionValue(TmpValue, {})\r
+ MacroDict[PcdName.strip()] = TmpValue\r
+ # Highest priority\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
- return False\r
- return True\r
- elif Op == '!=':\r
- if Value != MacroValue:\r
- return True\r
- else:\r
- return False\r
- elif Op == '==':\r
- if Value == MacroValue:\r
- return True\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
- InputVal = long(Value, 0)\r
- MacroVal = long(MacroValue, 0)\r
- if Op == '>':\r
- if MacroVal > InputVal:\r
- return True\r
- else:\r
- return False\r
- elif Op == '>=':\r
- if MacroVal >= InputVal:\r
- return True\r
- else:\r
- return False\r
- elif Op == '<':\r
- if MacroVal < InputVal:\r
- return True\r
- else:\r
- return False\r
- elif Op == '<=':\r
- if MacroVal <= InputVal:\r
- return True\r
- else:\r
- return False\r
- else:\r
- return False\r
+ return MacroDict\r
+\r
+ def __EvaluateConditional(self, Expression, Line, Op = None, Value = None):\r
+ MacroPcdDict = self.__CollectMacroPcd()\r
+ if Op == 'eval':\r
+ try:\r
+ if Value:\r
+ return ValueExpression(Expression, MacroPcdDict)(True)\r
else:\r
- raise Warning("Value %s is not a number", self.FileName, Line)\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
- return False\r
- return True\r
- elif Op == '!=':\r
- if Value != Profile.MacroValue:\r
- return True\r
+ return ValueExpression(Expression, MacroPcdDict)()\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
+ #\r
+ EdkLogger.warn('Parser', "Suspicious expression: %s" % str(Excpt),\r
+ File=self.FileName, ExtraData=self.__CurrentLine(),\r
+ Line=Line)\r
+ return Excpt.result\r
+ except Exception as Excpt:\r
+ if hasattr(Excpt, 'Pcd'):\r
+ if Excpt.Pcd in GlobalData.gPlatformOtherPcds:\r
+ Info = GlobalData.gPlatformOtherPcds[Excpt.Pcd]\r
+ raise Warning("Cannot use this PCD (%s) in an expression as"\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
+ self.FileName, Line)\r
else:\r
- return False\r
- elif Op == '==':\r
- if Value == Profile.MacroValue:\r
- return True\r
- else:\r
- return False\r
+ raise Warning("PCD (%s) is not defined in DSC file (%s)" % (Excpt.Pcd, GlobalData.gPlatformOtherPcds['DSCFILE']),\r
+ self.FileName, Line)\r
else:\r
- if (self.__IsHex(Value) or Value.isdigit()) and (self.__IsHex(Profile.MacroValue) or (Profile.MacroValue != None and Profile.MacroValue.isdigit())):\r
- InputVal = long(Value, 0)\r
- MacroVal = long(Profile.MacroValue, 0)\r
- if Op == '>':\r
- if MacroVal > InputVal:\r
- return True\r
- else:\r
- return False\r
- elif Op == '>=':\r
- if MacroVal >= InputVal:\r
- return True\r
- else:\r
- return False\r
- elif Op == '<':\r
- if MacroVal < InputVal:\r
- return True\r
- else:\r
- return False\r
- elif Op == '<=':\r
- if MacroVal <= InputVal:\r
- return True\r
- else:\r
- return False\r
- else:\r
- return False\r
- else:\r
- raise Warning("Value %s is not a number", self.FileName, Line)\r
-\r
- return False\r
+ raise Warning(str(Excpt), self.FileName, Line)\r
+ else:\r
+ if Expression.startswith('$(') and Expression[-1] == ')':\r
+ Expression = Expression[2:-1]\r
+ return Expression in MacroPcdDict\r
\r
## __IsToken() method\r
#\r
return True\r
return False\r
\r
+ def __GetExpression(self):\r
+ Line = self.Profile.FileLinesList[self.CurrentLineNumber - 1]\r
+ Index = len(Line) - 1\r
+ while Line[Index] in ['\r', '\n']:\r
+ Index -= 1\r
+ ExpressionString = self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine:Index+1]\r
+ self.CurrentOffsetWithinLine += len(ExpressionString)\r
+ ExpressionString = ExpressionString.strip()\r
+ return ExpressionString\r
+\r
## __GetNextWord() method\r
#\r
# Get next C name from file lines\r
\r
return False\r
\r
+ def __GetNextPcdWord(self):\r
+ self.__SkipWhiteSpace()\r
+ if self.__EndOfFile():\r
+ return False\r
+\r
+ TempChar = self.__CurrentChar()\r
+ StartPos = self.CurrentOffsetWithinLine\r
+ if (TempChar >= 'a' and TempChar <= 'z') or (TempChar >= 'A' and TempChar <= 'Z') or TempChar == '_' or TempChar == '[' or TempChar == ']':\r
+ self.__GetOneChar()\r
+ while not self.__EndOfLine():\r
+ TempChar = self.__CurrentChar()\r
+ if (TempChar >= 'a' and TempChar <= 'z') or (TempChar >= 'A' and TempChar <= 'Z') \\r
+ or (TempChar >= '0' and TempChar <= '9') or TempChar == '_' or TempChar == '-' or TempChar == '[' or TempChar == ']':\r
+ self.__GetOneChar()\r
+\r
+ else:\r
+ break\r
+\r
+ self.__Token = self.__CurrentLine()[StartPos : self.CurrentOffsetWithinLine]\r
+ return True\r
+\r
+ return False\r
+\r
## __GetNextToken() method\r
#\r
# Get next token unit before a seperator\r
# Record the token start position, the position of the first non-space char.\r
StartPos = self.CurrentOffsetWithinLine\r
StartLine = self.CurrentLineNumber\r
- while not self.__EndOfLine():\r
+ while StartLine == self.CurrentLineNumber:\r
TempChar = self.__CurrentChar()\r
# Try to find the end char that is not a space and not in seperator tuple.\r
# That is, when we got a space or any char in the tuple, we got the end of token.\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
return False\r
\r
+ @staticmethod\r
+ def __Verify(Name, Value, Scope):\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
# Go back one token unit in file buffer\r
# That is, when we got a space or any char in the tuple, we got the end of token.\r
if not str(TempChar).isspace() and not TempChar in SEPERATOR_TUPLE:\r
if not self.__UndoOneChar():\r
- break\r
+ return\r
# if we happen to meet a seperator as the first char, we must proceed to get it.\r
# That is, we get a token that is a seperator char. nomally it is the boundary of other tokens.\r
elif StartPos == self.CurrentOffsetWithinLine and TempChar in SEPERATOR_TUPLE:\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
## __GetNextHexNumber() method\r
#\r
# Get next HEX data before a seperator\r
def __GetNextHexNumber(self):\r
if not self.__GetNextToken():\r
return False\r
- if self.__IsHex(self.__Token):\r
+ if gHexPatternAll.match(self.__Token):\r
return True\r
else:\r
self.__UndoToken()\r
\r
return (pcdCName, pcdTokenSpaceCName)\r
\r
+ def __GetNextPcdSettings(self):\r
+ if not self.__GetNextWord():\r
+ raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)\r
+ pcdTokenSpaceCName = self.__Token\r
+\r
+ if not self.__IsToken( "."):\r
+ raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextWord():\r
+ raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)\r
+ pcdCName = self.__Token\r
+\r
+ Fields = []\r
+ while self.__IsToken("."):\r
+ if not self.__GetNextPcdWord():\r
+ raise Warning("expected format of <PcdTokenSpaceCName>.<PcdCName>", self.FileName, self.CurrentLineNumber)\r
+ Fields.append(self.__Token)\r
+\r
+ return (pcdCName, pcdTokenSpaceCName,".".join(Fields))\r
+\r
## __GetStringData() method\r
#\r
# Get string contents quoted in ""\r
def SetFileBufferPos(self, Pos):\r
(self.CurrentLineNumber, self.CurrentOffsetWithinLine) = Pos\r
\r
+ ## Preprocess() method\r
+ #\r
+ # Preprocess comment, conditional directive, include directive, replace macro.\r
+ # Exception will be raised if syntax error found\r
+ #\r
+ # @param self The object pointer\r
+ #\r
+ def Preprocess(self):\r
+ self.__StringToList()\r
+ self.PreprocessFile()\r
+ self.PreprocessIncludeFile()\r
+ self.__StringToList()\r
+ self.PreprocessFile()\r
+ self.PreprocessConditionalStatement()\r
+ self.__StringToList()\r
+ for Pos in self.__WipeOffArea:\r
+ self.__ReplaceFragment(Pos[0], Pos[1])\r
+ self.Profile.FileLinesList = ["".join(list) for list in self.Profile.FileLinesList]\r
+\r
+ while self.__GetDefines():\r
+ pass\r
+\r
## ParseFile() method\r
#\r
# Parse the file profile buffer to extract fd, fv ... information\r
def ParseFile(self):\r
\r
try:\r
- self.__StringToList()\r
- self.PreprocessFile()\r
- self.PreprocessIncludeFile()\r
- self.__StringToList()\r
- self.PreprocessFile()\r
- self.PreprocessConditionalStatement()\r
- self.__StringToList()\r
- for Pos in self.__WipeOffArea:\r
- self.__ReplaceFragment(Pos[0], Pos[1])\r
- self.Profile.FileLinesList = ["".join(list) for list in self.Profile.FileLinesList]\r
- \r
- while self.__GetDefines():\r
- pass\r
- \r
- Index = 0\r
- while Index < len(self.Profile.FileLinesList):\r
- FileLineTuple = GetRealFileLine(self.FileName, Index + 1)\r
- self.Profile.FileLinesList[Index] = self.__ReplaceMacros(self.Profile.FileLinesList[Index], FileLineTuple[0], FileLineTuple[1])\r
- Index += 1\r
-\r
- while self.__GetFd():\r
- pass\r
-\r
- while self.__GetFv():\r
- pass\r
-\r
- while self.__GetCapsule():\r
- pass\r
-\r
- while self.__GetVtf():\r
- pass\r
-\r
- while self.__GetRule():\r
- pass\r
- \r
- while self.__GetOptionRom():\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
- FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
#'\n\tGot Token: \"%s\" from File %s\n' % (self.__Token, FileLineTuple[0]) + \\r
- X.Message += ' near line %d, column %d: %s' \\r
+ # At this point, the closest parent would be the included file itself\r
+ Profile = GetParentAtLine(X.OriginalLineNumber)\r
+ if Profile is not None:\r
+ X.Message += ' near line %d, column %d: %s' \\r
+ % (X.LineNumber, 0, Profile.FileLinesList[X.LineNumber-1])\r
+ else:\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ X.Message += ' near line %d, column %d: %s' \\r
% (FileLineTuple[1], self.CurrentOffsetWithinLine + 1, self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine :].rstrip('\n').rstrip('\r'))\r
raise\r
\r
+ ## SectionParser() method\r
+ #\r
+ # Parse the file section info\r
+ # Exception will be raised if syntax error found\r
+ #\r
+ # @param self The object pointer\r
+ # @param section The section string\r
+\r
+ def SectionParser(self, section):\r
+ S = section.upper()\r
+ if not S.startswith("[DEFINES") and not S.startswith("[FD.") and not S.startswith("[FV.") and not S.startswith("[CAPSULE.") \\r
+ and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM.") and not S.startswith('[FMPPAYLOAD.'):\r
+ raise Warning("Unknown section or section appear sequence error (The correct sequence should be [DEFINES], [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.], [FMPPAYLOAD.])", self.FileName, self.CurrentLineNumber)\r
+\r
## __GetDefines() method\r
#\r
# Get Defines section contents and store its data into AllMacrosList\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[DEFINES"):\r
- if not S.startswith("[FD.") and not S.startswith("[FV.") and not S.startswith("[CAPSULE.") \\r
- and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [DEFINES], [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
\r
raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
\r
while self.__GetNextWord():\r
+ # handle the SET statement\r
+ if self.__Token == 'SET':\r
+ self.__UndoToken()\r
+ self.__GetSetStatement(None)\r
+ continue\r
+\r
Macro = self.__Token\r
- \r
+\r
if not self.__IsToken("="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken() or self.__Token.startswith('['):\r
raise Warning("expected MACRO value", self.FileName, self.CurrentLineNumber)\r
Value = self.__Token\r
- FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
- MacProfile = MacroProfile(FileLineTuple[0], FileLineTuple[1])\r
- MacProfile.MacroName = Macro\r
- MacProfile.MacroValue = Value\r
- AllMacroList.append(MacProfile)\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
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[FD."):\r
- if not S.startswith("[FV.") and not S.startswith("[CAPSULE.") \\r
+ if not S.startswith("[FV.") and not S.startswith('[FMPPAYLOAD.') and not S.startswith("[CAPSULE.") \\r
and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
raise Warning("Unknown section", self.FileName, self.CurrentLineNumber)\r
self.__UndoToken()\r
if FdName == "":\r
if len (self.Profile.FdDict) == 0:\r
FdName = GenFdsGlobalVariable.PlatformName\r
+ if FdName == "" and GlobalData.gActivePlatform:\r
+ FdName = GlobalData.gActivePlatform.PlatformName\r
self.Profile.FdNameNotSet = True\r
else:\r
raise Warning("expected FdName in [FD.] section", self.FileName, self.CurrentLineNumber)\r
self.CurrentFdName = FdName.upper()\r
- \r
+\r
if self.CurrentFdName in self.Profile.FdDict:\r
raise Warning("Unexpected the same FD name", self.FileName, self.CurrentLineNumber)\r
\r
if not Status:\r
raise Warning("FD name error", self.FileName, self.CurrentLineNumber)\r
\r
- self.__GetTokenStatements(FdObj)\r
+ while self.__GetTokenStatements(FdObj):\r
+ pass\r
+ for Attr in ("BaseAddress", "Size", "ErasePolarity"):\r
+ if getattr(FdObj, Attr) is None:\r
+ self.__GetNextToken()\r
+ raise Warning("Keyword %s missing" % Attr, self.FileName, self.CurrentLineNumber)\r
+\r
+ if not FdObj.BlockSizeList:\r
+ FdObj.BlockSizeList.append((1, FdObj.Size, None))\r
\r
self.__GetDefineStatements(FdObj)\r
\r
\r
return True\r
\r
+ def SetPcdLocalation(self,pcdpair):\r
+ self.Profile.PcdLocalDict[pcdpair] = (self.Profile.FileName,self.CurrentLineNumber)\r
+\r
## __GetTokenStatements() method\r
#\r
# Get token statements\r
# @param Obj for whom token statement is got\r
#\r
def __GetTokenStatements(self, Obj):\r
- if not self.__IsKeyword( "BaseAddress"):\r
- raise Warning("BaseAddress missing", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self.__GetNextHexNumber():\r
- raise Warning("expected Hex base address", self.FileName, self.CurrentLineNumber)\r
-\r
- Obj.BaseAddress = self.__Token\r
-\r
- if self.__IsToken( "|"):\r
- pcdPair = self.__GetNextPcdName()\r
- Obj.BaseAddressPcd = pcdPair\r
- self.Profile.PcdDict[pcdPair] = Obj.BaseAddress\r
+ if self.__IsKeyword( "BaseAddress"):\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__IsKeyword( "Size"):\r
- raise Warning("Size missing", self.FileName, self.CurrentLineNumber)\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("expected Hex base address", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ Obj.BaseAddress = self.__Token\r
\r
- if not self.__GetNextHexNumber():\r
- raise Warning("expected Hex size", self.FileName, self.CurrentLineNumber)\r
+ if self.__IsToken( "|"):\r
+ pcdPair = self.__GetNextPcdSettings()\r
+ Obj.BaseAddressPcd = pcdPair\r
+ self.Profile.PcdDict[pcdPair] = Obj.BaseAddress\r
+ self.SetPcdLocalation(pcdPair)\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple\r
+ return True\r
\r
+ if self.__IsKeyword( "Size"):\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
- Size = self.__Token\r
- if self.__IsToken( "|"):\r
- pcdPair = self.__GetNextPcdName()\r
- Obj.SizePcd = pcdPair\r
- self.Profile.PcdDict[pcdPair] = Size\r
- Obj.Size = long(Size, 0)\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("expected Hex size", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__IsKeyword( "ErasePolarity"):\r
- raise Warning("ErasePolarity missing", self.FileName, self.CurrentLineNumber)\r
+ Size = self.__Token\r
+ if self.__IsToken( "|"):\r
+ pcdPair = self.__GetNextPcdSettings()\r
+ Obj.SizePcd = pcdPair\r
+ self.Profile.PcdDict[pcdPair] = Size\r
+ self.SetPcdLocalation(pcdPair)\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple\r
+ Obj.Size = long(Size, 0)\r
+ return True\r
\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if self.__IsKeyword( "ErasePolarity"):\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__GetNextToken():\r
- raise Warning("expected Erase Polarity", self.FileName, self.CurrentLineNumber)\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Erase Polarity", self.FileName, self.CurrentLineNumber)\r
\r
- if self.__Token != "1" and self.__Token != "0":\r
- raise Warning("expected 1 or 0 Erase Polarity", self.FileName, self.CurrentLineNumber)\r
+ if self.__Token != "1" and self.__Token != "0":\r
+ raise Warning("expected 1 or 0 Erase Polarity", self.FileName, self.CurrentLineNumber)\r
\r
- Obj.ErasePolarity = self.__Token\r
+ Obj.ErasePolarity = self.__Token\r
+ return True\r
\r
- self.__GetBlockStatements(Obj)\r
+ return self.__GetBlockStatements(Obj)\r
\r
## __GetAddressStatements() method\r
#\r
# @param Obj for whom block statement is got\r
#\r
def __GetBlockStatements(self, Obj):\r
-\r
- if not self.__GetBlockStatement(Obj):\r
- #set default block size is 1\r
- Obj.BlockSizeList.append((1, Obj.Size, None))\r
- return\r
-\r
+ IsBlock = False\r
while self.__GetBlockStatement(Obj):\r
- pass\r
- \r
- for Item in Obj.BlockSizeList:\r
- if Item[0] == None or Item[1] == None:\r
- raise Warning("expected block statement for Fd Section", self.FileName, self.CurrentLineNumber)\r
+ IsBlock = True\r
+\r
+ Item = Obj.BlockSizeList[-1]\r
+ if Item[0] is None or Item[1] is None:\r
+ raise Warning("expected block statement", self.FileName, self.CurrentLineNumber)\r
+ return IsBlock\r
\r
## __GetBlockStatement() method\r
#\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__GetNextHexNumber() and not self.__GetNextDecimalNumber():\r
- raise Warning("expected Hex block size", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("expected Hex or Integer block size", self.FileName, self.CurrentLineNumber)\r
\r
BlockSize = self.__Token\r
BlockSizePcd = None\r
if self.__IsToken( "|"):\r
- PcdPair = self.__GetNextPcdName()\r
+ PcdPair = self.__GetNextPcdSettings()\r
BlockSizePcd = PcdPair\r
self.Profile.PcdDict[PcdPair] = BlockSize\r
+ self.SetPcdLocalation(PcdPair)\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.PcdFileLineDict[PcdPair] = FileLineTuple\r
BlockSize = long(BlockSize, 0)\r
\r
BlockNumber = None\r
#\r
def __GetSetStatement(self, Obj):\r
if self.__IsKeyword("SET"):\r
- PcdPair = self.__GetNextPcdName()\r
+ PcdPair = self.__GetNextPcdSettings()\r
\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__GetNextToken():\r
- raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
-\r
- Value = self.__Token\r
- if Value.startswith("{"):\r
- # deal with value with {}\r
- if not self.__SkipToToken( "}"):\r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
- Value += self.__SkippedChars\r
+ Value = self.__GetExpression()\r
+ Value = self.__EvaluateConditional(Value, self.CurrentLineNumber, 'eval', True)\r
\r
- Obj.SetVarDict[PcdPair] = Value\r
+ if Obj:\r
+ Obj.SetVarDict[PcdPair] = Value\r
self.Profile.PcdDict[PcdPair] = Value\r
+ self.SetPcdLocalation(PcdPair)\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.PcdFileLineDict[PcdPair] = FileLineTuple\r
return True\r
\r
return False\r
\r
+ ## __CalcRegionExpr(self)\r
+ #\r
+ # Calculate expression for offset or size of a region\r
+ #\r
+ # @return: None if invalid expression\r
+ # Calculated number if successfully\r
+ #\r
+ def __CalcRegionExpr(self):\r
+ StartPos = self.GetFileBufferPos()\r
+ Expr = ''\r
+ PairCount = 0\r
+ while not self.__EndOfFile():\r
+ CurCh = self.__CurrentChar()\r
+ if CurCh == '(':\r
+ PairCount += 1\r
+ elif CurCh == ')':\r
+ PairCount -= 1\r
+\r
+ if CurCh in '|\r\n' and PairCount == 0:\r
+ break\r
+ Expr += CurCh\r
+ self.__GetOneChar()\r
+ try:\r
+ return long(\r
+ ValueExpression(Expr,\r
+ self.__CollectMacroPcd()\r
+ )(True), 0)\r
+ except Exception:\r
+ self.SetFileBufferPos(StartPos)\r
+ return None\r
+\r
## __GetRegionLayout() method\r
#\r
# Get region layout for FD\r
# @retval False Not able to find\r
#\r
def __GetRegionLayout(self, Fd):\r
- if not self.__GetNextHexNumber():\r
+ Offset = self.__CalcRegionExpr()\r
+ if Offset is None:\r
return False\r
\r
RegionObj = Region.Region()\r
- RegionObj.Offset = long(self.__Token, 0)\r
+ RegionObj.Offset = Offset\r
Fd.RegionList.append(RegionObj)\r
\r
if not self.__IsToken( "|"):\r
raise Warning("expected '|'", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__GetNextHexNumber():\r
+ Size = self.__CalcRegionExpr()\r
+ if Size is None:\r
raise Warning("expected Region Size", self.FileName, self.CurrentLineNumber)\r
- RegionObj.Size = long(self.__Token, 0)\r
+ RegionObj.Size = Size\r
\r
if not self.__GetNextWord():\r
return True\r
\r
- if not self.__Token in ("SET", "FV", "FILE", "DATA", "CAPSULE"):\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
+ # PcdOffset[|PcdSize] or OffsetPcdExpression|Size\r
+ #\r
self.__UndoToken()\r
- RegionObj.PcdOffset = self.__GetNextPcdName()\r
- self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + long(Fd.BaseAddress, 0))\r
- if self.__IsToken( "|"):\r
- RegionObj.PcdSize = self.__GetNextPcdName()\r
- self.Profile.PcdDict[RegionObj.PcdSize] = "0x%08X" % RegionObj.Size\r
+ IsRegionPcd = (RegionSizeGuidPattern.match(self.__CurrentLine()[self.CurrentOffsetWithinLine:]) or\r
+ RegionOffsetPcdPattern.match(self.__CurrentLine()[self.CurrentOffsetWithinLine:]))\r
+ if IsRegionPcd:\r
+ RegionObj.PcdOffset = self.__GetNextPcdSettings()\r
+ self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + long(Fd.BaseAddress, 0))\r
+ self.SetPcdLocalation(RegionObj.PcdOffset)\r
+ self.__PcdDict['%s.%s' % (RegionObj.PcdOffset[1], RegionObj.PcdOffset[0])] = "0x%x" % RegionObj.Offset\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.PcdFileLineDict[RegionObj.PcdOffset] = FileLineTuple\r
+ if self.__IsToken( "|"):\r
+ RegionObj.PcdSize = self.__GetNextPcdSettings()\r
+ self.Profile.PcdDict[RegionObj.PcdSize] = "0x%08X" % RegionObj.Size\r
+ self.SetPcdLocalation(RegionObj.PcdSize)\r
+ self.__PcdDict['%s.%s' % (RegionObj.PcdSize[1], RegionObj.PcdSize[0])] = "0x%x" % RegionObj.Size\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.PcdFileLineDict[RegionObj.PcdSize] = FileLineTuple\r
\r
if not self.__GetNextWord():\r
return True\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
elif self.__Token == "FILE":\r
self.__UndoToken()\r
- self.__GetRegionFileType( RegionObj)\r
+ self.__GetRegionFileType(RegionObj)\r
\r
+ elif self.__Token == "INF":\r
+ self.__UndoToken()\r
+ RegionObj.RegionType = "INF"\r
+ while self.__IsKeyword("INF"):\r
+ self.__UndoToken()\r
+ ffsInf = self.__ParseInfStatement()\r
+ if not ffsInf:\r
+ break\r
+ RegionObj.RegionDataList.append(ffsInf)\r
+\r
+ elif self.__Token == "DATA":\r
+ self.__UndoToken()\r
+ self.__GetRegionDataType(RegionObj)\r
else:\r
self.__UndoToken()\r
- self.__GetRegionDataType( RegionObj)\r
+ if self.__GetRegionLayout(Fd):\r
+ return True\r
+ raise Warning("A valid region type was not found. "\r
+ "Valid types are [SET, FV, CAPSULE, FILE, DATA, INF]. This error occurred",\r
+ self.FileName, self.CurrentLineNumber)\r
\r
return True\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.RegionDataList.append(self.__Token)\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.__GetNextToken():\r
raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)\r
\r
- RegionObj.RegionDataList.append(self.__Token)\r
+ RegionObj.RegionDataList.append((self.__Token).upper())\r
\r
## __GetRegionCapType() method\r
#\r
if not self.__GetNextHexNumber():\r
raise Warning("expected Hex byte", self.FileName, self.CurrentLineNumber)\r
\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long", 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
+ # convert hex string value to byte hex string array\r
+ AllString = self.__Token\r
+ AllStrLen = len (AllString)\r
+ DataString = ""\r
+ while AllStrLen > 4:\r
+ DataString = DataString + "0x" + AllString[AllStrLen - 2: AllStrLen] + ","\r
+ AllStrLen = AllStrLen - 2\r
+ DataString = DataString + AllString[:AllStrLen] + ","\r
\r
- while self.__IsToken(","):\r
- if not self.__GetNextHexNumber():\r
- raise Warning("Invalid Hex number", self.FileName, self.CurrentLineNumber)\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
- DataString += self.__Token\r
- DataString += ","\r
+ # byte value array\r
+ if len (self.__Token) <= 4:\r
+ while self.__IsToken(","):\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("Invalid Hex number", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 4:\r
+ raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
+ DataString += self.__Token\r
+ DataString += ","\r
\r
if not self.__IsToken( "}"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextHexNumber():\r
raise Warning("expected Hex byte", self.FileName, self.CurrentLineNumber)\r
\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long", 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
+ # convert hex string value to byte hex string array\r
+ AllString = self.__Token\r
+ AllStrLen = len (AllString)\r
+ DataString = ""\r
+ while AllStrLen > 4:\r
+ DataString = DataString + "0x" + AllString[AllStrLen - 2: AllStrLen] + ","\r
+ AllStrLen = AllStrLen - 2\r
+ DataString = DataString + AllString[:AllStrLen] + ","\r
\r
- while self.__IsToken(","):\r
- self.__GetNextHexNumber()\r
- if len(self.__Token) > 4:\r
- raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
- DataString += self.__Token\r
- DataString += ","\r
+ # byte value array\r
+ if len (self.__Token) <= 4:\r
+ while self.__IsToken(","):\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("Invalid Hex number", self.FileName, self.CurrentLineNumber)\r
+ if len(self.__Token) > 4:\r
+ raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
+ DataString += self.__Token\r
+ DataString += ","\r
\r
if not self.__IsToken( "}"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[FV."):\r
- if not S.startswith("[CAPSULE.") \\r
- and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
\r
\r
self.__GetAddressStatements(FvObj)\r
\r
- self.__GetBlockStatement(FvObj)\r
-\r
- self.__GetSetStatements(FvObj)\r
-\r
- self.__GetFvAlignment(FvObj)\r
-\r
- self.__GetFvAttributes(FvObj)\r
- \r
- self.__GetFvNameGuid(FvObj)\r
-\r
FvObj.FvExtEntryTypeValue = []\r
FvObj.FvExtEntryType = []\r
FvObj.FvExtEntryData = []\r
while True:\r
- isFvExtEntry = self.__GetFvExtEntryStatement(FvObj)\r
- if not isFvExtEntry:\r
+ self.__GetSetStatements(FvObj)\r
+\r
+ if not (self.__GetBlockStatement(FvObj) or self.__GetFvBaseAddress(FvObj) or\r
+ self.__GetFvForceRebase(FvObj) or self.__GetFvAlignment(FvObj) or\r
+ self.__GetFvAttributes(FvObj) or self.__GetFvNameGuid(FvObj) or\r
+ self.__GetFvExtEntryStatement(FvObj) or self.__GetFvNameString(FvObj)):\r
break\r
\r
+ if FvObj.FvNameString == 'TRUE' and not FvObj.FvNameGuid:\r
+ raise Warning("FvNameString found but FvNameGuid was not found", self.FileName, self.CurrentLineNumber)\r
+\r
self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
\r
while True:\r
- isInf = self.__GetInfStatement(FvObj, MacroDict = FvObj.DefineVarDict.copy())\r
+ isInf = self.__GetInfStatement(FvObj)\r
isFile = self.__GetFileStatement(FvObj, MacroDict = FvObj.DefineVarDict.copy())\r
if not isInf and not isFile:\r
break\r
Obj.FvAlignment = self.__Token\r
return True\r
\r
+ ## __GetFvBaseAddress() method\r
+ #\r
+ # Get BaseAddress for FV\r
+ #\r
+ # @param self The object pointer\r
+ # @param Obj for whom FvBaseAddress is got\r
+ # @retval True Successfully find a FvBaseAddress statement\r
+ # @retval False Not able to find a FvBaseAddress statement\r
+ #\r
+ def __GetFvBaseAddress(self, Obj):\r
+\r
+ if not self.__IsKeyword("FvBaseAddress"):\r
+ return False\r
+\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected FV base address value", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not BaseAddrValuePattern.match(self.__Token.upper()):\r
+ raise Warning("Unknown FV base address value '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+ Obj.FvBaseAddress = self.__Token\r
+ return True\r
+\r
+ ## __GetFvForceRebase() method\r
+ #\r
+ # Get FvForceRebase for FV\r
+ #\r
+ # @param self The object pointer\r
+ # @param Obj for whom FvForceRebase is got\r
+ # @retval True Successfully find a FvForceRebase statement\r
+ # @retval False Not able to find a FvForceRebase statement\r
+ #\r
+ def __GetFvForceRebase(self, Obj):\r
+\r
+ if not self.__IsKeyword("FvForceRebase"):\r
+ return False\r
+\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected FvForceRebase value", self.FileName, self.CurrentLineNumber)\r
+\r
+ if self.__Token.upper() not in ["TRUE", "FALSE", "0", "0X0", "0X00", "1", "0X1", "0X01"]:\r
+ raise Warning("Unknown FvForceRebase value '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+\r
+ if self.__Token.upper() in ["TRUE", "1", "0X1", "0X01"]:\r
+ Obj.FvForceRebase = True\r
+ elif self.__Token.upper() in ["FALSE", "0", "0X0", "0X00"]:\r
+ Obj.FvForceRebase = False\r
+ else:\r
+ Obj.FvForceRebase = None\r
+\r
+ return True\r
+\r
+\r
## __GetFvAttributes() method\r
#\r
# Get attributes for FV\r
# @retval None\r
#\r
def __GetFvAttributes(self, FvObj):\r
-\r
+ IsWordToken = False\r
while self.__GetNextWord():\r
+ IsWordToken = True\r
name = self.__Token\r
if name not in ("ERASE_POLARITY", "MEMORY_MAPPED", \\r
"STICKY_WRITE", "LOCK_CAP", "LOCK_STATUS", "WRITE_ENABLED_CAP", \\r
"WRITE_DISABLED_CAP", "WRITE_STATUS", "READ_ENABLED_CAP", \\r
"READ_DISABLED_CAP", "READ_STATUS", "READ_LOCK_CAP", \\r
"READ_LOCK_STATUS", "WRITE_LOCK_CAP", "WRITE_LOCK_STATUS", \\r
- "WRITE_POLICY_RELIABLE"):\r
+ "WRITE_POLICY_RELIABLE", "WEAK_ALIGNMENT", "FvUsedSizeEnable"):\r
self.__UndoToken()\r
- return\r
+ return False\r
\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
FvObj.FvAttributeDict[name] = self.__Token\r
\r
- return\r
- \r
+ return IsWordToken\r
+\r
## __GetFvNameGuid() method\r
#\r
# Get FV GUID for FV\r
def __GetFvNameGuid(self, FvObj):\r
\r
if not self.__IsKeyword( "FvNameGuid"):\r
- return\r
+ return False\r
\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
FvObj.FvNameGuid = self.__Token\r
\r
- return\r
+ return True\r
+\r
+ def __GetFvNameString(self, FvObj):\r
+\r
+ if not self.__IsKeyword( "FvNameString"):\r
+ return False\r
+\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken() or self.__Token not in ('TRUE', 'FALSE'):\r
+ raise Warning("expected TRUE or FALSE for FvNameString", self.FileName, self.CurrentLineNumber)\r
+\r
+ FvObj.FvNameString = self.__Token\r
+\r
+ return True\r
\r
def __GetFvExtEntryStatement(self, FvObj):\r
\r
- if not self.__IsKeyword( "FV_EXT_ENTRY"):\r
+ if not (self.__IsKeyword( "FV_EXT_ENTRY") or self.__IsKeyword( "FV_EXT_ENTRY_TYPE")):\r
return False\r
\r
if not self.__IsKeyword ("TYPE"):\r
raise Warning("expected 'TYPE'", self.FileName, self.CurrentLineNumber)\r
- \r
+\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\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
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
- \r
+\r
if not self.__IsToken( "{"):\r
raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\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
+\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
- \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
+\r
+ FvObj.FvExtEntryData.append(self.__Token)\r
\r
if not self.__IsToken( "}"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
MacroDict.update(AprSectionObj.DefineVarDict)\r
\r
while True:\r
- IsInf = self.__GetInfStatement( AprSectionObj, MacroDict = MacroDict)\r
+ IsInf = self.__GetInfStatement(AprSectionObj)\r
IsFile = self.__GetFileStatement( AprSectionObj)\r
if not IsInf and not IsFile:\r
break\r
FvObj.AprioriSectionList.append(AprSectionObj)\r
return True\r
\r
- ## __GetInfStatement() method\r
- #\r
- # Get INF statements\r
- #\r
- # @param self The object pointer\r
- # @param Obj for whom inf statement is got\r
- # @param MacroDict dictionary used to replace macro\r
- # @retval True Successfully find inf statement\r
- # @retval False Not able to find inf statement\r
- #\r
- def __GetInfStatement(self, Obj, ForCapsule = False, MacroDict = {}):\r
-\r
- if not self.__IsKeyword( "INF"):\r
- return False\r
+ def __ParseInfStatement(self):\r
+ if not self.__IsKeyword("INF"):\r
+ return None\r
\r
ffsInf = FfsInfStatement.FfsInfStatement()\r
- self.__GetInfOptions( ffsInf)\r
+ self.__GetInfOptions(ffsInf)\r
\r
if not self.__GetNextToken():\r
raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
ffsInf.InfFileName = self.__Token\r
+ if not ffsInf.InfFileName.endswith('.inf'):\r
+ raise Warning("expected .inf file path", self.FileName, self.CurrentLineNumber)\r
+\r
+ ffsInf.CurrentLineNum = self.CurrentLineNumber\r
+ ffsInf.CurrentLineContent = self.__CurrentLine()\r
+\r
+ #Replace $(SAPCE) with real space\r
+ ffsInf.InfFileName = ffsInf.InfFileName.replace('$(SPACE)', ' ')\r
+\r
+ if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #do case sensitive check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not ffsInf.InfFileName in self.Profile.InfList:\r
self.Profile.InfList.append(ffsInf.InfFileName)\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.InfFileLineList.append(FileLineTuple)\r
+ if ffsInf.UseArch:\r
+ if ffsInf.UseArch not in self.Profile.InfDict:\r
+ self.Profile.InfDict[ffsInf.UseArch] = [ffsInf.InfFileName]\r
+ else:\r
+ self.Profile.InfDict[ffsInf.UseArch].append(ffsInf.InfFileName)\r
+ else:\r
+ self.Profile.InfDict['ArchTBD'].append(ffsInf.InfFileName)\r
\r
if self.__IsToken('|'):\r
if self.__IsKeyword('RELOCS_STRIPPED'):\r
ffsInf.KeepReloc = True\r
else:\r
raise Warning("Unknown reloc strip flag '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+ return ffsInf\r
+\r
+ ## __GetInfStatement() method\r
+ #\r
+ # Get INF statements\r
+ #\r
+ # @param self The object pointer\r
+ # @param Obj for whom inf statement is got\r
+ # @retval True Successfully find inf statement\r
+ # @retval False Not able to find inf statement\r
+ #\r
+ def __GetInfStatement(self, Obj, ForCapsule=False):\r
+ ffsInf = self.__ParseInfStatement()\r
+ if not ffsInf:\r
+ return False\r
\r
if ForCapsule:\r
capsuleFfs = CapsuleData.CapsuleFfs()\r
# @param FfsInfObj for whom option is got\r
#\r
def __GetInfOptions(self, FfsInfObj):\r
+ if self.__IsKeyword("FILE_GUID"):\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if not self.__GetNextGuid():\r
+ raise Warning("expected GUID value", self.FileName, self.CurrentLineNumber)\r
+ FfsInfObj.OverrideGuid = self.__Token\r
\r
if self.__IsKeyword( "RuleOverride"):\r
if not self.__IsToken( "="):\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
raise Warning("expected ARCH name", self.FileName, self.CurrentLineNumber)\r
FfsInfObj.UseArch = self.__Token\r
\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
+ 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) and p.match(self.__Token).span()[1] == len(self.__Token):\r
FfsInfObj.KeyStringList.append(self.__Token)\r
if not self.__IsToken(","):\r
return\r
if not self.__IsKeyword( "FILE"):\r
return False\r
\r
- FfsFileObj = FfsFileStatement.FileStatement()\r
-\r
if not self.__GetNextWord():\r
raise Warning("expected FFS type", self.FileName, self.CurrentLineNumber)\r
+\r
+ if ForCapsule and self.__Token == 'DATA':\r
+ self.__UndoToken()\r
+ self.__UndoToken()\r
+ return False\r
+\r
+ FfsFileObj = FfsFileStatement.FileStatement()\r
FfsFileObj.FvFileType = self.__Token\r
\r
if not self.__IsToken( "="):\r
if self.__Token == 'PCD':\r
if not self.__IsToken( "("):\r
raise Warning("expected '('", self.FileName, self.CurrentLineNumber)\r
- PcdPair = self.__GetNextPcdName()\r
+ PcdPair = self.__GetNextPcdSettings()\r
if not self.__IsToken( ")"):\r
raise Warning("expected ')'", self.FileName, self.CurrentLineNumber)\r
self.__Token = 'PCD('+PcdPair[1]+'.'+PcdPair[0]+')'\r
- \r
+\r
FfsFileObj.NameGuid = self.__Token\r
\r
self.__GetFilePart( FfsFileObj, MacroDict.copy())\r
#\r
# Check whether reloc strip flag can be set for a file type.\r
#\r
- # @param self The object pointer\r
# @param FileType The file type to check with\r
# @retval True This type could have relocation strip flag\r
# @retval False No way to have it\r
#\r
-\r
- def __FileCouldHaveRelocFlag (self, FileType):\r
- if FileType in ('SEC', 'PEI_CORE', 'PEIM', 'PEI_DXE_COMBO'):\r
+ @staticmethod\r
+ def __FileCouldHaveRelocFlag (FileType):\r
+ if FileType in (SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM, 'PEI_DXE_COMBO'):\r
return True\r
else:\r
return False\r
#\r
# Check whether reloc strip flag can be set for a section type.\r
#\r
- # @param self The object pointer\r
# @param SectionType The section type to check with\r
# @retval True This type could have relocation strip flag\r
# @retval False No way to have it\r
#\r
-\r
- def __SectionCouldHaveRelocFlag (self, SectionType):\r
- if SectionType in ('TE', 'PE32'):\r
+ @staticmethod\r
+ def __SectionCouldHaveRelocFlag (SectionType):\r
+ if SectionType in (BINARY_FILE_TYPE_TE, BINARY_FILE_TYPE_PE32):\r
return True\r
else:\r
return False\r
self.__GetFileOpts( FfsFileObj)\r
\r
if not self.__IsToken("{"):\r
-# if self.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'):\r
-# if self.__FileCouldHaveRelocFlag(FfsFileObj.FvFileType):\r
-# if self.__Token == 'RELOCS_STRIPPED':\r
-# FfsFileObj.KeepReloc = False\r
-# else:\r
-# FfsFileObj.KeepReloc = True\r
-# else:\r
-# raise Warning("File type %s could not have reloc strip flag%d" % (FfsFileObj.FvFileType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber)\r
-#\r
-# if not self.__IsToken("{"):\r
+ if self.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'):\r
+ if self.__FileCouldHaveRelocFlag(FfsFileObj.FvFileType):\r
+ if self.__Token == 'RELOCS_STRIPPED':\r
+ FfsFileObj.KeepReloc = False\r
+ else:\r
+ FfsFileObj.KeepReloc = True\r
+ else:\r
+ raise Warning("File type %s could not have reloc strip flag%d" % (FfsFileObj.FvFileType, self.CurrentLineNumber), self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__IsToken("{"):\r
raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
\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
elif self.__Token in ("DEFINE", "APRIORI", "SECTION"):\r
self.__UndoToken()\r
self.__GetSectionData( FfsFileObj, MacroDict)\r
+\r
+ elif hasattr(FfsFileObj, 'FvFileType') and FfsFileObj.FvFileType == 'RAW':\r
+ self.__UndoToken()\r
+ self.__GetRAWData(FfsFileObj, MacroDict)\r
+\r
else:\r
- FfsFileObj.FileName = self.__Token\r
+ FfsFileObj.CurrentLineNum = self.CurrentLineNumber\r
+ FfsFileObj.CurrentLineContent = self.__CurrentLine()\r
+ FfsFileObj.FileName = self.__Token.replace('$(SPACE)', ' ')\r
+ self.__VerifyFile(FfsFileObj.FileName)\r
\r
if not self.__IsToken( "}"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
\r
+ ## __GetRAWData() method\r
+ #\r
+ # Get RAW data for FILE statement\r
+ #\r
+ # @param self The object pointer\r
+ # @param FfsFileObj for whom section is got\r
+ # @param MacroDict dictionary used to replace macro\r
+ #\r
+ def __GetRAWData(self, FfsFileObj, MacroDict = {}):\r
+ FfsFileObj.FileName = []\r
+ FfsFileObj.SubAlignment = []\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
+ "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
+ if not self.__Token == "Auto":\r
+ AlignValue = self.__Token\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Filename value", self.FileName, self.CurrentLineNumber)\r
+\r
+ FileName = self.__Token.replace('$(SPACE)', ' ')\r
+ if FileName == '}':\r
+ self.__UndoToken()\r
+ raise Warning("expected Filename value", self.FileName, self.CurrentLineNumber)\r
+\r
+ self.__VerifyFile(FileName)\r
+ File = PathClass(NormPath(FileName), GenFdsGlobalVariable.WorkSpaceDir)\r
+ FfsFileObj.FileName.append(File.Path)\r
+ FfsFileObj.SubAlignment.append(AlignValue)\r
+\r
+ if self.__IsToken( "}"):\r
+ self.__UndoToken()\r
+ break\r
+\r
+ if len(FfsFileObj.SubAlignment) == 1:\r
+ FfsFileObj.SubAlignment = FfsFileObj.SubAlignment[0]\r
+ if len(FfsFileObj.FileName) == 1:\r
+ FfsFileObj.FileName = FfsFileObj.FileName[0]\r
+\r
## __GetFileOpts() method\r
#\r
# Get options for FILE statement\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\"", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.KeyStringList.append(self.__Token)\r
\r
FfsFileObj.CheckSum = True\r
\r
if self.__GetAlignment():\r
- FfsFileObj.Alignment = self.__Token\r
-\r
-\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
+ if not self.__Token == "Auto":\r
+ FfsFileObj.Alignment = self.__Token\r
\r
## __GetAlignment() method\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"):\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
else:\r
VerSectionObj.FileName = self.__Token\r
Obj.SectionList.append(VerSectionObj)\r
- \r
- elif self.__IsKeyword( "UI"):\r
+\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.__GetAprioriSection(FvObj, MacroDict.copy())\r
\r
while True:\r
- IsInf = self.__GetInfStatement(FvObj, MacroDict.copy())\r
+ IsInf = self.__GetInfStatement(FvObj)\r
IsFile = self.__GetFileStatement(FvObj, MacroDict.copy())\r
if not IsInf and not IsFile:\r
break\r
\r
FvImageSectionObj = FvImageSection.FvImageSection()\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
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
if not self.__GetNextToken():\r
raise Warning("expected section file path", self.FileName, self.CurrentLineNumber)\r
DataSectionObj.SectFileName = self.__Token\r
+ self.__VerifyFile(DataSectionObj.SectFileName)\r
else:\r
if not self.__GetCglSection(DataSectionObj):\r
return False\r
\r
return True\r
\r
+ ## __VerifyFile\r
+ #\r
+ # Check if file exists or not:\r
+ # If current phase if GenFds, the file must exist;\r
+ # If current phase is AutoGen and the file is not in $(OUTPUT_DIRECTORY), the file must exist\r
+ # @param FileName: File path to be verified.\r
+ #\r
+ def __VerifyFile(self, FileName):\r
+ if FileName.replace('$(WORKSPACE)', '').find('$') != -1:\r
+ return\r
+ if not GlobalData.gAutoGenPhase or not self.__GetMacroValue("OUTPUT_DIRECTORY") in FileName:\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
+\r
## __GetCglSection() method\r
#\r
# Get compressed or GUIDed section for Obj\r
GuidSectionObj.SectionType = "GUIDED"\r
GuidSectionObj.ProcessRequired = AttribDict["PROCESSING_REQUIRED"]\r
GuidSectionObj.AuthStatusValid = AttribDict["AUTH_STATUS_VALID"]\r
+ GuidSectionObj.ExtraHeaderSize = AttribDict["EXTRA_HEADER_SIZE"]\r
# Recursive sections...\r
while True:\r
IsLeafSection = self.__GetLeafSection(GuidSectionObj)\r
def __GetGuidAttrib(self):\r
\r
AttribDict = {}\r
- AttribDict["PROCESSING_REQUIRED"] = False\r
- AttribDict["AUTH_STATUS_VALID"] = False\r
- if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):\r
+ AttribDict["PROCESSING_REQUIRED"] = "NONE"\r
+ AttribDict["AUTH_STATUS_VALID"] = "NONE"\r
+ AttribDict["EXTRA_HEADER_SIZE"] = -1\r
+ while self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID") \\r
+ or self.__IsKeyword("EXTRA_HEADER_SIZE"):\r
AttribKey = self.__Token\r
\r
if not self.__IsToken("="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__GetNextToken() or self.__Token.upper() not in ("TRUE", "FALSE", "1", "0"):\r
- raise Warning("expected TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)\r
- AttribDict[AttribKey] = self.__Token\r
-\r
- if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):\r
- AttribKey = self.__Token\r
-\r
- if not self.__IsToken("="):\r
- raise Warning("expected '='")\r
-\r
- if not self.__GetNextToken() or self.__Token.upper() not in ("TRUE", "FALSE", "1", "0"):\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected TRUE(1)/FALSE(0)/Number", self.FileName, self.CurrentLineNumber)\r
+ elif AttribKey == "EXTRA_HEADER_SIZE":\r
+ Base = 10\r
+ if self.__Token[0:2].upper() == "0X":\r
+ Base = 16\r
+ try:\r
+ AttribDict[AttribKey] = int(self.__Token, Base)\r
+ continue\r
+ except ValueError:\r
+ raise Warning("expected Number", self.FileName, self.CurrentLineNumber)\r
+ elif self.__Token.upper() not in ("TRUE", "FALSE", "1", "0"):\r
raise Warning("expected TRUE/FALSE (1/0)", self.FileName, self.CurrentLineNumber)\r
AttribDict[AttribKey] = self.__Token\r
\r
\r
AlignValue = None\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 '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
else:\r
return True\r
\r
+ def __GetFmp(self):\r
+ if not self.__GetNextToken():\r
+ return False\r
+ S = self.__Token.upper()\r
+ if S.startswith("[") and not S.startswith("[FMPPAYLOAD."):\r
+ self.SectionParser(S)\r
+ self.__UndoToken()\r
+ return False\r
+\r
+ self.__UndoToken()\r
+ self.__SkipToToken("[FMPPAYLOAD.", True)\r
+ FmpUiName = self.__GetUiName().upper()\r
+ if FmpUiName in self.Profile.FmpPayloadDict:\r
+ raise Warning("Duplicated FMP UI name found: %s" % FmpUiName, self.FileName, self.CurrentLineNumber)\r
+\r
+ FmpData = CapsuleData.CapsulePayload()\r
+ FmpData.UiName = FmpUiName\r
+\r
+ if not self.__IsToken( "]"):\r
+ raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("The FMP payload section is empty!", self.FileName, self.CurrentLineNumber)\r
+ FmpKeyList = ['IMAGE_HEADER_INIT_VERSION', 'IMAGE_TYPE_ID', 'IMAGE_INDEX', 'HARDWARE_INSTANCE', 'CERTIFICATE_GUID', 'MONOTONIC_COUNT']\r
+ while self.__Token in FmpKeyList:\r
+ Name = self.__Token\r
+ FmpKeyList.remove(Name)\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if Name == 'IMAGE_TYPE_ID':\r
+ if not self.__GetNextGuid():\r
+ raise Warning("expected GUID value for IMAGE_TYPE_ID.", self.FileName, self.CurrentLineNumber)\r
+ FmpData.ImageTypeId = self.__Token\r
+ elif Name == 'CERTIFICATE_GUID':\r
+ if not self.__GetNextGuid():\r
+ raise Warning("expected GUID value for CERTIFICATE_GUID.", self.FileName, self.CurrentLineNumber)\r
+ FmpData.Certificate_Guid = self.__Token\r
+ if uuid.UUID(FmpData.Certificate_Guid) != EFI_CERT_TYPE_RSA2048_SHA256_GUID and uuid.UUID(FmpData.Certificate_Guid) != EFI_CERT_TYPE_PKCS7_GUID:\r
+ raise Warning("Only support EFI_CERT_TYPE_RSA2048_SHA256_GUID or EFI_CERT_TYPE_PKCS7_GUID for CERTIFICATE_GUID.", self.FileName, self.CurrentLineNumber)\r
+ else:\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected value of %s" % Name, self.FileName, self.CurrentLineNumber)\r
+ Value = self.__Token\r
+ if Name == 'IMAGE_HEADER_INIT_VERSION':\r
+ if FdfParser.__Verify(Name, Value, 'UINT8'):\r
+ FmpData.Version = Value\r
+ elif Name == 'IMAGE_INDEX':\r
+ if FdfParser.__Verify(Name, Value, 'UINT8'):\r
+ FmpData.ImageIndex = Value\r
+ elif Name == 'HARDWARE_INSTANCE':\r
+ if FdfParser.__Verify(Name, Value, 'UINT8'):\r
+ FmpData.HardwareInstance = Value\r
+ elif Name == 'MONOTONIC_COUNT':\r
+ if FdfParser.__Verify(Name, Value, 'UINT64'):\r
+ FmpData.MonotonicCount = Value\r
+ if FmpData.MonotonicCount.upper().startswith('0X'):\r
+ FmpData.MonotonicCount = (long)(FmpData.MonotonicCount, 16)\r
+ else:\r
+ FmpData.MonotonicCount = (long)(FmpData.MonotonicCount)\r
+ if not self.__GetNextToken():\r
+ break\r
+ else:\r
+ self.__UndoToken()\r
+\r
+ if (FmpData.MonotonicCount and not FmpData.Certificate_Guid) or (not FmpData.MonotonicCount and FmpData.Certificate_Guid):\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, "CERTIFICATE_GUID and MONOTONIC_COUNT must be work as a pair.")\r
+\r
+ # Only the IMAGE_TYPE_ID is required item\r
+ if FmpKeyList and 'IMAGE_TYPE_ID' in FmpKeyList:\r
+ raise Warning("Missing keywords IMAGE_TYPE_ID in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
+ # get the Image file and Vendor code file\r
+ self.__GetFMPCapsuleData(FmpData)\r
+ if not FmpData.ImageFile:\r
+ raise Warning("Missing image file in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
+ # check whether more than one Vendor code file\r
+ if len(FmpData.VendorCodeFile) > 1:\r
+ raise Warning("At most one Image file and one Vendor code file are allowed in FMP payload section.", self.FileName, self.CurrentLineNumber)\r
+ self.Profile.FmpPayloadDict[FmpUiName] = FmpData\r
+ return True\r
+\r
## __GetCapsule() method\r
#\r
# Get capsule section contents and store its data into capsule list of self.Profile\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[CAPSULE."):\r
- if not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
\r
def __GetCapsuleTokens(self, Obj):\r
if not self.__GetNextToken():\r
return False\r
- while self.__Token in ("CAPSULE_GUID", "CAPSULE_HEADER_SIZE", "CAPSULE_FLAGS"):\r
+ while self.__Token in ("CAPSULE_GUID", "CAPSULE_HEADER_SIZE", "CAPSULE_FLAGS", "OEM_CAPSULE_FLAGS", "CAPSULE_HEADER_INIT_VERSION"):\r
Name = self.__Token.strip()\r
if not self.__IsToken("="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__Token in ("PersistAcrossReset", "PopulateSystemTable", "InitiateReset"):\r
raise Warning("expected PersistAcrossReset, PopulateSystemTable, or InitiateReset", self.FileName, self.CurrentLineNumber)\r
Value += self.__Token.strip()\r
+ elif Name == 'OEM_CAPSULE_FLAGS':\r
+ Value = self.__Token.strip()\r
+ if not Value.upper().startswith('0X'):\r
+ raise Warning("expected hex value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\r
+ try:\r
+ Value = int(Value, 0)\r
+ except ValueError:\r
+ raise Warning("expected hex value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\r
+ if not 0x0000 <= Value <= 0xFFFF:\r
+ raise Warning("expected hex value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\r
+ Value = self.__Token.strip()\r
else:\r
Value = self.__Token.strip()\r
- Obj.TokensDict[Name] = Value \r
+ Obj.TokensDict[Name] = Value\r
if not self.__GetNextToken():\r
return False\r
self.__UndoToken()\r
IsInf = self.__GetInfStatement(Obj, True)\r
IsFile = self.__GetFileStatement(Obj, True)\r
IsFv = self.__GetFvStatement(Obj)\r
- if not IsInf and not IsFile and not IsFv:\r
+ IsFd = self.__GetFdStatement(Obj)\r
+ IsAnyFile = self.__GetAnyFileStatement(Obj)\r
+ IsAfile = self.__GetAfileStatement(Obj)\r
+ IsFmp = self.__GetFmpStatement(Obj)\r
+ if not (IsInf or IsFile or IsFv or IsFd or IsAnyFile or IsAfile or IsFmp):\r
+ break\r
+\r
+ ## __GetFMPCapsuleData() method\r
+ #\r
+ # Get capsule data for FMP capsule\r
+ #\r
+ # @param self The object pointer\r
+ # @param Obj for whom capsule data are got\r
+ #\r
+ def __GetFMPCapsuleData(self, Obj):\r
+\r
+ while True:\r
+ IsFv = self.__GetFvStatement(Obj, True)\r
+ IsFd = self.__GetFdStatement(Obj, True)\r
+ IsAnyFile = self.__GetAnyFileStatement(Obj, True)\r
+ if not (IsFv or IsFd or IsAnyFile):\r
break\r
\r
## __GetFvStatement() method\r
# @retval True Successfully find a FV statement\r
# @retval False Not able to find a FV statement\r
#\r
- def __GetFvStatement(self, CapsuleObj):\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
if not self.__GetNextToken():\r
raise Warning("expected FV name", self.FileName, self.CurrentLineNumber)\r
\r
+ if self.__Token.upper() not in self.Profile.FvDict:\r
+ raise Warning("FV name does not exist", self.FileName, self.CurrentLineNumber)\r
+\r
CapsuleFv = CapsuleData.CapsuleFv()\r
CapsuleFv.FvName = self.__Token\r
- CapsuleObj.CapsuleDataList.append(CapsuleFv)\r
+ if FMPCapsule:\r
+ if not CapsuleObj.ImageFile:\r
+ CapsuleObj.ImageFile.append(CapsuleFv)\r
+ else:\r
+ CapsuleObj.VendorCodeFile.append(CapsuleFv)\r
+ else:\r
+ CapsuleObj.CapsuleDataList.append(CapsuleFv)\r
+ return True\r
+\r
+ ## __GetFdStatement() method\r
+ #\r
+ # Get FD for capsule\r
+ #\r
+ # @param self The object pointer\r
+ # @param CapsuleObj for whom FD is got\r
+ # @retval True Successfully find a FD statement\r
+ # @retval False Not able to find a FD statement\r
+ #\r
+ def __GetFdStatement(self, CapsuleObj, FMPCapsule = False):\r
+\r
+ if not self.__IsKeyword("FD"):\r
+ return False\r
+\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected FD name", self.FileName, self.CurrentLineNumber)\r
+\r
+ if self.__Token.upper() not in self.Profile.FdDict:\r
+ raise Warning("FD name does not exist", self.FileName, self.CurrentLineNumber)\r
+\r
+ CapsuleFd = CapsuleData.CapsuleFd()\r
+ CapsuleFd.FdName = self.__Token\r
+ if FMPCapsule:\r
+ if not CapsuleObj.ImageFile:\r
+ CapsuleObj.ImageFile.append(CapsuleFd)\r
+ else:\r
+ CapsuleObj.VendorCodeFile.append(CapsuleFd)\r
+ else:\r
+ CapsuleObj.CapsuleDataList.append(CapsuleFd)\r
+ return True\r
+\r
+ def __GetFmpStatement(self, CapsuleObj):\r
+ if not self.__IsKeyword("FMP_PAYLOAD"):\r
+ if not self.__IsKeyword("FMP"):\r
+ return False\r
+\r
+ if not self.__IsKeyword("PAYLOAD"):\r
+ self.__UndoToken()\r
+ return False\r
+\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected payload name after FMP_PAYLOAD =", self.FileName, self.CurrentLineNumber)\r
+ Payload = self.__Token.upper()\r
+ if Payload not in self.Profile.FmpPayloadDict:\r
+ raise Warning("This FMP Payload does not exist: %s" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+ CapsuleObj.FmpPayloadList.append(self.Profile.FmpPayloadDict[Payload])\r
+ return True\r
+\r
+ def __ParseRawFileStatement(self):\r
+ if not self.__IsKeyword("FILE"):\r
+ return None\r
+\r
+ if not self.__IsKeyword("DATA"):\r
+ self.__UndoToken()\r
+ return None\r
+\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected File name", self.FileName, self.CurrentLineNumber)\r
+\r
+ AnyFileName = self.__Token\r
+ self.__VerifyFile(AnyFileName)\r
+\r
+ if not os.path.isabs(AnyFileName):\r
+ AnyFileName = mws.join(GenFdsGlobalVariable.WorkSpaceDir, AnyFileName)\r
+\r
+ return AnyFileName\r
+\r
+ ## __GetAnyFileStatement() method\r
+ #\r
+ # Get AnyFile for capsule\r
+ #\r
+ # @param self The object pointer\r
+ # @param CapsuleObj for whom AnyFile is got\r
+ # @retval True Successfully find a Anyfile statement\r
+ # @retval False Not able to find a AnyFile statement\r
+ #\r
+ def __GetAnyFileStatement(self, CapsuleObj, FMPCapsule = False):\r
+ AnyFileName = self.__ParseRawFileStatement()\r
+ if not AnyFileName:\r
+ return False\r
+\r
+ CapsuleAnyFile = CapsuleData.CapsuleAnyFile()\r
+ CapsuleAnyFile.FileName = AnyFileName\r
+ if FMPCapsule:\r
+ if not CapsuleObj.ImageFile:\r
+ CapsuleObj.ImageFile.append(CapsuleAnyFile)\r
+ else:\r
+ CapsuleObj.VendorCodeFile.append(CapsuleAnyFile)\r
+ else:\r
+ CapsuleObj.CapsuleDataList.append(CapsuleAnyFile)\r
+ return True\r
+\r
+ ## __GetAfileStatement() method\r
+ #\r
+ # Get Afile for capsule\r
+ #\r
+ # @param self The object pointer\r
+ # @param CapsuleObj for whom Afile is got\r
+ # @retval True Successfully find a Afile statement\r
+ # @retval False Not able to find a Afile statement\r
+ #\r
+ def __GetAfileStatement(self, CapsuleObj):\r
+\r
+ if not self.__IsKeyword("APPEND"):\r
+ return False\r
+\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Afile name", self.FileName, self.CurrentLineNumber)\r
+\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",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
+ AfileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(AfileName)\r
+ self.__VerifyFile(AfileName)\r
+ else:\r
+ if not os.path.exists(AfileName):\r
+ raise Warning('%s does not exist' % AfileName, self.FileName, self.CurrentLineNumber)\r
+ else:\r
+ pass\r
+\r
+ CapsuleAfile = CapsuleData.CapsuleAfile()\r
+ CapsuleAfile.FileName = AfileName\r
+ CapsuleObj.CapsuleDataList.append(CapsuleAfile)\r
return True\r
\r
## __GetRule() method\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[RULE."):\r
- if not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
self.__UndoToken()\r
raise Warning("expected '.'", self.FileName, self.CurrentLineNumber)\r
\r
Arch = self.__SkippedChars.rstrip(".")\r
- if Arch.upper() not in ("IA32", "X64", "IPF", "EBC", "ARM", "COMMON"):\r
+ if Arch.upper() not in ARCH_SET_FULL:\r
raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber)\r
\r
ModuleType = self.__GetModuleType()\r
\r
if not self.__GetNextWord():\r
raise Warning("expected Module type", self.FileName, self.CurrentLineNumber)\r
- if self.__Token.upper() not in ("SEC", "PEI_CORE", "PEIM", "DXE_CORE", \\r
- "DXE_DRIVER", "DXE_SAL_DRIVER", \\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", "ACPITABLE", "SMM_CORE"):\r
+ if self.__Token.upper() not in (SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM, SUP_MODULE_DXE_CORE, \\r
+ SUP_MODULE_DXE_DRIVER, SUP_MODULE_DXE_SAL_DRIVER, \\r
+ SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_DXE_RUNTIME_DRIVER, \\r
+ SUP_MODULE_UEFI_DRIVER, SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_USER_DEFINED, "DEFAULT", SUP_MODULE_BASE, \\r
+ EDK_COMPONENT_TYPE_SECURITY_CORE, EDK_COMPONENT_TYPE_COMBINED_PEIM_DRIVER, EDK_COMPONENT_TYPE_PIC_PEIM, EDK_COMPONENT_TYPE_RELOCATABLE_PEIM, \\r
+ "PE32_PEIM", EDK_COMPONENT_TYPE_BS_DRIVER, EDK_COMPONENT_TYPE_RT_DRIVER, EDK_COMPONENT_TYPE_SAL_RT_DRIVER, EDK_COMPONENT_TYPE_APPLICATION, "ACPITABLE", SUP_MODULE_SMM_CORE, SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CORE_STANDALONE):\r
raise Warning("Unknown Module type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
return self.__Token\r
\r
#\r
def __GetFileExtension(self):\r
if not self.__IsToken("."):\r
- raise Warning("expected '.'", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("expected '.'", self.FileName, self.CurrentLineNumber)\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 FFS type", 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", "SMM", "SMM_CORE"):\r
+ if Type not in ("RAW", "FREEFORM", SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM,\\r
+ "PEI_DXE_COMBO", "DRIVER", SUP_MODULE_DXE_CORE, EDK_COMPONENT_TYPE_APPLICATION, "FV_IMAGE", "SMM", SUP_MODULE_SMM_CORE, SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CORE_STANDALONE):\r
raise Warning("Unknown FV type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
\r
if not self.__IsToken("="):\r
if self.__Token == 'PCD':\r
if not self.__IsToken( "("):\r
raise Warning("expected '('", self.FileName, self.CurrentLineNumber)\r
- PcdPair = self.__GetNextPcdName()\r
+ PcdPair = self.__GetNextPcdSettings()\r
if not self.__IsToken( ")"):\r
raise Warning("expected ')'", self.FileName, self.CurrentLineNumber)\r
self.__Token = 'PCD('+PcdPair[1]+'.'+PcdPair[0]+')'\r
- \r
+\r
NameGuid = self.__Token\r
\r
KeepReloc = None\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\"", self.FileName, self.CurrentLineNumber)\r
KeyStringList.append(self.__Token)\r
\r
\r
AlignValue = ""\r
if self.__GetAlignment():\r
- if self.__Token not in ("Auto", "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 '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
#For FFS, Auto is default option same to ""\r
if not self.__Token == "Auto":\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
\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"):\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
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
Rule.FileExtension = Ext\r
Rule.FileName = self.__Token\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"):\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
\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"):\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
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" % EfiSectionObj.SectionType, self.FileName, self.CurrentLineNumber)\r
else:\r
raise Warning("Section type %s could not have reloc strip flag" % EfiSectionObj.SectionType, self.FileName, self.CurrentLineNumber)\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
- \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
self.__GetNextWord()\r
- \r
+\r
if self.__Token == 'PCD':\r
if not self.__IsToken( "("):\r
raise Warning("expected '('", self.FileName, self.CurrentLineNumber)\r
- PcdPair = self.__GetNextPcdName()\r
+ PcdPair = self.__GetNextPcdSettings()\r
if not self.__IsToken( ")"):\r
raise Warning("expected ')'", self.FileName, self.CurrentLineNumber)\r
self.__Token = 'PCD('+PcdPair[1]+'.'+PcdPair[0]+')'\r
- \r
- EfiSectionObj.FileName = self.__Token \r
- \r
+\r
+ EfiSectionObj.FileName = self.__Token\r
+\r
else:\r
self.__UndoToken()\r
else:\r
#\r
# Get whether a section could be optional\r
#\r
- # @param self The object pointer\r
# @param SectionType The section type to check\r
# @retval True section could be optional\r
# @retval False section never optional\r
#\r
- def __RuleSectionCouldBeOptional(self, SectionType):\r
- if SectionType in ("DXE_DEPEX", "UI", "VERSION", "PEI_DEPEX", "RAW", "SMM_DEPEX"):\r
+ @staticmethod\r
+ def __RuleSectionCouldBeOptional(SectionType):\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
# Get whether a section could have build number information\r
#\r
- # @param self The object pointer\r
# @param SectionType The section type to check\r
# @retval True section could have build number information\r
# @retval False section never have build number information\r
#\r
- def __RuleSectionCouldHaveBuildNum(self, SectionType):\r
+ @staticmethod\r
+ def __RuleSectionCouldHaveBuildNum(SectionType):\r
if SectionType in ("VERSION"):\r
return True\r
else:\r
#\r
# Get whether a section could have string\r
#\r
- # @param self The object pointer\r
# @param SectionType The section type to check\r
# @retval True section could have string\r
# @retval False section never have string\r
#\r
- def __RuleSectionCouldHaveString(self, SectionType):\r
- if SectionType in ("UI", "VERSION"):\r
+ @staticmethod\r
+ def __RuleSectionCouldHaveString(SectionType):\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
GuidSectionObj.SectionType = "GUIDED"\r
GuidSectionObj.ProcessRequired = AttribDict["PROCESSING_REQUIRED"]\r
GuidSectionObj.AuthStatusValid = AttribDict["AUTH_STATUS_VALID"]\r
+ GuidSectionObj.ExtraHeaderSize = AttribDict["EXTRA_HEADER_SIZE"]\r
\r
# Efi sections...\r
while True:\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[VTF."):\r
- if not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
+ self.SectionParser(S)\r
self.__UndoToken()\r
return False\r
\r
raise Warning("expected '.'", 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 '%s'" % Arch, 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", 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 '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
VtfObj.ArchList = self.__Token.upper()\r
\r
raise Warning("expected Reset file", self.FileName, self.CurrentLineNumber)\r
\r
VtfObj.ResetBin = self.__Token\r
+ if VtfObj.ResetBin.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(VtfObj.ResetBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
while self.__GetComponentStatement(VtfObj):\r
pass\r
raise Warning("expected Component type", 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 '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
CompStatementObj.CompType = self.__Token\r
\r
if not self.__GetNextToken():\r
raise Warning("expected Component version", 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
+ Pattern = re.compile('-$|[0-9a-fA-F]{1,2}\.[0-9a-fA-F]{1,2}$', re.DOTALL)\r
+ if Pattern.match(self.__Token) is None:\r
raise Warning("Unknown version format '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
CompStatementObj.CompVer = self.__Token\r
\r
raise Warning("expected Component file", self.FileName, self.CurrentLineNumber)\r
\r
CompStatementObj.CompBin = self.__Token\r
+ if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompBin), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not self.__IsKeyword("COMP_SYM"):\r
raise Warning("expected COMP_SYM", self.FileName, self.CurrentLineNumber)\r
raise Warning("expected Component symbol file", self.FileName, self.CurrentLineNumber)\r
\r
CompStatementObj.CompSym = self.__Token\r
+ if CompStatementObj.CompSym != '-' and CompStatementObj.CompSym.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompSym), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not self.__IsKeyword("COMP_SIZE"):\r
raise Warning("expected COMP_SIZE", self.FileName, self.CurrentLineNumber)\r
\r
S = self.__Token.upper()\r
if S.startswith("[") and not S.startswith("[OPTIONROM."):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
- \r
+ self.SectionParser(S)\r
+ self.__UndoToken()\r
+ return False\r
+\r
self.__UndoToken()\r
if not self.__IsToken("[OptionRom.", True):\r
raise Warning("Unknown Keyword '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
isFile = self.__GetOptRomFileStatement(OptRomObj)\r
if not isInf and not isFile:\r
break\r
- \r
+\r
return True\r
\r
## __GetOptRomInfStatement() method\r
if not self.__GetNextToken():\r
raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
ffsInf.InfFileName = self.__Token\r
+ if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if not ffsInf.InfFileName in self.Profile.InfList:\r
self.Profile.InfList.append(ffsInf.InfFileName)\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.InfFileLineList.append(FileLineTuple)\r
+ if ffsInf.UseArch:\r
+ if ffsInf.UseArch not in self.Profile.InfDict:\r
+ self.Profile.InfDict[ffsInf.UseArch] = [ffsInf.InfFileName]\r
+ else:\r
+ self.Profile.InfDict[ffsInf.UseArch].append(ffsInf.InfFileName)\r
+ else:\r
+ self.Profile.InfDict['ArchTBD'].append(ffsInf.InfFileName)\r
+\r
\r
- \r
self.__GetOptRomOverrides (ffsInf)\r
- \r
+\r
Obj.FfsList.append(ffsInf)\r
return True\r
\r
Overrides.PciRevision = self.__Token\r
continue\r
\r
- if self.__IsKeyword( "COMPRESS"):\r
+ if self.__IsKeyword( "PCI_COMPRESS"):\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
EdkLogger.error("FdfParser", FORMAT_INVALID, File=self.FileName, Line=self.CurrentLineNumber)\r
\r
Obj.OverrideAttribs = Overrides\r
- \r
+\r
## __GetOptRomFileStatement() method\r
#\r
# Get FILE statements\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 not self.__GetNextToken():\r
raise Warning("expected File path", self.FileName, self.CurrentLineNumber)\r
FfsFileObj.FileName = self.__Token\r
+ if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(FfsFileObj.FileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
\r
if FfsFileObj.FileType == 'EFI':\r
self.__GetOptRomOverrides(FfsFileObj)\r
- \r
+\r
Obj.FfsList.append(FfsFileObj)\r
\r
return True\r
def __GetCapInFd (self, FdName):\r
\r
CapList = []\r
- if FdName.upper() in self.Profile.FdDict.keys():\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 == 'CAPSULE':\r
for elementRegionData in elementRegion.RegionDataList:\r
if elementRegionData.endswith(".cap"):\r
continue\r
- if elementRegionData != None and elementRegionData.upper() not in CapList:\r
+ if elementRegionData is not None and elementRegionData.upper() not in CapList:\r
CapList.append(elementRegionData.upper())\r
return CapList\r
\r
def __GetReferencedFdCapTuple(self, CapObj, RefFdList = [], RefFvList = []):\r
\r
for CapsuleDataObj in CapObj.CapsuleDataList :\r
- if CapsuleDataObj.FvName != None and CapsuleDataObj.FvName.upper() not in RefFvList:\r
+ if hasattr(CapsuleDataObj, 'FvName') and CapsuleDataObj.FvName is not None and CapsuleDataObj.FvName.upper() not in RefFvList:\r
RefFvList.append (CapsuleDataObj.FvName.upper())\r
- elif CapsuleDataObj.Ffs != None:\r
- if isinstance(CapsuleDataObj.Ffs, FfsFileStatement.FileStatement):\r
- if CapsuleDataObj.Ffs.FvName != None and CapsuleDataObj.Ffs.FvName.upper() not in RefFvList:\r
- RefFvList.append(CapsuleDataObj.Ffs.FvName.upper())\r
- elif CapsuleDataObj.Ffs.FdName != None and CapsuleDataObj.Ffs.FdName.upper() not in RefFdList:\r
- RefFdList.append(CapsuleDataObj.Ffs.FdName.upper())\r
- else:\r
- self.__GetReferencedFdFvTupleFromSection(CapsuleDataObj.Ffs, RefFdList, RefFvList)\r
+ elif hasattr(CapsuleDataObj, 'FdName') and CapsuleDataObj.FdName is not None and CapsuleDataObj.FdName.upper() not in RefFdList:\r
+ RefFdList.append (CapsuleDataObj.FdName.upper())\r
+ elif CapsuleDataObj.Ffs is not None:\r
+ if isinstance(CapsuleDataObj.Ffs, FfsFileStatement.FileStatement):\r
+ if CapsuleDataObj.Ffs.FvName is not None and CapsuleDataObj.Ffs.FvName.upper() not in RefFvList:\r
+ RefFvList.append(CapsuleDataObj.Ffs.FvName.upper())\r
+ elif CapsuleDataObj.Ffs.FdName is not None and CapsuleDataObj.Ffs.FdName.upper() not in RefFdList:\r
+ RefFdList.append(CapsuleDataObj.Ffs.FdName.upper())\r
+ else:\r
+ self.__GetReferencedFdFvTupleFromSection(CapsuleDataObj.Ffs, RefFdList, RefFvList)\r
\r
## __GetFvInFd() method\r
#\r
def __GetFvInFd (self, FdName):\r
\r
FvList = []\r
- if FdName.upper() in self.Profile.FdDict.keys():\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
- 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
# Check the cycle between FV and FD image\r
#\r
MaxLength = len (self.Profile.FvDict)\r
- for FvName in self.Profile.FvDict.keys():\r
+ for FvName in self.Profile.FvDict:\r
LogStr = "\nCycle Reference Checking for FV: %s\n" % FvName\r
RefFvStack = []\r
RefFvStack.append(FvName)\r
FdAnalyzedList = []\r
- \r
+\r
Index = 0\r
while RefFvStack != [] and Index < MaxLength:\r
Index = Index + 1\r
FvNameFromStack = RefFvStack.pop()\r
- if FvNameFromStack.upper() in self.Profile.FvDict.keys():\r
+ if FvNameFromStack.upper() in self.Profile.FvDict:\r
FvObj = self.Profile.FvDict[FvNameFromStack.upper()]\r
else:\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
# Check the cycle between Capsule and FD image\r
#\r
MaxLength = len (self.Profile.CapsuleDict)\r
- for CapName in self.Profile.CapsuleDict.keys():\r
+ for CapName in self.Profile.CapsuleDict:\r
#\r
# Capsule image to be checked.\r
#\r
RefCapStack.append(CapName)\r
FdAnalyzedList = []\r
FvAnalyzedList = []\r
- \r
+\r
Index = 0\r
while RefCapStack != [] and Index < MaxLength:\r
Index = Index + 1\r
CapNameFromStack = RefCapStack.pop()\r
- if CapNameFromStack.upper() in self.Profile.CapsuleDict.keys():\r
+ if CapNameFromStack.upper() in self.Profile.CapsuleDict:\r
CapObj = self.Profile.CapsuleDict[CapNameFromStack.upper()]\r
else:\r
continue\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
if RefFvName in FvAnalyzedList:\r
continue\r
LogStr += "Capsule %s contains FV %s\n" % (CapNameFromStack, RefFvName)\r
- if RefFvName.upper() in self.Profile.FvDict.keys():\r
+ if RefFvName.upper() in self.Profile.FvDict:\r
FvObj = self.Profile.FvDict[RefFvName.upper()]\r
else:\r
continue\r
\r
return False\r
\r
+ def GetAllIncludedFile (self):\r
+ global AllIncludeFileList\r
+ return AllIncludeFileList\r
+\r
if __name__ == "__main__":\r
- parser = FdfParser("..\LakeportX64Pkg.fdf")\r
+ import sys\r
+ try:\r
+ test_file = sys.argv[1]\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