Sync EDKII BaseTools to BaseTools project r1903.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10123 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 225 insertions, 79 deletions

diff --git a/BaseTools/Source/Python/Common/BuildToolError.py b/BaseTools/Source/Python/Common/BuildToolError.py
index 982ea93659..a49de46401 100644
--- a/BaseTools/Source/Python/Common/BuildToolError.py
+++ b/BaseTools/Source/Python/Common/BuildToolError.py
@@ -84,7 +84,7 @@ UNKNOWN_ERROR = 0xFFFF
 
 ## Error message of each error code
 gErrorMessage = {
-    FILE_NOT_FOUND          :   "File/directory not found",
+    FILE_NOT_FOUND          :   "File/directory not found in workspace",
     FILE_OPEN_FAILURE       :   "File open failure",
     FILE_WRITE_FAILURE      :   "File write failure",
     FILE_PARSE_FAILURE      :   "File parse failure",
diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py
index c2da992059..dd33380a1e 100644
--- a/BaseTools/Source/Python/Common/DataType.py
+++ b/BaseTools/Source/Python/Common/DataType.py
@@ -73,6 +73,8 @@ EDK_COMPONENT_TYPE_BS_DRIVER = 'BS_DRIVER'
 EDK_COMPONENT_TYPE_RT_DRIVER = 'RT_DRIVER'

 EDK_COMPONENT_TYPE_SAL_RT_DRIVER = 'SAL_RT_DRIVER'

 EDK_COMPONENT_TYPE_APPLICATION = 'APPLICATION'

+EDK_NAME   = 'EDK'

+EDKII_NAME = 'EDKII'

 

 BINARY_FILE_TYPE_FW = 'FW'

 BINARY_FILE_TYPE_GUID = 'GUID'

@@ -230,6 +232,19 @@ TAB_PCDS_DYNAMIC_EBC = TAB_PCDS + TAB_PCDS_DYNAMIC + TAB_SPLIT + TAB_ARCH_EBC
 TAB_PCD_DYNAMIC_TYPE_LIST = [TAB_PCDS_DYNAMIC_DEFAULT_NULL, TAB_PCDS_DYNAMIC_VPD_NULL, TAB_PCDS_DYNAMIC_HII_NULL]

 TAB_PCD_DYNAMIC_EX_TYPE_LIST = [TAB_PCDS_DYNAMIC_EX_DEFAULT_NULL, TAB_PCDS_DYNAMIC_EX_VPD_NULL, TAB_PCDS_DYNAMIC_EX_HII_NULL]

 

+TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_PEI_PAGE_SIZE = 'PcdLoadFixAddressPeiCodePageNumber'

+TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_PEI_PAGE_SIZE_DATA_TYPE = 'UINT32'

+TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_DXE_PAGE_SIZE = 'PcdLoadFixAddressBootTimeCodePageNumber'

+TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_DXE_PAGE_SIZE_DATA_TYPE = 'UINT32'

+TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_RUNTIME_PAGE_SIZE = 'PcdLoadFixAddressRuntimeCodePageNumber'

+TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_RUNTIME_PAGE_SIZE_DATA_TYPE = 'UINT32'

+TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE = 'PcdLoadFixAddressSmmCodePageNumber'

+TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE_DATA_TYPE = 'UINT32'

+TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_LIST = [TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_PEI_PAGE_SIZE, \

+                                            TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_DXE_PAGE_SIZE, \

+                                            TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_RUNTIME_PAGE_SIZE, \

+                                            TAB_PCDS_PATCHABLE_LOAD_FIX_ADDRESS_SMM_PAGE_SIZE]

+

 TAB_DEPEX = 'Depex'

 TAB_DEPEX_COMMON = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_COMMON

 TAB_DEPEX_IA32 = TAB_DEPEX + TAB_SPLIT + TAB_ARCH_IA32

@@ -338,6 +353,7 @@ TAB_DSC_DEFINES_MAKEFILE_NAME = 'MAKEFILE_NAME'
 TAB_DSC_DEFINES_BS_BASE_ADDRESS = 'BsBaseAddress'

 TAB_DSC_DEFINES_RT_BASE_ADDRESS = 'RtBaseAddress'

 TAB_DSC_DEFINES_DEFINE = 'DEFINE'

+TAB_FIX_LOAD_TOP_MEMORY_ADDRESS = 'FIX_LOAD_TOP_MEMORY_ADDRESS'

 

 #

 # TargetTxt Definitions

diff --git a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
index 82ab1796ad..c33b9bff0b 100644
--- a/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
+++ b/BaseTools/Source/Python/Common/EdkIIWorkspaceBuild.py
@@ -1,7 +1,7 @@
 ## @file

 # This file is used to define each component of the build database

 #

-# Copyright (c) 2007 ~ 2008, Intel Corporation

+# Copyright (c) 2007 - 2010, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -748,7 +748,8 @@ class WorkspaceBuild(object):
                 #

                 Pb.Specification = ModuleHeader.Specification

                 Pb.Specification[TAB_INF_DEFINES_EDK_RELEASE_VERSION] = ModuleHeader.EdkReleaseVersion

-                Pb.Specification[TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION] = ModuleHeader.EfiSpecificationVersion

+                Pb.Specification[TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION] = ModuleHeader.UefiSpecificationVersion

+                Pb.Specification[TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION] = ModuleHeader.UefiSpecificationVersion

                 Pb.AutoGenVersion = int(ModuleHeader.InfVersion, 0)

 

                 #

diff --git a/BaseTools/Source/Python/Common/FdfParserLite.py b/BaseTools/Source/Python/Common/FdfParserLite.py
index b397b16b42..e9b69ff1b9 100644
--- 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):

         

         if not self.__GetBlockStatement(Obj):

-            raise Warning("expected block statement At Line ", self.FileName, self.CurrentLineNumber)

-            

+            #set default block size is 1

+            Obj.BlockSizeList.append((1, Obj.Size, None))

+            return True

+

         while self.__GetBlockStatement(Obj):

             pass

+        

+        for Item in Obj.BlockSizeList:

+            if Item[0] == None or Item[1] == None:

+                raise Warning("expected block statement for Fd Section", self.FileName, self.CurrentLineNumber)

+

         return True

     

     ## __GetBlockStatement() method

@@ -2329,6 +2336,8 @@ class FdfParser(object):
         

         AlignValue = None

         if self.__GetAlignment():

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+                raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

             

         BuildNum = None

@@ -2342,6 +2351,8 @@ class FdfParser(object):
             BuildNum = self.__Token

             

         if self.__IsKeyword( "VERSION"):

+            if AlignValue == 'Auto':

+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

             if not self.__IsToken( "="):

                 raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)

             if not self.__GetNextToken():

@@ -2356,6 +2367,8 @@ class FdfParser(object):
             Obj.SectionList.append(VerSectionObj)

 

         elif self.__IsKeyword( "UI"):

+            if AlignValue == 'Auto':

+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

             if not self.__IsToken( "="):

                 raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)

             if not self.__GetNextToken():

@@ -2369,6 +2382,8 @@ class FdfParser(object):
             Obj.SectionList.append(UiSectionObj)

             

         elif self.__IsKeyword( "FV_IMAGE"):

+            if AlignValue == 'Auto':

+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

             if not self.__IsToken( "="):

                 raise Warning("expected '=' At Line ", self.FileName, self.CurrentLineNumber)

             if not self.__GetNextWord():

@@ -2409,6 +2424,8 @@ class FdfParser(object):
             Obj.SectionList.append(FvImageSectionObj) 

            

         elif self.__IsKeyword("PEI_DEPEX_EXP") or self.__IsKeyword("DXE_DEPEX_EXP") or self.__IsKeyword("SMM_DEPEX_EXP"):

+            if AlignValue == 'Auto':

+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

             DepexSectionObj = CommonDataClass.FdfClass.DepexSectionClassObject()

             DepexSectionObj.Alignment = AlignValue

             DepexSectionObj.DepexType = self.__Token

@@ -2436,6 +2453,8 @@ class FdfParser(object):
             if self.__Token not in ("COMPAT16", "PE32", "PIC", "TE", "FV_IMAGE", "RAW", "DXE_DEPEX",\

                                "UI", "VERSION", "PEI_DEPEX", "SUBTYPE_GUID", "SMM_DEPEX"):

                 raise Warning("Unknown section type '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

+            if AlignValue == 'Auto'and (not self.__Token == 'PE32') and (not self.__Token == 'TE'):

+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

             # DataSection

             DataSectionObj = CommonDataClass.FdfClass.DataSectionClassObject()

             DataSectionObj.Alignment = AlignValue

@@ -2585,6 +2604,8 @@ class FdfParser(object):
         

         AlignValue = None

         if self.__GetAlignment():

+            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+                raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

             

         if not self.__GetCglSection(FfsFileObj, AlignValue):

@@ -2899,7 +2920,7 @@ class FdfParser(object):
             

         AlignValue = ""

         if self.__GetAlignment():

-            if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

                 raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)

             AlignValue = self.__Token

 

@@ -2963,8 +2984,10 @@ class FdfParser(object):
                 CheckSum = True

     

             if self.__GetAlignment():

-                if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+                if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

                     raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)

+                if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):

+                    raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

                 AlignValue = self.__Token

             

             if not self.__GetNextToken():

@@ -3039,14 +3062,6 @@ class FdfParser(object):
                         raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)

                     FvImageSectionObj.Alignment = self.__Token

                 

-                if self.__IsKeyword("FV"):

-                    FvImageSectionObj.FvFileType = self.__Token

-                

-                if self.__GetAlignment():

-                    if self.__Token not in ("8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

-                        raise Warning("Incorrect alignment At Line ", self.FileName, self.CurrentLineNumber)

-                    FvImageSectionObj.Alignment = self.__Token

-                    

                 if self.__IsToken('|'):

                     FvImageSectionObj.FvFileExtension = self.__GetFileExtension()

                 elif self.__GetNextToken():

@@ -3110,6 +3125,10 @@ class FdfParser(object):
                 EfiSectionObj.BuildNum = self.__Token

                 

         if self.__GetAlignment():

+            if self.__Token not in ("Auto", "8", "16", "32", "64", "128", "512", "1K", "4K", "32K" ,"64K"):

+                raise Warning("Incorrect alignment '%s'" % self.__Token, self.FileName, self.CurrentLineNumber)

+            if self.__Token == 'Auto' and (not SectionName == 'PE32') and (not SectionName == 'TE'):

+                raise Warning("Auto alignment can only be used in PE32 or TE section ", self.FileName, self.CurrentLineNumber)

             EfiSectionObj.Alignment = self.__Token

         

         if self.__IsKeyword('RELOCS_STRIPPED') or self.__IsKeyword('RELOCS_RETAINED'):

diff --git a/BaseTools/Source/Python/Common/InfClassObject.py b/BaseTools/Source/Python/Common/InfClassObject.py
index 27e67f3a1d..7127cc5cff 100644
--- a/BaseTools/Source/Python/Common/InfClassObject.py
+++ b/BaseTools/Source/Python/Common/InfClassObject.py
@@ -1,7 +1,7 @@
 ## @file

 # This file is used to define each component of INF file

 #

-# Copyright (c) 2007, Intel Corporation

+# Copyright (c) 2007 - 2010, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -85,7 +85,8 @@ class InfHeader(ModuleHeaderClass):
         TAB_INF_DEFINES_BASE_NAME                   : "Name",

         TAB_INF_DEFINES_FILE_GUID                   : "Guid",

         TAB_INF_DEFINES_MODULE_TYPE                 : "ModuleType",

-        TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION   : "EfiSpecificationVersion",

+        TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION   : "UefiSpecificationVersion",

+        TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION  : "UefiSpecificationVersion",

         TAB_INF_DEFINES_EDK_RELEASE_VERSION         : "EdkReleaseVersion",

         #

         # Optional Fields

@@ -452,7 +453,7 @@ class Inf(InfObject):
             print 'Guid =', M.Header[Arch].Guid

             print 'Version =', M.Header[Arch].Version

             print 'InfVersion =', M.Header[Arch].InfVersion

-            print 'EfiSpecificationVersion =', M.Header[Arch].EfiSpecificationVersion

+            print 'UefiSpecificationVersion =', M.Header[Arch].UefiSpecificationVersion

             print 'EdkReleaseVersion =', M.Header[Arch].EdkReleaseVersion

             print 'ModuleType =', M.Header[Arch].ModuleType

             print 'BinaryModule =', M.Header[Arch].BinaryModule

diff --git a/BaseTools/Source/Python/Common/InfClassObjectLight.py b/BaseTools/Source/Python/Common/InfClassObjectLight.py
index a655828e6a..179b75e28a 100644
--- a/BaseTools/Source/Python/Common/InfClassObjectLight.py
+++ b/BaseTools/Source/Python/Common/InfClassObjectLight.py
@@ -1,7 +1,7 @@
 ## @file

 # This file is used to define each component of INF file

 #

-# Copyright (c) 2007, Intel Corporation

+# Copyright (c) 2007 - 2010, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -71,7 +71,8 @@ class InfHeader(ModuleHeaderClass):
         TAB_INF_DEFINES_BASE_NAME                   : "Name",

         TAB_INF_DEFINES_FILE_GUID                   : "Guid",

         TAB_INF_DEFINES_MODULE_TYPE                 : "ModuleType",

-        TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION   : "EfiSpecificationVersion",

+        TAB_INF_DEFINES_EFI_SPECIFICATION_VERSION   : "UefiSpecificationVersion",

+        TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION  : "UefiSpecificationVersion",

         TAB_INF_DEFINES_EDK_RELEASE_VERSION         : "EdkReleaseVersion",        

 

         # Optional Fields

@@ -583,7 +584,7 @@ class Inf(InfObject):
                     ModuleHeader.PcdIsDriver = Value

                 elif Name == TAB_INF_DEFINES_MODULE_TYPE:

                     ModuleHeader.ModuleType = Value

-                elif Name == TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION:

+                elif Name in (TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION, TAB_INF_DEFINES_UEFI_SPECIFICATION_VERSION):

                     ModuleHeader.UefiSpecificationVersion = Value

                 elif Name == TAB_INF_DEFINES_PI_SPECIFICATION_VERSION:

                     ModuleHeader.PiSpecificationVersion = Value

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 2883169f3c..546dd37772 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -22,6 +22,7 @@ import threading
 import time
 import re
 import cPickle
+import array
 from UserDict import IterableUserDict
 from UserList import UserList
 
@@ -1343,6 +1344,90 @@ class PathClass(object):
 
     Key = property(_GetFileKey)
 
+## Parse PE image to get the required PE informaion.
+#
+class PeImageClass():
+    ## Constructor
+    #
+    #   @param  File FilePath of PeImage
+    #
+    def __init__(self, PeFile):
+        self.FileName   = PeFile
+        self.IsValid    = False
+        self.Size       = 0
+        self.EntryPoint = 0
+        self.SectionAlignment  = 0
+        self.SectionHeaderList = []
+        self.ErrorInfo = ''
+        try:
+             PeObject = open(PeFile, 'rb')
+        except:
+            self.ErrorInfo = self.FileName + ' can not be found\n'
+            return
+        # Read DOS header
+        ByteArray = array.array('B')
+        ByteArray.fromfile(PeObject, 0x3E)
+        ByteList = ByteArray.tolist()
+        # DOS signature should be 'MZ'
+        if self._ByteListToStr (ByteList[0x0:0x2]) != 'MZ':
+            self.ErrorInfo = self.FileName + ' has no valid DOS signature MZ'
+            return
+
+        # Read 4 byte PE Signature
+        PeOffset = self._ByteListToInt(ByteList[0x3C:0x3E])
+        PeObject.seek(PeOffset)
+        ByteArray = array.array('B')
+        ByteArray.fromfile(PeObject, 4)
+        # PE signature should be 'PE\0\0'
+        if ByteArray.tostring() != 'PE\0\0':
+            self.ErrorInfo = self.FileName + ' has no valid PE signature PE00'
+            return
+
+        # Read PE file header
+        ByteArray = array.array('B')
+        ByteArray.fromfile(PeObject, 0x14)
+        ByteList = ByteArray.tolist()
+        SecNumber = self._ByteListToInt(ByteList[0x2:0x4])
+        if SecNumber == 0:
+            self.ErrorInfo = self.FileName + ' has no section header'
+            return
+
+        # Read PE optional header
+        OptionalHeaderSize = self._ByteListToInt(ByteArray[0x10:0x12])
+        ByteArray = array.array('B')
+        ByteArray.fromfile(PeObject, OptionalHeaderSize)
+        ByteList = ByteArray.tolist()
+        self.EntryPoint       = self._ByteListToInt(ByteList[0x10:0x14])
+        self.SectionAlignment = self._ByteListToInt(ByteList[0x20:0x24])
+        self.Size             = self._ByteListToInt(ByteList[0x38:0x3C])
+
+        # Read each Section Header
+        for Index in range(SecNumber):
+            ByteArray = array.array('B')
+            ByteArray.fromfile(PeObject, 0x28)
+            ByteList = ByteArray.tolist()
+            SecName  = self._ByteListToStr(ByteList[0:8])
+            SecVirtualSize = self._ByteListToInt(ByteList[8:12])
+            SecRawAddress  = self._ByteListToInt(ByteList[20:24])
+            SecVirtualAddress = self._ByteListToInt(ByteList[12:16])
+            self.SectionHeaderList.append((SecName, SecVirtualAddress, SecRawAddress, SecVirtualSize))
+        self.IsValid = True
+        PeObject.close()
+
+    def _ByteListToStr(self, ByteList):
+        String = ''
+        for index in range(len(ByteList)):
+            if ByteList[index] == 0: 
+                break
+            String += chr(ByteList[index])
+        return String
+
+    def _ByteListToInt(self, ByteList):
+        Value = 0
+        for index in range(len(ByteList) - 1, -1, -1):
+            Value = (Value << 8) | int(ByteList[index])
+        return Value
+        
 ##
 #
 # This acts like the main() function for the script, unless it is 'import'ed into another
diff --git a/BaseTools/Source/Python/Common/Parsing.py b/BaseTools/Source/Python/Common/Parsing.py
index 755f7901b5..6ab91fbc33 100644
--- a/BaseTools/Source/Python/Common/Parsing.py
+++ b/BaseTools/Source/Python/Common/Parsing.py
@@ -1,7 +1,7 @@
 ## @file

-# This file is used to define common parsing related functions used in parsing INF/DEC/DSC process 

+# This file is used to define common parsing related functions used in parsing INF/DEC/DSC process

 #

-# Copyright (c) 2008, Intel Corporation

+# Copyright (c) 2008 ~ 2010, Intel Corporation

 # All rights reserved. This program and the accompanying materials

 # are licensed and made available under the terms and conditions of the BSD License

 # which accompanies this distribution.  The full text of the license may be found at

@@ -31,7 +31,7 @@ def ParseContent(Lines, ):
         Line = CleanString(Line)

         if Line == '':

             continue

-        

+

         #

         # Find a new section tab

         # First insert previous section items

@@ -48,7 +48,7 @@ def ParseContent(Lines, ):
             SectionItemList = []

             ArchList = []

             ThirdList = []

-            

+

             LineList = GetSplitValueList(Line[len(TAB_SECTION_START):len(Line) - len(TAB_SECTION_END)], TAB_COMMA_SPLIT)

             for Item in LineList:

                 ItemList = GetSplitValueList(Item, TAB_SPLIT)

@@ -66,7 +66,7 @@ def ParseContent(Lines, ):
                     ThirdList.append(ItemList[2])

 

             continue

-        

+

         #

         # Not in any defined section

         #

@@ -97,13 +97,13 @@ def ParseDefineMacro2(Table, RecordSets, GlobalMacro):
     RecordSet = Table.Exec(SqlCommand)

     for Record in RecordSet:

         Macros[Record[0]] = Record[1]

-    

+

     #

     # Overrided by Global Macros

     #

     for Key in GlobalMacro.keys():

         Macros[Key] = GlobalMacro[Key]

-    

+

     #

     # Replace the Macros

     #

@@ -111,7 +111,7 @@ def ParseDefineMacro2(Table, RecordSets, GlobalMacro):
         if RecordSets[Key] != []:

             for Item in RecordSets[Key]:

                 Item[0] = ReplaceMacro(Item[0], Macros)

-    

+

 ## ParseDefineMacro

 #

 # Search whole table to find all defined Macro and replaced them with the real values

@@ -130,22 +130,22 @@ def ParseDefineMacro(Table, GlobalMacro):
 #            The follow SqlCommand (expr replace) is not supported in Sqlite 3.3.4 which is used in Python 2.5                                     *

 #            Reserved Only                                                                                                                         *

 #            SqlCommand = """update %s set Value1 = replace(Value1, '%s', '%s')                                                                    *

-#                            where ID in (select ID from %s                                                                                        * 

+#                            where ID in (select ID from %s                                                                                        *

 #                                         where Model = %s                                                                                         *

 #                                         and Value1 like '%%%s%%'                                                                                 *

 #                                         and StartLine > %s                                                                                       *

 #                                         and Enabled > -1                                                                                         *

-#                                         and Arch = '%s')""" % \                                                                                  *  

+#                                         and Arch = '%s')""" % \                                                                                  *

 #                                         (self.TblDsc.Table, Record[0], Record[1], self.TblDsc.Table, Record[2], Record[1], Record[3], Record[4]) *

 #***************************************************************************************************************************************************

         Macros[Record[0]] = Record[1]

-    

+

     #

     # Overrided by Global Macros

     #

     for Key in GlobalMacro.keys():

         Macros[Key] = GlobalMacro[Key]

-    

+

     #

     # Found all defined macro and replaced

     #

@@ -228,7 +228,7 @@ def QueryDefinesItem2(Table, Arch, BelongsToFile):
                     and BelongsToFile = %s

                     and Enabled > -1""" % (Table.Table, MODEL_META_DATA_HEADER, ConvertToSqlString2(TAB_ARCH_COMMON), BelongsToFile)

         RecordSet = Table.Exec(SqlCommand)

-    

+

     return RecordSet

 

 ##QueryDscItem

@@ -307,7 +307,7 @@ def GetBuildOption(String, File, LineNo = -1):
 ## Get Library Class

 #

 # Get Library of Dsc as <LibraryClassKeyWord>|<LibraryInstance>

-# 

+#

 # @param Item:           String as <LibraryClassKeyWord>|<LibraryInstance>

 # @param ContainerFile:  The file which describes the library class, used for error report

 #

@@ -329,7 +329,7 @@ def GetLibraryClass(Item, ContainerFile, WorkspaceDir, LineNo = -1):
 ## Get Library Class

 #

 # Get Library of Dsc as <LibraryClassKeyWord>[|<LibraryInstance>][|<TokenSpaceGuidCName>.<PcdCName>]

-# 

+#

 # @param Item:           String as <LibraryClassKeyWord>|<LibraryInstance>

 # @param ContainerFile:  The file which describes the library class, used for error report

 #

@@ -349,7 +349,7 @@ def GetLibraryClassOfInf(Item, ContainerFile, WorkspaceDir, LineNo = -1):
         if Item[1] != '':

             SupMod = Item[1]

 

-    return (ItemList[0], ItemList[1], ItemList[2], SupMod)    

+    return (ItemList[0], ItemList[1], ItemList[2], SupMod)

 

 ## CheckPcdTokenInfo

 #

@@ -373,7 +373,7 @@ def CheckPcdTokenInfo(TokenInfoString, Section, File, LineNo = -1):
 ## Get Pcd

 #

 # Get Pcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>|<Value>[|<Type>|<MaximumDatumSize>]

-# 

+#

 # @param Item:           String as <PcdTokenSpaceGuidCName>.<TokenCName>|<Value>[|<Type>|<MaximumDatumSize>]

 # @param ContainerFile:  The file which describes the pcd, used for error report

 #

@@ -382,23 +382,23 @@ def CheckPcdTokenInfo(TokenInfoString, Section, File, LineNo = -1):
 def GetPcd(Item, Type, ContainerFile, LineNo = -1):

     TokenGuid, TokenName, Value, MaximumDatumSize, Token = '', '', '', '', ''

     List = GetSplitValueList(Item + TAB_VALUE_SPLIT * 2)

-    

+

     if len(List) < 4 or len(List) > 6:

         RaiseParserError(Item, 'Pcds' + Type, ContainerFile, '<PcdTokenSpaceGuidCName>.<TokenCName>|<Value>[|<Type>|<MaximumDatumSize>]', LineNo)

     else:

         Value = List[1]

         MaximumDatumSize = List[2]

         Token = List[3]

-        

+

     if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

         (TokenGuid, TokenName) = GetSplitValueList(List[0], TAB_SPLIT)

-    

+

     return (TokenName, TokenGuid, Value, MaximumDatumSize, Token, Type)

 

 ## Get FeatureFlagPcd

 #

 # Get FeatureFlagPcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>|TRUE/FALSE

-# 

+#

 # @param Item:           String as <PcdTokenSpaceGuidCName>.<TokenCName>|TRUE/FALSE

 # @param ContainerFile:  The file which describes the pcd, used for error report

 #

@@ -413,13 +413,13 @@ def GetFeatureFlagPcd(Item, Type, ContainerFile, LineNo = -1):
         Value = List[1]

     if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

         (TokenGuid, TokenName) = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-    

+

     return (TokenName, TokenGuid, Value, Type)

 

 ## Get DynamicDefaultPcd

 #

 # Get DynamicDefaultPcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>|<Value>[|<DatumTyp>[|<MaxDatumSize>]]

-# 

+#

 # @param Item:           String as <PcdTokenSpaceGuidCName>.<TokenCName>|TRUE/FALSE

 # @param ContainerFile:  The file which describes the pcd, used for error report

 #

@@ -436,13 +436,13 @@ def GetDynamicDefaultPcd(Item, Type, ContainerFile, LineNo = -1):
         MaxDatumSize = List[3]

     if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

         (TokenGuid, TokenName) = GetSplitValueList(List[0], TAB_SPLIT)

-    

+

     return (TokenName, TokenGuid, Value, DatumTyp, MaxDatumSize, Type)

 

 ## Get DynamicHiiPcd

 #

 # Get DynamicHiiPcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>|<String>|<VariableGuidCName>|<VariableOffset>[|<DefaultValue>[|<MaximumDatumSize>]]

-# 

+#

 # @param Item:           String as <PcdTokenSpaceGuidCName>.<TokenCName>|TRUE/FALSE

 # @param ContainerFile:  The file which describes the pcd, used for error report

 #

@@ -457,13 +457,13 @@ def GetDynamicHiiPcd(Item, Type, ContainerFile, LineNo = -1):
         L1, L2, L3, L4, L5 = List[1], List[2], List[3], List[4], List[5]

     if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

         (TokenGuid, TokenName) = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-    

+

     return (TokenName, TokenGuid, L1, L2, L3, L4, L5, Type)

 

 ## Get DynamicVpdPcd

 #

 # Get DynamicVpdPcd of Dsc as <PcdTokenSpaceGuidCName>.<TokenCName>|<VpdOffset>[|<MaximumDatumSize>]

-# 

+#

 # @param Item:           String as <PcdTokenSpaceGuidCName>.<TokenCName>|TRUE/FALSE

 # @param ContainerFile:  The file which describes the pcd, used for error report

 #

@@ -478,7 +478,7 @@ def GetDynamicVpdPcd(Item, Type, ContainerFile, LineNo = -1):
         L1, L2 = List[1], List[2]

     if CheckPcdTokenInfo(List[0], 'Pcds' + Type, ContainerFile, LineNo):

         (TokenGuid, TokenName) = GetSplitValueList(List[0], DataType.TAB_SPLIT)

-    

+

     return (TokenName, TokenGuid, L1, L2, Type)

 

 ## GetComponent

@@ -500,13 +500,13 @@ def GetComponent(Lines, KeyValues):
 

     for Line in Lines:

         Line = Line[0]

-        

+

         #

         # Ignore !include statement

         #

         if Line.upper().find(TAB_INCLUDE.upper() + ' ') > -1 or Line.upper().find(TAB_DEFINE + ' ') > -1:

             continue

-        

+

         if findBlock == False:

             ListItem = Line

             #

@@ -596,7 +596,7 @@ def GetExec(String):
 # Set KeyValues as [ ['component name', [lib1, lib2, lib3], [bo1, bo2, bo3], [pcd1, pcd2, pcd3]], ...]

 #

 # @param Lines:             The content to be parsed

-# @param Key:               Reserved 

+# @param Key:               Reserved

 # @param KeyValues:         To store data after parsing

 # @param CommentCharacter:  Comment char, used to ignore comment content

 #

@@ -683,7 +683,7 @@ def GetComponents(Lines, Key, KeyValues, CommentCharacter):
 ## Get Source

 #

 # Get Source of Inf as <Filename>[|<Family>[|<TagName>[|<ToolCode>[|<PcdFeatureFlag>]]]]

-# 

+#

 # @param Item:           String as <Filename>[|<Family>[|<TagName>[|<ToolCode>[|<PcdFeatureFlag>]]]]

 # @param ContainerFile:  The file which describes the library class, used for error report

 #

@@ -704,11 +704,12 @@ def GetSource(Item, ContainerFile, FileRelativePath, LineNo = -1):
 ## Get Binary

 #

 # Get Binary of Inf as <Filename>[|<Family>[|<TagName>[|<ToolCode>[|<PcdFeatureFlag>]]]]

-# 

+#

 # @param Item:           String as <Filename>[|<Family>[|<TagName>[|<ToolCode>[|<PcdFeatureFlag>]]]]

 # @param ContainerFile:  The file which describes the library class, used for error report

 #

 # @retval (List[0], List[1], List[2], List[3])

+# @retval List

 #

 def GetBinary(Item, ContainerFile, FileRelativePath, LineNo = -1):

     ItemNew = Item + DataType.TAB_VALUE_SPLIT

@@ -718,15 +719,22 @@ def GetBinary(Item, ContainerFile, FileRelativePath, LineNo = -1):
     else:

         if List[3] != '':

             CheckPcdTokenInfo(List[3], 'Binaries', ContainerFile, LineNo)

-    

-    return (List[0], List[1], List[2], List[3])

+

+    if len(List) == 4:

+        return (List[0], List[1], List[2], List[3])

+    elif len(List) == 3:

+        return (List[0], List[1], List[2], '')

+    elif len(List) == 2:

+        return (List[0], List[1], '', '')

+    elif len(List) == 1:

+        return (List[0], '', '', '')

 

 ## Get Guids/Protocols/Ppis

 #

 # Get Guids/Protocols/Ppis of Inf as <GuidCName>[|<PcdFeatureFlag>]

 #

 # @param Item:           String as <GuidCName>[|<PcdFeatureFlag>]

-# @param Type:           Type of parsing string 

+# @param Type:           Type of parsing string

 # @param ContainerFile:  The file which describes the library class, used for error report

 #

 # @retval (List[0], List[1])

@@ -736,7 +744,7 @@ def GetGuidsProtocolsPpisOfInf(Item, Type, ContainerFile, LineNo = -1):
     List = GetSplitValueList(ItemNew)

     if List[1] != '':

         CheckPcdTokenInfo(List[1], Type, ContainerFile, LineNo)

-    

+

     return (List[0], List[1])

 

 ## Get Guids/Protocols/Ppis

@@ -744,7 +752,7 @@ def GetGuidsProtocolsPpisOfInf(Item, Type, ContainerFile, LineNo = -1):
 # Get Guids/Protocols/Ppis of Dec as <GuidCName>=<GuidValue>

 #

 # @param Item:           String as <GuidCName>=<GuidValue>

-# @param Type:           Type of parsing string 

+# @param Type:           Type of parsing string

 # @param ContainerFile:  The file which describes the library class, used for error report

 #

 # @retval (List[0], List[1])

@@ -753,7 +761,7 @@ def GetGuidsProtocolsPpisOfDec(Item, Type, ContainerFile, LineNo = -1):
     List = GetSplitValueList(Item, DataType.TAB_EQUAL_SPLIT)

     if len(List) != 2:

         RaiseParserError(Item, Type, ContainerFile, '<CName>=<GuidValue>', LineNo)

-    

+

     return (List[0], List[1])

 

 ## GetPackage

@@ -761,7 +769,7 @@ def GetGuidsProtocolsPpisOfDec(Item, Type, ContainerFile, LineNo = -1):
 # Get Package of Inf as <PackagePath>[|<PcdFeatureFlag>]

 #

 # @param Item:           String as <PackagePath>[|<PcdFeatureFlag>]

-# @param Type:           Type of parsing string 

+# @param Type:           Type of parsing string

 # @param ContainerFile:  The file which describes the library class, used for error report

 #

 # @retval (List[0], List[1])

@@ -771,10 +779,10 @@ def GetPackage(Item, ContainerFile, FileRelativePath, LineNo = -1):
     List = GetSplitValueList(ItemNew)

     CheckFileType(List[0], '.Dec', ContainerFile, 'package', List[0], LineNo)

     CheckFileExist(FileRelativePath, List[0], ContainerFile, 'Packages', List[0], LineNo)

-    

+

     if List[1] != '':

         CheckPcdTokenInfo(List[1], 'Packages', ContainerFile, LineNo)

-    

+

     return (List[0], List[1])

 

 ## Get Pcd Values of Inf

@@ -790,15 +798,15 @@ def GetPackage(Item, ContainerFile, FileRelativePath, LineNo = -1):
 def GetPcdOfInf(Item, Type, File, LineNo):

     Format = '<TokenSpaceGuidCName>.<PcdCName>[|<Value>]'

     TokenGuid, TokenName, Value, InfType = '', '', '', ''

-    

+

     if Type == TAB_PCDS_FIXED_AT_BUILD:

         InfType = TAB_INF_FIXED_PCD

     elif Type == TAB_PCDS_PATCHABLE_IN_MODULE:

         InfType = TAB_INF_PATCH_PCD

     elif Type == TAB_PCDS_FEATURE_FLAG:

-        InfType = TAB_INF_FEATURE_PCD        

+        InfType = TAB_INF_FEATURE_PCD

     elif Type == TAB_PCDS_DYNAMIC_EX:

-        InfType = TAB_INF_PCD_EX        

+        InfType = TAB_INF_PCD_EX

     elif Type == TAB_PCDS_DYNAMIC:

         InfType = TAB_INF_PCD

     List = GetSplitValueList(Item + DataType.TAB_VALUE_SPLIT)

@@ -815,7 +823,7 @@ def GetPcdOfInf(Item, Type, File, LineNo):
 

     return (TokenGuid, TokenName, Value, Type)

 

-    

+

 ## Get Pcd Values of Dec

 #

 # Get Pcd of Dec as <TokenSpcCName>.<TokenCName>|<Value>|<DatumType>|<Token>

@@ -837,7 +845,7 @@ def GetPcdOfDec(Item, Type, File, LineNo = -1):
     else:

         TokenGuid = TokenInfo[0]

         TokenName = TokenInfo[1]

-    

+

     return (TokenGuid, TokenName, Value, DatumType, Token, Type)

 

 ## Parse DEFINE statement

@@ -854,7 +862,7 @@ def ParseDefine(LineValue, StartLine, Table, FileID, Filename, SectionName, Sect
     Table.Insert(MODEL_META_DATA_DEFINE, Define[0], Define[1], '', '', '', Arch, SectionModel, FileID, StartLine, -1, StartLine, -1, 0)

 

 ## InsertSectionItems

-# 

+#

 # Insert item data of a section to a dict

 #

 def InsertSectionItems(Model, CurrentSection, SectionItemList, ArchList, ThirdList, RecordSet):

@@ -869,23 +877,23 @@ def InsertSectionItems(Model, CurrentSection, SectionItemList, ArchList, ThirdLi
         for SectionItem in SectionItemList:

             BelongsToItem, EndLine, EndColumn = -1, -1, -1

             LineValue, StartLine, EndLine, Comment = SectionItem[0], SectionItem[1], SectionItem[1], SectionItem[2]

-            

+

             EdkLogger.debug(4, "Parsing %s ..." %LineValue)

             # And then parse DEFINE statement

             if LineValue.upper().find(DataType.TAB_DEFINE.upper() + ' ') > -1:

                 continue

-            

+

             # At last parse other sections

             ID = -1

             Records.append([LineValue, Arch, StartLine, ID, Third, Comment])

-        

+

         if RecordSet != {}:

             RecordSet[Model] = Records

 

 ## Insert records to database

-# 

+#

 # Insert item data of a section to database

-# @param Table:            The Table to be inserted 

+# @param Table:            The Table to be inserted

 # @param FileID:           The ID of belonging file

 # @param Filename:         The name of belonging file

 # @param CurrentSection:   The name of currect section

@@ -893,7 +901,7 @@ def InsertSectionItems(Model, CurrentSection, SectionItemList, ArchList, ThirdLi
 # @param ArchList:         A list of arches

 # @param ThirdList:        A list of third parameters, ModuleType for LibraryClass and SkuId for Dynamic Pcds

 # @param IfDefList:        A list of all conditional statements

-# @param RecordSet:        A dict of all parsed records 

+# @param RecordSet:        A dict of all parsed records

 #

 def InsertSectionItemsIntoDatabase(Table, FileID, Filename, Model, CurrentSection, SectionItemList, ArchList, ThirdList, IfDefList, RecordSet):

     #

@@ -909,7 +917,7 @@ def InsertSectionItemsIntoDatabase(Table, FileID, Filename, Model, CurrentSectio
         for SectionItem in SectionItemList:

             BelongsToItem, EndLine, EndColumn = -1, -1, -1

             LineValue, StartLine, EndLine = SectionItem[0], SectionItem[1], SectionItem[1]

-            

+

             EdkLogger.debug(4, "Parsing %s ..." %LineValue)

             #

             # And then parse DEFINE statement

@@ -917,13 +925,13 @@ def InsertSectionItemsIntoDatabase(Table, FileID, Filename, Model, CurrentSectio
             if LineValue.upper().find(DataType.TAB_DEFINE.upper() + ' ') > -1:

                 ParseDefine(LineValue, StartLine, Table, FileID, Filename, CurrentSection, Model, Arch)

                 continue

-            

+

             #

             # At last parse other sections

             #

             ID = Table.Insert(Model, LineValue, Third, Third, '', '', Arch, -1, FileID, StartLine, -1, StartLine, -1, 0)

             Records.append([LineValue, Arch, StartLine, ID, Third])

-        

+

         if RecordSet != {}:

             RecordSet[Model] = Records

 

@@ -932,4 +940,4 @@ def GenMetaDatSectionItem(Key, Value, List):
     if Key not in List:

         List[Key] = [Value]

     else:

-        List[Key].append(Value) 
\ No newline at end of file
+        List[Key].append(Value)
\ No newline at end of file
diff --git a/BaseTools/Source/Python/Common/__init__.py b/BaseTools/Source/Python/Common/__init__.py
index e69de29bb2..b289a2b0d8 100644
--- a/BaseTools/Source/Python/Common/__init__.py
+++ b/BaseTools/Source/Python/Common/__init__.py
@@ -0,0 +1,15 @@
+## @file

+# Python 'Common' package initialization file.

+#

+# This file is required to make Python interpreter treat the directory

+# as containing package.

+#

+# Copyright (c) 2007 - 2010, Intel Corporation<BR>

+# All rights reserved. This program and the accompanying materials

+# are licensed and made available under the terms and conditions of the BSD License

+# which accompanies this distribution.  The full text of the license may be found at

+# http://opensource.org/licenses/bsd-license.php

+#

+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

+#