## @file\r
# parse FDF file\r
#\r
-# Copyright (c) 2007 - 2013, 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
\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
try:\r
return long(\r
ValueExpression(Expr,\r
- dict(['%s.%s' % (Pcd[1], Pcd[0]), Val] \r
- for Pcd, Val in self.Profile.PcdDict.iteritems())\r
+ self.__CollectMacroPcd()\r
)(True),0)\r
except Exception:\r
self.SetFileBufferPos(StartPos)\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
# @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
\r
FvObj.FvAttributeDict[name] = self.__Token\r
\r
- return True\r
+ return IsWordToken\r
\r
## __GetFvNameGuid() method\r
#\r
FfsFileObj.CurrentLineNum = self.CurrentLineNumber\r
FfsFileObj.CurrentLineContent = self.__CurrentLine()\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
+ 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
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 integer value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\r
+ raise Warning("expected hex value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\r
if not 0x0000 <= Value <= 0xFFFF:\r
- raise Warning("expected integer value between 0x0000 and 0xFFFF", self.FileName, self.CurrentLineNumber)\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
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
+ if not (IsInf or IsFile or IsFv or IsFd or IsAnyFile or IsAfile):\r
break\r
\r
## __GetFvStatement() method\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
projects / mirror_edk2.git / blobdiff