Sync EDKII BaseTools to BaseTools project r2093.

[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 c4358cf47913d4467a13f6891c915cc35429a82a..52d32a9e98779009ab97e9c1c77399dd822ffaa0 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -565,9 +565,9 @@ class FdfParser:
         self.Rewind()\r
 \r
     \r
-    ## PreprocessIncludeFile() method\r
+    ## PreprocessConditionalStatement() method\r
     #\r
-    #   Preprocess file contents, replace !include statements with file contents.\r
+    #   Preprocess conditional statement.\r
     #   In the end, rewind the file buffer pointer to the beginning\r
     #\r
     #   @param  self        The object pointer\r
@@ -751,7 +751,7 @@ class FdfParser:
                     raise Warning("Value %s is not a number", self.FileName, Line)\r
 \r
         for Profile in AllMacroList:\r
-            if Profile.FileName == FileLineTuple[0] and Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:\r
+            if Profile.MacroName == Name and Profile.DefinedAtLine <= FileLineTuple[1]:\r
                 if Op == None:\r
                     if Value == 'Bool' and Profile.MacroValue == None or Profile.MacroValue.upper() == 'FALSE':\r
                         return False\r
@@ -1264,6 +1264,12 @@ class FdfParser:
             raise Warning("expected ']'", self.FileName, self.CurrentLineNumber)\r
 \r
         while self.__GetNextWord():\r
+            # handle the SET statement\r
+            if self.__Token == 'SET':\r
+                self.__UndoToken()\r
+                self.__GetSetStatement(None)\r
+                continue\r
+            \r
             Macro = self.__Token\r
             \r
             if not self.__IsToken("="):\r
@@ -1489,7 +1495,7 @@ class FdfParser:
         \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
+                raise Warning("expected block statement", self.FileName, self.CurrentLineNumber)\r
 \r
     ## __GetBlockStatement() method\r
     #\r
@@ -1508,7 +1514,7 @@ class FdfParser:
             raise Warning("expected '='", self.FileName, self.CurrentLineNumber)\r
 \r
         if not self.__GetNextHexNumber() and not self.__GetNextDecimalNumber():\r
-            raise Warning("expected Hex block size", self.FileName, self.CurrentLineNumber)\r
+            raise Warning("expected Hex or Integer block size", self.FileName, self.CurrentLineNumber)\r
 \r
         BlockSize = self.__Token\r
         BlockSizePcd = None\r
@@ -1609,7 +1615,8 @@ class FdfParser:
                     raise Warning("expected '}'", self.FileName, self.CurrentLineNumber)\r
                 Value += self.__SkippedChars\r
 \r
-            Obj.SetVarDict[PcdPair] = Value\r
+            if Obj:\r
+                Obj.SetVarDict[PcdPair] = Value\r
             self.Profile.PcdDict[PcdPair] = Value\r
             return True\r
 \r
@@ -1904,7 +1911,8 @@ class FdfParser:
 \r
         self.__GetAddressStatements(FvObj)\r
 \r
-        self.__GetBlockStatement(FvObj)\r
+        while self.__GetBlockStatement(FvObj):\r
+            pass\r
 \r
         self.__GetSetStatements(FvObj)\r
 \r
@@ -3532,6 +3540,11 @@ class FdfParser:
                 raise Warning("expected Reset file", self.FileName, self.CurrentLineNumber)\r
 \r
             VtfObj.ResetBin = self.__Token\r
+            if VtfObj.ResetBin.replace('$(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
@@ -3634,6 +3647,11 @@ class FdfParser:
             raise Warning("expected Component file", self.FileName, self.CurrentLineNumber)\r
 \r
         CompStatementObj.CompBin = self.__Token\r
+        if CompStatementObj.CompBin != '-' and CompStatementObj.CompBin.replace('$(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
@@ -3645,6 +3663,11 @@ class FdfParser:
             raise Warning("expected Component symbol file", self.FileName, self.CurrentLineNumber)\r
 \r
         CompStatementObj.CompSym = self.__Token\r
+        if CompStatementObj.CompSym != '-' and CompStatementObj.CompSym.replace('$(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
@@ -3722,6 +3745,11 @@ class FdfParser:
         if not self.__GetNextToken():\r
             raise Warning("expected INF file path", self.FileName, self.CurrentLineNumber)\r
         ffsInf.InfFileName = self.__Token\r
+        if ffsInf.InfFileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #check for file path\r
+            ErrorCode, ErrorInfo = PathClass(NormPath(ffsInf.InfFileName), GenFdsGlobalVariable.WorkSpaceDir).Validate()\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
@@ -3814,6 +3842,11 @@ class FdfParser:
         if not self.__GetNextToken():\r
             raise Warning("expected File path", self.FileName, self.CurrentLineNumber)\r
         FfsFileObj.FileName = self.__Token\r
+        if FfsFileObj.FileName.replace('$(WORKSPACE)', '').find('$') == -1:\r
+            #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
         if FfsFileObj.FileType == 'EFI':\r
             self.__GetOptRomOverrides(FfsFileObj)\r