SF.net SVN: edk2-buildtools:[2638] trunk/BaseTools/Source/Python/GenFds/ FdfParser.py

[<yi...@us...>]

Revision: 2638
          http://sourceforge.net/p/edk2-buildtools/code/2638
Author:   yingke
Date:     2014-01-09 06:33:45 +0000 (Thu, 09 Jan 2014)
Log Message:
-----------
Fix a bug which report error if a correct FD contains a region with no region type followed by another region whose offset is an expression staring with a PCD.

Reviewed-by: Liming Gao <lim...@in...>
Signed-off-by: Yingke Liu <yin...@in...>

Modified Paths:
--------------
    trunk/BaseTools/Source/Python/GenFds/FdfParser.py

Modified: trunk/BaseTools/Source/Python/GenFds/FdfParser.py
===================================================================
--- trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2014-01-09 06:25:14 UTC (rev 2637)
+++ trunk/BaseTools/Source/Python/GenFds/FdfParser.py	2014-01-09 06:33:45 UTC (rev 2638)
@@ -1,7 +1,7 @@
 ## @file
 # parse FDF file
 #
-#  Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -77,6 +77,7 @@
 
 RegionSizePattern = re.compile("\s*(?P<base>(?:0x|0X)?[a-fA-F0-9]+)\s*\|\s*(?P<size>(?:0x|0X)?[a-fA-F0-9]+)\s*")
 RegionSizeGuidPattern = re.compile("\s*(?P<base>\w+\.\w+)\s*\|\s*(?P<size>\w+\.\w+)\s*")
+RegionOffsetPcdPattern = re.compile("\s*(?P<base>\w+\.\w+)\s*$")
 ShortcutPcdPattern = re.compile("\s*\w+\s*=\s*(?P<value>(?:0x|0X)?[a-fA-F0-9]+)\s*\|\s*(?P<name>\w+\.\w+)\s*")
 
 IncludeFileList = []
@@ -1768,18 +1769,26 @@
             return True
 
         if not self.__Token in ("SET", "FV", "FILE", "DATA", "CAPSULE"):
+            #
+            # If next token is a word which is not a valid FV type, it might be part of [PcdOffset[|PcdSize]]
+            # Or it might be next region's offset described by an expression which starts with a PCD.
+            #    PcdOffset[|PcdSize] or OffsetPcdExpression|Size
+            #
             self.__UndoToken()
-            RegionObj.PcdOffset = self.__GetNextPcdName()
-            self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + long(Fd.BaseAddress, 0))
-            self.__PcdDict['%s.%s' % (RegionObj.PcdOffset[1], RegionObj.PcdOffset[0])] = "0x%x" % RegionObj.Offset
-            FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)
-            self.Profile.PcdFileLineDict[RegionObj.PcdOffset] = FileLineTuple
-            if self.__IsToken( "|"):
-                RegionObj.PcdSize = self.__GetNextPcdName()
-                self.Profile.PcdDict[RegionObj.PcdSize] = "0x%08X" % RegionObj.Size
-                self.__PcdDict['%s.%s' % (RegionObj.PcdSize[1], RegionObj.PcdSize[0])] = "0x%x" % RegionObj.Size
+            IsRegionPcd = (RegionSizeGuidPattern.match(self.__CurrentLine()[self.CurrentOffsetWithinLine:]) or
+                           RegionOffsetPcdPattern.match(self.__CurrentLine()[self.CurrentOffsetWithinLine:]))
+            if IsRegionPcd:
+                RegionObj.PcdOffset = self.__GetNextPcdName()
+                self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + long(Fd.BaseAddress, 0))
+                self.__PcdDict['%s.%s' % (RegionObj.PcdOffset[1], RegionObj.PcdOffset[0])] = "0x%x" % RegionObj.Offset
                 FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)
-                self.Profile.PcdFileLineDict[RegionObj.PcdSize] = FileLineTuple
+                self.Profile.PcdFileLineDict[RegionObj.PcdOffset] = FileLineTuple
+                if self.__IsToken( "|"):
+                    RegionObj.PcdSize = self.__GetNextPcdName()
+                    self.Profile.PcdDict[RegionObj.PcdSize] = "0x%08X" % RegionObj.Size
+                    self.__PcdDict['%s.%s' % (RegionObj.PcdSize[1], RegionObj.PcdSize[0])] = "0x%x" % RegionObj.Size
+                    FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)
+                    self.Profile.PcdFileLineDict[RegionObj.PcdSize] = FileLineTuple
 
             if not self.__GetNextWord():
                 return True
@@ -1806,6 +1815,9 @@
             self.__UndoToken()
             self.__GetRegionDataType( RegionObj)
         else:
+            self.__UndoToken()
+            if self.__GetRegionLayout(Fd):
+                return True
             raise Warning("A valid region type was not found. "
                           "Valid types are [SET, FV, CAPSULE, FILE, DATA]. This error occurred",
                           self.FileName, self.CurrentLineNumber)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.