BaseTools: change the Division Operator in the expression

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

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 4fa4eda04a5fd7a8a8c36b49a9fad8d8d1b1c7ab..ed1bd33fdbb3246c23f221aee88d53d421906b42 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -1,7 +1,7 @@
 ## @file\r
 # generate flash image\r
 #\r
 ## @file\r
 # generate flash image\r
 #\r

-#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r

 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r


@@ -19,32 +19,36 @@ from optparse import OptionParser
 import sys\r
 import Common.LongFilePathOs as os\r
 import linecache\r
 import sys\r
 import Common.LongFilePathOs as os\r
 import linecache\r

-import FdfParser\r
+from . import FdfParser\r

 import Common.BuildToolError as BuildToolError\r
 import Common.BuildToolError as BuildToolError\r

-from GenFdsGlobalVariable import GenFdsGlobalVariable\r
+from .GenFdsGlobalVariable import GenFdsGlobalVariable\r

 from Workspace.WorkspaceDatabase import WorkspaceDatabase\r
 from Workspace.BuildClassObject import PcdClassObject\r
 from Workspace.WorkspaceDatabase import WorkspaceDatabase\r
 from Workspace.BuildClassObject import PcdClassObject\r

-from Workspace.BuildClassObject import ModuleBuildClassObject\r
-import RuleComplexFile\r
-from EfiSection import EfiSection\r
-import StringIO\r
+from . import RuleComplexFile\r
+from .EfiSection import EfiSection\r
+from io import BytesIO\r
+from io import StringIO\r

 import Common.TargetTxtClassObject as TargetTxtClassObject\r
 import Common.ToolDefClassObject as ToolDefClassObject\r
 import Common.TargetTxtClassObject as TargetTxtClassObject\r
 import Common.ToolDefClassObject as ToolDefClassObject\r

-import Common.DataType\r
+from Common.DataType import *\r

 import Common.GlobalData as GlobalData\r
 from Common import EdkLogger\r
 import Common.GlobalData as GlobalData\r
 from Common import EdkLogger\r

-from Common.String import *\r
+from Common.StringUtils import *\r

 from Common.Misc import DirCache, PathClass\r
 from Common.Misc import SaveFileOnChange\r
 from Common.Misc import ClearDuplicatedInf\r
 from Common.Misc import GuidStructureStringToGuidString\r
 from Common.BuildVersion import gBUILD_VERSION\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
 from Common.Misc import DirCache, PathClass\r
 from Common.Misc import SaveFileOnChange\r
 from Common.Misc import ClearDuplicatedInf\r
 from Common.Misc import GuidStructureStringToGuidString\r
 from Common.BuildVersion import gBUILD_VERSION\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r

+from . import FfsFileStatement\r
+import glob\r
+from struct import unpack\r
+from Common.GlobalData import gGuidPattern\r

 \r
 ## Version and Copyright\r
 versionNumber = "1.0" + ' ' + gBUILD_VERSION\r
 __version__ = "%prog Version " + versionNumber\r
 \r
 ## Version and Copyright\r
 versionNumber = "1.0" + ' ' + gBUILD_VERSION\r
 __version__ = "%prog Version " + versionNumber\r

-__copyright__ = "Copyright (c) 2007 - 2014, Intel Corporation  All rights reserved."\r
+__copyright__ = "Copyright (c) 2007 - 2018, Intel Corporation  All rights reserved."\r

 \r
 ## Tool entrance method\r
 #\r
 \r
 ## Tool entrance method\r
 #\r


@@ -66,22 +70,22 @@ def main():
 \r
     EdkLogger.Initialize()\r
     try:\r
 \r
     EdkLogger.Initialize()\r
     try:\r

-        if Options.verbose != None:\r
+        if Options.verbose is not None:\r

             EdkLogger.SetLevel(EdkLogger.VERBOSE)\r
             GenFdsGlobalVariable.VerboseMode = True\r
             EdkLogger.SetLevel(EdkLogger.VERBOSE)\r
             GenFdsGlobalVariable.VerboseMode = True\r

-            \r
-        if Options.FixedAddress != None:\r
+\r
+        if Options.FixedAddress is not None:\r

             GenFdsGlobalVariable.FixedLoadAddress = True\r
             GenFdsGlobalVariable.FixedLoadAddress = True\r

-            \r
-        if Options.quiet != None:\r
+\r
+        if Options.quiet is not None:\r

             EdkLogger.SetLevel(EdkLogger.QUIET)\r
             EdkLogger.SetLevel(EdkLogger.QUIET)\r

-        if Options.debug != None:\r
+        if Options.debug is not None:\r

             EdkLogger.SetLevel(Options.debug + 1)\r
             GenFdsGlobalVariable.DebugLevel = Options.debug\r
         else:\r
             EdkLogger.SetLevel(EdkLogger.INFO)\r
 \r
             EdkLogger.SetLevel(Options.debug + 1)\r
             GenFdsGlobalVariable.DebugLevel = Options.debug\r
         else:\r
             EdkLogger.SetLevel(EdkLogger.INFO)\r
 \r

-        if (Options.Workspace == None):\r
+        if (Options.Workspace is None):\r

             EdkLogger.error("GenFds", OPTION_MISSING, "WORKSPACE not defined",\r
                             ExtraData="Please use '-w' switch to pass it or set the WORKSPACE environment variable.")\r
         elif not os.path.exists(Options.Workspace):\r
             EdkLogger.error("GenFds", OPTION_MISSING, "WORKSPACE not defined",\r
                             ExtraData="Please use '-w' switch to pass it or set the WORKSPACE environment variable.")\r
         elif not os.path.exists(Options.Workspace):\r


@@ -90,12 +94,14 @@ def main():
         else:\r
             Workspace = os.path.normcase(Options.Workspace)\r
             GenFdsGlobalVariable.WorkSpaceDir = Workspace\r
         else:\r
             Workspace = os.path.normcase(Options.Workspace)\r
             GenFdsGlobalVariable.WorkSpaceDir = Workspace\r

-            if 'EDK_SOURCE' in os.environ.keys():\r
+            if 'EDK_SOURCE' in os.environ:\r

                 GenFdsGlobalVariable.EdkSourceDir = os.path.normcase(os.environ['EDK_SOURCE'])\r
             if (Options.debug):\r
                 GenFdsGlobalVariable.VerboseLogger("Using Workspace:" + Workspace)\r
                 GenFdsGlobalVariable.EdkSourceDir = os.path.normcase(os.environ['EDK_SOURCE'])\r
             if (Options.debug):\r
                 GenFdsGlobalVariable.VerboseLogger("Using Workspace:" + Workspace)\r

+            if Options.GenfdsMultiThread:\r
+                GenFdsGlobalVariable.EnableGenfdsMultiThread = True\r

         os.chdir(GenFdsGlobalVariable.WorkSpaceDir)\r
         os.chdir(GenFdsGlobalVariable.WorkSpaceDir)\r

-        \r
+\r

         # set multiple workspace\r
         PackagesPath = os.getenv("PACKAGES_PATH")\r
         mws.setWs(GenFdsGlobalVariable.WorkSpaceDir, PackagesPath)\r
         # set multiple workspace\r
         PackagesPath = os.getenv("PACKAGES_PATH")\r
         mws.setWs(GenFdsGlobalVariable.WorkSpaceDir, PackagesPath)\r


@@ -118,13 +124,9 @@ def main():
 \r
         if (Options.BuildTarget):\r
             GenFdsGlobalVariable.TargetName = Options.BuildTarget\r
 \r
         if (Options.BuildTarget):\r
             GenFdsGlobalVariable.TargetName = Options.BuildTarget\r

-        else:\r
-            EdkLogger.error("GenFds", OPTION_MISSING, "Missing build target")\r

 \r
         if (Options.ToolChain):\r
             GenFdsGlobalVariable.ToolChainTag = Options.ToolChain\r
 \r
         if (Options.ToolChain):\r
             GenFdsGlobalVariable.ToolChainTag = Options.ToolChain\r

-        else:\r
-            EdkLogger.error("GenFds", OPTION_MISSING, "Missing tool chain tag")\r

 \r
         if (Options.activePlatform):\r
             ActivePlatform = Options.activePlatform\r
 \r
         if (Options.activePlatform):\r
             ActivePlatform = Options.activePlatform\r


@@ -138,18 +140,11 @@ def main():
 \r
             if not os.path.exists(ActivePlatform)  :\r
                 EdkLogger.error("GenFds", FILE_NOT_FOUND, "ActivePlatform doesn't exist!")\r
 \r
             if not os.path.exists(ActivePlatform)  :\r
                 EdkLogger.error("GenFds", FILE_NOT_FOUND, "ActivePlatform doesn't exist!")\r

-\r
-            if os.path.normcase (ActivePlatform).find(Workspace) == 0:\r
-                ActivePlatform = mws.relpath(ActivePlatform, Workspace)\r
-            if len(ActivePlatform) > 0 :\r
-                if ActivePlatform[0] == '\\' or ActivePlatform[0] == '/':\r
-                    ActivePlatform = ActivePlatform[1:]\r
-            else:\r
-                EdkLogger.error("GenFds", FILE_NOT_FOUND, "ActivePlatform doesn't exist!")\r

         else:\r
             EdkLogger.error("GenFds", OPTION_MISSING, "Missing active platform")\r
 \r
         else:\r
             EdkLogger.error("GenFds", OPTION_MISSING, "Missing active platform")\r
 \r

-        GenFdsGlobalVariable.ActivePlatform = PathClass(NormPath(ActivePlatform), Workspace)\r
+        GlobalData.BuildOptionPcd     = Options.OptionPcd if Options.OptionPcd else {}\r
+        GenFdsGlobalVariable.ActivePlatform = PathClass(NormPath(ActivePlatform))\r

 \r
         if (Options.ConfDirectory):\r
             # Get alternate Conf location, if it is absolute, then just use the absolute directory name\r
 \r
         if (Options.ConfDirectory):\r
             # Get alternate Conf location, if it is absolute, then just use the absolute directory name\r


@@ -163,12 +158,33 @@ def main():
                 # This also handles someone specifying the Conf directory in the workspace. Using --conf=Conf\r
                 ConfDirectoryPath = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, ConfDirectoryPath)\r
         else:\r
                 # This also handles someone specifying the Conf directory in the workspace. Using --conf=Conf\r
                 ConfDirectoryPath = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, ConfDirectoryPath)\r
         else:\r

-            # Get standard WORKSPACE/Conf, use the absolute path to the WORKSPACE/Conf\r
-            ConfDirectoryPath = mws.join(GenFdsGlobalVariable.WorkSpaceDir, 'Conf')\r
+            if "CONF_PATH" in os.environ:\r
+                ConfDirectoryPath = os.path.normcase(os.environ["CONF_PATH"])\r
+            else:\r
+                # Get standard WORKSPACE/Conf, use the absolute path to the WORKSPACE/Conf\r
+                ConfDirectoryPath = mws.join(GenFdsGlobalVariable.WorkSpaceDir, 'Conf')\r

         GenFdsGlobalVariable.ConfDir = ConfDirectoryPath\r
         GenFdsGlobalVariable.ConfDir = ConfDirectoryPath\r

+        if not GlobalData.gConfDirectory:\r
+            GlobalData.gConfDirectory = GenFdsGlobalVariable.ConfDir\r

         BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, "target.txt"))\r
         if os.path.isfile(BuildConfigurationFile) == True:\r
         BuildConfigurationFile = os.path.normpath(os.path.join(ConfDirectoryPath, "target.txt"))\r
         if os.path.isfile(BuildConfigurationFile) == True:\r

-            TargetTxtClassObject.TargetTxtClassObject(BuildConfigurationFile)\r
+            TargetTxt = TargetTxtClassObject.TargetTxtClassObject()\r
+            TargetTxt.LoadTargetTxtFile(BuildConfigurationFile)\r
+            # if no build target given in command line, get it from target.txt\r
+            if not GenFdsGlobalVariable.TargetName:\r
+                BuildTargetList = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TARGET]\r
+                if len(BuildTargetList) != 1:\r
+                    EdkLogger.error("GenFds", OPTION_VALUE_INVALID, ExtraData="Only allows one instance for Target.")\r
+                GenFdsGlobalVariable.TargetName = BuildTargetList[0]\r
+\r
+            # if no tool chain given in command line, get it from target.txt\r
+            if not GenFdsGlobalVariable.ToolChainTag:\r
+                ToolChainList = TargetTxt.TargetTxtDictionary[DataType.TAB_TAT_DEFINES_TOOL_CHAIN_TAG]\r
+                if ToolChainList is None or len(ToolChainList) == 0:\r
+                    EdkLogger.error("GenFds", RESOURCE_NOT_AVAILABLE, ExtraData="No toolchain given. Don't know how to build.")\r
+                if len(ToolChainList) != 1:\r
+                    EdkLogger.error("GenFds", OPTION_VALUE_INVALID, ExtraData="Only allows one instance for ToolChain.")\r
+                GenFdsGlobalVariable.ToolChainTag = ToolChainList[0]\r

         else:\r
             EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=BuildConfigurationFile)\r
 \r
         else:\r
             EdkLogger.error("GenFds", FILE_NOT_FOUND, ExtraData=BuildConfigurationFile)\r
 \r


@@ -183,6 +199,8 @@ def main():
                     Pair = Pair[:-1]\r
                 List = Pair.split('=')\r
                 if len(List) == 2:\r
                     Pair = Pair[:-1]\r
                 List = Pair.split('=')\r
                 if len(List) == 2:\r

+                    if not List[1].strip():\r
+                        EdkLogger.error("GenFds", OPTION_VALUE_INVALID, ExtraData="No Value given for Macro %s" %List[0])\r

                     if List[0].strip() == "EFI_SOURCE":\r
                         GlobalData.gEfiSource = List[1].strip()\r
                         GlobalData.gGlobalDefines["EFI_SOURCE"] = GlobalData.gEfiSource\r
                     if List[0].strip() == "EFI_SOURCE":\r
                         GlobalData.gEfiSource = List[1].strip()\r
                         GlobalData.gGlobalDefines["EFI_SOURCE"] = GlobalData.gEfiSource\r


@@ -199,11 +217,19 @@ def main():
                     GlobalData.gCommandLineDefines[List[0].strip()] = "TRUE"\r
         os.environ["WORKSPACE"] = Workspace\r
 \r
                     GlobalData.gCommandLineDefines[List[0].strip()] = "TRUE"\r
         os.environ["WORKSPACE"] = Workspace\r
 \r

+        # Use the -t and -b option as gGlobalDefines's TOOLCHAIN and TARGET if they are not defined\r
+        if "TARGET" not in GlobalData.gGlobalDefines:\r
+            GlobalData.gGlobalDefines["TARGET"] = GenFdsGlobalVariable.TargetName\r
+        if "TOOLCHAIN" not in GlobalData.gGlobalDefines:\r
+            GlobalData.gGlobalDefines["TOOLCHAIN"] = GenFdsGlobalVariable.ToolChainTag\r
+        if "TOOL_CHAIN_TAG" not in GlobalData.gGlobalDefines:\r
+            GlobalData.gGlobalDefines['TOOL_CHAIN_TAG'] = GenFdsGlobalVariable.ToolChainTag\r
+\r

         """call Workspace build create database"""\r
         GlobalData.gDatabasePath = os.path.normpath(os.path.join(ConfDirectoryPath, GlobalData.gDatabasePath))\r
         BuildWorkSpace = WorkspaceDatabase(GlobalData.gDatabasePath)\r
         BuildWorkSpace.InitDatabase()\r
         """call Workspace build create database"""\r
         GlobalData.gDatabasePath = os.path.normpath(os.path.join(ConfDirectoryPath, GlobalData.gDatabasePath))\r
         BuildWorkSpace = WorkspaceDatabase(GlobalData.gDatabasePath)\r
         BuildWorkSpace.InitDatabase()\r

-        \r
+\r

         #\r
         # Get files real name in workspace dir\r
         #\r
         #\r
         # Get files real name in workspace dir\r
         #\r


@@ -214,12 +240,12 @@ def main():
             ArchList = Options.archList.split(',')\r
         else:\r
 #            EdkLogger.error("GenFds", OPTION_MISSING, "Missing build ARCH")\r
             ArchList = Options.archList.split(',')\r
         else:\r
 #            EdkLogger.error("GenFds", OPTION_MISSING, "Missing build ARCH")\r

-            ArchList = BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, 'COMMON', Options.BuildTarget, Options.ToolChain].SupArchList\r
+            ArchList = BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, TAB_COMMON, Options.BuildTarget, Options.ToolChain].SupArchList\r

 \r
 \r

-        TargetArchList = set(BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, 'COMMON', Options.BuildTarget, Options.ToolChain].SupArchList) & set(ArchList)\r
+        TargetArchList = set(BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, TAB_COMMON, Options.BuildTarget, Options.ToolChain].SupArchList) & set(ArchList)\r

         if len(TargetArchList) == 0:\r
         if len(TargetArchList) == 0:\r

-            EdkLogger.error("GenFds", GENFDS_ERROR, "Target ARCH %s not in platform supported ARCH %s" % (str(ArchList), str(BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, 'COMMON'].SupArchList)))\r
-        \r
+            EdkLogger.error("GenFds", GENFDS_ERROR, "Target ARCH %s not in platform supported ARCH %s" % (str(ArchList), str(BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, TAB_COMMON].SupArchList)))\r
+\r

         for Arch in ArchList:\r
             GenFdsGlobalVariable.OutputDirFromDscDict[Arch] = NormPath(BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, Options.BuildTarget, Options.ToolChain].OutputDirectory)\r
             GenFdsGlobalVariable.PlatformName = BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, Options.BuildTarget, Options.ToolChain].PlatformName\r
         for Arch in ArchList:\r
             GenFdsGlobalVariable.OutputDirFromDscDict[Arch] = NormPath(BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, Options.BuildTarget, Options.ToolChain].OutputDirectory)\r
             GenFdsGlobalVariable.PlatformName = BuildWorkSpace.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, Options.BuildTarget, Options.ToolChain].PlatformName\r


@@ -254,43 +280,68 @@ def main():
             EdkLogger.error("GenFds", FORMAT_NOT_SUPPORTED, "Cycle Reference Detected in FDF file")\r
 \r
         if (Options.uiFdName) :\r
             EdkLogger.error("GenFds", FORMAT_NOT_SUPPORTED, "Cycle Reference Detected in FDF file")\r
 \r
         if (Options.uiFdName) :\r

-            if Options.uiFdName.upper() in FdfParserObj.Profile.FdDict.keys():\r
+            if Options.uiFdName.upper() in FdfParserObj.Profile.FdDict:\r

                 GenFds.OnlyGenerateThisFd = Options.uiFdName\r
             else:\r
                 EdkLogger.error("GenFds", OPTION_VALUE_INVALID,\r
                                 "No such an FD in FDF file: %s" % Options.uiFdName)\r
 \r
         if (Options.uiFvName) :\r
                 GenFds.OnlyGenerateThisFd = Options.uiFdName\r
             else:\r
                 EdkLogger.error("GenFds", OPTION_VALUE_INVALID,\r
                                 "No such an FD in FDF file: %s" % Options.uiFdName)\r
 \r
         if (Options.uiFvName) :\r

-            if Options.uiFvName.upper() in FdfParserObj.Profile.FvDict.keys():\r
+            if Options.uiFvName.upper() in FdfParserObj.Profile.FvDict:\r

                 GenFds.OnlyGenerateThisFv = Options.uiFvName\r
             else:\r
                 EdkLogger.error("GenFds", OPTION_VALUE_INVALID,\r
                                 "No such an FV in FDF file: %s" % Options.uiFvName)\r
 \r
         if (Options.uiCapName) :\r
                 GenFds.OnlyGenerateThisFv = Options.uiFvName\r
             else:\r
                 EdkLogger.error("GenFds", OPTION_VALUE_INVALID,\r
                                 "No such an FV in FDF file: %s" % Options.uiFvName)\r
 \r
         if (Options.uiCapName) :\r

-            if Options.uiCapName.upper() in FdfParserObj.Profile.CapsuleDict.keys():\r
+            if Options.uiCapName.upper() in FdfParserObj.Profile.CapsuleDict:\r

                 GenFds.OnlyGenerateThisCap = Options.uiCapName\r
             else:\r
                 EdkLogger.error("GenFds", OPTION_VALUE_INVALID,\r
                                 "No such a Capsule in FDF file: %s" % Options.uiCapName)\r
 \r
                 GenFds.OnlyGenerateThisCap = Options.uiCapName\r
             else:\r
                 EdkLogger.error("GenFds", OPTION_VALUE_INVALID,\r
                                 "No such a Capsule in FDF file: %s" % Options.uiCapName)\r
 \r

+        GenFdsGlobalVariable.WorkSpace = BuildWorkSpace\r
+        if ArchList is not None:\r
+            GenFdsGlobalVariable.ArchList = ArchList\r
+\r
+        # Dsc Build Data will handle Pcd Settings from CommandLine.\r
+\r

         """Modify images from build output if the feature of loading driver at fixed address is on."""\r
         if GenFdsGlobalVariable.FixedLoadAddress:\r
             GenFds.PreprocessImage(BuildWorkSpace, GenFdsGlobalVariable.ActivePlatform)\r
         """Modify images from build output if the feature of loading driver at fixed address is on."""\r
         if GenFdsGlobalVariable.FixedLoadAddress:\r
             GenFds.PreprocessImage(BuildWorkSpace, GenFdsGlobalVariable.ActivePlatform)\r

+\r
+        # Record the FV Region info that may specific in the FD\r
+        if FdfParserObj.Profile.FvDict and FdfParserObj.Profile.FdDict:\r
+            for Fv in FdfParserObj.Profile.FvDict:\r
+                FvObj = FdfParserObj.Profile.FvDict[Fv]\r
+                for Fd in FdfParserObj.Profile.FdDict:\r
+                    FdObj = FdfParserObj.Profile.FdDict[Fd]\r
+                    for RegionObj in FdObj.RegionList:\r
+                        if RegionObj.RegionType != BINARY_FILE_TYPE_FV:\r
+                            continue\r
+                        for RegionData in RegionObj.RegionDataList:\r
+                            if FvObj.UiFvName.upper() == RegionData.upper():\r
+                                if FvObj.FvRegionInFD:\r
+                                    if FvObj.FvRegionInFD != RegionObj.Size:\r
+                                        EdkLogger.error("GenFds", FORMAT_INVALID, "The FV %s's region is specified in multiple FD with different value." %FvObj.UiFvName)\r
+                                else:\r
+                                    FvObj.FvRegionInFD = RegionObj.Size\r
+                                    RegionObj.BlockInfoOfRegion(FdObj.BlockSizeList, FvObj)\r
+\r

         """Call GenFds"""\r
         GenFds.GenFd('', FdfParserObj, BuildWorkSpace, ArchList)\r
 \r
         """Generate GUID cross reference file"""\r
         """Call GenFds"""\r
         GenFds.GenFd('', FdfParserObj, BuildWorkSpace, ArchList)\r
 \r
         """Generate GUID cross reference file"""\r

-        GenFds.GenerateGuidXRefFile(BuildWorkSpace, ArchList)\r
+        GenFds.GenerateGuidXRefFile(BuildWorkSpace, ArchList, FdfParserObj)\r

 \r
         """Display FV space info."""\r
         GenFds.DisplayFvSpaceInfo(FdfParserObj)\r
 \r
 \r
         """Display FV space info."""\r
         GenFds.DisplayFvSpaceInfo(FdfParserObj)\r
 \r

-    except FdfParser.Warning, X:\r
+    except FdfParser.Warning as X:\r

         EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError=False)\r
         ReturnCode = FORMAT_INVALID\r
         EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError=False)\r
         ReturnCode = FORMAT_INVALID\r

-    except FatalError, X:\r
-        if Options.debug != None:\r
+    except FatalError as X:\r
+        if Options.debug is not None:\r

             import traceback\r
             EdkLogger.quiet(traceback.format_exc())\r
         ReturnCode = X.args[0]\r
             import traceback\r
             EdkLogger.quiet(traceback.format_exc())\r
         ReturnCode = X.args[0]\r


@@ -300,7 +351,7 @@ def main():
                     "\nPython",\r
                     CODE_ERROR,\r
                     "Tools code failure",\r
                     "\nPython",\r
                     CODE_ERROR,\r
                     "Tools code failure",\r

-                    ExtraData="Please send email to edk2-devel@lists.sourceforge.net for help, attaching following call stack trace!\n",\r
+                    ExtraData="Please send email to edk2-devel@lists.01.org for help, attaching following call stack trace!\n",\r

                     RaiseError=False\r
                     )\r
         EdkLogger.quiet(traceback.format_exc())\r
                     RaiseError=False\r
                     )\r
         EdkLogger.quiet(traceback.format_exc())\r


@@ -316,7 +367,7 @@ def SingleCheckCallback(option, opt_str, value, parser):
         gParamCheck.append(option)\r
     else:\r
         parser.error("Option %s only allows one instance in command line!" % option)\r
         gParamCheck.append(option)\r
     else:\r
         parser.error("Option %s only allows one instance in command line!" % option)\r

-        \r
+\r

 ## Parse command line options\r
 #\r
 # Using standard Python module optparse to parse command line option of this tool.\r
 ## Parse command line options\r
 #\r
 # Using standard Python module optparse to parse command line option of this tool.\r


@@ -349,6 +400,8 @@ def myOptionParser():
     Parser.add_option("-s", "--specifyaddress", dest="FixedAddress", action="store_true", type=None, help="Specify driver load address.")\r
     Parser.add_option("--conf", action="store", type="string", dest="ConfDirectory", help="Specify the customized Conf directory.")\r
     Parser.add_option("--ignore-sources", action="store_true", dest="IgnoreSources", default=False, help="Focus to a binary build and ignore all source files")\r
     Parser.add_option("-s", "--specifyaddress", dest="FixedAddress", action="store_true", type=None, help="Specify driver load address.")\r
     Parser.add_option("--conf", action="store", type="string", dest="ConfDirectory", help="Specify the customized Conf directory.")\r
     Parser.add_option("--ignore-sources", action="store_true", dest="IgnoreSources", default=False, help="Focus to a binary build and ignore all source files")\r

+    Parser.add_option("--pcd", action="append", dest="OptionPcd", help="Set PCD value by command line. Format: \"PcdName=Value\" ")\r
+    Parser.add_option("--genfds-multi-thread", action="store_true", dest="GenfdsMultiThread", default=False, help="Enable GenFds multi thread to generate ffs file.")\r

 \r
     (Options, args) = Parser.parse_args()\r
     return Options\r
 \r
     (Options, args) = Parser.parse_args()\r
     return Options\r


@@ -362,8 +415,6 @@ def myOptionParser():
 #\r
 class GenFds :\r
     FdfParsef = None\r
 #\r
 class GenFds :\r
     FdfParsef = None\r

-    # FvName, FdName, CapName in FDF, Image file name\r
-    ImageBinDict = {}\r

     OnlyGenerateThisFd = None\r
     OnlyGenerateThisFv = None\r
     OnlyGenerateThisCap = None\r
     OnlyGenerateThisFd = None\r
     OnlyGenerateThisFv = None\r
     OnlyGenerateThisCap = None\r


@@ -379,49 +430,59 @@ class GenFds :
         GenFdsGlobalVariable.SetDir ('', FdfParser, WorkSpace, ArchList)\r
 \r
         GenFdsGlobalVariable.VerboseLogger(" Generate all Fd images and their required FV and Capsule images!")\r
         GenFdsGlobalVariable.SetDir ('', FdfParser, WorkSpace, ArchList)\r
 \r
         GenFdsGlobalVariable.VerboseLogger(" Generate all Fd images and their required FV and Capsule images!")\r

-        if GenFds.OnlyGenerateThisCap != None and GenFds.OnlyGenerateThisCap.upper() in GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict.keys():\r
-            CapsuleObj = GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict.get(GenFds.OnlyGenerateThisCap.upper())\r
-            if CapsuleObj != None:\r
+        if GenFds.OnlyGenerateThisCap is not None and GenFds.OnlyGenerateThisCap.upper() in GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict:\r
+            CapsuleObj = GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict[GenFds.OnlyGenerateThisCap.upper()]\r
+            if CapsuleObj is not None:\r

                 CapsuleObj.GenCapsule()\r
                 return\r
 \r
                 CapsuleObj.GenCapsule()\r
                 return\r
 \r

-        if GenFds.OnlyGenerateThisFd != None and GenFds.OnlyGenerateThisFd.upper() in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():\r
-            FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict.get(GenFds.OnlyGenerateThisFd.upper())\r
-            if FdObj != None:\r
+        if GenFds.OnlyGenerateThisFd is not None and GenFds.OnlyGenerateThisFd.upper() in GenFdsGlobalVariable.FdfParser.Profile.FdDict:\r
+            FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[GenFds.OnlyGenerateThisFd.upper()]\r
+            if FdObj is not None:\r

                 FdObj.GenFd()\r
                 return\r
                 FdObj.GenFd()\r
                 return\r

-        elif GenFds.OnlyGenerateThisFd == None and GenFds.OnlyGenerateThisFv == None:\r
-            for FdName in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():\r
-                FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[FdName]\r
+        elif GenFds.OnlyGenerateThisFd is None and GenFds.OnlyGenerateThisFv is None:\r
+            for FdObj in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():\r

                 FdObj.GenFd()\r
 \r
         GenFdsGlobalVariable.VerboseLogger("\n Generate other FV images! ")\r
                 FdObj.GenFd()\r
 \r
         GenFdsGlobalVariable.VerboseLogger("\n Generate other FV images! ")\r

-        if GenFds.OnlyGenerateThisFv != None and GenFds.OnlyGenerateThisFv.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict.keys():\r
-            FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict.get(GenFds.OnlyGenerateThisFv.upper())\r
-            if FvObj != None:\r
-                Buffer = StringIO.StringIO()\r
+        if GenFds.OnlyGenerateThisFv is not None and GenFds.OnlyGenerateThisFv.upper() in GenFdsGlobalVariable.FdfParser.Profile.FvDict:\r
+            FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict[GenFds.OnlyGenerateThisFv.upper()]\r
+            if FvObj is not None:\r
+                Buffer = BytesIO()\r

                 FvObj.AddToBuffer(Buffer)\r
                 Buffer.close()\r
                 return\r
                 FvObj.AddToBuffer(Buffer)\r
                 Buffer.close()\r
                 return\r

-        elif GenFds.OnlyGenerateThisFv == None:\r
-            for FvName in GenFdsGlobalVariable.FdfParser.Profile.FvDict.keys():\r
-                Buffer = StringIO.StringIO('')\r
-                FvObj = GenFdsGlobalVariable.FdfParser.Profile.FvDict[FvName]\r
+        elif GenFds.OnlyGenerateThisFv is None:\r
+            for FvObj in GenFdsGlobalVariable.FdfParser.Profile.FvDict.values():\r
+                Buffer = BytesIO()\r

                 FvObj.AddToBuffer(Buffer)\r
                 Buffer.close()\r
                 FvObj.AddToBuffer(Buffer)\r
                 Buffer.close()\r

-        \r
-        if GenFds.OnlyGenerateThisFv == None and GenFds.OnlyGenerateThisFd == None and GenFds.OnlyGenerateThisCap == None:\r
+\r
+        if GenFds.OnlyGenerateThisFv is None and GenFds.OnlyGenerateThisFd is None and GenFds.OnlyGenerateThisCap is None:\r

             if GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict != {}:\r
                 GenFdsGlobalVariable.VerboseLogger("\n Generate other Capsule images!")\r
             if GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict != {}:\r
                 GenFdsGlobalVariable.VerboseLogger("\n Generate other Capsule images!")\r

-                for CapsuleName in GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict.keys():\r
-                    CapsuleObj = GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict[CapsuleName]\r
+                for CapsuleObj in GenFdsGlobalVariable.FdfParser.Profile.CapsuleDict.values():\r

                     CapsuleObj.GenCapsule()\r
 \r
             if GenFdsGlobalVariable.FdfParser.Profile.OptRomDict != {}:\r
                 GenFdsGlobalVariable.VerboseLogger("\n Generate all Option ROM!")\r
                     CapsuleObj.GenCapsule()\r
 \r
             if GenFdsGlobalVariable.FdfParser.Profile.OptRomDict != {}:\r
                 GenFdsGlobalVariable.VerboseLogger("\n Generate all Option ROM!")\r

-                for DriverName in GenFdsGlobalVariable.FdfParser.Profile.OptRomDict.keys():\r
-                    OptRomObj = GenFdsGlobalVariable.FdfParser.Profile.OptRomDict[DriverName]\r
+                for OptRomObj in GenFdsGlobalVariable.FdfParser.Profile.OptRomDict.values():\r

                     OptRomObj.AddToBuffer(None)\r
                     OptRomObj.AddToBuffer(None)\r

+    @staticmethod\r
+    def GenFfsMakefile(OutputDir, FdfParser, WorkSpace, ArchList, GlobalData):\r
+        GenFdsGlobalVariable.SetEnv(FdfParser, WorkSpace, ArchList, GlobalData)\r
+        for FdObj in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():\r
+            FdObj.GenFd(Flag=True)\r
+\r
+        for FvObj in GenFdsGlobalVariable.FdfParser.Profile.FvDict.values():\r
+            FvObj.AddToBuffer(Buffer=None, Flag=True)\r
+\r
+        if GenFdsGlobalVariable.FdfParser.Profile.OptRomDict != {}:\r
+            for OptRomObj in GenFdsGlobalVariable.FdfParser.Profile.OptRomDict.values():\r
+                OptRomObj.AddToBuffer(Buffer=None, Flag=True)\r
+\r
+        return GenFdsGlobalVariable.FfsCmdDict\r

 \r
     ## GetFvBlockSize()\r
     #\r
 \r
     ## GetFvBlockSize()\r
     #\r


@@ -431,14 +492,14 @@ class GenFds :
     def GetFvBlockSize(FvObj):\r
         DefaultBlockSize = 0x1\r
         FdObj = None\r
     def GetFvBlockSize(FvObj):\r
         DefaultBlockSize = 0x1\r
         FdObj = None\r

-        if GenFds.OnlyGenerateThisFd != None and GenFds.OnlyGenerateThisFd.upper() in GenFdsGlobalVariable.FdfParser.Profile.FdDict.keys():\r
+        if GenFds.OnlyGenerateThisFd is not None and GenFds.OnlyGenerateThisFd.upper() in GenFdsGlobalVariable.FdfParser.Profile.FdDict:\r

             FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[GenFds.OnlyGenerateThisFd.upper()]\r
             FdObj = GenFdsGlobalVariable.FdfParser.Profile.FdDict[GenFds.OnlyGenerateThisFd.upper()]\r

-        if FdObj == None:\r
+        if FdObj is None:\r

             for ElementFd in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():\r
                 for ElementRegion in ElementFd.RegionList:\r
             for ElementFd in GenFdsGlobalVariable.FdfParser.Profile.FdDict.values():\r
                 for ElementRegion in ElementFd.RegionList:\r

-                    if ElementRegion.RegionType == 'FV':\r
+                    if ElementRegion.RegionType == BINARY_FILE_TYPE_FV:\r

                         for ElementRegionData in ElementRegion.RegionDataList:\r
                         for ElementRegionData in ElementRegion.RegionDataList:\r

-                            if ElementRegionData != None and ElementRegionData.upper() == FvObj.UiFvName:\r
+                            if ElementRegionData is not None and ElementRegionData.upper() == FvObj.UiFvName:\r

                                 if FvObj.BlockSizeList != []:\r
                                     return FvObj.BlockSizeList[0][0]\r
                                 else:\r
                                 if FvObj.BlockSizeList != []:\r
                                     return FvObj.BlockSizeList[0][0]\r
                                 else:\r


@@ -448,9 +509,9 @@ class GenFds :
             return DefaultBlockSize\r
         else:\r
             for ElementRegion in FdObj.RegionList:\r
             return DefaultBlockSize\r
         else:\r
             for ElementRegion in FdObj.RegionList:\r

-                    if ElementRegion.RegionType == 'FV':\r
+                    if ElementRegion.RegionType == BINARY_FILE_TYPE_FV:\r

                         for ElementRegionData in ElementRegion.RegionDataList:\r
                         for ElementRegionData in ElementRegion.RegionDataList:\r

-                            if ElementRegionData != None and ElementRegionData.upper() == FvObj.UiFvName:\r
+                            if ElementRegionData is not None and ElementRegionData.upper() == FvObj.UiFvName:\r

                                 if FvObj.BlockSizeList != []:\r
                                     return FvObj.BlockSizeList[0][0]\r
                                 else:\r
                                 if FvObj.BlockSizeList != []:\r
                                     return FvObj.BlockSizeList[0][0]\r
                                 else:\r


@@ -463,7 +524,7 @@ class GenFds :
     #   @retval None\r
     #\r
     def DisplayFvSpaceInfo(FdfParser):\r
     #   @retval None\r
     #\r
     def DisplayFvSpaceInfo(FdfParser):\r

-        \r
+\r

         FvSpaceInfoList = []\r
         MaxFvNameLength = 0\r
         for FvName in FdfParser.Profile.FvDict:\r
         FvSpaceInfoList = []\r
         MaxFvNameLength = 0\r
         for FvName in FdfParser.Profile.FvDict:\r


@@ -490,16 +551,16 @@ class GenFds :
                         if NameValue[0].strip() == 'EFI_FV_SPACE_SIZE':\r
                             FreeFound = True\r
                             Free = NameValue[1].strip()\r
                         if NameValue[0].strip() == 'EFI_FV_SPACE_SIZE':\r
                             FreeFound = True\r
                             Free = NameValue[1].strip()\r

-                \r
+\r

                 if TotalFound and UsedFound and FreeFound:\r
                     FvSpaceInfoList.append((FvName, Total, Used, Free))\r
                 if TotalFound and UsedFound and FreeFound:\r
                     FvSpaceInfoList.append((FvName, Total, Used, Free))\r

-                \r
+\r

         GenFdsGlobalVariable.InfLogger('\nFV Space Information')\r
         for FvSpaceInfo in FvSpaceInfoList:\r
             Name = FvSpaceInfo[0]\r
         GenFdsGlobalVariable.InfLogger('\nFV Space Information')\r
         for FvSpaceInfo in FvSpaceInfoList:\r
             Name = FvSpaceInfo[0]\r

-            TotalSizeValue = long(FvSpaceInfo[1], 0)\r
-            UsedSizeValue = long(FvSpaceInfo[2], 0)\r
-            FreeSizeValue = long(FvSpaceInfo[3], 0)\r
+            TotalSizeValue = int(FvSpaceInfo[1], 0)\r
+            UsedSizeValue = int(FvSpaceInfo[2], 0)\r
+            FreeSizeValue = int(FvSpaceInfo[3], 0)\r

             if UsedSizeValue == TotalSizeValue:\r
                 Percentage = '100'\r
             else:\r
             if UsedSizeValue == TotalSizeValue:\r
                 Percentage = '100'\r
             else:\r


@@ -514,45 +575,142 @@ class GenFds :
     #   @retval None\r
     #\r
     def PreprocessImage(BuildDb, DscFile):\r
     #   @retval None\r
     #\r
     def PreprocessImage(BuildDb, DscFile):\r

-        PcdDict = BuildDb.BuildObject[DscFile, 'COMMON', GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag].Pcds\r
+        PcdDict = BuildDb.BuildObject[DscFile, TAB_COMMON, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag].Pcds\r

         PcdValue = ''\r
         for Key in PcdDict:\r
             PcdObj = PcdDict[Key]\r
             if PcdObj.TokenCName == 'PcdBsBaseAddress':\r
                 PcdValue = PcdObj.DefaultValue\r
                 break\r
         PcdValue = ''\r
         for Key in PcdDict:\r
             PcdObj = PcdDict[Key]\r
             if PcdObj.TokenCName == 'PcdBsBaseAddress':\r
                 PcdValue = PcdObj.DefaultValue\r
                 break\r

-        \r
+\r

         if PcdValue == '':\r
             return\r
         if PcdValue == '':\r
             return\r

-        \r
-        Int64PcdValue = long(PcdValue, 0)\r
-        if Int64PcdValue == 0 or Int64PcdValue < -1:    \r
+\r
+        Int64PcdValue = int(PcdValue, 0)\r
+        if Int64PcdValue == 0 or Int64PcdValue < -1:\r

             return\r
             return\r

-                \r
+\r

         TopAddress = 0\r
         if Int64PcdValue > 0:\r
             TopAddress = Int64PcdValue\r
         TopAddress = 0\r
         if Int64PcdValue > 0:\r
             TopAddress = Int64PcdValue\r

-            \r
-        ModuleDict = BuildDb.BuildObject[DscFile, 'COMMON', GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag].Modules\r
+\r
+        ModuleDict = BuildDb.BuildObject[DscFile, TAB_COMMON, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag].Modules\r

         for Key in ModuleDict:\r
         for Key in ModuleDict:\r

-            ModuleObj = BuildDb.BuildObject[Key, 'COMMON', GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
-            print ModuleObj.BaseName + ' ' + ModuleObj.ModuleType\r
+            ModuleObj = BuildDb.BuildObject[Key, TAB_COMMON, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
+            print(ModuleObj.BaseName + ' ' + ModuleObj.ModuleType)\r

 \r
 \r

-    def GenerateGuidXRefFile(BuildDb, ArchList):\r
+    def GenerateGuidXRefFile(BuildDb, ArchList, FdfParserObj):\r

         GuidXRefFileName = os.path.join(GenFdsGlobalVariable.FvDir, "Guid.xref")\r
         GuidXRefFileName = os.path.join(GenFdsGlobalVariable.FvDir, "Guid.xref")\r

-        GuidXRefFile = StringIO.StringIO('')\r
+        GuidXRefFile = StringIO('')\r
+        PkgGuidDict = {}\r

         GuidDict = {}\r
         GuidDict = {}\r

+        ModuleList = []\r
+        FileGuidList = []\r
+        GuidPattern = gGuidPattern\r

         for Arch in ArchList:\r
             PlatformDataBase = BuildDb.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
         for Arch in ArchList:\r
             PlatformDataBase = BuildDb.BuildObject[GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r

+            PkgList = GenFdsGlobalVariable.WorkSpace.GetPackageList(GenFdsGlobalVariable.ActivePlatform, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag)\r
+            for P in PkgList:\r
+                PkgGuidDict.update(P.Guids)\r
+            for Name, Guid in PlatformDataBase.Pcds:\r
+                Pcd = PlatformDataBase.Pcds[Name, Guid]\r
+                if Pcd.Type in [TAB_PCDS_DYNAMIC_HII, TAB_PCDS_DYNAMIC_EX_HII]:\r
+                    for SkuId in Pcd.SkuInfoList:\r
+                        Sku = Pcd.SkuInfoList[SkuId]\r
+                        if Sku.VariableGuid and Sku.VariableGuid in PkgGuidDict.keys():\r
+                            GuidDict[Sku.VariableGuid] = PkgGuidDict[Sku.VariableGuid]\r

             for ModuleFile in PlatformDataBase.Modules:\r
                 Module = BuildDb.BuildObject[ModuleFile, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
             for ModuleFile in PlatformDataBase.Modules:\r
                 Module = BuildDb.BuildObject[ModuleFile, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r

-                GuidXRefFile.write("%s %s\n" % (Module.Guid, Module.BaseName))\r
+                if Module in ModuleList:\r
+                    continue\r
+                else:\r
+                    ModuleList.append(Module)\r
+                GuidMatch = GuidPattern.match(ModuleFile.BaseName)\r
+                if GuidMatch is not None:\r
+                    GuidXRefFile.write("%s %s\n" % (ModuleFile.BaseName, Module.BaseName))\r
+                else:\r
+                    GuidXRefFile.write("%s %s\n" % (Module.Guid, Module.BaseName))\r

                 for key, item in Module.Protocols.items():\r
                     GuidDict[key] = item\r
                 for key, item in Module.Guids.items():\r
                     GuidDict[key] = item\r
                 for key, item in Module.Ppis.items():\r
                     GuidDict[key] = item\r
                 for key, item in Module.Protocols.items():\r
                     GuidDict[key] = item\r
                 for key, item in Module.Guids.items():\r
                     GuidDict[key] = item\r
                 for key, item in Module.Ppis.items():\r
                     GuidDict[key] = item\r

+            for FvName in FdfParserObj.Profile.FvDict:\r
+                for FfsObj in FdfParserObj.Profile.FvDict[FvName].FfsList:\r
+                    if not isinstance(FfsObj, FfsFileStatement.FileStatement):\r
+                        InfPath = PathClass(NormPath(mws.join(GenFdsGlobalVariable.WorkSpaceDir, FfsObj.InfFileName)))\r
+                        FdfModule = BuildDb.BuildObject[InfPath, Arch, GenFdsGlobalVariable.TargetName, GenFdsGlobalVariable.ToolChainTag]\r
+                        if FdfModule in ModuleList:\r
+                            continue\r
+                        else:\r
+                            ModuleList.append(FdfModule)\r
+                        GuidXRefFile.write("%s %s\n" % (FdfModule.Guid, FdfModule.BaseName))\r
+                        for key, item in FdfModule.Protocols.items():\r
+                            GuidDict[key] = item\r
+                        for key, item in FdfModule.Guids.items():\r
+                            GuidDict[key] = item\r
+                        for key, item in FdfModule.Ppis.items():\r
+                            GuidDict[key] = item\r
+                    else:\r
+                        FileStatementGuid = FfsObj.NameGuid\r
+                        if FileStatementGuid in FileGuidList:\r
+                            continue\r
+                        else:\r
+                            FileGuidList.append(FileStatementGuid)\r
+                        Name = []\r
+                        FfsPath = os.path.join(GenFdsGlobalVariable.FvDir, 'Ffs')\r
+                        FfsPath = glob.glob(os.path.join(FfsPath, FileStatementGuid) + '*')\r
+                        if not FfsPath:\r
+                            continue\r
+                        if not os.path.exists(FfsPath[0]):\r
+                            continue\r
+                        MatchDict = {}\r
+                        ReFileEnds = re.compile('\S+(.ui)$|\S+(fv.sec.txt)$|\S+(.pe32.txt)$|\S+(.te.txt)$|\S+(.pic.txt)$|\S+(.raw.txt)$|\S+(.ffs.txt)$')\r
+                        FileList = os.listdir(FfsPath[0])\r
+                        for File in FileList:\r
+                            Match = ReFileEnds.search(File)\r
+                            if Match:\r
+                                for Index in range(1, 8):\r
+                                    if Match.group(Index) and Match.group(Index) in MatchDict:\r
+                                        MatchDict[Match.group(Index)].append(File)\r
+                                    elif Match.group(Index):\r
+                                        MatchDict[Match.group(Index)] = [File]\r
+                        if not MatchDict:\r
+                            continue\r
+                        if '.ui' in MatchDict:\r
+                            for File in MatchDict['.ui']:\r
+                                with open(os.path.join(FfsPath[0], File), 'rb') as F:\r
+                                    F.read()\r
+                                    length = F.tell()\r
+                                    F.seek(4)\r
+                                    TmpStr = unpack('%dh' % ((length - 4) // 2), F.read())\r
+                                    Name = ''.join(chr(c) for c in TmpStr[:-1])\r
+                        else:\r
+                            FileList = []\r
+                            if 'fv.sec.txt' in MatchDict:\r
+                                FileList = MatchDict['fv.sec.txt']\r
+                            elif '.pe32.txt' in MatchDict:\r
+                                FileList = MatchDict['.pe32.txt']\r
+                            elif '.te.txt' in MatchDict:\r
+                                FileList = MatchDict['.te.txt']\r
+                            elif '.pic.txt' in MatchDict:\r
+                                FileList = MatchDict['.pic.txt']\r
+                            elif '.raw.txt' in MatchDict:\r
+                                FileList = MatchDict['.raw.txt']\r
+                            elif '.ffs.txt' in MatchDict:\r
+                                FileList = MatchDict['.ffs.txt']\r
+                            else:\r
+                                pass\r
+                            for File in FileList:\r
+                                with open(os.path.join(FfsPath[0], File), 'r') as F:\r
+                                    Name.append((F.read().split()[-1]))\r
+                        if not Name:\r
+                            continue\r
+\r
+                        Name = ' '.join(Name) if isinstance(Name, type([])) else Name\r
+                        GuidXRefFile.write("%s %s\n" %(FileStatementGuid, Name))\r
+\r

        # Append GUIDs, Protocols, and PPIs to the Xref file\r
         GuidXRefFile.write("\n")\r
         for key, item in GuidDict.items():\r
        # Append GUIDs, Protocols, and PPIs to the Xref file\r
         GuidXRefFile.write("\n")\r
         for key, item in GuidDict.items():\r