## @file\r
# parse FDF file\r
#\r
-# Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
from Common.Misc import tdict\r
\r
import re\r
-import os\r
+import Common.LongFilePathOs as os\r
+from Common.LongFilePathSupport import OpenLongFilePath as open\r
\r
##define T_CHAR_SPACE ' '\r
##define T_CHAR_NULL '\0'\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
+RegionOffsetPcdPattern = re.compile("\s*(?P<base>\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
\r
IncludeFileList = []\r
\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
# Used to section info\r
self.__CurSection = []\r
PreIndex = 0\r
StartPos = CurLine.find('$(', PreIndex)\r
EndPos = CurLine.find(')', StartPos+2)\r
- while StartPos != -1 and EndPos != -1:\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 != None:\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.__GetNextPcdName()\r
PcdName = "%s.%s" % (PcdPair[1], PcdPair[0])\r
if not self.__IsToken( "="):\r
Value = self.__EvaluateConditional(Value, self.CurrentLineNumber, 'eval', True)\r
\r
self.__PcdDict[PcdName] = Value\r
+\r
+ self.Profile.PcdDict[PcdPair] = Value\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
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
MacroDict = {}\r
\r
# PCD macro\r
+ MacroDict.update(GlobalData.gPlatformPcds)\r
MacroDict.update(self.__PcdDict)\r
\r
# Lowest priority\r
Line=Line)\r
return Excpt.result\r
except Exception, Excpt:\r
- raise Warning("Invalid expression", *FileLineTuple)\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
+ *FileLineTuple)\r
+ else:\r
+ raise Warning("PCD (%s) is not defined in DSC file (%s)" % (Excpt.Pcd, GlobalData.gPlatformOtherPcds['DSCFILE']),\r
+ *FileLineTuple)\r
+ else:\r
+ raise Warning(str(Excpt), *FileLineTuple)\r
else:\r
if Expression.startswith('$(') and Expression[-1] == ')':\r
Expression = Expression[2:-1] \r
while self.__GetFv():\r
pass\r
\r
+ while self.__GetFmp():\r
+ pass\r
+\r
while self.__GetCapsule():\r
pass\r
\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 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) == 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
# @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
- FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
- self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple\r
-\r
- if not self.__IsKeyword( "Size"):\r
- raise Warning("Size 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 size", self.FileName, self.CurrentLineNumber)\r
-\r
-\r
- Size = self.__Token\r
- if self.__IsToken( "|"):\r
- pcdPair = self.__GetNextPcdName()\r
- Obj.SizePcd = pcdPair\r
- self.Profile.PcdDict[pcdPair] = Size\r
- FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
- self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple\r
- Obj.Size = long(Size, 0)\r
-\r
- if not self.__IsKeyword( "ErasePolarity"):\r
- raise Warning("ErasePolarity missing", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self.__IsToken( "="):\r
- raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ if self.__IsKeyword( "BaseAddress"):\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
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple\r
+ return True\r
\r
- if not self.__GetNextToken():\r
- raise Warning("expected Erase Polarity", self.FileName, self.CurrentLineNumber)\r
+ if self.__IsKeyword( "Size"):\r
+ if not self.__IsToken( "="):\r
+ raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+ \r
+ if not self.__GetNextHexNumber():\r
+ raise Warning("expected Hex size", 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
+ Size = self.__Token\r
+ if self.__IsToken( "|"):\r
+ pcdPair = self.__GetNextPcdName()\r
+ Obj.SizePcd = pcdPair\r
+ self.Profile.PcdDict[pcdPair] = Size\r
+ FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
+ self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple\r
+ Obj.Size = long(Size, 0)\r
+ return True\r
\r
- Obj.ErasePolarity = self.__Token\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
+ \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
+ 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
+ IsBlock = True\r
\r
- for Item in Obj.BlockSizeList:\r
+ Item = Obj.BlockSizeList[-1]\r
if Item[0] == None or Item[1] == None:\r
raise Warning("expected block statement", self.FileName, self.CurrentLineNumber)\r
+ return IsBlock\r
\r
## __GetBlockStatement() method\r
#\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 == 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 == 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
+ #\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
- FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
- self.Profile.PcdFileLineDict[RegionObj.PcdOffset] = FileLineTuple\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.__GetNextPcdName()\r
+ self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + long(Fd.BaseAddress, 0))\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.PcdSize] = FileLineTuple\r
+ self.Profile.PcdFileLineDict[RegionObj.PcdOffset] = FileLineTuple\r
+ if self.__IsToken( "|"):\r
+ RegionObj.PcdSize = self.__GetNextPcdName()\r
+ self.Profile.PcdDict[RegionObj.PcdSize] = "0x%08X" % RegionObj.Size\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
self.__UndoToken()\r
self.__GetRegionDataType( RegionObj)\r
else:\r
+ self.__UndoToken()\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]. This error occurred",\r
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
+ if 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 or section appear sequence error (The correct sequence should be [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\r
self.__UndoToken()\r
\r
self.__GetAddressStatements(FvObj)\r
\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
- 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)):\r
break\r
\r
self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\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"):\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
+ return IsWordToken\r
\r
## __GetFvNameGuid() method\r
#\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 __GetFvExtEntryStatement(self, FvObj):\r
\r
if not self.__GetNextToken():\r
raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
ffsInf.InfFileName = self.__Token\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
else:\r
raise Warning("Unknown reloc strip flag '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
\r
- ffsInf.CurrentLineNum = self.CurrentLineNumber\r
- ffsInf.CurrentLineContent = self.__CurrentLine()\r
- \r
if ForCapsule:\r
capsuleFfs = CapsuleData.CapsuleFfs()\r
capsuleFfs.Ffs = ffsInf\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
\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
\r
FfsFileObj.NameGuid = self.__Token\r
\r
- FfsFileObj.CurrentLineNum = self.CurrentLineNumber\r
- FfsFileObj.CurrentLineContent = self.__CurrentLine()\r
- \r
self.__GetFilePart( FfsFileObj, MacroDict.copy())\r
\r
if ForCapsule:\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
self.__UndoToken()\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 self.__GetMacroValue("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
+ 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
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
+ 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
AttribDict = {}\r
AttribDict["PROCESSING_REQUIRED"] = "NONE"\r
AttribDict["AUTH_STATUS_VALID"] = "NONE"\r
- if self.__IsKeyword("PROCESSING_REQUIRED") or self.__IsKeyword("AUTH_STATUS_VALID"):\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
else:\r
return True\r
\r
+ def __GetFmp(self):\r
+ if not self.__GetNextToken():\r
+ return False\r
+ S = self.__Token.upper()\r
+ if not S.startswith("[FMPPAYLOAD."):\r
+ if not S.startswith("[CAPSULE.") 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.], [FmpPayload.], [Capsule.], [VTF.], [Rule.], [OptionRom.])", self.FileName, self.CurrentLineNumber)\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']\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
+ 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
+ FmpData.Version = Value\r
+ elif Name == 'IMAGE_INDEX':\r
+ FmpData.ImageIndex = Value\r
+ elif Name == 'HARDWARE_INSTANCE':\r
+ FmpData.HardwareInstance = Value\r
+ if not self.__GetNextToken():\r
+ break\r
+ else:\r
+ self.__UndoToken()\r
+\r
+ if FmpKeyList:\r
+ raise Warning("Missing keywords %s in FMP payload section" % ', '.join(FmpKeyList), self.FileName, self.CurrentLineNumber)\r
+ ImageFile = self.__ParseRawFileStatement()\r
+ if not ImageFile:\r
+ raise Warning("Missing image file in FMP payload section", self.FileName, self.CurrentLineNumber)\r
+ FmpData.ImageFile = ImageFile\r
+ VendorCodeFile = self.__ParseRawFileStatement()\r
+ if VendorCodeFile:\r
+ FmpData.VendorCodeFile = VendorCodeFile\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
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
IsFv = self.__GetFvStatement(Obj)\r
IsFd = self.__GetFdStatement(Obj)\r
IsAnyFile = self.__GetAnyFileStatement(Obj)\r
- if not (IsInf or IsFile or IsFv or IsFd or IsAnyFile):\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
## __GetFvStatement() method\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
+ def __GetFmpStatement(self, CapsuleObj):\r
+ if not self.__IsKeyword("FMP"):\r
+ return False\r
\r
- if not self.__IsKeyword("FILE"):\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 False\r
+ return None\r
\r
if not self.__IsToken("="):\r
raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\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
+ 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):\r
+ AnyFileName = self.__ParseRawFileStatement()\r
+ if not AnyFileName:\r
+ return False\r
\r
CapsuleAnyFile = CapsuleData.CapsuleAnyFile()\r
CapsuleAnyFile.FileName = AnyFileName\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","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
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 ("IA32", "X64", "IPF", "EBC", "ARM", "AARCH64", "COMMON"):\r
raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber)\r
\r
ModuleType = self.__GetModuleType()\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
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
projects / mirror_edk2.git / blobdiff