Sync tool code to BuildTools project r1739.

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / FdfParser.py

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 07de92610a463912edccdbf4fa9d4c988d5b4113..24732a0d5e2054a10294ec471ec3814b310c0595 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1877,6 +1877,14 @@ class FdfParser:
         \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
+                break\r
+\r
         self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
         self.__GetAprioriSection(FvObj, FvObj.DefineVarDict.copy())\r
 \r
@@ -1970,6 +1978,79 @@ class FdfParser:
 \r
         return\r
 \r
+    def __GetFvExtEntryStatement(self, FvObj):\r
+\r
+        if not self.__IsKeyword( "FV_EXT_ENTRY"):\r
+            return False\r
+\r
+        if not self.__IsKeyword ("TYPE"):\r
+            raise Warning("expected 'TYPE'", self.FileName, self.CurrentLineNumber)\r
+            \r
+        if not self.__IsToken( "="):\r
+            raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+\r
+        if not self.__GetNextHexNumber() and not self.__GetNextDecimalNumber():\r
+            raise Warning("expected Hex FV extension entry type value At Line ", self.FileName, self.CurrentLineNumber)\r
+\r
+        FvObj.FvExtEntryTypeValue += [self.__Token]\r
+\r
+        if not self.__IsToken( "{"):\r
+            raise Warning("expected '{'", self.FileName, self.CurrentLineNumber)\r
+\r
+        if not self.__IsKeyword ("FILE") and not self.__IsKeyword ("DATA"):\r
+            raise Warning("expected 'FILE' or 'DATA'", self.FileName, self.CurrentLineNumber)\r
+\r
+        FvObj.FvExtEntryType += [self.__Token]\r
+\r
+        if self.__Token == 'DATA':\r
+\r
+            if not self.__IsToken( "="):\r
+                raise Warning("expected '='", 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 byte", self.FileName, self.CurrentLineNumber)\r
+\r
+            if len(self.__Token) > 4:\r
+                raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
+\r
+            DataString = self.__Token\r
+            DataString += ","\r
+\r
+            while self.__IsToken(","):\r
+                if not self.__GetNextHexNumber():\r
+                    raise Warning("Invalid Hex number", self.FileName, self.CurrentLineNumber)\r
+                if len(self.__Token) > 4:\r
+                    raise Warning("Hex byte(must be 2 digits) too long", self.FileName, self.CurrentLineNumber)\r
+                DataString += self.__Token\r
+                DataString += ","\r
+\r
+            if not self.__IsToken( "}"):\r
+                raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+\r
+            if not self.__IsToken( "}"):\r
+                raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+\r
+            DataString = DataString.rstrip(",")\r
+            FvObj.FvExtEntryData += [DataString]\r
+\r
+        if self.__Token == 'FILE':\r
+        \r
+            if not self.__IsToken( "="):\r
+                raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+                \r
+            if not self.__GetNextToken():\r
+                raise Warning("expected FV Extension Entry file path At Line ", self.FileName, self.CurrentLineNumber)\r
+                \r
+            FvObj.FvExtEntryData += [self.__Token]\r
+\r
+            if not self.__IsToken( "}"):\r
+                raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
+\r
+        return True\r
+\r
     ## __GetAprioriSection() method\r
     #\r
     #   Get token statements\r
@@ -2683,15 +2764,31 @@ class FdfParser:
     #   @param  Obj         for whom token statements are got\r
     #\r
     def __GetCapsuleTokens(self, Obj):\r
-\r
-        if not self.__IsKeyword("CAPSULE_GUID"):\r
-            raise Warning("expected 'CAPSULE_GUID'", self.FileName, self.CurrentLineNumber)\r
-\r
-        while self.__CurrentLine().find("=") != -1:\r
-            NameValue = self.__CurrentLine().split("=")\r
-            Obj.TokensDict[NameValue[0].strip()] = NameValue[1].strip()\r
-            self.CurrentLineNumber += 1\r
-            self.CurrentOffsetWithinLine = 0\r
+        if not self.__GetNextToken():\r
+            return False\r
+        while self.__Token in ("CAPSULE_GUID", "CAPSULE_HEADER_SIZE", "CAPSULE_FLAGS"):\r
+            Name = self.__Token.strip()\r
+            if not self.__IsToken("="):\r
+                raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
+            if not self.__GetNextToken():\r
+                raise Warning("expected value", self.FileName, self.CurrentLineNumber)\r
+            if Name == 'CAPSULE_FLAGS':\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
+                while self.__IsToken(","):\r
+                    Value += ','\r
+                    if not self.__GetNextToken():\r
+                        raise Warning("expected value", 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
+            else:\r
+                Value = self.__Token.strip()\r
+            Obj.TokensDict[Name] = Value  \r
+            if not self.__GetNextToken():\r
+                return False\r
+        self.__UndoToken()\r
 \r
     ## __GetCapsuleData() method\r
     #\r
@@ -2815,7 +2912,7 @@ class FdfParser:
                              "DXE_SMM_DRIVER", "DXE_RUNTIME_DRIVER", \\r
                              "UEFI_DRIVER", "UEFI_APPLICATION", "USER_DEFINED", "DEFAULT", "BASE", \\r
                              "SECURITY_CORE", "COMBINED_PEIM_DRIVER", "PIC_PEIM", "RELOCATABLE_PEIM", \\r
-                             "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_RT_DRIVER", "APPLICATION", "ACPITABLE", "SMM_DRIVER", "SMM_CORE"):\r
+                             "PE32_PEIM", "BS_DRIVER", "RT_DRIVER", "SAL_RT_DRIVER", "APPLICATION", "ACPITABLE", "SMM_CORE"):\r
             raise Warning("Unknown Module type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
         return self.__Token\r
 \r
@@ -2859,7 +2956,7 @@ class FdfParser:
 \r
         Type = self.__Token.strip().upper()\r
         if Type not in ("RAW", "FREEFORM", "SEC", "PEI_CORE", "PEIM",\\r
-                             "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLICATION", "FV_IMAGE", "SMM_DXE_COMBO", "SMM", "SMM_CORE"):\r
+                             "PEI_DXE_COMBO", "DRIVER", "DXE_CORE", "APPLICATION", "FV_IMAGE", "SMM", "SMM_CORE"):\r
             raise Warning("Unknown FV type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
 \r
         if not self.__IsToken("="):\r
@@ -3238,8 +3335,8 @@ class FdfParser:
         elif SectionType == "RAW":\r
             if FileType not in ("BIN", "SEC_BIN", "RAW", "ASL", "ACPI"):\r
                 raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
-        elif SectionType == "DXE_DEPEX":\r
-            if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX"):\r
+        elif SectionType == "DXE_DEPEX" or SectionType == "SMM_DEPEX":\r
+            if FileType not in ("DXE_DEPEX", "SEC_DXE_DEPEX", "SMM_DEPEX"):\r
                 raise Warning("Incorrect section file type '%s'" % FileType, self.FileName, self.CurrentLineNumber)\r
         elif SectionType == "UI":\r
             if FileType not in ("UI", "SEC_UI"):\r