## @file\r
# parse FDF file\r
#\r
-# Copyright (c) 2007, Intel Corporation\r
+# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
#\r
-# All rights reserved. This program and the accompanying materials\r
+# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
# which accompanies this distribution. The full text of the license may be found at\r
# http://opensource.org/licenses/bsd-license.php\r
##\r
# Import Modules\r
#\r
+import re\r
+\r
import Fd\r
import Region\r
import Fv\r
import OptRomInfStatement\r
import OptRomFileStatement\r
\r
+from GenFdsGlobalVariable import GenFdsGlobalVariable\r
from Common.BuildToolError import *\r
from Common import EdkLogger\r
+from Common.Misc import PathClass\r
+from Common.String import NormPath\r
+import Common.GlobalData as GlobalData\r
+from Common.Expression import *\r
+from Common import GlobalData\r
+from Common.String import ReplaceMacro\r
\r
import re\r
import os\r
\r
SEPERATOR_TUPLE = ('=', '|', ',', '{', '}')\r
\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+)\s*\|\s*(?P<size>\w+\.\w+)\s*")\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
self.InfList = []\r
\r
self.FdDict = {}\r
+ self.FdNameNotSet = False\r
self.FvDict = {}\r
- self.CapsuleList = []\r
+ self.CapsuleDict = {}\r
self.VtfList = []\r
self.RuleDict = {}\r
self.OptRomDict = {}\r
self.__SkippedChars = ""\r
\r
self.__WipeOffArea = []\r
+ if GenFdsGlobalVariable.WorkSpaceDir == '':\r
+ GenFdsGlobalVariable.WorkSpaceDir = os.getenv("WORKSPACE")\r
+\r
+ InputMacroDict.update(GlobalData.gPlatformDefines)\r
+ InputMacroDict.update(GlobalData.gGlobalDefines)\r
+ InputMacroDict.update(GlobalData.gCommandLineDefines)\r
\r
## __IsWhiteSpace() 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
Offset += 1\r
\r
\r
+ def __GetMacroName(self):\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
+ MacroName = self.__Token\r
+ NotFlag = False\r
+ if MacroName.startswith('!'):\r
+ NotFlag = True\r
+ MacroName = MacroName[1:].strip()\r
+ \r
+ if not MacroName.startswith('$(') or not MacroName.endswith(')'):\r
+ raise Warning("Macro name expected(Please use '$(%(Token)s)' if '%(Token)s' is a macro.)" % {"Token" : MacroName},\r
+ self.FileName, self.CurrentLineNumber)\r
+ MacroName = MacroName[2:-1]\r
+ return MacroName, NotFlag\r
+ \r
## PreprocessFile() method\r
#\r
# Preprocess file contents, replace comments with spaces.\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
- 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
+ __IncludeMacros = {}\r
+ __IncludeMacros['WORKSPACE'] = InputMacroDict['WORKSPACE']\r
+ __IncludeMacros['ECP_SOURCE'] = InputMacroDict['ECP_SOURCE']\r
+ __IncludeMacros['EFI_SOURCE'] = InputMacroDict['EFI_SOURCE']\r
+ __IncludeMacros['EDK_SOURCE'] = InputMacroDict['EDK_SOURCE']\r
+ \r
+ IncludedFile = NormPath(ReplaceMacro(IncFileName, __IncludeMacros, RaiseError=True))\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
+ IncludedFile1 = PathClass(IncludedFile, GenFdsGlobalVariable.ActivePlatform.Dir)\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), GenFdsGlobalVariable.ActivePlatform.Dir, GlobalData.gWorkspace), \r
+ self.FileName, self.CurrentLineNumber)\r
+\r
+ IncFileProfile = IncludeFileProfile(IncludedFile1.Path)\r
\r
CurrentLine = self.CurrentLineNumber\r
CurrentOffset = self.CurrentOffsetWithinLine\r
self.Profile.FileLinesList[IncludeLine - 1] = ''.join(TempList)\r
\r
self.Rewind()\r
-\r
- ## PreprocessIncludeFile() method\r
+ \r
+ def __GetIfListCurrentItemStat(self, 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
while self.__GetNextToken():\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
+ 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
+ if not self.__GetNextToken():\r
+ raise Warning("expected value", self.FileName, self.CurrentLineNumber)\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
+ InputMacroDict[MacProfile.MacroName] = MacProfile.MacroValue\r
+ self.__WipeOffArea.append(((DefineLine, DefineOffset), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
+ elif self.__Token == 'SET':\r
+ PcdPair = self.__GetNextPcdName()\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
\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
+ 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
\r
+ InputMacroDict[PcdName] = Value\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
- CondLabel = self.__Token\r
-\r
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
- MacroName = self.__Token\r
- NotFlag = False\r
- if MacroName.startswith('!'):\r
- NotFlag = True\r
- MacroName = MacroName[1:]\r
-\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
\r
+ CondLabel = self.__Token\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
- if not self.__GetNextToken():\r
- raise Warning("expected Macro name", self.FileName, self.CurrentLineNumber)\r
- MacroName = self.__Token\r
- NotFlag = False\r
- if MacroName.startswith('!'):\r
- NotFlag = True\r
- MacroName = MacroName[1:]\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
-\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 IfList[-1][1]:\r
self.__WipeOffArea.append(((self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - len('!endif')), (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
self.__WipeOffArea.append((IfList[-1][0], (self.CurrentLineNumber - 1, self.CurrentOffsetWithinLine - 1)))\r
\r
IfList.pop()\r
-\r
-\r
- if len(IfList) > 0:\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
+ 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
+ InputMacroDict[RegionSizeGuid.group('base')] = RegionSize.group('base')\r
+ InputMacroDict[RegionSizeGuid.group('size')] = RegionSize.group('size')\r
+ RegionLayoutLine = self.CurrentLineNumber + 1\r
+\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
-\r
+ def __EvaluateConditional(self, Expression, Line, Op = None, Value = None):\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
- 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
- else:\r
- return False\r
- elif Op == '==':\r
- if Value == Profile.MacroValue:\r
- return True\r
- else:\r
- return False\r
- else:\r
- if (self.__IsHex(Value) or Value.isdigit()) and (self.__IsHex(Profile.MacroValue) or (Profile.MacroValue != None and Profile.MacroValue.isdigit())):\r
- 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
+ if Op == 'eval':\r
+ try:\r
+ return ValueExpression(Expression, InputMacroDict)()\r
+ except SymbolNotFound:\r
+ return False\r
+ except WrnExpression, 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, Excpt:\r
+ raise Warning("Invalid expression", *FileLineTuple)\r
+ else:\r
+ if Expression.startswith('$(') and Expression[-1] == ')':\r
+ Expression = Expression[2:-1] \r
+ return Expression in InputMacroDict\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
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
+ 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
## 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
+ self.Preprocess()\r
while self.__GetFd():\r
pass\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
if not self.__IsToken("="):\r
raise Warning("expected [FD.]", self.FileName, self.CurrentLineNumber)\r
\r
FdName = self.__GetUiName()\r
+ if FdName == "":\r
+ if len (self.Profile.FdDict) == 0:\r
+ FdName = GenFdsGlobalVariable.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
+ if self.CurrentFdName in self.Profile.FdDict:\r
+ raise Warning("Unexpected the same FD name", self.FileName, self.CurrentLineNumber)\r
\r
if not self.__IsToken( "]"):\r
raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
FdObj = Fd.FD()\r
FdObj.FdUiName = self.CurrentFdName\r
self.Profile.FdDict[self.CurrentFdName] = FdObj\r
+\r
+ if len (self.Profile.FdDict) > 1 and self.Profile.FdNameNotSet:\r
+ raise Warning("expected all FDs have their name", self.FileName, self.CurrentLineNumber)\r
+\r
Status = self.__GetCreateFile(FdObj)\r
if not Status:\r
raise Warning("FD name error", self.FileName, self.CurrentLineNumber)\r
\r
- if not self.__GetTokenStatements(FdObj):\r
- return False\r
+ self.__GetTokenStatements(FdObj)\r
\r
self.__GetDefineStatements(FdObj)\r
\r
#\r
# @param self The object pointer\r
# @param Obj for whom token statement is got\r
- # @retval True Successfully find a token statement\r
- # @retval False Not able to find a token statement\r
#\r
def __GetTokenStatements(self, Obj):\r
if not self.__IsKeyword( "BaseAddress"):\r
\r
Obj.ErasePolarity = self.__Token\r
\r
- Status = self.__GetBlockStatements(Obj)\r
- return Status\r
+ self.__GetBlockStatements(Obj)\r
\r
## __GetAddressStatements() method\r
#\r
#\r
# @param self The object pointer\r
# @param Obj for whom block statement is got\r
- # @retval True Successfully find\r
- # @retval False Not able to find\r
#\r
def __GetBlockStatements(self, Obj):\r
\r
if not self.__GetBlockStatement(Obj):\r
- raise Warning("expected block statement", self.FileName, self.CurrentLineNumber)\r
+ #set default block size is 1\r
+ Obj.BlockSizeList.append((1, Obj.Size, None))\r
+ return\r
\r
while self.__GetBlockStatement(Obj):\r
pass\r
- return True\r
+ \r
+ for Item in Obj.BlockSizeList:\r
+ if Item[0] == None or Item[1] == None:\r
+ raise Warning("expected block statement", self.FileName, self.CurrentLineNumber)\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
PcdPair = self.__GetNextPcdName()\r
BlockSizePcd = PcdPair\r
self.Profile.PcdDict[PcdPair] = BlockSize\r
- BlockSize = long(self.__Token, 0)\r
+ BlockSize = long(BlockSize, 0)\r
\r
BlockNumber = None\r
if self.__IsKeyword( "NumBlocks"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
Value += self.__SkippedChars\r
\r
- Obj.SetVarDict[PcdPair] = Value\r
+ if Obj:\r
+ Obj.SetVarDict[PcdPair] = Value\r
self.Profile.PcdDict[PcdPair] = Value\r
return True\r
\r
if not self.__GetNextWord():\r
return True\r
\r
- if not self.__Token in ("SET", "FV", "FILE", "DATA"):\r
+ if not self.__Token in ("SET", "FV", "FILE", "DATA", "CAPSULE"):\r
self.__UndoToken()\r
RegionObj.PcdOffset = self.__GetNextPcdName()\r
self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + long(Fd.BaseAddress, 0))\r
if not self.__GetNextWord():\r
return True\r
\r
- if self.__Token == "FV":\r
+ elif self.__Token == "FV":\r
self.__UndoToken()\r
self.__GetRegionFvType( RegionObj)\r
\r
+ elif self.__Token == "CAPSULE":\r
+ self.__UndoToken()\r
+ self.__GetRegionCapType( RegionObj)\r
+\r
elif self.__Token == "FILE":\r
self.__UndoToken()\r
self.__GetRegionFileType( RegionObj)\r
\r
- else:\r
+ elif self.__Token == "DATA":\r
self.__UndoToken()\r
self.__GetRegionDataType( RegionObj)\r
+ else:\r
+ raise Warning("A valid region type was not found. "\r
+ "Valid types are [SET, FV, CAPSULE, FILE, DATA]. This error occurred",\r
+ self.FileName, self.CurrentLineNumber)\r
\r
return True\r
\r
\r
RegionObj.RegionDataList.append(self.__Token)\r
\r
+ ## __GetRegionCapType() method\r
+ #\r
+ # Get region capsule data for region\r
+ #\r
+ # @param self The object pointer\r
+ # @param RegionObj for whom region data is got\r
+ #\r
+ def __GetRegionCapType(self, RegionObj):\r
+\r
+ if not self.__IsKeyword("CAPSULE"):\r
+ raise Warning("expected Keyword 'CAPSULE'", 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 CAPSULE name", self.FileName, self.CurrentLineNumber)\r
+\r
+ RegionObj.RegionType = "CAPSULE"\r
+ RegionObj.RegionDataList.append(self.__Token)\r
+\r
+ while self.__IsKeyword("CAPSULE"):\r
+\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected CAPSULE name", self.FileName, self.CurrentLineNumber)\r
+\r
+ RegionObj.RegionDataList.append(self.__Token)\r
+\r
## __GetRegionFileType() method\r
#\r
# Get region file data for region\r
if not self.__GetNextHexNumber():\r
raise Warning("expected Hex byte", 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
-\r
- DataString = self.__Token\r
- DataString += ","\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
+ 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
+ # 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
+ # 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
self.__GetAddressStatements(FvObj)\r
\r
- self.__GetBlockStatement(FvObj)\r
+ while self.__GetBlockStatement(FvObj):\r
+ pass\r
\r
self.__GetSetStatements(FvObj)\r
+ \r
+ self.__GetFvBaseAddress(FvObj)\r
+ \r
+ self.__GetFvForceRebase(FvObj)\r
\r
self.__GetFvAlignment(FvObj)\r
\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
+ break\r
+\r
self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
\r
raise Warning("Unknown alignment value '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\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
+ IsValidBaseAddrValue = re.compile('^0[x|X][0-9a-fA-F]+')\r
+\r
+ if not IsValidBaseAddrValue.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
\r
return\r
\r
+ def __GetFvExtEntryStatement(self, FvObj):\r
+\r
+ if not self.__IsKeyword( "FV_EXT_ENTRY"):\r
+ return False\r
+\r
+ if not self.__IsKeyword ("TYPE"):\r
+ raise Warning("expected 'TYPE'", self.FileName, self.CurrentLineNumber)\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
+\r
+ if not self.__IsToken( "{"):\r
+ raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+\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
+\r
+ if self.__Token == 'DATA':\r
+\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", 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 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
+\r
+ DataString = self.__Token\r
+ DataString += ","\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
+\r
+ if not self.__IsToken( "}"):\r
+ raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+\r
+ if not self.__IsToken( "}"):\r
+ raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+\r
+ DataString = DataString.rstrip(",")\r
+ FvObj.FvExtEntryData += [DataString]\r
+\r
+ if self.__Token == 'FILE':\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 Extension Entry file path At Line ", self.FileName, self.CurrentLineNumber)\r
+ \r
+ FvObj.FvExtEntryData += [self.__Token]\r
+\r
+ if not self.__IsToken( "}"):\r
+ raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+\r
+ return True\r
+\r
## __GetAprioriSection() method\r
#\r
# Get token statements\r
if not self.__GetNextToken():\r
raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
ffsInf.InfFileName = self.__Token\r
-\r
-# if ffsInf.InfFileName.find('$') >= 0:\r
-# ffsInf.InfFileName = GenFdsGlobalVariable.GenFdsGlobalVariable.MacroExtend(ffsInf.InfFileName, MacroDict)\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
ffsInf.KeepReloc = True\r
else:\r
raise Warning("Unknown reloc strip flag '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
-\r
+ \r
+ ffsInf.CurrentLineNum = self.CurrentLineNumber\r
+ ffsInf.CurrentLineContent = self.__CurrentLine()\r
+ \r
if ForCapsule:\r
capsuleFfs = CapsuleData.CapsuleFfs()\r
capsuleFfs.Ffs = ffsInf\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
self.__Token = 'PCD('+PcdPair[1]+'.'+PcdPair[0]+')'\r
\r
FfsFileObj.NameGuid = self.__Token\r
-\r
+ \r
+ FfsFileObj.CurrentLineNum = self.CurrentLineNumber\r
+ FfsFileObj.CurrentLineContent = self.__CurrentLine()\r
+ \r
self.__GetFilePart( FfsFileObj, MacroDict.copy())\r
\r
if ForCapsule:\r
self.__GetSectionData( FfsFileObj, MacroDict)\r
else:\r
FfsFileObj.FileName = self.__Token\r
+ if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #\r
+ # For file in OUTPUT_DIRECTORY will not check whether it exist or not at AutoGen phase.\r
+ #\r
+ if not GlobalData.gAutoGenPhase:\r
+ #do case sensitive 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
+ else:\r
+ if not InputMacroDict["OUTPUT_DIRECTORY"] in FfsFileObj.FileName:\r
+ #do case sensitive 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
\r
if not self.__IsToken( "}"):\r
raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\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"):\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
+ raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
BuildNum = None\r
BuildNum = self.__Token\r
\r
if self.__IsKeyword( "VERSION"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
else:\r
VerSectionObj.FileName = self.__Token\r
Obj.SectionList.append(VerSectionObj)\r
-\r
+ \r
elif self.__IsKeyword( "UI"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
Obj.SectionList.append(UiSectionObj)\r
\r
elif self.__IsKeyword( "FV_IMAGE"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
if not self.__IsToken( "="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
if not self.__GetNextToken():\r
Obj.SectionList.append(FvImageSectionObj)\r
\r
elif self.__IsKeyword("PEI_DEPEX_EXP") or self.__IsKeyword("DXE_DEPEX_EXP") or self.__IsKeyword("SMM_DEPEX_EXP"):\r
+ if AlignValue == 'Auto':\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
DepexSectionObj = DepexSection.DepexSection()\r
DepexSectionObj.Alignment = AlignValue\r
DepexSectionObj.DepexType = self.__Token\r
Obj.SectionList.append(DepexSectionObj)\r
\r
else:\r
-\r
if not self.__GetNextWord():\r
raise Warning("expected section type", self.FileName, self.CurrentLineNumber)\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
raise Warning("Unknown section type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+ if AlignValue == 'Auto'and (not self.__Token == 'PE32') and (not self.__Token == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
+\r
# DataSection\r
DataSectionObj = DataSection.DataSection()\r
DataSectionObj.Alignment = AlignValue\r
if not self.__GetNextToken():\r
raise Warning("expected section file path", self.FileName, self.CurrentLineNumber)\r
DataSectionObj.SectFileName = self.__Token\r
+ if DataSectionObj.SectFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+ #do case sensitive check for file path\r
+ ErrorCode, ErrorInfo = PathClass(NormPath(DataSectionObj.SectFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
+ if ErrorCode != 0:\r
+ EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
else:\r
if not self.__GetCglSection(DataSectionObj):\r
return False\r
def __GetGuidAttrib(self):\r
\r
AttribDict = {}\r
- AttribDict["PROCESSING_REQUIRED"] = False\r
- AttribDict["AUTH_STATUS_VALID"] = False\r
+ AttribDict["PROCESSING_REQUIRED"] = "NONE"\r
+ AttribDict["AUTH_STATUS_VALID"] = "NONE"\r
if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):\r
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
+ raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
AlignValue = self.__Token\r
\r
if not self.__GetCglSection(FfsFileObj, AlignValue):\r
CapsuleObj.CreateFile = self.__Token\r
\r
self.__GetCapsuleStatements(CapsuleObj)\r
- self.Profile.CapsuleList.append(CapsuleObj)\r
+ self.Profile.CapsuleDict[CapsuleObj.UiCapsuleName] = CapsuleObj\r
return True\r
\r
## __GetCapsuleStatements() method\r
self.__GetCapsuleTokens(Obj)\r
self.__GetDefineStatements(Obj)\r
self.__GetSetStatements(Obj)\r
-\r
self.__GetCapsuleData(Obj)\r
\r
- ## __GetCapsuleStatements() method\r
+ ## __GetCapsuleTokens() method\r
#\r
# Get token statements for capsule\r
#\r
# @param Obj for whom token statements are got\r
#\r
def __GetCapsuleTokens(self, Obj):\r
-\r
- if not self.__IsKeyword("CAPSULE_GUID"):\r
- raise Warning("expected 'CAPSULE_GUID'", self.FileName, self.CurrentLineNumber)\r
-\r
- while self.__CurrentLine().find("=") != -1:\r
- NameValue = self.__CurrentLine().split("=")\r
- Obj.TokensDict[NameValue[0].strip()] = NameValue[1].strip()\r
- self.CurrentLineNumber += 1\r
- self.CurrentOffsetWithinLine = 0\r
+ if not self.__GetNextToken():\r
+ return False\r
+ while self.__Token in ("CAPSULE_GUID", "CAPSULE_HEADER_SIZE", "CAPSULE_FLAGS"):\r
+ Name = self.__Token.strip()\r
+ if not self.__IsToken("="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+ if Name == 'CAPSULE_FLAGS':\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
+ while self.__IsToken(","):\r
+ Value += ','\r
+ if not self.__GetNextToken():\r
+ raise Warning("expected value", 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
+ else:\r
+ Value = self.__Token.strip()\r
+ Obj.TokensDict[Name] = Value \r
+ if not self.__GetNextToken():\r
+ return False\r
+ self.__UndoToken()\r
\r
## __GetCapsuleData() method\r
#\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
+ if not (IsInf or IsFile or IsFv or IsFd or IsAnyFile):\r
break\r
\r
## __GetFvStatement() method\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.keys():\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
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):\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.keys():\r
+ raise Warning("FD name does not exist", self.FileName, self.CurrentLineNumber)\r
+\r
+ CapsuleFd = CapsuleData.CapsuleFd()\r
+ CapsuleFd.FdName = self.__Token\r
+ CapsuleObj.CapsuleDataList.append(CapsuleFd)\r
+ return True\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):\r
+\r
+ if not self.__IsKeyword("FILE"):\r
+ return False\r
+\r
+ if not self.__IsKeyword("DATA"):\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 File name", self.FileName, self.CurrentLineNumber)\r
+ \r
+ AnyFileName = self.__Token\r
+ AnyFileName = GenFdsGlobalVariable.ReplaceWorkspaceMacro(AnyFileName)\r
+ if not os.path.exists(AnyFileName):\r
+ raise Warning("File %s not exists"%AnyFileName, self.FileName, self.CurrentLineNumber)\r
+\r
+ CapsuleAnyFile = CapsuleData.CapsuleAnyFile()\r
+ CapsuleAnyFile.FileName = AnyFileName\r
+ CapsuleObj.CapsuleDataList.append(CapsuleAnyFile)\r
+ return True\r
+\r
## __GetRule() method\r
#\r
# Get Rule section contents and store its data into rule list of self.Profile\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_DRIVER", "SMM_CORE"):\r
+ "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_RT_DRIVER", "APPLICATION", "ACPITABLE", "SMM_CORE"):\r
raise Warning("Unknown Module type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
return self.__Token\r
\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_DXE_COMBO", "SMM", "SMM_CORE"):\r
+ "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLICATION", "FV_IMAGE", "SMM", "SMM_CORE"):\r
raise Warning("Unknown FV type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
\r
if not self.__IsToken("="):\r
\r
AlignValue = ""\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
- AlignValue = self.__Token\r
+ #For FFS, Auto is default option same to ""\r
+ if not self.__Token == "Auto":\r
+ AlignValue = self.__Token\r
\r
if self.__IsToken("{"):\r
# Complex file rule expected\r
\r
return Rule\r
\r
- elif self.__IsToken("|"):\r
- # Ext rule expected\r
- Ext = self.__GetFileExtension()\r
-\r
- Rule = RuleSimpleFile.RuleSimpleFile()\r
-\r
- Rule.FvFileType = Type\r
- Rule.NameGuid = NameGuid\r
- Rule.Alignment = AlignValue\r
- Rule.CheckSum = CheckSum\r
- Rule.Fixed = Fixed\r
- Rule.FileExtension = Ext\r
- Rule.KeyStringList = KeyStringList\r
- if KeepReloc != None:\r
- Rule.KeepReloc = KeepReloc\r
-\r
- return Rule\r
-\r
else:\r
# Simple file rule expected\r
if not self.__GetNextWord():\r
if self.__IsKeyword("CheckSum", True):\r
CheckSum = True\r
\r
+ SectAlignment = ""\r
if self.__GetAlignment():\r
- if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+ if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
- AlignValue = self.__Token\r
+ if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
+ SectAlignment = self.__Token\r
\r
- if not self.__GetNextToken():\r
+ Ext = None\r
+ if self.__IsToken('|'):\r
+ Ext = self.__GetFileExtension()\r
+ elif not self.__GetNextToken():\r
raise Warning("expected File name", self.FileName, self.CurrentLineNumber)\r
\r
Rule = RuleSimpleFile.RuleSimpleFile()\r
Rule.FvFileType = Type\r
Rule.NameGuid = NameGuid\r
Rule.Alignment = AlignValue\r
+ Rule.SectAlignment = SectAlignment\r
Rule.CheckSum = CheckSum\r
Rule.Fixed = Fixed\r
- Rule.FileName = self.__Token\r
Rule.KeyStringList = KeyStringList\r
if KeepReloc != None:\r
Rule.KeepReloc = KeepReloc\r
+ Rule.FileExtension = Ext\r
+ Rule.FileName = self.__Token\r
return Rule\r
\r
## __GetEfiSection() method\r
raise Warning("expected '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
- raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
- FvImageSectionObj.Alignment = self.__Token\r
-\r
- if self.__IsKeyword("FV"):\r
- FvImageSectionObj.FvFileType = self.__Token\r
-\r
if self.__GetAlignment():\r
if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\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
+ raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+ if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+ raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
EfiSectionObj.Alignment = self.__Token\r
\r
if self.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'):\r
elif SectionType == "RAW":\r
if FileType not in ("BIN", "SEC_BIN", "RAW", "ASL", "ACPI"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
- elif SectionType == "DXE_DEPEX":\r
- if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX"):\r
+ elif SectionType == "DXE_DEPEX" or SectionType == "SMM_DEPEX":\r
+ if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX", "SMM_DEPEX"):\r
raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
elif SectionType == "UI":\r
if FileType not in ("UI", "SEC_UI"):\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
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
+ Pattern = re.compile('-$|[0-9a-fA-F]{1,2}\.[0-9a-fA-F]{1,2}$', re.DOTALL)\r
if Pattern.match(self.__Token) == None:\r
raise Warning("Unknown version format '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
CompStatementObj.CompVer = self.__Token\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
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
def __GetOptRomOverrides(self, Obj):\r
if self.__IsToken('{'):\r
Overrides = OptionRom.OverrideAttribs()\r
- if self.__IsKeyword( "PCI_VENDOR_ID"):\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
- if not self.__GetNextHexNumber():\r
- raise Warning("expected Hex vendor id", self.FileName, self.CurrentLineNumber)\r
- Overrides.PciVendorId = self.__Token\r
- \r
- if self.__IsKeyword( "PCI_CLASS_CODE"):\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
- if not self.__GetNextHexNumber():\r
- raise Warning("expected Hex class code", self.FileName, self.CurrentLineNumber)\r
- Overrides.PciClassCode = self.__Token\r
- \r
- if self.__IsKeyword( "PCI_DEVICE_ID"):\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
- if not self.__GetNextHexNumber():\r
- raise Warning("expected Hex device id", self.FileName, self.CurrentLineNumber)\r
- \r
- Overrides.PciDeviceId = self.__Token\r
- \r
- if self.__IsKeyword( "PCI_REVISION"):\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
- if not self.__GetNextHexNumber():\r
- raise Warning("expected Hex revision", self.FileName, self.CurrentLineNumber)\r
- Overrides.PciRevision = self.__Token\r
- \r
- if self.__IsKeyword( "COMPRESS"):\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
- if not self.__GetNextToken():\r
- raise Warning("expected TRUE/FALSE for compress", self.FileName, self.CurrentLineNumber)\r
- \r
- if self.__Token.upper() == 'TRUE':\r
- Overrides.NeedCompress = True \r
- \r
- if not self.__IsToken( "}"):\r
- \r
- if self.__Token not in ("PCI_CLASS_CODE", "PCI_VENDOR_ID", "PCI_DEVICE_ID", "PCI_REVISION", "COMPRESS"):\r
- raise Warning("unknown attribute %s" % self.__Token, self.FileName, self.CurrentLineNumber)\r
- \r
- raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
- \r
+ while True:\r
+ if self.__IsKeyword( "PCI_VENDOR_ID"):\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("expected Hex vendor id", self.FileName, self.CurrentLineNumber)\r
+ Overrides.PciVendorId = self.__Token\r
+ continue\r
+\r
+ if self.__IsKeyword( "PCI_CLASS_CODE"):\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("expected Hex class code", self.FileName, self.CurrentLineNumber)\r
+ Overrides.PciClassCode = self.__Token\r
+ continue\r
+\r
+ if self.__IsKeyword( "PCI_DEVICE_ID"):\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("expected Hex device id", self.FileName, self.CurrentLineNumber)\r
+\r
+ Overrides.PciDeviceId = self.__Token\r
+ continue\r
+\r
+ if self.__IsKeyword( "PCI_REVISION"):\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("expected Hex revision", self.FileName, self.CurrentLineNumber)\r
+ Overrides.PciRevision = self.__Token\r
+ continue\r
+\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
+ raise Warning("expected TRUE/FALSE for compress", self.FileName, self.CurrentLineNumber)\r
+ Overrides.NeedCompress = self.__Token.upper() == 'TRUE'\r
+ continue\r
+\r
+ if self.__IsToken( "}"):\r
+ break\r
+ else:\r
+ EdkLogger.error("FdfParser", FORMAT_INVALID, File=self.FileName, Line=self.CurrentLineNumber)\r
+\r
Obj.OverrideAttribs = Overrides\r
\r
## __GetOptRomFileStatement() method\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
Obj.FfsList.append(FfsFileObj)\r
\r
return True\r
- \r
- \r
+\r
+ ## __GetCapInFd() method\r
+ #\r
+ # Get Cap list contained in FD\r
+ #\r
+ # @param self The object pointer\r
+ # @param FdName FD name\r
+ # @retval CapList List of Capsule in FD\r
+ #\r
+ def __GetCapInFd (self, FdName):\r
+\r
+ CapList = []\r
+ if FdName.upper() in self.Profile.FdDict.keys():\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
+ CapList.append(elementRegionData.upper())\r
+ return CapList\r
+\r
+ ## __GetReferencedFdCapTuple() method\r
+ #\r
+ # Get FV and FD list referenced by a capsule image\r
+ #\r
+ # @param self The object pointer\r
+ # @param CapObj Capsule section to be searched\r
+ # @param RefFdList referenced FD by section\r
+ # @param RefFvList referenced FV by section\r
+ #\r
+ def __GetReferencedFdCapTuple(self, CapObj, RefFdList = [], RefFvList = []):\r
+\r
+ for CapsuleDataObj in CapObj.CapsuleDataList :\r
+ if hasattr(CapsuleDataObj, 'FvName') and CapsuleDataObj.FvName != None and CapsuleDataObj.FvName.upper() not in RefFvList:\r
+ RefFvList.append (CapsuleDataObj.FvName.upper())\r
+ elif hasattr(CapsuleDataObj, 'FdName') and CapsuleDataObj.FdName != None and CapsuleDataObj.FdName.upper() not in RefFdList:\r
+ RefFdList.append (CapsuleDataObj.FdName.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
+\r
## __GetFvInFd() method\r
#\r
# Get FV list contained in FD\r
for elementRegion in FdObj.RegionList:\r
if elementRegion.RegionType == '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
FvList.append(elementRegionData.upper())\r
return FvList\r
# @retval False Not exists cycle reference\r
#\r
def CycleReferenceCheck(self):\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
+ LogStr = "\nCycle Reference Checking for FV: %s\n" % FvName\r
+ RefFvStack = []\r
+ RefFvStack.append(FvName)\r
+ FdAnalyzedList = []\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
+ FvObj = self.Profile.FvDict[FvNameFromStack.upper()]\r
+ else:\r
+ continue\r
\r
- CycleRefExists = False\r
+ RefFdList = []\r
+ RefFvList = []\r
+ self.__GetReferencedFdFvTuple(FvObj, RefFdList, RefFvList)\r
\r
- try:\r
- for FvName in self.Profile.FvDict.keys():\r
- LogStr = "Cycle Reference Checking for FV: %s\n" % FvName\r
- RefFvStack = []\r
- RefFvStack.append(FvName)\r
- FdAnalyzedList = []\r
-\r
- while RefFvStack != []:\r
- FvNameFromStack = RefFvStack.pop()\r
- if FvNameFromStack.upper() in self.Profile.FvDict.keys():\r
- FvObj = self.Profile.FvDict[FvNameFromStack.upper()]\r
- else:\r
+ for RefFdName in RefFdList:\r
+ if RefFdName in FdAnalyzedList:\r
continue\r
\r
- RefFdList = []\r
- RefFvList = []\r
- self.__GetReferencedFdFvTuple(FvObj, RefFdList, RefFvList)\r
+ LogStr += "FV %s contains FD %s\n" % (FvNameFromStack, RefFdName)\r
+ FvInFdList = self.__GetFvInFd(RefFdName)\r
+ if FvInFdList != []:\r
+ for FvNameInFd in FvInFdList:\r
+ LogStr += "FD %s contains FV %s\n" % (RefFdName,FvNameInFd)\r
+ if FvNameInFd not in RefFvStack:\r
+ RefFvStack.append(FvNameInFd)\r
+\r
+ if FvName in RefFvStack or FvNameFromStack in RefFvStack:\r
+ EdkLogger.info(LogStr)\r
+ return True\r
+ FdAnalyzedList.append(RefFdName)\r
+\r
+ for RefFvName in RefFvList:\r
+ LogStr += "FV %s contains FV %s\n" % (FvNameFromStack, RefFvName)\r
+ if RefFvName not in RefFvStack:\r
+ RefFvStack.append(RefFvName)\r
+\r
+ if FvName in RefFvStack or FvNameFromStack in RefFvStack:\r
+ EdkLogger.info(LogStr)\r
+ return True\r
+\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
+ #\r
+ # Capsule image to be checked.\r
+ #\r
+ LogStr = "\n\n\nCycle Reference Checking for Capsule: %s\n" % CapName\r
+ RefCapStack = []\r
+ RefCapStack.append(CapName)\r
+ FdAnalyzedList = []\r
+ FvAnalyzedList = []\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
+ CapObj = self.Profile.CapsuleDict[CapNameFromStack.upper()]\r
+ else:\r
+ continue\r
\r
+ RefFvList = []\r
+ RefFdList = []\r
+ self.__GetReferencedFdCapTuple(CapObj, RefFdList, RefFvList)\r
+\r
+ FvListLength = 0\r
+ FdListLength = 0\r
+ while FvListLength < len (RefFvList) or FdListLength < len (RefFdList):\r
for RefFdName in RefFdList:\r
if RefFdName in FdAnalyzedList:\r
continue\r
\r
- LogStr += "FD %s is referenced by FV %s\n" % (RefFdName, FvNameFromStack)\r
+ LogStr += "Capsule %s contains FD %s\n" % (CapNameFromStack, RefFdName)\r
+ CapInFdList = self.__GetCapInFd(RefFdName)\r
+ if CapInFdList != []:\r
+ for CapNameInFd in CapInFdList:\r
+ LogStr += "FD %s contains Capsule %s\n" % (RefFdName,CapNameInFd)\r
+ if CapNameInFd not in RefCapStack:\r
+ RefCapStack.append(CapNameInFd)\r
+\r
+ if CapName in RefCapStack or CapNameFromStack in RefCapStack:\r
+ EdkLogger.info(LogStr)\r
+ return True\r
+\r
FvInFdList = self.__GetFvInFd(RefFdName)\r
if FvInFdList != []:\r
- LogStr += "FD %s contains FV: " % RefFdName\r
- for FvObj in FvInFdList:\r
- LogStr += FvObj\r
- LogStr += ' \n'\r
- if FvObj not in RefFvStack:\r
- RefFvStack.append(FvObj)\r
-\r
- if FvName in RefFvStack:\r
- CycleRefExists = True\r
- raise Warning(LogStr)\r
- FdAnalyzedList.append(RefFdName)\r
+ for FvNameInFd in FvInFdList:\r
+ LogStr += "FD %s contains FV %s\n" % (RefFdName,FvNameInFd)\r
+ if FvNameInFd not in RefFvList:\r
+ RefFvList.append(FvNameInFd)\r
\r
+ FdAnalyzedList.append(RefFdName)\r
+ #\r
+ # the number of the parsed FV and FD image\r
+ #\r
+ FvListLength = len (RefFvList)\r
+ FdListLength = len (RefFdList)\r
for RefFvName in RefFvList:\r
- LogStr += "FV %s is referenced by FV %s\n" % (RefFvName, FvNameFromStack)\r
- if RefFvName not in RefFvStack:\r
- RefFvStack.append(RefFvName)\r
-\r
- if FvName in RefFvStack:\r
- CycleRefExists = True\r
- raise Warning(LogStr)\r
-\r
- except Warning:\r
- print LogStr\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
+ FvObj = self.Profile.FvDict[RefFvName.upper()]\r
+ else:\r
+ continue\r
+ self.__GetReferencedFdFvTuple(FvObj, RefFdList, RefFvList)\r
+ FvAnalyzedList.append(RefFvName)\r
\r
- finally:\r
- return CycleRefExists\r
+ return False\r
\r
if __name__ == "__main__":\r
- parser = FdfParser("..\LakeportX64Pkg.fdf")\r
+ import sys\r
+ try:\r
+ test_file = sys.argv[1]\r
+ except IndexError, v:\r
+ print "Usage: %s filename" % sys.argv[0]\r
+ sys.exit(1)\r
+\r
+ parser = FdfParser(test_file)\r
try:\r
parser.ParseFile()\r
parser.CycleReferenceCheck()\r
except Warning, X:\r
- print str(X)\r
+ print str(X)\r
else:\r
print "Success!"\r
\r