\r
from Common.BuildToolError import *\r
from Common import EdkLogger\r
-from Common.Misc import PathClass, tdict\r
+from Common.Misc import PathClass, tdict, ProcessDuplicatedInf\r
from Common.StringUtils import NormPath, ReplaceMacro\r
from Common import GlobalData\r
from Common.Expression import *\r
from .RuleComplexFile import RuleComplexFile\r
from .RuleSimpleFile import RuleSimpleFile\r
from .EfiSection import EfiSection\r
-from .Vtf import Vtf\r
-from .ComponentStatement import ComponentStatement\r
from .OptionRom import OPTIONROM\r
from .OptRomInfStatement import OptRomInfStatement, OverrideAttribs\r
from .OptRomFileStatement import OptRomFileStatement\r
T_CHAR_TAB = '\t'\r
T_CHAR_DOUBLE_QUOTE = '\"'\r
T_CHAR_SINGLE_QUOTE = '\''\r
-T_CHAR_STAR = '*'\r
T_CHAR_BRACE_R = '}'\r
\r
SEPARATORS = {TAB_EQUAL_SPLIT, TAB_VALUE_SPLIT, TAB_COMMA_SPLIT, '{', T_CHAR_BRACE_R}\r
self.FdNameNotSet = False\r
self.FvDict = {}\r
self.CapsuleDict = {}\r
- self.VtfList = []\r
self.RuleDict = {}\r
self.OptRomDict = {}\r
self.FmpPayloadDict = {}\r
# [FV.UiName]\r
# [Capsule.UiName]\r
# [Rule]: don't take rule section into account, macro is not allowed in this section\r
- # [VTF.arch.UiName, arch]\r
# [OptionRom.DriverName]\r
self._CurSection = []\r
Section = Section.strip()[1:-1].upper().replace(' ', '').strip(TAB_SPLIT)\r
\r
if Item == TAB_COMMON_DEFINES.upper():\r
self._CurSection = [TAB_COMMON, TAB_COMMON, TAB_COMMON]\r
- elif Item == 'VTF' and len(ItemList) == 3:\r
- UiName = ItemList[2]\r
- Pos = UiName.find(TAB_COMMA_SPLIT)\r
- if Pos != -1:\r
- UiName = UiName[:Pos]\r
- self._CurSection = ['VTF', UiName, ItemList[1]]\r
elif len(ItemList) > 1:\r
self._CurSection = [ItemList[0], ItemList[1], TAB_COMMON]\r
elif len(ItemList) > 0:\r
InComment = False\r
HashComment = False\r
# check for */ comment end\r
- elif InComment and not DoubleSlashComment and not HashComment and self._CurrentChar() == T_CHAR_STAR and self._NextChar() == TAB_BACK_SLASH:\r
+ elif InComment and not DoubleSlashComment and not HashComment and self._CurrentChar() == TAB_STAR and self._NextChar() == TAB_BACK_SLASH:\r
self._SetCurrentCharValue(TAB_SPACE_SPLIT)\r
self._GetOneChar()\r
self._SetCurrentCharValue(TAB_SPACE_SPLIT)\r
InComment = True\r
HashComment = True\r
# check for /* comment start\r
- elif self._CurrentChar() == TAB_BACK_SLASH and self._NextChar() == T_CHAR_STAR:\r
+ elif self._CurrentChar() == TAB_BACK_SLASH and self._NextChar() == TAB_STAR:\r
self._SetCurrentCharValue(TAB_SPACE_SPLIT)\r
self._GetOneChar()\r
self._SetCurrentCharValue(TAB_SPACE_SPLIT)\r
def _GetNextGuid(self):\r
if not self._GetNextToken():\r
return False\r
- if gGuidPattern.match(self._Token) is not None:\r
+ if GlobalData.gGuidPattern.match(self._Token) is not None:\r
return True\r
else:\r
self._UndoToken()\r
def _GetNextHexNumber(self):\r
if not self._GetNextToken():\r
return False\r
- if gHexPatternAll.match(self._Token):\r
+ if GlobalData.gHexPatternAll.match(self._Token):\r
return True\r
else:\r
self._UndoToken()\r
#\r
# Keep processing sections of the FDF until no new sections or a syntax error is found\r
#\r
- while self._GetFd() or self._GetFv() or self._GetFmp() or self._GetCapsule() or self._GetVtf() or self._GetRule() or self._GetOptionRom():\r
+ while self._GetFd() or self._GetFv() or self._GetFmp() or self._GetCapsule() or self._GetRule() or self._GetOptionRom():\r
pass\r
\r
except Warning as X:\r
def SectionParser(self, section):\r
S = section.upper()\r
if not S.startswith("[DEFINES") and not S.startswith("[FD.") and not S.startswith("[FV.") and not S.startswith("[CAPSULE.") \\r
- and not S.startswith("[VTF.") and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM.") and not S.startswith('[FMPPAYLOAD.'):\r
- raise Warning("Unknown section or section appear sequence error (The correct sequence should be [DEFINES], [FD.], [FV.], [Capsule.], [VTF.], [Rule.], [OptionRom.], [FMPPAYLOAD.])", self.FileName, self.CurrentLineNumber)\r
+ and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM.") and not S.startswith('[FMPPAYLOAD.'):\r
+ raise Warning("Unknown section or section appear sequence error (The correct sequence should be [DEFINES], [FD.], [FV.], [Capsule.], [Rule.], [OptionRom.], [FMPPAYLOAD.])", self.FileName, self.CurrentLineNumber)\r
\r
## _GetDefines() method\r
#\r
S = self._Token.upper()\r
if S.startswith(TAB_SECTION_START) and not S.startswith("[FD."):\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
+ and not S.startswith("[RULE.") and not S.startswith("[OPTIONROM."):\r
raise Warning("Unknown section", self.FileName, self.CurrentLineNumber)\r
self._UndoToken()\r
return False\r
self.SetPcdLocalation(pcdPair)\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple\r
- Obj.Size = long(Size, 0)\r
+ Obj.Size = int(Size, 0)\r
return True\r
\r
if self._IsKeyword("ErasePolarity"):\r
if not self._GetNextDecimalNumber() and not self._GetNextHexNumber():\r
raise Warning.Expected("address", self.FileName, self.CurrentLineNumber)\r
\r
- BsAddress = long(self._Token, 0)\r
+ BsAddress = int(self._Token, 0)\r
Obj.BsBaseAddress = BsAddress\r
\r
if self._IsKeyword("RtBaseAddress"):\r
if not self._GetNextDecimalNumber() and not self._GetNextHexNumber():\r
raise Warning.Expected("address", self.FileName, self.CurrentLineNumber)\r
\r
- RtAddress = long(self._Token, 0)\r
+ RtAddress = int(self._Token, 0)\r
Obj.RtBaseAddress = RtAddress\r
\r
## _GetBlockStatements() method\r
self.SetPcdLocalation(PcdPair)\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
self.Profile.PcdFileLineDict[PcdPair] = FileLineTuple\r
- BlockSize = long(BlockSize, 0)\r
+ BlockSize = int(BlockSize, 0)\r
\r
BlockNumber = None\r
if self._IsKeyword("NumBlocks"):\r
if not self._GetNextDecimalNumber() and not self._GetNextHexNumber():\r
raise Warning.Expected("block numbers", self.FileName, self.CurrentLineNumber)\r
\r
- BlockNumber = long(self._Token, 0)\r
+ BlockNumber = int(self._Token, 0)\r
\r
Obj.BlockSizeList.append((BlockSize, BlockNumber, BlockSizePcd))\r
return True\r
Expr += CurCh\r
self._GetOneChar()\r
try:\r
- return long(\r
+ return int(\r
ValueExpression(Expr,\r
self._CollectMacroPcd()\r
)(True), 0)\r
RegionOffsetPcdPattern.match(self._CurrentLine()[self.CurrentOffsetWithinLine:]))\r
if IsRegionPcd:\r
RegionObj.PcdOffset = self._GetNextPcdSettings()\r
- self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + long(theFd.BaseAddress, 0))\r
+ self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + int(theFd.BaseAddress, 0))\r
self.SetPcdLocalation(RegionObj.PcdOffset)\r
self._PcdDict['%s.%s' % (RegionObj.PcdOffset[1], RegionObj.PcdOffset[0])] = "0x%x" % RegionObj.Offset\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
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
+ NewFileName = ffsInf.InfFileName\r
+ if ffsInf.OverrideGuid:\r
+ NewFileName = ProcessDuplicatedInf(PathClass(ffsInf.InfFileName,GenFdsGlobalVariable.WorkSpaceDir), ffsInf.OverrideGuid, GenFdsGlobalVariable.WorkSpaceDir).Path\r
+\r
+ if not NewFileName in self.Profile.InfList:\r
+ self.Profile.InfList.append(NewFileName)\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
self.Profile.InfFileLineList.append(FileLineTuple)\r
if ffsInf.UseArch:\r
#\r
@staticmethod\r
def _FileCouldHaveRelocFlag (FileType):\r
- if FileType in {SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM, 'PEI_DXE_COMBO'}:\r
+ if FileType in {SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MODULE_PEIM, SUP_MODULE_MM_CORE_STANDALONE, 'PEI_DXE_COMBO'}:\r
return True\r
else:\r
return False\r
if FdfParser._Verify(Name, Value, 'UINT64'):\r
FmpData.MonotonicCount = Value\r
if FmpData.MonotonicCount.upper().startswith('0X'):\r
- FmpData.MonotonicCount = (long)(FmpData.MonotonicCount, 16)\r
+ FmpData.MonotonicCount = int(FmpData.MonotonicCount, 16)\r
else:\r
- FmpData.MonotonicCount = (long)(FmpData.MonotonicCount)\r
+ FmpData.MonotonicCount = int(FmpData.MonotonicCount)\r
if not self._GetNextToken():\r
break\r
else:\r
\r
return False\r
\r
- ## _GetVtf() method\r
- #\r
- # Get VTF section contents and store its data into VTF list of self.Profile\r
- #\r
- # @param self The object pointer\r
- # @retval True Successfully find a VTF\r
- # @retval False Not able to find a VTF\r
- #\r
- def _GetVtf(self):\r
- HW_ARCH_SET = {TAB_ARCH_IA32, TAB_ARCH_X64, TAB_ARCH_IPF, TAB_ARCH_ARM, TAB_ARCH_AARCH64}\r
- if not self._GetNextToken():\r
- return False\r
-\r
- S = self._Token.upper()\r
- if S.startswith(TAB_SECTION_START) and not S.startswith("[VTF."):\r
- self.SectionParser(S)\r
- self._UndoToken()\r
- return False\r
-\r
- self._UndoToken()\r
- if not self._IsToken("[VTF.", True):\r
- FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
- #print 'Parsing String: %s in File %s, At line: %d, Offset Within Line: %d' \\r
- # % (self.Profile.FileLinesList[self.CurrentLineNumber - 1][self.CurrentOffsetWithinLine:], FileLineTuple[0], FileLineTuple[1], self.CurrentOffsetWithinLine)\r
- raise Warning.Expected("[VTF.]", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._SkipToToken(TAB_SPLIT):\r
- raise Warning.Expected("'.'", self.FileName, self.CurrentLineNumber)\r
-\r
- Arch = self._SkippedChars.rstrip(TAB_SPLIT).upper()\r
- if Arch not in HW_ARCH_SET:\r
- raise Warning("Unknown Arch '%s'" % Arch, self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextWord():\r
- raise Warning.Expected("VTF name", self.FileName, self.CurrentLineNumber)\r
- Name = self._Token.upper()\r
-\r
- VtfObj = Vtf()\r
- VtfObj.UiName = Name\r
- VtfObj.KeyArch = Arch\r
-\r
- if self._IsToken(TAB_COMMA_SPLIT):\r
- if not self._GetNextWord():\r
- raise Warning.Expected("Arch list", self.FileName, self.CurrentLineNumber)\r
- if self._Token.upper() not in HW_ARCH_SET:\r
- raise Warning("Unknown Arch '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
- VtfObj.ArchList = self._Token.upper()\r
-\r
- if not self._IsToken(TAB_SECTION_END):\r
- raise Warning.ExpectedBracketClose(self.FileName, self.CurrentLineNumber)\r
-\r
- if self._IsKeyword("IA32_RST_BIN"):\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Reset file", self.FileName, self.CurrentLineNumber)\r
-\r
- VtfObj.ResetBin = self._Token\r
- if VtfObj.ResetBin.replace(TAB_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
-\r
- self.Profile.VtfList.append(VtfObj)\r
- return True\r
-\r
- ## _GetComponentStatement() method\r
- #\r
- # Get components in VTF\r
- #\r
- # @param self The object pointer\r
- # @param VtfObj for whom component is got\r
- # @retval True Successfully find a component\r
- # @retval False Not able to find a component\r
- #\r
- def _GetComponentStatement(self, VtfObj):\r
- if not self._IsKeyword("COMP_NAME"):\r
- return False\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextWord():\r
- raise Warning.Expected("Component Name", self.FileName, self.CurrentLineNumber)\r
-\r
- CompStatementObj = ComponentStatement()\r
- CompStatementObj.CompName = self._Token\r
-\r
- if not self._IsKeyword("COMP_LOC"):\r
- raise Warning.Expected("COMP_LOC", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- CompStatementObj.CompLoc = ""\r
- if self._GetNextWord():\r
- CompStatementObj.CompLoc = self._Token\r
- if self._IsToken(TAB_VALUE_SPLIT):\r
- if not self._GetNextWord():\r
- raise Warning.Expected("Region Name", self.FileName, self.CurrentLineNumber)\r
-\r
- if self._Token not in {"F", "N", "S"}: #, "H", "L", "PH", "PL"): not support\r
- raise Warning("Unknown location type '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
-\r
- CompStatementObj.FilePos = self._Token\r
- else:\r
- self.CurrentLineNumber += 1\r
- self.CurrentOffsetWithinLine = 0\r
-\r
- if not self._IsKeyword("COMP_TYPE"):\r
- raise Warning.Expected("COMP_TYPE", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Component type", self.FileName, self.CurrentLineNumber)\r
- if self._Token not in {"FIT", "PAL_B", "PAL_A", "OEM"}:\r
- if not self._Token.startswith("0x") or len(self._Token) < 3 or len(self._Token) > 4 or \\r
- not self._Token[2] in hexdigits or not self._Token[-1] in hexdigits:\r
- raise Warning("Unknown location type '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
- CompStatementObj.CompType = self._Token\r
-\r
- if not self._IsKeyword("COMP_VER"):\r
- raise Warning.Expected("COMP_VER", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Component version", self.FileName, self.CurrentLineNumber)\r
-\r
- Pattern = compile('-$|[0-9a-fA-F]{1,2}\.[0-9a-fA-F]{1,2}$', DOTALL)\r
- if Pattern.match(self._Token) is None:\r
- raise Warning("Unknown version format '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
- CompStatementObj.CompVer = self._Token\r
-\r
- if not self._IsKeyword("COMP_CS"):\r
- raise Warning.Expected("COMP_CS", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Component CS", self.FileName, self.CurrentLineNumber)\r
- if self._Token not in {"1", "0"}:\r
- raise Warning("Unknown Component CS '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
- CompStatementObj.CompCs = self._Token\r
-\r
-\r
- if not self._IsKeyword("COMP_BIN"):\r
- raise Warning.Expected("COMP_BIN", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\r
- raise Warning.Expected("Component file", self.FileName, self.CurrentLineNumber)\r
-\r
- CompStatementObj.CompBin = self._Token\r
- if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace(TAB_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
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._GetNextToken():\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(TAB_WORKSPACE, '').find('$') == -1:\r
- #check for file path\r
- ErrorCode, ErrorInfo = PathClass(NormPath(CompStatementObj.CompSym), GenFdsGlobalVariable.WorkSpaceDir).Validate()\r
- if ErrorCode != 0:\r
- EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)\r
-\r
- if not self._IsKeyword("COMP_SIZE"):\r
- raise Warning.Expected("COMP_SIZE", self.FileName, self.CurrentLineNumber)\r
-\r
- if not self._IsToken(TAB_EQUAL_SPLIT):\r
- raise Warning.ExpectedEquals(self.FileName, self.CurrentLineNumber)\r
-\r
- if self._IsToken("-"):\r
- CompStatementObj.CompSize = self._Token\r
- elif self._GetNextDecimalNumber():\r
- CompStatementObj.CompSize = self._Token\r
- elif self._GetNextHexNumber():\r
- CompStatementObj.CompSize = self._Token\r
- else:\r
- raise Warning("Unknown size '%s'" % self._Token, self.FileName, self.CurrentLineNumber)\r
-\r
- VtfObj.ComponentStatementList.append(CompStatementObj)\r
- return True\r
-\r
## _GetOptionRom() method\r
#\r
# Get OptionROM section contents and store its data into OptionROM list of self.Profile\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
+ NewFileName = ffsInf.InfFileName\r
+ if ffsInf.OverrideGuid:\r
+ NewFileName = ProcessDuplicatedInf(PathClass(ffsInf.InfFileName,GenFdsGlobalVariable.WorkSpaceDir), ffsInf.OverrideGuid, GenFdsGlobalVariable.WorkSpaceDir).Path\r
+\r
+ if not NewFileName in self.Profile.InfList:\r
+ self.Profile.InfList.append(NewFileName)\r
FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
self.Profile.InfFileLineList.append(FileLineTuple)\r
if ffsInf.UseArch:\r
projects / mirror_edk2.git / blobdiff