##\r
# Import Modules\r
#\r
+import re\r
+\r
import Fd\r
import Region\r
import Fv\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
\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
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
# Whether char at current FileBufferPos is whitespace\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[IncludeLine - 1] = ''.join(TempList)\r
\r
self.Rewind()\r
-\r
+ \r
def __GetIfListCurrentItemStat(self, IfList):\r
if len(IfList) == 0:\r
return True\r
return False\r
\r
return True\r
- \r
-\r
+ \r
## PreprocessConditionalStatement() method\r
#\r
# Preprocess conditional statement.\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
- if self.__GetIfListCurrentItemStat(IfList):\r
+ if self.__GetIfListCurrentItemStat(IfList): \r
DefineLine = self.CurrentLineNumber - 1\r
DefineOffset = self.CurrentOffsetWithinLine - len('DEFINE')\r
if not self.__GetNextToken():\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
+ 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
+\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
+\r
CondLabel = self.__Token\r
+ Expression = self.__GetExpression()\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
-\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 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
+ 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
-\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
-\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.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
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
self.__GetSetStatements(FvObj)\r
\r
self.__GetFvBaseAddress(FvObj)\r
+ \r
+ self.__GetFvForceRebase(FvObj)\r
\r
self.__GetFvAlignment(FvObj)\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 alignment value '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\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
+ 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
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
else:\r
FfsFileObj.FileName = self.__Token\r
if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:\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
+ # 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
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
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
+ 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
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
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 != 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
+ 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
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
projects / mirror_edk2.git / blobdiff