Sync EDKII BaseTools to BaseTools project r1903.

[mirror_edk2.git] / BaseTools / Source / Python / Common / FdfParserLite.py

diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py
index b397b16b42baefd6a8cd33b688fa7128f1f6fb77..e9b69ff1b9a92a512c7dc8401e647c1fa0035a20 100644 (file)
--- a/BaseTools/Source/Python/Common/FdfParserLite.py
+++ b/BaseTools/Source/Python/Common/FdfParserLite.py
@@ -1439,10 +1439,17 @@ class FdfParser(object):
     def __GetBlockStatements(self, Obj):\r
         \r
         if not self.__GetBlockStatement(Obj):\r
-            raise Warning("expected block statement At Line ", self.FileName, self.CurrentLineNumber)\r
-            \r
+            #set default block size is 1\r
+            Obj.BlockSizeList.append((1, Obj.Size, None))\r
+            return True\r
+\r
         while self.__GetBlockStatement(Obj):\r
             pass\r
+        \r
+        for Item in Obj.BlockSizeList:\r
+            if Item[0] == None or Item[1] == None:\r
+                raise Warning("expected block statement for Fd Section", self.FileName, self.CurrentLineNumber)\r
+\r
         return True\r
     \r
     ## __GetBlockStatement() method\r
@@ -2329,6 +2336,8 @@ class FdfParser(object):
         \r
         AlignValue = None\r
         if self.__GetAlignment():\r
+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+                raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
             AlignValue = self.__Token\r
             \r
         BuildNum = None\r
@@ -2342,6 +2351,8 @@ class FdfParser(object):
             BuildNum = self.__Token\r
             \r
         if self.__IsKeyword( "VERSION"):\r
+            if AlignValue == 'Auto':\r
+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
             if not self.__IsToken( "="):\r
                 raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)\r
             if not self.__GetNextToken():\r
@@ -2356,6 +2367,8 @@ class FdfParser(object):
             Obj.SectionList.append(VerSectionObj)\r
 \r
         elif self.__IsKeyword( "UI"):\r
+            if AlignValue == 'Auto':\r
+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
             if not self.__IsToken( "="):\r
                 raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)\r
             if not self.__GetNextToken():\r
@@ -2369,6 +2382,8 @@ class FdfParser(object):
             Obj.SectionList.append(UiSectionObj)\r
             \r
         elif self.__IsKeyword( "FV_IMAGE"):\r
+            if AlignValue == 'Auto':\r
+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
             if not self.__IsToken( "="):\r
                 raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)\r
             if not self.__GetNextWord():\r
@@ -2409,6 +2424,8 @@ class FdfParser(object):
             Obj.SectionList.append(FvImageSectionObj) \r
            \r
         elif self.__IsKeyword("PEI_DEPEX_EXP") or self.__IsKeyword("DXE_DEPEX_EXP") or self.__IsKeyword("SMM_DEPEX_EXP"):\r
+            if AlignValue == 'Auto':\r
+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
             DepexSectionObj = CommonDataClass.FdfClass.DepexSectionClassObject()\r
             DepexSectionObj.Alignment = AlignValue\r
             DepexSectionObj.DepexType = self.__Token\r
@@ -2436,6 +2453,8 @@ class FdfParser(object):
             if self.__Token not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\\r
                                "UI", "VERSION", "PEI_DEPEX", "SUBTYPE_GUID", "SMM_DEPEX"):\r
                 raise Warning("Unknown section type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+            if AlignValue == 'Auto'and (not self.__Token == 'PE32') and (not self.__Token == 'TE'):\r
+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
             # DataSection\r
             DataSectionObj = CommonDataClass.FdfClass.DataSectionClassObject()\r
             DataSectionObj.Alignment = AlignValue\r
@@ -2585,6 +2604,8 @@ class FdfParser(object):
         \r
         AlignValue = None\r
         if self.__GetAlignment():\r
+            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+                raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
             AlignValue = self.__Token\r
             \r
         if not self.__GetCglSection(FfsFileObj, AlignValue):\r
@@ -2899,7 +2920,7 @@ class FdfParser(object):
             \r
         AlignValue = ""\r
         if self.__GetAlignment():\r
-            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
                 raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)\r
             AlignValue = self.__Token\r
 \r
@@ -2963,8 +2984,10 @@ class FdfParser(object):
                 CheckSum = True\r
     \r
             if self.__GetAlignment():\r
-                if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
                     raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)\r
+                if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+                    raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
                 AlignValue = self.__Token\r
             \r
             if not self.__GetNextToken():\r
@@ -3039,14 +3062,6 @@ class FdfParser(object):
                         raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)\r
                     FvImageSectionObj.Alignment = self.__Token\r
                 \r
-                if self.__IsKeyword("FV"):\r
-                    FvImageSectionObj.FvFileType = self.__Token\r
-                \r
-                if self.__GetAlignment():\r
-                    if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
-                        raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)\r
-                    FvImageSectionObj.Alignment = self.__Token\r
-                    \r
                 if self.__IsToken('|'):\r
                     FvImageSectionObj.FvFileExtension = self.__GetFileExtension()\r
                 elif self.__GetNextToken():\r
@@ -3110,6 +3125,10 @@ class FdfParser(object):
                 EfiSectionObj.BuildNum = self.__Token\r
                 \r
         if self.__GetAlignment():\r
+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):\r
+                raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)\r
+            if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):\r
+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)\r
             EfiSectionObj.Alignment = self.__Token\r
         \r
         if self.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'):\r