# Import Modules\r
#\r
from __future__ import print_function\r
+from __future__ import absolute_import\r
import Common.LongFilePathOs as os\r
import re\r
import time\r
import copy\r
-import md5\r
+from hashlib import md5\r
\r
import Common.EdkLogger as EdkLogger\r
import Common.GlobalData as GlobalData\r
from CommonDataClass.DataClass import *\r
from Common.DataType import *\r
from Common.StringUtils import *\r
-from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClass, AnalyzePcdData, AnalyzeDscPcd, AnalyzePcdExpression, ParseFieldValue\r
+from Common.Misc import GuidStructureStringToGuidString, CheckPcdDatum, PathClass, AnalyzePcdData, AnalyzeDscPcd, AnalyzePcdExpression, ParseFieldValue, StructPattern\r
from Common.Expression import *\r
from CommonDataClass.Exceptions import *\r
from Common.LongFilePathSupport import OpenLongFilePath as open\r
from collections import defaultdict\r
-from MetaFileTable import MetaFileStorage\r
-from MetaFileCommentParser import CheckInfComment\r
+from .MetaFileTable import MetaFileStorage\r
+from .MetaFileCommentParser import CheckInfComment\r
+from Common.DataType import TAB_COMMENT_EDK_START, TAB_COMMENT_EDK_END\r
\r
## RegEx for finding file versions\r
hexVersionPattern = re.compile(r'0[xX][\da-f-A-F]{5,8}')\r
decVersionPattern = re.compile(r'\d+\.\d+')\r
+CODEPattern = re.compile(r"{CODE\([a-fA-F0-9Xx\{\},\s]*\)}")\r
\r
## A decorator used to parse macro definition\r
def ParseMacro(Parser):\r
def MacroParser(self):\r
- Match = gMacroDefPattern.match(self._CurrentLine)\r
+ Match = GlobalData.gMacroDefPattern.match(self._CurrentLine)\r
if not Match:\r
# Not 'DEFINE/EDK_GLOBAL' statement, call decorated method\r
Parser(self)\r
EdkLogger.error('Parser', FORMAT_INVALID, "%s can only be defined via environment variable" % Name,\r
ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
# Only upper case letters, digit and '_' are allowed\r
- if not gMacroNamePattern.match(Name):\r
+ if not GlobalData.gMacroNamePattern.match(Name):\r
EdkLogger.error('Parser', FORMAT_INVALID, "The macro name must be in the pattern [A-Z][A-Z0-9_]*",\r
ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
\r
## Set parsing complete flag in both class and table\r
def _Done(self):\r
self._Finished = True\r
- ## Do not set end flag when processing included files\r
- if self._From == -1:\r
- self._Table.SetEndFlag()\r
+ self._Table.SetEndFlag()\r
\r
def _PostProcess(self):\r
self._PostProcessed = True\r
\r
## Get the parse complete flag\r
- def _GetFinished(self):\r
+ @property\r
+ def Finished(self):\r
return self._Finished\r
\r
## Set the complete flag\r
- def _SetFinished(self, Value):\r
+ @Finished.setter\r
+ def Finished(self, Value):\r
self._Finished = Value\r
\r
## Remove records that do not match given Filter Arch\r
DataInfo = (DataInfo,)\r
\r
# Parse the file first, if necessary\r
- if not self._Finished:\r
- if self._RawTable.IsIntegrity():\r
- self._Finished = True\r
- else:\r
- self._Table = self._RawTable\r
- self._PostProcessed = False\r
- self.Start()\r
+ self.StartParse()\r
\r
# No specific ARCH or Platform given, use raw data\r
if self._RawTable and (len(DataInfo) == 1 or DataInfo[1] is None):\r
\r
return self._FilterRecordList(self._Table.Query(*DataInfo), DataInfo[1])\r
\r
+ def StartParse(self):\r
+ if not self._Finished:\r
+ if self._RawTable.IsIntegrity():\r
+ self._Finished = True\r
+ else:\r
+ self._Table = self._RawTable\r
+ self._PostProcessed = False\r
+ self.Start()\r
## Data parser for the common format in different type of file\r
#\r
# The common format in the meatfile is like\r
EdkLogger.error("Parser", FORMAT_INVALID, "Global macro %s is not permitted." % (Macro), ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
else:\r
EdkLogger.error("Parser", FORMAT_INVALID, "%s not defined" % (Macro), ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
- # Sometimes, we need to make differences between EDK and EDK2 modules \r
+ # Sometimes, we need to make differences between EDK and EDK2 modules\r
if Name == 'INF_VERSION':\r
if hexVersionPattern.match(Value):\r
- self._Version = int(Value, 0) \r
+ self._Version = int(Value, 0)\r
elif decVersionPattern.match(Value):\r
ValueList = Value.split('.')\r
- Major = '%04o' % int(ValueList[0], 0)\r
- Minor = '%04o' % int(ValueList[1], 0)\r
- self._Version = int('0x' + Major + Minor, 0)\r
+ Major = int(ValueList[0], 0)\r
+ Minor = int(ValueList[1], 0)\r
+ if Major > 0xffff or Minor > 0xffff:\r
+ EdkLogger.error('Parser', FORMAT_INVALID, "Invalid version number",\r
+ ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
+ self._Version = int('0x{0:04x}{1:04x}'.format(Major, Minor), 0)\r
else:\r
EdkLogger.error('Parser', FORMAT_INVALID, "Invalid version number",\r
ExtraData=self._CurrentLine, File=self.MetaFile, Line=self._LineIndex + 1)\r
)\r
def GetValidExpression(self, TokenSpaceGuid, PcdCName):\r
return self._Table.GetValidExpression(TokenSpaceGuid, PcdCName)\r
- def _GetMacros(self):\r
+\r
+ @property\r
+ def _Macros(self):\r
Macros = {}\r
Macros.update(self._FileLocalMacros)\r
Macros.update(self._GetApplicableSectionMacro())\r
return Macros\r
\r
- ## Construct section Macro dict \r
+ ## Construct section Macro dict\r
def _ConstructSectionMacroDict(self, Name, Value):\r
ScopeKey = [(Scope[0], Scope[1], Scope[2]) for Scope in self._Scope]\r
ScopeKey = tuple(ScopeKey)\r
\r
self._SectionsMacroDict[SectionDictKey][Name] = Value\r
\r
- ## Get section Macros that are applicable to current line, which may come from other sections \r
+ ## Get section Macros that are applicable to current line, which may come from other sections\r
## that share the same name while scope is wider\r
def _GetApplicableSectionMacro(self):\r
Macros = {}\r
return Macros\r
\r
_SectionParser = {}\r
- Finished = property(_GetFinished, _SetFinished)\r
- _Macros = property(_GetMacros)\r
-\r
\r
## INF file parser class\r
#\r
SectionComments.extend(Comments)\r
Comments = []\r
continue\r
- if Line.find(DataType.TAB_COMMENT_EDK_START) > -1:\r
+ if Line.find(TAB_COMMENT_EDK_START) > -1:\r
IsFindBlockComment = True\r
continue\r
- if Line.find(DataType.TAB_COMMENT_EDK_END) > -1:\r
+ if Line.find(TAB_COMMENT_EDK_END) > -1:\r
IsFindBlockComment = False\r
continue\r
if IsFindBlockComment:\r
#\r
def __init__(self, FilePath, FileType, Arch, Table, Owner= -1, From= -1):\r
# prevent re-initialization\r
- if hasattr(self, "_Table"):\r
+ if hasattr(self, "_Table") and self._Table is Table:\r
return\r
MetaFileParser.__init__(self, FilePath, FileType, Arch, Table, Owner, From)\r
self._Version = 0x00010005 # Only EDK2 dsc file is supported\r
#\r
self._IdMapping = {-1:-1}\r
\r
+ self._PcdCodeValue = ""\r
+ self._PcdDataTypeCODE = False\r
+ self._CurrentPcdName = ""\r
+ self._Content = None\r
+\r
## Parser starter\r
def Start(self):\r
Content = ''\r
EdkLogger.error("Parser", FILE_READ_FAILURE, ExtraData=self.MetaFile)\r
\r
OwnerId = {}\r
+\r
+ Content = self.ProcessMultipleLineCODEValue(Content)\r
+\r
for Index in range(0, len(Content)):\r
Line = CleanString(Content[Index])\r
# skip empty line\r
self._SubsectionType = MODEL_META_DATA_SUBSECTION_HEADER\r
# directive line\r
elif Line[0] == '!':\r
- self._DirectiveParser()\r
+ TokenList = GetSplitValueList(Line, ' ', 1)\r
+ if TokenList[0] == TAB_INCLUDE:\r
+ for Arch, ModuleType, DefaultStore in self._Scope:\r
+ if self._SubsectionType != MODEL_UNKNOWN and Arch in OwnerId:\r
+ self._Owner[-1] = OwnerId[Arch]\r
+ self._DirectiveParser()\r
+ else:\r
+ self._DirectiveParser()\r
continue\r
if Line[0] == TAB_OPTION_START and not self._InSubsection:\r
EdkLogger.error("Parser", FILE_READ_FAILURE, "Missing the '{' before %s in Line %s" % (Line, Index+1), ExtraData=self.MetaFile)\r
#\r
for Arch, ModuleType, DefaultStore in self._Scope:\r
Owner = self._Owner[-1]\r
- if self._SubsectionType != MODEL_UNKNOWN:\r
+ if self._SubsectionType != MODEL_UNKNOWN and Arch in OwnerId:\r
Owner = OwnerId[Arch]\r
self._LastItem = self._Store(\r
self._ItemType,\r
def _LibraryInstanceParser(self):\r
self._ValueList[0] = self._CurrentLine\r
\r
+ def ProcessMultipleLineCODEValue(self,Content):\r
+ CODEBegin = False\r
+ CODELine = ""\r
+ continuelinecount = 0\r
+ newContent = []\r
+ for Index in range(0, len(Content)):\r
+ Line = Content[Index]\r
+ if CODEBegin:\r
+ CODELine = CODELine + Line\r
+ continuelinecount +=1\r
+ if ")}" in Line:\r
+ newContent.append(CODELine)\r
+ for _ in range(continuelinecount):\r
+ newContent.append("")\r
+ CODEBegin = False\r
+ CODELine = ""\r
+ continuelinecount = 0\r
+ else:\r
+ if not Line:\r
+ newContent.append(Line)\r
+ continue\r
+ if "{CODE(" not in Line:\r
+ newContent.append(Line)\r
+ continue\r
+ elif CODEPattern.findall(Line):\r
+ newContent.append(Line)\r
+ continue\r
+ else:\r
+ CODEBegin = True\r
+ CODELine = Line\r
+\r
+ return newContent\r
+\r
+ def _DecodeCODEData(self):\r
+ pass\r
## PCD sections parser\r
#\r
# [PcdsFixedAtBuild]\r
#\r
@ParseMacro\r
def _PcdParser(self):\r
+ if self._PcdDataTypeCODE:\r
+ self._PcdCodeValue = self._PcdCodeValue + "\n " + self._CurrentLine\r
+ if self._CurrentLine.endswith(")}"):\r
+ self._CurrentLine = "|".join((self._CurrentPcdName, self._PcdCodeValue))\r
+ self._PcdDataTypeCODE = False\r
+ self._PcdCodeValue = ""\r
+ else:\r
+ self._ValueList = None\r
+ return\r
TokenList = GetSplitValueList(self._CurrentLine, TAB_VALUE_SPLIT, 1)\r
+ self._CurrentPcdName = TokenList[0]\r
+ if len(TokenList) == 2 and TokenList[1].strip().startswith("{CODE"):\r
+ self._PcdDataTypeCODE = True\r
+ self._PcdCodeValue = TokenList[1].strip()\r
+\r
+ if self._PcdDataTypeCODE:\r
+ if self._CurrentLine.endswith(")}"):\r
+ self._PcdDataTypeCODE = False\r
+ self._PcdCodeValue = ""\r
+ else:\r
+ self._ValueList = None\r
+ return\r
self._ValueList[0:1] = GetSplitValueList(TokenList[0], TAB_SPLIT)\r
PcdNameTockens = GetSplitValueList(TokenList[0], TAB_SPLIT)\r
if len(PcdNameTockens) == 2:\r
if self._CurrentLine[-1] == '{':\r
self._ValueList[0] = self._CurrentLine[0:-1].strip()\r
self._InSubsection = True\r
+ self._SubsectionType = MODEL_UNKNOWN\r
else:\r
self._ValueList[0] = self._CurrentLine\r
\r
)\r
\r
## Override parent's method since we'll do all macro replacements in parser\r
- def _GetMacros(self):\r
+ @property\r
+ def _Macros(self):\r
Macros = {}\r
Macros.update(self._FileLocalMacros)\r
Macros.update(self._GetApplicableSectionMacro())\r
MODEL_META_DATA_CONDITIONAL_STATEMENT_ERROR : self._ProcessError,\r
}\r
\r
- self._Table = MetaFileStorage(self._RawTable.Cur, self.MetaFile, MODEL_FILE_DSC, True)\r
- self._Table.Create()\r
+ self._Table = MetaFileStorage(self._RawTable.DB, self.MetaFile, MODEL_FILE_DSC, True)\r
self._DirectiveStack = []\r
self._DirectiveEvalStack = []\r
self._FileWithError = self.MetaFile\r
try:\r
Processer[self._ItemType]()\r
except EvaluationException as Excpt:\r
- # \r
+ #\r
# Only catch expression evaluation error here. We need to report\r
# the precise number of line on which the error occurred\r
#\r
EdkLogger.debug(EdkLogger.DEBUG_5, str(Exc), self._ValueList[1])\r
Result = False\r
except WrnExpression as Excpt:\r
- # \r
+ #\r
# Catch expression evaluation warning here. We need to report\r
# the precise number of line and return the evaluation result\r
#\r
__IncludeMacros['EFI_SOURCE'] = GlobalData.gGlobalDefines['EFI_SOURCE']\r
__IncludeMacros['EDK_SOURCE'] = GlobalData.gGlobalDefines['EDK_SOURCE']\r
#\r
- # Allow using MACROs comes from [Defines] section to keep compatible. \r
+ # Allow using MACROs comes from [Defines] section to keep compatible.\r
#\r
__IncludeMacros.update(self._Macros)\r
\r
\r
self._FileWithError = IncludedFile1\r
\r
- IncludedFileTable = MetaFileStorage(self._Table.Cur, IncludedFile1, MODEL_FILE_DSC, False)\r
FromItem = self._Content[self._ContentIndex - 1][0]\r
if self._InSubsection:\r
Owner = self._Content[self._ContentIndex - 1][8]\r
else:\r
Owner = self._Content[self._ContentIndex - 1][0]\r
+ IncludedFileTable = MetaFileStorage(self._RawTable.DB, IncludedFile1, MODEL_FILE_DSC, False, FromItem=FromItem)\r
Parser = DscParser(IncludedFile1, self._FileType, self._Arch, IncludedFileTable,\r
Owner=Owner, From=FromItem)\r
\r
\r
# set the parser status with current status\r
Parser._SectionName = self._SectionName\r
- if self._InSubsection:\r
- Parser._SectionType = self._SubsectionType\r
- else:\r
- Parser._SectionType = self._SectionType\r
+ Parser._SubsectionType = self._SubsectionType\r
+ Parser._InSubsection = self._InSubsection\r
+ Parser._SectionType = self._SectionType\r
Parser._Scope = self._Scope\r
Parser._Enabled = self._Enabled\r
# Parse the included file\r
- Parser.Start()\r
-\r
- # update current status with sub-parser's status\r
- self._SectionName = Parser._SectionName\r
- if not self._InSubsection:\r
- self._SectionType = Parser._SectionType\r
- self._SubsectionType = Parser._SubsectionType\r
- self._InSubsection = Parser._InSubsection\r
-\r
- self._Scope = Parser._Scope\r
- self._Enabled = Parser._Enabled\r
-\r
+ Parser.StartParse()\r
# Insert all records in the table for the included file into dsc file table\r
Records = IncludedFileTable.GetAll()\r
if Records:\r
\r
ValList, Valid, Index = AnalyzeDscPcd(self._ValueList[2], self._ItemType)\r
if not Valid:\r
+ if self._ItemType in (MODEL_PCD_DYNAMIC_DEFAULT, MODEL_PCD_DYNAMIC_EX_DEFAULT, MODEL_PCD_FIXED_AT_BUILD, MODEL_PCD_PATCHABLE_IN_MODULE):\r
+ if ValList[1] != TAB_VOID and StructPattern.match(ValList[1]) is None and ValList[2]:\r
+ EdkLogger.error('build', FORMAT_INVALID, "Pcd format incorrect. The datum type info should be VOID* or a valid struct name.", File=self._FileWithError,\r
+ Line=self._LineIndex + 1, ExtraData="%s.%s|%s" % (self._ValueList[0], self._ValueList[1], self._ValueList[2]))\r
EdkLogger.error('build', FORMAT_INVALID, "Pcd format incorrect.", File=self._FileWithError, Line=self._LineIndex + 1,\r
ExtraData="%s.%s|%s" % (self._ValueList[0], self._ValueList[1], self._ValueList[2]))\r
PcdValue = ValList[Index]\r
MODEL_META_DATA_SUBSECTION_HEADER : _SubsectionHeaderParser,\r
}\r
\r
- _Macros = property(_GetMacros)\r
-\r
## DEC file parser class\r
#\r
# @param FilePath The path of platform description file\r
if self._ValueList[0] not in self._GuidDict:\r
self._GuidDict[self._ValueList[0]] = self._ValueList[1]\r
\r
+ def ParsePcdName(self,namelist):\r
+ if "[" in namelist[1]:\r
+ pcdname = namelist[1][:namelist[1].index("[")]\r
+ arrayindex = namelist[1][namelist[1].index("["):]\r
+ namelist[1] = pcdname\r
+ if len(namelist) == 2:\r
+ namelist.append(arrayindex)\r
+ else:\r
+ namelist[2] = ".".join((arrayindex,namelist[2]))\r
+ return namelist\r
+\r
## PCD sections parser\r
#\r
# [PcdsFixedAtBuild]\r
return\r
\r
if self._include_flag:\r
- self._ValueList[1] = "<HeaderFiles>_" + md5.new(self._CurrentLine).hexdigest()\r
+ self._ValueList[1] = "<HeaderFiles>_" + md5(self._CurrentLine).hexdigest()\r
self._ValueList[2] = self._CurrentLine\r
if self._package_flag and "}" != self._CurrentLine:\r
- self._ValueList[1] = "<Packages>_" + md5.new(self._CurrentLine).hexdigest()\r
+ self._ValueList[1] = "<Packages>_" + md5(self._CurrentLine).hexdigest()\r
self._ValueList[2] = self._CurrentLine\r
if self._CurrentLine == "}":\r
self._package_flag = False\r
return\r
else:\r
PcdTockens = self._CurrentLine.split(TAB_VALUE_SPLIT)\r
- PcdNames = PcdTockens[0].split(TAB_SPLIT)\r
+ PcdNames = self.ParsePcdName(PcdTockens[0].split(TAB_SPLIT))\r
if len(PcdNames) == 2:\r
- self._CurrentStructurePcdName = ""\r
+ if PcdNames[1].strip().endswith("]"):\r
+ PcdName = PcdNames[1][:PcdNames[1].index('[')]\r
+ Index = PcdNames[1][PcdNames[1].index('['):]\r
+ self._ValueList[0] = TAB_SPLIT.join((PcdNames[0],PcdName))\r
+ self._ValueList[1] = Index\r
+ self._ValueList[2] = PcdTockens[1]\r
+ else:\r
+ self._CurrentStructurePcdName = ""\r
else:\r
if self._CurrentStructurePcdName != TAB_SPLIT.join(PcdNames[:2]):\r
EdkLogger.error('Parser', FORMAT_INVALID, "Pcd Name does not match: %s and %s " % (self._CurrentStructurePcdName, TAB_SPLIT.join(PcdNames[:2])),\r