]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
Refine the code for PCD tools.
[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / autogen / AutoGen.java
index 95875544b3592f9d5bb598dd771c5020fcc417b2..f3b107712ea96a2f4e3ba8e6cd7ef7b621d04e8d 100644 (file)
@@ -3,13 +3,13 @@
 \r
  This class is to generate Autogen.h and Autogen.c according to module surface area\r
  or library surface area.\r
\r
+\r
  Copyright (c) 2006, Intel Corporation\r
  All rights reserved. This program and the accompanying materials\r
  are licensed and made available under the terms and conditions of the BSD License\r
  which accompanies this distribution.  The full text of the license may be found at\r
  http://opensource.org/licenses/bsd-license.php\r
\r
+\r
  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
 \r
 package org.tianocore.build.autogen;\r
 \r
-import org.tianocore.build.global.GlobalData;\r
-import org.tianocore.build.global.Spd;\r
-import org.tianocore.build.global.SurfaceAreaQuery;\r
-import org.tianocore.build.id.ModuleIdentification;\r
-import org.tianocore.build.id.PackageIdentification;\r
-import org.tianocore.GuidsDocument;\r
-import org.tianocore.LibraryClassDocument.LibraryClass;\r
-import org.tianocore.PPIsDocument;\r
-import org.tianocore.ProtocolsDocument;\r
-//import org.tianocore.build.pcd.action.PCDAutoGenAction;\r
-import org.tianocore.build.exception.*;\r
-import org.apache.tools.ant.BuildException;\r
-import org.apache.xmlbeans.XmlObject;\r
-\r
 import java.io.File;\r
+import java.io.FileInputStream;\r
+import java.io.FileOutputStream;\r
 import java.io.FileReader;\r
 import java.io.FileWriter;\r
 import java.util.ArrayList;\r
 import java.util.HashSet;\r
 import java.util.Iterator;\r
+import java.util.LinkedHashSet;\r
+import java.util.LinkedList;\r
 import java.util.List;\r
 import java.util.Map;\r
 import java.util.Set;\r
 \r
+import org.apache.tools.ant.BuildException;\r
+import org.apache.xmlbeans.XmlObject;\r
+import org.tianocore.GuidsDocument;\r
+import org.tianocore.LibraryClassDocument.LibraryClass;\r
+import org.tianocore.PPIsDocument;\r
+import org.tianocore.ProtocolsDocument;\r
+import org.tianocore.build.exception.*;\r
+import org.tianocore.build.global.GlobalData;\r
+import org.tianocore.build.global.Spd;\r
+import org.tianocore.build.global.SurfaceAreaQuery;\r
+import org.tianocore.build.id.ModuleIdentification;\r
+import org.tianocore.build.id.PackageIdentification;\r
+import org.tianocore.build.pcd.action.PCDAutoGenAction;\r
+\r
+import org.tianocore.common.logger.EdkLog;\r
+\r
 /**\r
  * This class is to generate Autogen.h and Autogen.c according to module surface\r
  * area or library surface area.\r
  */\r
 public class AutoGen {\r
-    // /\r
-    // / The output path of Autogen.h and Autogen.c\r
-    // /\r
+    ///\r
+    /// The output path of Autogen.h and Autogen.c\r
+    ///\r
     private String outputPath;\r
 \r
-    // /\r
-    // / The base name of module or library.\r
-    // /\r
+    ///\r
+    /// The name of FV directory\r
+    ///\r
+    private String fvDir;\r
+\r
+    ///\r
+    /// The base name of module or library.\r
+    ///\r
     private ModuleIdentification moduleId;\r
 \r
-    // /\r
-    // / The build architecture\r
-    // /\r
+    ///\r
+    /// The build architecture\r
+    ///\r
     private String arch;\r
 \r
-    // /\r
-    // / PcdAutogen instance which is used to manage how to generate the PCD\r
-    // / information.\r
-    // /\r
-//    private PCDAutoGenAction myPcdAutogen;\r
-\r
-    // /\r
-    // / The protocl list which records in module or library surface area and\r
-    // / it's dependence on library instance surface area.\r
-    // /\r
+    ///\r
+    /// PcdAutogen instance which is used to manage how to generate the PCD\r
+    /// information.\r
+    ///\r
+    private PCDAutoGenAction myPcdAutogen;\r
+\r
+    ///\r
+    /// the one of type : NOT_PCD_DRIVER, PEI_PCD_DRIVER, DXE_PCD_DRIVER\r
+    /// \r
+    private CommonDefinition.PCD_DRIVER_TYPE pcdDriverType;\r
+\r
+    ///\r
+    /// The protocl list which records in module or library surface area and\r
+    /// it's dependence on library instance surface area.\r
+    ///\r
     private Set<String> mProtocolList = new HashSet<String>();\r
 \r
-    // /\r
-    // / The Ppi list which recorded in module or library surface area and its\r
-    // / dependency on library instance surface area.\r
-    // /\r
+    ///\r
+    /// The Ppi list which recorded in module or library surface area and its\r
+    /// dependency on library instance surface area.\r
+    ///\r
     private Set<String> mPpiList = new HashSet<String>();\r
 \r
-    // /\r
-    // / The Guid list which recoreded in module or library surface are and it's\r
-    // / dependence on library instance surface area.\r
-    // /\r
+    ///\r
+    /// The Guid list which recoreded in module or library surface area and it's\r
+    /// dependence on library instance surface area.\r
+    ///\r
     private Set<String> mGuidList = new HashSet<String>();\r
 \r
+    //\r
+    // The dependence package list which recoreded in module or library surface\r
+    // area and it's dependence on library instance surface are.\r
+    //\r
+    private List<PackageIdentification> mDepPkgList = new LinkedList<PackageIdentification>();\r
+\r
+    //\r
+    //  For non library module, add its library instance's construct and destructor to\r
+    //  list.\r
+    //\r
+    private List<String> libConstructList = new ArrayList<String>();\r
+    private List<String> libDestructList = new ArrayList<String>();\r
+\r
+    //\r
+    // List to store SetVirtalAddressMapCallBack, ExitBootServiceCallBack\r
+    //\r
+    private List<String> setVirtalAddList = new ArrayList<String>();\r
+    private List<String> exitBootServiceList = new ArrayList<String>();\r
+\r
+\r
     /**\r
      * Construct function\r
-     * \r
+     *\r
      * This function mainly initialize some member variable.\r
-     * \r
+     *\r
      * @param outputPath\r
      *            Output path of AutoGen file.\r
      * @param baseName\r
@@ -97,18 +133,19 @@ public class AutoGen {
      * @param arch\r
      *            Target architecture.\r
      */\r
-    public AutoGen(String outputPath, ModuleIdentification moduleId, String arch) {\r
+    public AutoGen(String fvDir, String outputPath, ModuleIdentification moduleId, String arch) {\r
         this.outputPath = outputPath;\r
         this.moduleId = moduleId;\r
         this.arch = arch;\r
+        this.fvDir = fvDir;\r
 \r
     }\r
 \r
     /**\r
      * saveFile function\r
-     * \r
+     *\r
      * This function save the content in stringBuffer to file.\r
-     * \r
+     *\r
      * @param fileName\r
      *            The name of file.\r
      * @param fileBuffer\r
@@ -147,10 +184,10 @@ public class AutoGen {
 \r
     /**\r
      * genAutogen function\r
-     * \r
+     *\r
      * This function call libGenAutoGen or moduleGenAutogen function, which\r
      * dependence on generate library autogen or module autogen.\r
-     * \r
+     *\r
      * @throws BuildException\r
      *             Failed to creat AutoGen.c & AutoGen.h.\r
      */\r
@@ -174,36 +211,37 @@ public class AutoGen {
 \r
         } catch (Exception e) {\r
             throw new BuildException(\r
-                    "Failed to create AutoGen.c & AutoGen.h!\n"\r
-                            + e.getMessage());\r
+                                    "Failed to create AutoGen.c & AutoGen.h!\n"\r
+                                    + e.getMessage());\r
         }\r
     }\r
 \r
     /**\r
      * moduleGenAutogen function\r
-     * \r
+     *\r
      * This function generates AutoGen.c & AutoGen.h for module.\r
-     * \r
+     *\r
      * @throws BuildException\r
      *             Faile to create module AutoGen.c & AutoGen.h.\r
      */\r
     void moduleGenAutogen() throws BuildException {\r
 \r
         try {\r
+            collectLibInstanceInfo();\r
             moduleGenAutogenC();\r
             moduleGenAutogenH();\r
         } catch (Exception e) {\r
             throw new BuildException(\r
-                    "Faile to create module AutoGen.c & AutoGen.h!\n"\r
-                            + e.getMessage());\r
+                                    "Faile to create module AutoGen.c & AutoGen.h!\n"\r
+                                    + e.getMessage());\r
         }\r
     }\r
 \r
     /**\r
      * libGenAutogen function\r
-     * \r
+     *\r
      * This function generates AutoGen.c & AutoGen.h for library.\r
-     * \r
+     *\r
      * @throws BuildException\r
      *             Faile to create library AutoGen.c & AutoGen.h\r
      */\r
@@ -213,16 +251,16 @@ public class AutoGen {
             libGenAutogenH();\r
         } catch (Exception e) {\r
             throw new BuildException(\r
-                    "Faile to create library AutoGen.c & AutoGen.h!\n"\r
-                            + e.getMessage());\r
+                                    "Failed to create library AutoGen.c & AutoGen.h!\n"\r
+                                    + e.getMessage());\r
         }\r
     }\r
 \r
     /**\r
      * moduleGenAutogenH\r
-     * \r
+     *\r
      * This function generates AutoGen.h for module.\r
-     * \r
+     *\r
      * @throws BuildException\r
      *             Failed to generate AutoGen.h.\r
      */\r
@@ -231,7 +269,7 @@ public class AutoGen {
         Set<String> libClassIncludeH;\r
         String moduleType;\r
         // List<String> headerFileList;\r
-        Set<String> headerFileList;\r
+        List<String> headerFileList;\r
         Iterator item;\r
         StringBuffer fileBuffer = new StringBuffer(8192);\r
 \r
@@ -244,10 +282,8 @@ public class AutoGen {
         // Add #ifndef ${BaseName}_AUTOGENH\r
         // #def ${BseeName}_AUTOGENH\r
         //\r
-        fileBuffer.append("#ifndef    " + this.moduleId.getName().toUpperCase()\r
-                + "_AUTOGENH\r\n");\r
-        fileBuffer.append("#define    " + this.moduleId.getName().toUpperCase()\r
-                + "_AUTOGENH\r\n\r\n");\r
+        fileBuffer.append("#ifndef    " + "_AUTOGENH_" + this.moduleId.getGuid().replaceAll("-", "_") +"\r\n");\r
+        fileBuffer.append("#define    " + "_AUTOGENH_" + this.moduleId.getGuid().replaceAll("-", "_") +"\r\n\r\n");\r
 \r
         //\r
         // Write the specification version and release version at the begine\r
@@ -257,29 +293,6 @@ public class AutoGen {
         // moduleType.\r
         //\r
         moduleType = SurfaceAreaQuery.getModuleType();\r
-        switch (CommonDefinition.getModuleType(moduleType)) {\r
-        case CommonDefinition.ModuleTypeDxeCore:\r
-        case CommonDefinition.ModuleTypeDxeDriver:\r
-        case CommonDefinition.ModuleTypeDxeRuntimeDriver:\r
-        case CommonDefinition.ModuleTypeDxeSmmDriver:\r
-        case CommonDefinition.ModuleTypeDxeSalDriver:\r
-        case CommonDefinition.ModuleTypeUefiDriver:\r
-        case CommonDefinition.ModuleTypeUefiApplication:\r
-            fileBuffer.append(CommonDefinition.autoGenHLine1);\r
-            break;\r
-        default:\r
-            fileBuffer.append(CommonDefinition.autoGenHVersionDefault);\r
-            break;\r
-        }\r
-        switch (CommonDefinition.getModuleType(moduleType)) {\r
-        case CommonDefinition.ModuleTypeUefiDriver:\r
-        case CommonDefinition.ModuleTypeUefiApplication:\r
-            fileBuffer.append(CommonDefinition.autoGenHReleaseDefault);\r
-            break;\r
-        default:\r
-            fileBuffer.append(CommonDefinition.autoGenHLine2);\r
-            break;\r
-        }\r
 \r
         //\r
         // Add "extern int __make_me_compile_correctly;" at begin of\r
@@ -287,17 +300,26 @@ public class AutoGen {
         //\r
         fileBuffer.append(CommonDefinition.autoGenHbegin);\r
 \r
+        //\r
+        // Put EFI_SPECIFICATION_VERSION, and EDK_RELEASE_VERSION.\r
+        //\r
+        String[] specList = SurfaceAreaQuery.getExternSpecificaiton();\r
+        for (int i = 0; i < specList.length; i++) {\r
+            fileBuffer.append(CommonDefinition.marcDefineStr + specList[i]\r
+                              + "\r\n");\r
+        }\r
         //\r
         // Write consumed package's mdouleInfo related .h file to autogen.h\r
         //\r
-//        PackageIdentification[] consumedPkgIdList = SurfaceAreaQuery\r
-//                .getDependencePkg(this.arch);\r
-        PackageIdentification[] consumedPkgIdList = SurfaceAreaQuery.getDependencePkg(null);\r
+        // PackageIdentification[] consumedPkgIdList = SurfaceAreaQuery\r
+        // .getDependencePkg(this.arch);\r
+        PackageIdentification[] consumedPkgIdList = SurfaceAreaQuery\r
+                                                    .getDependencePkg(this.arch);\r
         if (consumedPkgIdList != null) {\r
             headerFileList = depPkgToAutogenH(consumedPkgIdList, moduleType);\r
             item = headerFileList.iterator();\r
-            while (item.hasNext()){\r
-               fileBuffer.append(item.next().toString());\r
+            while (item.hasNext()) {\r
+                fileBuffer.append(item.next().toString());\r
             }\r
         }\r
 \r
@@ -305,32 +327,43 @@ public class AutoGen {
         // Write library class's related *.h file to autogen.h.\r
         //\r
         String[] libClassList = SurfaceAreaQuery\r
-                .getLibraryClasses(CommonDefinition.AlwaysConsumed);\r
+                                .getLibraryClasses(CommonDefinition.AlwaysConsumed,this.arch);\r
         if (libClassList != null) {\r
             libClassIncludeH = LibraryClassToAutogenH(libClassList);\r
             item = libClassIncludeH.iterator();\r
-            while (item.hasNext()){\r
-               fileBuffer.append(item.next().toString());\r
+            while (item.hasNext()) {\r
+                fileBuffer.append(item.next().toString());\r
             }\r
         }\r
 \r
         libClassList = SurfaceAreaQuery\r
-                .getLibraryClasses(CommonDefinition.AlwaysProduced);\r
+                       .getLibraryClasses(CommonDefinition.AlwaysProduced, this.arch);\r
         if (libClassList != null) {\r
             libClassIncludeH = LibraryClassToAutogenH(libClassList);\r
             item = libClassIncludeH.iterator();\r
-            while (item.hasNext()){\r
-               fileBuffer.append(item.next().toString());\r
+            while (item.hasNext()) {\r
+                fileBuffer.append(item.next().toString());\r
             }\r
         }\r
         fileBuffer.append("\r\n");\r
 \r
         //\r
+        //  If is TianoR8FlashMap, copy {Fv_DIR}/FlashMap.h to\r
+        // {DEST_DIR_DRBUG}/FlashMap.h\r
+        //\r
+        if (SurfaceAreaQuery.isHaveTianoR8FlashMap()) {\r
+            fileBuffer.append(CommonDefinition.include);\r
+            fileBuffer.append("  <");\r
+            fileBuffer.append(CommonDefinition.tianoR8FlashMapH + ">\r\n");\r
+            copyFlashMapHToDebugDir();\r
+        }\r
+\r
         // Write PCD autogen information to AutoGen.h.\r
         //\r
-//        if (this.myPcdAutogen != null) {\r
-//            fileBuffer.append(this.myPcdAutogen.OutputH());\r
-//        }\r
+        if (this.myPcdAutogen != null) {\r
+            fileBuffer.append("\r\n");\r
+            fileBuffer.append(this.myPcdAutogen.getHAutoGenString());\r
+        }\r
 \r
         //\r
         // Append the #endif at AutoGen.h\r
@@ -347,9 +380,9 @@ public class AutoGen {
 \r
     /**\r
      * moduleGenAutogenC\r
-     * \r
+     *\r
      * This function generates AutoGen.c for module.\r
-     * \r
+     *\r
      * @throws BuildException\r
      *             Failed to generate AutoGen.c.\r
      */\r
@@ -367,17 +400,18 @@ public class AutoGen {
         fileBuffer.append(CommonDefinition.includeAutogenH);\r
 \r
         //\r
-        // Get the native MSA file infomation. Since before call autogen, \r
-        // the MSA native <Externs> information were overrided. So before \r
+        // Get the native MSA file infomation. Since before call autogen,\r
+        // the MSA native <Externs> information were overrided. So before\r
         // process <Externs> it should be set the DOC as the Native MSA info.\r
         //\r
-        Map<String, XmlObject> doc  = GlobalData.getNativeMsa(this.moduleId);\r
+        Map<String, XmlObject> doc = GlobalData.getNativeMsa(this.moduleId);\r
         SurfaceAreaQuery.push(doc);\r
         //\r
-        // Write <Extern> DriverBinding/ComponentName/DriverConfiguration/DriverDialog\r
+        // Write <Extern>\r
+        // DriverBinding/ComponentName/DriverConfiguration/DriverDialog\r
         // to AutoGen.c\r
         //\r
-        \r
+\r
         ExternsDriverBindingToAutoGenC(fileBuffer);\r
 \r
         //\r
@@ -390,22 +424,23 @@ public class AutoGen {
         // Write EntryPoint to autgoGen.c\r
         //\r
         String[] entryPointList = SurfaceAreaQuery.getModuleEntryPointArray();\r
-        if (entryPointList != null) {\r
-            EntryPointToAutoGen(entryPointList, fileBuffer);\r
-        }\r
+        EntryPointToAutoGen(CommonDefinition.remDupString(entryPointList), fileBuffer);\r
+\r
+        pcdDriverType = SurfaceAreaQuery.getPcdDriverType();\r
 \r
         //\r
-        // Restore the DOC which include the FPD module info. \r
+        // Restore the DOC which include the FPD module info.\r
         //\r
         SurfaceAreaQuery.pop();\r
-        \r
+\r
         //\r
         // Write Guid to autogen.c\r
         //\r
-        String guid = CommonDefinition.formatGuidName(SurfaceAreaQuery.getModuleGuid());\r
-        \r
+        String guid = CommonDefinition.formatGuidName(SurfaceAreaQuery\r
+                                                      .getModuleGuid());\r
+\r
         fileBuffer\r
-                .append("GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiCallerIdGuid = {");\r
+        .append("GLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID gEfiCallerIdGuid = {");\r
         if (guid == null) {\r
             throw new AutoGenException("Guid value must set!\n");\r
         }\r
@@ -427,6 +462,17 @@ public class AutoGen {
         //\r
         LibInstanceToAutogenC(fileBuffer);\r
 \r
+        //\r
+        // Get module dependent Package identification.\r
+        //\r
+        PackageIdentification[] packages = SurfaceAreaQuery.getDependencePkg(this.arch);\r
+        for (int i = 0; i < packages.length; i++) {\r
+            if (!this.mDepPkgList.contains(packages[i])) {\r
+                this.mDepPkgList.add(packages[i]);\r
+            }\r
+\r
+        }\r
+\r
         //\r
         // Write consumed ppi, guid, protocol to autogen.c\r
         //\r
@@ -435,24 +481,23 @@ public class AutoGen {
         GuidGuidToAutogenC(fileBuffer);\r
 \r
         //\r
-        // Call pcd autogen. PCDAutoGenAction tool only need module name and\r
-        // isPcdEmulatedDriver as parameter. Library inherits PCD and module's\r
-        // PCD information has been collected in FPDParser task by\r
-        // CollectPCDAction.\r
-        // Note : when PCD image tool ready,\r
-        // isPCDEmulatedDriver parameter will be removed.\r
-        //\r
-//        try {\r
-//            this.myPcdAutogen = new PCDAutoGenAction(moduleId.getName(),\r
-//                    moduleId.getName().equalsIgnoreCase("PcdEmulatorPeim"));\r
-//            this.myPcdAutogen.execute();\r
-//        } catch (Exception e) {\r
-//            throw new BuildException("PCD Autogen failed:" + e.getMessage());\r
-//        }\r
-//\r
-//        if (this.myPcdAutogen != null) {\r
-//            fileBuffer.append(this.myPcdAutogen.OutputC());\r
-//        }\r
+        // Call pcd autogen.\r
+        //\r
+        this.myPcdAutogen = new PCDAutoGenAction(moduleId, \r
+                                                 arch, \r
+                                                 false, \r
+                                                 null,\r
+                                                 pcdDriverType);\r
+        try {\r
+            this.myPcdAutogen.execute();\r
+        } catch (Exception exp) {\r
+            throw new PcdAutogenException (exp.getMessage());\r
+        }\r
+\r
+        if (this.myPcdAutogen != null) {\r
+            fileBuffer.append("\r\n");\r
+            fileBuffer.append(this.myPcdAutogen.getCAutoGenString());\r
+        }\r
 \r
         if (!saveFile(outputPath + File.separatorChar + "AutoGen.c", fileBuffer)) {\r
             throw new BuildException("Failed to generate AutoGen.c !!!");\r
@@ -462,9 +507,9 @@ public class AutoGen {
 \r
     /**\r
      * libGenAutogenH\r
-     * \r
+     *\r
      * This function generates AutoGen.h for library.\r
-     * \r
+     *\r
      * @throws BuildException\r
      *             Failed to generate AutoGen.c.\r
      */\r
@@ -472,7 +517,7 @@ public class AutoGen {
 \r
         Set<String> libClassIncludeH;\r
         String moduleType;\r
-        Set<String> headerFileList;\r
+        List<String> headerFileList;\r
         Iterator item;\r
         StringBuffer fileBuffer = new StringBuffer(10240);\r
 \r
@@ -485,10 +530,8 @@ public class AutoGen {
         // Add #ifndef ${BaseName}_AUTOGENH\r
         // #def ${BseeName}_AUTOGENH\r
         //\r
-        fileBuffer.append("#ifndef    " + this.moduleId.getName().toUpperCase()\r
-                + "_AUTOGENH\r\n");\r
-        fileBuffer.append("#define    " + this.moduleId.getName().toUpperCase()\r
-                + "_AUTOGENH\r\n\r\n");\r
+        fileBuffer.append("#ifndef    " + "_AUTOGENH_" + this.moduleId.getGuid().replaceAll("-", "_") + "\r\n");\r
+        fileBuffer.append("#define    " + "_AUTOGENH_" + this.moduleId.getGuid().replaceAll("-", "_") + "\r\n\r\n");\r
 \r
         //\r
         // Write EFI_SPECIFICATION_VERSION and EDK_RELEASE_VERSION\r
@@ -498,53 +541,66 @@ public class AutoGen {
         //\r
         fileBuffer.append(CommonDefinition.autoGenHbegin);\r
         String[] specList = SurfaceAreaQuery.getExternSpecificaiton();\r
-        for (int i = 0; i < specList.length; i++){\r
-            fileBuffer.append(CommonDefinition.marcDefineStr + specList[i] + "\r\n");\r
+        for (int i = 0; i < specList.length; i++) {\r
+            fileBuffer.append(CommonDefinition.marcDefineStr + specList[i]\r
+                              + "\r\n");\r
         }\r
-//        fileBuffer.append(CommonDefinition.autoGenHLine1);\r
-//        fileBuffer.append(CommonDefinition.autoGenHLine2);\r
+        // fileBuffer.append(CommonDefinition.autoGenHLine1);\r
+        // fileBuffer.append(CommonDefinition.autoGenHLine2);\r
 \r
         //\r
         // Write consumed package's mdouleInfo related *.h file to autogen.h.\r
-        // \r
+        //\r
         moduleType = SurfaceAreaQuery.getModuleType();\r
         PackageIdentification[] cosumedPkglist = SurfaceAreaQuery\r
-                .getDependencePkg(this.arch);\r
+                                                 .getDependencePkg(this.arch);\r
         headerFileList = depPkgToAutogenH(cosumedPkglist, moduleType);\r
         item = headerFileList.iterator();\r
-        while (item.hasNext()){\r
-               fileBuffer.append(item.next().toString());\r
+        while (item.hasNext()) {\r
+            fileBuffer.append(item.next().toString());\r
         }\r
         //\r
         // Write library class's related *.h file to autogen.h\r
         //\r
         String[] libClassList = SurfaceAreaQuery\r
-                .getLibraryClasses(CommonDefinition.AlwaysConsumed);\r
+                                .getLibraryClasses(CommonDefinition.AlwaysConsumed, this.arch);\r
         if (libClassList != null) {\r
             libClassIncludeH = LibraryClassToAutogenH(libClassList);\r
             item = libClassIncludeH.iterator();\r
-            while (item.hasNext()){\r
-               fileBuffer.append(item.next().toString());\r
+            while (item.hasNext()) {\r
+                fileBuffer.append(item.next().toString());\r
             }\r
         }\r
 \r
         libClassList = SurfaceAreaQuery\r
-                .getLibraryClasses(CommonDefinition.AlwaysProduced);\r
+                       .getLibraryClasses(CommonDefinition.AlwaysProduced, this.arch);\r
         if (libClassList != null) {\r
             libClassIncludeH = LibraryClassToAutogenH(libClassList);\r
             item = libClassIncludeH.iterator();\r
-            while (item.hasNext()){\r
-               fileBuffer.append(item.next().toString());\r
+            while (item.hasNext()) {\r
+                fileBuffer.append(item.next().toString());\r
             }\r
         }\r
         fileBuffer.append("\r\n");\r
 \r
+        //\r
+        //  If is TianoR8FlashMap, copy {Fv_DIR}/FlashMap.h to\r
+        // {DEST_DIR_DRBUG}/FlashMap.h\r
+        //\r
+        if (SurfaceAreaQuery.isHaveTianoR8FlashMap()) {\r
+            fileBuffer.append(CommonDefinition.include);\r
+            fileBuffer.append("  <");\r
+            fileBuffer.append(CommonDefinition.tianoR8FlashMapH + ">\r\n");\r
+            copyFlashMapHToDebugDir();\r
+        }\r
+\r
         //\r
         // Write PCD information to library AutoGen.h.\r
         //\r
-//        if (this.myPcdAutogen != null) {\r
-//            fileBuffer.append(this.myPcdAutogen.OutputH());\r
-//        }\r
+        if (this.myPcdAutogen != null) {\r
+            fileBuffer.append("\r\n");\r
+            fileBuffer.append(this.myPcdAutogen.getHAutoGenString());\r
+        }\r
 \r
         //\r
         // Append the #endif at AutoGen.h\r
@@ -561,13 +617,13 @@ public class AutoGen {
 \r
     /**\r
      * libGenAutogenC\r
-     * \r
+     *\r
      * This function generates AutoGen.h for library.\r
-     * \r
+     *\r
      * @throws BuildException\r
      *             Failed to generate AutoGen.c.\r
      */\r
-    void libGenAutogenC() throws BuildException {\r
+    void libGenAutogenC() throws BuildException, PcdAutogenException {\r
         StringBuffer fileBuffer = new StringBuffer(10240);\r
 \r
         //\r
@@ -579,25 +635,23 @@ public class AutoGen {
         fileBuffer.append("\r\n");\r
 \r
         //\r
-        // Call pcd autogen. PCDAutoGenAction tool only need module name and\r
-        // isPcdEmulatedDriver as parameter. Library inherit PCD and module's\r
-        // PCD information has been collected in FPDParser task by\r
-        // CollectPCDAction.\r
-        // Note : when PCD image tool ready,\r
-        // isPCDEmulatedDriver parameter will be removed.\r
+        // Call pcd autogen.\r
         //\r
+        this.myPcdAutogen = new PCDAutoGenAction(moduleId,\r
+                                                 arch,\r
+                                                 true,\r
+                                                 SurfaceAreaQuery.getModulePcdEntryNameArray(),\r
+                                                 pcdDriverType);\r
         try {\r
-//            this.myPcdAutogen = new PCDAutoGenAction(this.moduleId.getName(),\r
-//                    this.moduleId.getName().equalsIgnoreCase("PcdEmulatorPeim"));\r
-//            this.myPcdAutogen.execute();\r
-//             this.myPcdAutogen = new PCDAutoGenAction(this.moduleId,);\r
+            this.myPcdAutogen.execute();\r
         } catch (Exception e) {\r
-            throw new BuildException(e.getMessage());\r
+            throw new PcdAutogenException(e.getMessage());\r
         }\r
 \r
-//        if (this.myPcdAutogen != null) {\r
-//            fileBuffer.append(this.myPcdAutogen.OutputC());\r
-//        }\r
+        if (this.myPcdAutogen != null) {\r
+            fileBuffer.append("\r\n");\r
+            fileBuffer.append(this.myPcdAutogen.getCAutoGenString());\r
+        }\r
 \r
         if (!saveFile(outputPath + File.separatorChar + "AutoGen.c", fileBuffer)) {\r
             throw new BuildException("Failed to generate AutoGen.c !!!");\r
@@ -606,17 +660,18 @@ public class AutoGen {
 \r
     /**\r
      * LibraryClassToAutogenH\r
-     * \r
+     *\r
      * This function returns *.h files declared by library classes which are\r
      * consumed or produced by current build module or library.\r
-     * \r
+     *\r
      * @param libClassList\r
      *            List of library class which consumed or produce by current\r
      *            build module or library.\r
      * @return includeStrList List of *.h file.\r
      */\r
-    Set<String> LibraryClassToAutogenH(String[] libClassList) throws AutoGenException{\r
-        Set<String> includStrList = new HashSet<String>();\r
+    Set<String> LibraryClassToAutogenH(String[] libClassList)\r
+    throws AutoGenException {\r
+        Set<String> includStrList = new LinkedHashSet<String>();\r
         String includerName[];\r
         String str = "";\r
 \r
@@ -627,10 +682,11 @@ public class AutoGen {
 \r
         for (int i = 0; i < libClassList.length; i++) {\r
             includerName = GlobalData.getLibraryClassHeaderFiles(\r
-                    SurfaceAreaQuery.getDependencePkg(this.arch),\r
-                    libClassList[i]);\r
-            if (includerName == null){\r
-                throw new AutoGenException("Can not find library class [" + libClassList[i] + "] declaration in every packages. ");\r
+                                                                SurfaceAreaQuery.getDependencePkg(this.arch),\r
+                                                                libClassList[i]);\r
+            if (includerName == null) {\r
+                throw new AutoGenException("Can not find library class ["\r
+                                           + libClassList[i] + "] declaration in any SPD package. ");\r
             }\r
             for (int j = 0; j < includerName.length; j++) {\r
                 String includeNameStr = includerName[j];\r
@@ -647,44 +703,48 @@ public class AutoGen {
 \r
     /**\r
      * IncludesToAutogenH\r
-     * \r
+     *\r
      * This function add include file in AutoGen.h file.\r
-     * \r
+     *\r
      * @param packageNameList\r
      *            List of module depended package.\r
      * @param moduleType\r
      *            Module type.\r
      * @return\r
      */\r
-    Set<String> depPkgToAutogenH(PackageIdentification[] packageNameList,\r
-            String moduleType) throws AutoGenException{\r
+    List<String> depPkgToAutogenH(PackageIdentification[] packageNameList,\r
+                                  String moduleType) throws AutoGenException {\r
 \r
-        Set<String> includeStrList = new HashSet<String>();\r
+        List<String> includeStrList = new LinkedList<String>();\r
         String pkgHeader;\r
         String includeStr = "";\r
 \r
         //\r
         // Get include file from moduleInfo file\r
         //\r
-        for (int i = 0; i < packageNameList.length; i++){\r
-//             pkgHeader = GlobalData.getPackageHeaderFiles(packageNameList[i], moduleType);\r
-//            if (pkgHeader == null){\r
-//             throw new AutoGenException("Can not find package [" + packageNameList[i] + "] declaration in every packages. ");\r
-//            }else if (!pkgHeader.equalsIgnoreCase("")){\r
-//             includeStr = CommonDefinition.include + "<" + pkgHeader + ">\r\n";\r
-//                includeStrList.add(includeStr);\r
-//            }\r
+        for (int i = 0; i < packageNameList.length; i++) {\r
+            pkgHeader = GlobalData.getPackageHeaderFiles(packageNameList[i],\r
+                                                         moduleType);\r
+            if (pkgHeader == null) {\r
+                throw new AutoGenException("Can not find package ["\r
+                                           + packageNameList[i]\r
+                                           + "] declaration in any SPD package. ");\r
+            } else if (!pkgHeader.equalsIgnoreCase("")) {\r
+                includeStr = CommonDefinition.include + " <" + pkgHeader\r
+                             + ">\r\n";\r
+                includeStrList.add(includeStr);\r
+            }\r
         }\r
-        \r
+\r
         return includeStrList;\r
     }\r
 \r
     /**\r
      * EntryPointToAutoGen\r
-     * \r
+     *\r
      * This function convert <ModuleEntryPoint> & <ModuleUnloadImage>\r
      * information in mas to AutoGen.c\r
-     * \r
+     *\r
      * @param entryPointList\r
      *            List of entry point.\r
      * @param fileBuffer\r
@@ -692,7 +752,7 @@ public class AutoGen {
      * @throws Exception\r
      */\r
     void EntryPointToAutoGen(String[] entryPointList, StringBuffer fileBuffer)\r
-            throws BuildException {\r
+    throws BuildException {\r
 \r
         String typeStr = SurfaceAreaQuery.getModuleType();\r
 \r
@@ -701,29 +761,29 @@ public class AutoGen {
         // for difference module type.\r
         //\r
         switch (CommonDefinition.getModuleType(typeStr)) {\r
-\r
+        \r
         case CommonDefinition.ModuleTypePeiCore:\r
-            if (entryPointList.length != 1 || entryPointList[0].equals("")) {\r
+            if (entryPointList == null ||entryPointList.length != 1 ) {\r
                 throw new BuildException(\r
-                        "Module type = 'PEI_CORE', only have one module entry point!");\r
+                                        "Module type = 'PEI_CORE', can have only one module entry point!");\r
             } else {\r
                 fileBuffer.append("EFI_STATUS\r\n");\r
                 fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append(entryPointList[0]);\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer\r
-                        .append("  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r\n");\r
+                .append("  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r\n");\r
                 fileBuffer\r
-                        .append("  IN VOID                        *OldCoreData\r\n");\r
+                .append("  IN VOID                        *OldCoreData\r\n");\r
                 fileBuffer.append("  );\r\n\r\n");\r
 \r
                 fileBuffer.append("EFI_STATUS\r\n");\r
                 fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
                 fileBuffer\r
-                        .append("  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r\n");\r
+                .append("  IN EFI_PEI_STARTUP_DESCRIPTOR  *PeiStartupDescriptor,\r\n");\r
                 fileBuffer\r
-                        .append("  IN VOID                        *OldCoreData\r\n");\r
+                .append("  IN VOID                        *OldCoreData\r\n");\r
                 fileBuffer.append("  )\r\n\r\n");\r
                 fileBuffer.append("{\r\n");\r
                 fileBuffer.append("  return ");\r
@@ -735,9 +795,9 @@ public class AutoGen {
 \r
         case CommonDefinition.ModuleTypeDxeCore:\r
             fileBuffer.append("const UINT32 _gUefiDriverRevision = 0;\r\n");\r
-            if (entryPointList.length != 1 || entryPointList[0].equals("")) {\r
+            if (entryPointList == null || entryPointList.length != 1) {\r
                 throw new BuildException(\r
-                        "Module type = 'DXE_CORE', only have one module entry point!");\r
+                                        "Module type = 'DXE_CORE', can have only one module entry point!");\r
             } else {\r
 \r
                 fileBuffer.append("VOID\r\n");\r
@@ -763,22 +823,31 @@ public class AutoGen {
         case CommonDefinition.ModuleTypePeim:\r
             int entryPointCount = 0;\r
             fileBuffer\r
-                    .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gPeimRevision = 0;\r\n");\r
+            .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT32 _gPeimRevision = 0;\r\n");\r
+            if (entryPointList == null || entryPointList.length == 0) {\r
+                fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
+                fileBuffer.append("  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r\n");\r
+                fileBuffer.append("  IN EFI_PEI_SERVICES     **PeiServices\r\n");\r
+                fileBuffer.append("  )\r\n\r\n");\r
+                fileBuffer.append("{\r\n");\r
+                fileBuffer.append("  return EFI_SUCCESS;\r\n");\r
+                fileBuffer.append("}\r\n\r\n");\r
+                break;\r
+            }\r
             for (int i = 0; i < entryPointList.length; i++) {\r
-                if (!entryPointList[i].equals("")) {\r
-                    fileBuffer.append("EFI_STATUS\r\n");\r
-                    fileBuffer.append("EFIAPI\r\n");\r
-                    fileBuffer.append(entryPointList[i]);\r
-                    fileBuffer.append(" (\r\n");\r
-                    fileBuffer\r
-                            .append("  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r\n");\r
-                    fileBuffer\r
-                            .append("  IN EFI_PEI_SERVICES     **PeiServices\r\n");\r
-                    fileBuffer.append("  );\r\n");\r
-                    entryPointCount++;\r
-                } else {\r
-                    break;\r
-                }\r
+                fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append(entryPointList[i]);\r
+                fileBuffer.append(" (\r\n");\r
+                fileBuffer\r
+                .append("  IN EFI_FFS_FILE_HEADER  *FfsHeader,\r\n");\r
+                fileBuffer\r
+                .append("  IN EFI_PEI_SERVICES     **PeiServices\r\n");\r
+                fileBuffer.append("  );\r\n");\r
+                entryPointCount++;\r
+\r
             }\r
 \r
             fileBuffer.append("EFI_STATUS\r\n");\r
@@ -788,10 +857,7 @@ public class AutoGen {
             fileBuffer.append("  IN EFI_PEI_SERVICES     **PeiServices\r\n");\r
             fileBuffer.append("  )\r\n\r\n");\r
             fileBuffer.append("{\r\n");\r
-\r
-            if (entryPointCount == 0) {\r
-                fileBuffer.append("  return EFI_SUCCESS;\r\n");\r
-            } else if (entryPointCount == 1) {\r
+            if (entryPointCount == 1) {\r
                 fileBuffer.append("  return ");\r
                 fileBuffer.append(entryPointList[0]);\r
                 fileBuffer.append(" (FfsHeader, PeiServices);\r\n");\r
@@ -805,7 +871,7 @@ public class AutoGen {
                         fileBuffer.append(entryPointList[i]);\r
                         fileBuffer.append(" (FfsHeader, PeiServices);\r\n");\r
                         fileBuffer\r
-                                .append("  if (!EFI_ERROR (Status) || EFI_ERROR (CombinedStatus)) {\r\n");\r
+                        .append("  if (!EFI_ERROR (Status) || EFI_ERROR (CombinedStatus)) {\r\n");\r
                         fileBuffer.append("    CombinedStatus = Status;\r\n");\r
                         fileBuffer.append("  }\r\n\r\n");\r
                     } else {\r
@@ -819,98 +885,113 @@ public class AutoGen {
 \r
         case CommonDefinition.ModuleTypeDxeSmmDriver:\r
             entryPointCount = 0;\r
-            for (int i = 0; i < entryPointList.length; i++) {\r
-                if (!entryPointList[i].equals("")) {\r
+            //\r
+            // If entryPoint is null, create an empty ProcessModuleEntryPointList\r
+            // function.\r
+            //\r
+            if (entryPointList == null || entryPointList.length == 0) {\r
+                fileBuffer\r
+                .append("GLOBAL_REMOVE_IF_UNREFERENCED  const UINT8  _gDriverEntryPointCount = ");\r
+                fileBuffer.append(Integer.toString(entryPointCount));\r
+                fileBuffer.append(";\r\n");\r
+                fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
+                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                fileBuffer.append("  )\r\n\r\n");\r
+                fileBuffer.append("{\r\n");\r
+                fileBuffer.append("  return EFI_SUCCESS;\r\n");\r
+                fileBuffer.append("}\r\n\r\n");\r
+\r
+            } else {\r
+                for (int i = 0; i < entryPointList.length; i++) {\r
                     fileBuffer.append("EFI_STATUS\r\n");\r
                     fileBuffer.append("EFIAPI\r\n");\r
                     fileBuffer.append(entryPointList[i]);\r
                     fileBuffer.append(" (\r\n");\r
-                    fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");\r
-                    fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                    fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                    fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
                     fileBuffer.append("  );\r\n");\r
                     entryPointCount++;\r
-                } else {\r
-                    break;\r
                 }\r
-            }\r
-            fileBuffer\r
-                    .append("GLOBAL_REMOVE_IF_UNREFERENCED  const UINT8  _gDriverEntryPointCount = ");\r
-            fileBuffer.append(Integer.toString(entryPointCount));\r
-            fileBuffer.append(";\r\n");\r
-            fileBuffer\r
-                    .append("static BASE_LIBRARY_JUMP_BUFFER  mJumpContext;\r\n");\r
-            fileBuffer\r
-                    .append("static EFI_STATUS  mDriverEntryPointStatus = EFI_LOAD_ERROR;\r\n\r\n");\r
+                fileBuffer\r
+                .append("GLOBAL_REMOVE_IF_UNREFERENCED  const UINT8  _gDriverEntryPointCount = ");\r
+                fileBuffer.append(Integer.toString(entryPointCount));\r
+                fileBuffer.append(";\r\n");\r
+                fileBuffer\r
+                .append("static BASE_LIBRARY_JUMP_BUFFER  mJumpContext;\r\n");\r
+                fileBuffer\r
+                .append("static EFI_STATUS  mDriverEntryPointStatus = EFI_LOAD_ERROR;\r\n\r\n");\r
 \r
-            fileBuffer.append("EFI_STATUS\r\n");\r
-            fileBuffer.append("EFIAPI\r\n");\r
-            fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
-            fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");\r
-            fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
-            fileBuffer.append("  )\r\n\r\n");\r
-            fileBuffer.append("{\r\n");\r
+                fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
+                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                fileBuffer.append("  )\r\n\r\n");\r
+                fileBuffer.append("{\r\n");\r
 \r
-            for (int i = 0; i < entryPointList.length; i++) {\r
-                if (!entryPointList[i].equals("")) {\r
+\r
+                for (int i = 0; i < entryPointList.length; i++) {\r
                     fileBuffer\r
-                            .append("  if (SetJump (&mJumpContext) == 0) {\r\n");\r
+                    .append("  if (SetJump (&mJumpContext) == 0) {\r\n");\r
                     fileBuffer.append("    ExitDriver (");\r
                     fileBuffer.append(entryPointList[i]);\r
                     fileBuffer.append(" (ImageHandle, SystemTable));\r\n");\r
                     fileBuffer.append("    ASSERT (FALSE);\r\n");\r
                     fileBuffer.append("  }\r\n");\r
-                } else {\r
-                    break;\r
+\r
                 }\r
+                fileBuffer.append("  return mDriverEntryPointStatus;\r\n");\r
+                fileBuffer.append("}\r\n\r\n");\r
+\r
+                fileBuffer.append("VOID\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append("ExitDriver (\r\n");\r
+                fileBuffer.append("  IN EFI_STATUS  Status\n");\r
+                fileBuffer.append("  )\r\n\r\n");\r
+                fileBuffer.append("{\r\n");\r
+                fileBuffer\r
+                .append("  if (!EFI_ERROR (Status) || EFI_ERROR (mDriverEntryPointStatus)) {\r\n");\r
+                fileBuffer.append("    mDriverEntryPointStatus = Status;\r\n");\r
+                fileBuffer.append("  }\r\n");\r
+                fileBuffer.append("  LongJump (&mJumpContext, (UINTN)-1);\r\n");\r
+                fileBuffer.append("  ASSERT (FALSE);\r\n");\r
+                fileBuffer.append("}\r\n\r\n");\r
+\r
             }\r
-            fileBuffer.append("  return mDriverEntryPointStatus;\r\n");\r
-            fileBuffer.append("}\r\n\r\n");\r
 \r
-            fileBuffer.append("VOID\r\n");\r
-            fileBuffer.append("EFIAPI\r\n");\r
-            fileBuffer.append("ExitDriver (\r\n");\r
-            fileBuffer.append("  IN EFI_STATUS  Status\n");\r
-            fileBuffer.append("  )\r\n\r\n");\r
-            fileBuffer.append("{\r\n");\r
-            fileBuffer\r
-                    .append("  if (!EFI_ERROR (Status) || EFI_ERROR (mDriverEntryPointStatus)) {\r\n");\r
-            fileBuffer.append("    mDriverEntryPointStatus = Status;\r\n");\r
-            fileBuffer.append("  }\r\n");\r
-            fileBuffer.append("  LongJump (&mJumpContext, (UINTN)-1);\r\n");\r
-            fileBuffer.append("  ASSERT (FALSE);\r\n");\r
-            fileBuffer.append("}\r\n\r\n");\r
 \r
             //\r
             // Add "ModuleUnloadImage" for DxeSmmDriver module type;\r
             //\r
             entryPointList = SurfaceAreaQuery.getModuleUnloadImageArray();\r
+            entryPointList = CommonDefinition.remDupString(entryPointList);\r
             entryPointCount = 0;\r
-            \r
-            fileBuffer\r
-                    .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverUnloadImageCount = ");\r
-            fileBuffer.append(Integer.toString(entryPointCount));\r
-            fileBuffer.append(";\r\n\r\n");\r
 \r
             if (entryPointList != null) {\r
                 for (int i = 0; i < entryPointList.length; i++) {\r
-                    if (!entryPointList[i].equals("")) {\r
-                        fileBuffer.append("EFI_STATUS\r\n");\r
-                        fileBuffer.append("EFIAPI\r\n");\r
-                        fileBuffer.append(entryPointList[i]);\r
-                        fileBuffer.append(" (\r\n");\r
-                        fileBuffer\r
-                                .append("  EFI_HANDLE        ImageHandle\r\n");\r
-                        fileBuffer.append("  );\r\n");\r
-                    } else {\r
-                        break;\r
-                    }\r
+                    fileBuffer.append("EFI_STATUS\r\n");\r
+                    fileBuffer.append("EFIAPI\r\n");\r
+                    fileBuffer.append(entryPointList[i]);\r
+                    fileBuffer.append(" (\r\n");\r
+                    fileBuffer\r
+                    .append("  IN EFI_HANDLE        ImageHandle\r\n");\r
+                    fileBuffer.append("  );\r\n");\r
+                    entryPointCount++;\r
                 }\r
             }\r
 \r
+            fileBuffer\r
+            .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverUnloadImageCount = ");\r
+            fileBuffer.append(Integer.toString(entryPointCount));\r
+            fileBuffer.append(";\r\n\r\n");\r
+\r
             fileBuffer.append("EFI_STATUS\r\n");\r
             fileBuffer.append("EFIAPI\r\n");\r
             fileBuffer.append("ProcessModuleUnloadList (\r\n");\r
-            fileBuffer.append("  EFI_HANDLE  ImageHandle\r\n");\r
+            fileBuffer.append("  IN EFI_HANDLE  ImageHandle\r\n");\r
             fileBuffer.append("  )\r\n");\r
             fileBuffer.append("{\r\n");\r
 \r
@@ -924,7 +1005,11 @@ public class AutoGen {
                 fileBuffer.append("  EFI_STATUS  Status;\r\n\r\n");\r
                 fileBuffer.append("  Status = EFI_SUCCESS;\r\n\r\n");\r
                 for (int i = 0; i < entryPointList.length; i++) {\r
-                    if (!entryPointList[i].equals("")) {\r
+                    if (i == 0) {\r
+                        fileBuffer.append("     Status = ");\r
+                        fileBuffer.append(entryPointList[i]);\r
+                        fileBuffer.append("(ImageHandle);\r\n");\r
+                    } else {\r
                         fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");\r
                         fileBuffer.append("    ");\r
                         fileBuffer.append(entryPointList[i]);\r
@@ -934,8 +1019,6 @@ public class AutoGen {
                         fileBuffer.append(entryPointList[i]);\r
                         fileBuffer.append("(ImageHandle);\r\n");\r
                         fileBuffer.append("  }\r\n");\r
-                    } else {\r
-                        break;\r
                     }\r
                 }\r
                 fileBuffer.append("  return Status;\r\n");\r
@@ -950,135 +1033,133 @@ public class AutoGen {
         case CommonDefinition.ModuleTypeUefiApplication:\r
             entryPointCount = 0;\r
             fileBuffer.append("const UINT32 _gUefiDriverRevision = 0;\r\n");\r
-            for (int i = 0; i < entryPointList.length; i++) {\r
-                if (!entryPointList[i].equals("")) {\r
+            //\r
+            // If entry point is null, create a empty ProcessModuleEntryPointList function.\r
+            //\r
+            if (entryPointList == null || entryPointList.length == 0) {\r
+                fileBuffer\r
+                .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverEntryPointCount = 0;\r\n");\r
+                fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
+                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                fileBuffer.append("  )\r\n\r\n");\r
+                fileBuffer.append("{\r\n");\r
+                fileBuffer.append("  return EFI_SUCCESS;\r\n");\r
+                fileBuffer.append("}\r\n");\r
+\r
+            } else {\r
+                for (int i = 0; i < entryPointList.length; i++) {\r
+\r
                     fileBuffer.append("EFI_STATUS\r\n");\r
                     fileBuffer.append("EFIAPI\r\n");\r
                     fileBuffer.append(entryPointList[i]);\r
                     fileBuffer.append(" (\r\n");\r
-                    fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");\r
-                    fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                    fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                    fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
                     fileBuffer.append("  );\r\n");\r
                     entryPointCount++;\r
-                } else {\r
-                    break;\r
                 }\r
-            }\r
 \r
-            fileBuffer\r
-                    .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverEntryPointCount = ");\r
-            fileBuffer.append(Integer.toString(entryPointCount));\r
-            fileBuffer.append(";\r\n");\r
-            if (entryPointCount > 1) {\r
-                fileBuffer\r
-                        .append("static BASE_LIBRARY_JUMP_BUFFER  mJumpContext;\r\n");\r
                 fileBuffer\r
-                        .append("static EFI_STATUS  mDriverEntryPointStatus = EFI_LOAD_ERROR;\r\n");\r
-            }\r
-            fileBuffer.append("\n");\r
+                .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverEntryPointCount = ");\r
+                fileBuffer.append(Integer.toString(entryPointCount));\r
+                fileBuffer.append(";\r\n");\r
+                if (entryPointCount > 1) {\r
+                    fileBuffer\r
+                    .append("static BASE_LIBRARY_JUMP_BUFFER  mJumpContext;\r\n");\r
+                    fileBuffer\r
+                    .append("static EFI_STATUS  mDriverEntryPointStatus = EFI_LOAD_ERROR;\r\n");\r
+                }\r
+                fileBuffer.append("\n");\r
 \r
-            fileBuffer.append("EFI_STATUS\r\n");\r
-            fileBuffer.append("EFIAPI\r\n");\r
-            fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
-            fileBuffer.append("  EFI_HANDLE        ImageHandle,\r\n");\r
-            fileBuffer.append("  EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
-            fileBuffer.append("  )\r\n\r\n");\r
-            fileBuffer.append("{\r\n");\r
+                fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append("ProcessModuleEntryPointList (\r\n");\r
+                fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
+                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
+                fileBuffer.append("  )\r\n\r\n");\r
+                fileBuffer.append("{\r\n");\r
 \r
-            if (entryPointCount == 0) {\r
-                fileBuffer.append("  return EFI_SUCCESS;\r\n");\r
-            } else if (entryPointCount == 1) {\r
-                fileBuffer.append("  return (");\r
-                fileBuffer.append(entryPointList[0]);\r
-                fileBuffer.append(" (ImageHandle, SystemTable));\r\n");\r
-            } else {\r
-                for (int i = 0; i < entryPointList.length; i++) {\r
-                    if (!entryPointList[i].equals("")) {\r
-                        fileBuffer\r
-                                .append("  if (SetJump (&mJumpContext) == 0) {\r\n");\r
-                        fileBuffer.append("    ExitDriver (");\r
-                        fileBuffer.append(entryPointList[i]);\r
-                        fileBuffer.append(" (ImageHandle, SystemTable));\r\n");\r
-                        fileBuffer.append("    ASSERT (FALSE);\r\n");\r
-                        fileBuffer.append("  }\r\n");\r
-                    } else {\r
-                        break;\r
+                if (entryPointCount == 1) {\r
+                    fileBuffer.append("  return (");\r
+                    fileBuffer.append(entryPointList[0]);\r
+                    fileBuffer.append(" (ImageHandle, SystemTable));\r\n");\r
+                } else {\r
+                    for (int i = 0; i < entryPointList.length; i++) {\r
+                        if (!entryPointList[i].equals("")) {\r
+                            fileBuffer\r
+                            .append("  if (SetJump (&mJumpContext) == 0) {\r\n");\r
+                            fileBuffer.append("    ExitDriver (");\r
+                            fileBuffer.append(entryPointList[i]);\r
+                            fileBuffer.append(" (ImageHandle, SystemTable));\r\n");\r
+                            fileBuffer.append("    ASSERT (FALSE);\r\n");\r
+                            fileBuffer.append("  }\r\n");\r
+                        } else {\r
+                            break;\r
+                        }\r
                     }\r
+                    fileBuffer.append("  return mDriverEntryPointStatus;\r\n");\r
                 }\r
-                fileBuffer.append("  return mDriverEntryPointStatus;\r\n");\r
-            }\r
-            fileBuffer.append("}\r\n\r\n");\r
+                fileBuffer.append("}\r\n\r\n");\r
+\r
+                fileBuffer.append("VOID\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append("ExitDriver (\r\n");\r
+                fileBuffer.append("  IN EFI_STATUS  Status\r\n");\r
+                fileBuffer.append("  )\r\n\r\n");\r
+                fileBuffer.append("{\r\n");\r
+                if (entryPointCount <= 1) {\r
+                    fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");\r
+                    fileBuffer\r
+                    .append("    ProcessLibraryDestructorList (gImageHandle, gST);\r\n");\r
+                    fileBuffer.append("  }\r\n");\r
+                    fileBuffer\r
+                    .append("  gBS->Exit (gImageHandle, Status, 0, NULL);\r\n");\r
+                } else {\r
+                    fileBuffer\r
+                    .append("  if (!EFI_ERROR (Status) || EFI_ERROR (mDriverEntryPointStatus)) {\r\n");\r
+                    fileBuffer.append("    mDriverEntryPointStatus = Status;\r\n");\r
+                    fileBuffer.append("  }\r\n");\r
+                    fileBuffer.append("  LongJump (&mJumpContext, (UINTN)-1);\r\n");\r
+                    fileBuffer.append("  ASSERT (FALSE);\r\n");\r
+                }\r
+                fileBuffer.append("}\r\n\r\n");\r
 \r
-            fileBuffer.append("VOID\n");\r
-            fileBuffer.append("EFIAPI\n");\r
-            fileBuffer.append("ExitDriver (\r\n");\r
-            fileBuffer.append("  IN EFI_STATUS  Status\n");\r
-            fileBuffer.append("  )\r\n\r\n");\r
-            fileBuffer.append("{\r\n");\r
-            if (entryPointCount <= 1) {\r
-                fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");\r
-                fileBuffer\r
-                        .append("    ProcessLibraryDestructorList (gImageHandle, gST);\r\n");\r
-                fileBuffer.append("  }\r\n");\r
-                fileBuffer\r
-                        .append("  gBS->Exit (gImageHandle, Status, 0, NULL);\r\n");\r
-            } else {\r
-                fileBuffer\r
-                        .append("  if (!EFI_ERROR (Status) || EFI_ERROR (mDriverEntryPointStatus)) {\r\n");\r
-                fileBuffer.append("    mDriverEntryPointStatus = Status;\r\n");\r
-                fileBuffer.append("  }\r\n");\r
-                fileBuffer.append("  LongJump (&mJumpContext, (UINTN)-1);\r\n");\r
-                fileBuffer.append("  ASSERT (FALSE);\r\n");\r
             }\r
-            fileBuffer.append("}\r\n\r\n");\r
 \r
             //\r
             // Add ModuleUnloadImage for DxeDriver and UefiDriver module type.\r
             //\r
             entryPointList = SurfaceAreaQuery.getModuleUnloadImageArray();\r
+            //\r
+            // Remover duplicate unload entry point.\r
+            //\r
+            entryPointList = CommonDefinition.remDupString(entryPointList);\r
             entryPointCount = 0;\r
-            if (entryPointList != null) {\r
-                for (int i = 0; i < entryPointList.length; i++) {\r
-                    if (!entryPointList[i].equals("")) {\r
-                        fileBuffer.append("EFI_STATUS\r\n");\r
-                        fileBuffer.append("EFIAPI\r\n");\r
-                        fileBuffer.append(entryPointList[i]);\r
-                        fileBuffer.append(" (\r\n");\r
-                        fileBuffer\r
-                                .append("  EFI_HANDLE        ImageHandle\r\n");\r
-                        fileBuffer.append("  );\r\n");\r
-                        entryPointCount++;\r
-                    } else {\r
-                        break;\r
-                    }\r
+            if (entryPointList != null) {\r
+                for (int i = 0; i < entryPointList.length; i++) {\r
+                    fileBuffer.append("EFI_STATUS\r\n");\r
+                    fileBuffer.append("EFIAPI\r\n");\r
+                    fileBuffer.append(entryPointList[i]);\r
+                    fileBuffer.append(" (\r\n");\r
+                    fileBuffer\r
+                    .append("  IN EFI_HANDLE        ImageHandle\r\n");\r
+                    fileBuffer.append("  );\r\n");\r
+                    entryPointCount++;\r
                 }\r
             }\r
 \r
             fileBuffer\r
-                    .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverUnloadImageCount = ");\r
+            .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverUnloadImageCount = ");\r
             fileBuffer.append(Integer.toString(entryPointCount));\r
             fileBuffer.append(";\r\n\r\n");\r
 \r
-            if (entryPointList != null) {\r
-                for (int i = 0; i < entryPointList.length; i++) {\r
-                    if (!entryPointList[i].equals("")) {\r
-                        fileBuffer.append("EFI_STATUS\r\n");\r
-                        fileBuffer.append("EFIAPI\r\n");\r
-                        fileBuffer.append(entryPointList[i]);\r
-                        fileBuffer.append(" (\r\n");\r
-                        fileBuffer\r
-                                .append("  EFI_HANDLE        ImageHandle\r\n");\r
-                        fileBuffer.append("  );\r\n");\r
-                    } else {\r
-                        break;\r
-                    }\r
-                }\r
-            }\r
-\r
             fileBuffer.append("EFI_STATUS\n");\r
-            fileBuffer.append("EFIAPI\n");\r
+            fileBuffer.append("EFIAPI\r\n");\r
             fileBuffer.append("ProcessModuleUnloadList (\r\n");\r
-            fileBuffer.append("  EFI_HANDLE  ImageHandle\r\n");\r
+            fileBuffer.append("  IN EFI_HANDLE  ImageHandle\r\n");\r
             fileBuffer.append("  )\r\n");\r
             fileBuffer.append("{\r\n");\r
 \r
@@ -1092,7 +1173,11 @@ public class AutoGen {
                 fileBuffer.append("  EFI_STATUS  Status;\r\n\r\n");\r
                 fileBuffer.append("  Status = EFI_SUCCESS;\r\n\r\n");\r
                 for (int i = 0; i < entryPointList.length; i++) {\r
-                    if (!entryPointList[i].equals("")) {\r
+                    if (i == 0) {\r
+                        fileBuffer.append("  Status = ");\r
+                        fileBuffer.append(entryPointList[i]);\r
+                        fileBuffer.append("(ImageHandle);\r\n");\r
+                    } else {\r
                         fileBuffer.append("  if (EFI_ERROR (Status)) {\r\n");\r
                         fileBuffer.append("    ");\r
                         fileBuffer.append(entryPointList[i]);\r
@@ -1102,8 +1187,6 @@ public class AutoGen {
                         fileBuffer.append(entryPointList[i]);\r
                         fileBuffer.append("(ImageHandle);\r\n");\r
                         fileBuffer.append("  }\r\n");\r
-                    } else {\r
-                        break;\r
                     }\r
                 }\r
                 fileBuffer.append("  return Status;\r\n");\r
@@ -1115,10 +1198,10 @@ public class AutoGen {
 \r
     /**\r
      * PpiGuidToAutogenc\r
-     * \r
+     *\r
      * This function gets GUIDs from SPD file accrodeing to <PPIs> information\r
      * and write those GUIDs to AutoGen.c.\r
-     * \r
+     *\r
      * @param fileBuffer\r
      *            String Buffer for Autogen.c file.\r
      * @throws BuildException\r
@@ -1131,12 +1214,13 @@ public class AutoGen {
         // Get the all PPI adn PPI Notify from MSA file,\r
         // then add those PPI ,and PPI Notify name to list.\r
         //\r
-        String[] ppiList = SurfaceAreaQuery.getPpiArray(null);\r
+\r
+        String[] ppiList = SurfaceAreaQuery.getPpiArray(this.arch);\r
         for (int i = 0; i < ppiList.length; i++) {\r
             this.mPpiList.add(ppiList[i]);\r
         }\r
 \r
-        String[] ppiNotifyList = SurfaceAreaQuery.getPpiNotifyArray(null);\r
+        String[] ppiNotifyList = SurfaceAreaQuery.getPpiNotifyArray(this.arch);\r
         for (int i = 0; i < ppiNotifyList.length; i++) {\r
             this.mPpiList.add(ppiNotifyList[i]);\r
         }\r
@@ -1147,32 +1231,31 @@ public class AutoGen {
         Iterator ppiIterator = this.mPpiList.iterator();\r
         String ppiKeyWord = null;\r
         while (ppiIterator.hasNext()) {\r
-               ppiKeyWord = ppiIterator.next().toString();\r
-            cNameGuid = GlobalData\r
-                    .getPpiGuid(SurfaceAreaQuery.getDependencePkg(this.arch),\r
-                            ppiKeyWord);\r
+            ppiKeyWord = ppiIterator.next().toString();\r
+            cNameGuid = GlobalData.getPpiGuid(this.mDepPkgList, ppiKeyWord);\r
             if (cNameGuid != null) {\r
                 fileBuffer\r
-                        .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID ");\r
+                .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID ");\r
                 fileBuffer.append(cNameGuid[0]);\r
                 fileBuffer.append(" =     { ");\r
-                fileBuffer.append(cNameGuid[1]);\r
+                fileBuffer.append(CommonDefinition.formatGuidName(cNameGuid[1]));\r
                 fileBuffer.append(" } ;");\r
             } else {\r
-               //\r
+                //\r
                 // If can't find Ppi GUID declaration in every package\r
                 //\r
-                throw new AutoGenException("Can not find Ppi GUID [" + ppiKeyWord + "] declaration in every packages. ");\r
+                throw new AutoGenException("Can not find Ppi GUID ["\r
+                                           + ppiKeyWord + "] declaration in any SPD package!");\r
             }\r
         }\r
     }\r
 \r
     /**\r
      * ProtocolGuidToAutogenc\r
-     * \r
+     *\r
      * This function gets GUIDs from SPD file accrodeing to <Protocol>\r
      * information and write those GUIDs to AutoGen.c.\r
-     * \r
+     *\r
      * @param fileBuffer\r
      *            String Buffer for Autogen.c file.\r
      * @throws BuildException\r
@@ -1191,7 +1274,7 @@ public class AutoGen {
         }\r
 \r
         String[] protocolNotifyList = SurfaceAreaQuery\r
-                .getProtocolNotifyArray(this.arch);\r
+                                      .getProtocolNotifyArray(this.arch);\r
 \r
         for (int i = 0; i < protocolNotifyList.length; i++) {\r
             this.mProtocolList.add(protocolNotifyList[i]);\r
@@ -1200,41 +1283,43 @@ public class AutoGen {
         //\r
         // Get the NAME and GUID from dependence SPD and write to Autogen.c\r
         //\r
-        Iterator protocolIterator = this.mPpiList.iterator();\r
+        Iterator protocolIterator = this.mProtocolList.iterator();\r
         String protocolKeyWord = null;\r
+\r
+\r
         while (protocolIterator.hasNext()) {\r
-               protocolKeyWord = protocolIterator.next().toString();\r
-            cNameGuid = GlobalData.getProtocolGuid(SurfaceAreaQuery\r
-                    .getDependencePkg(this.arch), protocolKeyWord);\r
+            protocolKeyWord = protocolIterator.next().toString();\r
+            cNameGuid = GlobalData.getProtocolGuid(this.mDepPkgList, protocolKeyWord);\r
             if (cNameGuid != null) {\r
                 fileBuffer\r
-                        .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID ");\r
+                .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID ");\r
                 fileBuffer.append(cNameGuid[0]);\r
                 fileBuffer.append(" =     { ");\r
-                fileBuffer.append(cNameGuid[1]);\r
+                fileBuffer.append(CommonDefinition.formatGuidName(cNameGuid[1]));\r
                 fileBuffer.append(" } ;");\r
             } else {\r
-               //\r
+                //\r
                 // If can't find protocol GUID declaration in every package\r
                 //\r
-                throw new BuildException("Can not find protocol Guid [" + cNameGuid + "] declaration in every packages. ");\r
+                throw new BuildException("Can not find protocol Guid ["\r
+                                         + protocolKeyWord + "] declaration in any SPD package!");\r
             }\r
         }\r
     }\r
 \r
     /**\r
      * GuidGuidToAutogenc\r
-     * \r
+     *\r
      * This function gets GUIDs from SPD file accrodeing to <Guids> information\r
      * and write those GUIDs to AutoGen.c.\r
-     * \r
+     *\r
      * @param fileBuffer\r
      *            String Buffer for Autogen.c file.\r
-     * \r
+     *\r
      */\r
     void GuidGuidToAutogenC(StringBuffer fileBuffer) throws AutoGenException {\r
         String[] cNameGuid = null;\r
-        String   guidKeyWord = null;\r
+        String guidKeyWord = null;\r
 \r
         String[] guidList = SurfaceAreaQuery.getGuidEntryArray(this.arch);\r
 \r
@@ -1242,24 +1327,25 @@ public class AutoGen {
             this.mGuidList.add(guidList[i]);\r
         }\r
 \r
+\r
         Iterator guidIterator = this.mGuidList.iterator();\r
         while (guidIterator.hasNext()) {\r
-               guidKeyWord = guidIterator.next().toString();\r
-            cNameGuid = GlobalData.getGuid(SurfaceAreaQuery\r
-                    .getDependencePkg(this.arch), guidKeyWord);\r
-            \r
+            guidKeyWord = guidIterator.next().toString();\r
+            cNameGuid = GlobalData.getGuid(this.mDepPkgList, guidKeyWord);\r
+\r
             if (cNameGuid != null) {\r
                 fileBuffer\r
-                        .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID ");\r
+                .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED EFI_GUID ");\r
                 fileBuffer.append(cNameGuid[0]);\r
                 fileBuffer.append(" =     { ");\r
-                fileBuffer.append(cNameGuid[1]);\r
+                fileBuffer.append(CommonDefinition.formatGuidName(cNameGuid[1]));\r
                 fileBuffer.append("} ;");\r
-            }else {\r
-               //\r
+            } else {\r
+                //\r
                 // If can't find GUID declaration in every package\r
                 //\r
-                throw new AutoGenException("Can not find Guid [" + guidKeyWord + "] declaration in every packages. ");\r
+                throw new AutoGenException("Can not find Guid [" + guidKeyWord\r
+                                           + "] declaration in any SPD package. ");\r
             }\r
 \r
         }\r
@@ -1267,129 +1353,27 @@ public class AutoGen {
 \r
     /**\r
      * LibInstanceToAutogenC\r
-     * \r
+     *\r
      * This function adds dependent library instance to autogen.c,which\r
      * includeing library's constructor, destructor, and library dependent ppi,\r
      * protocol, guid, pcd information.\r
-     * \r
+     *\r
      * @param fileBuffer\r
      *            String buffer for AutoGen.c\r
      * @throws BuildException\r
      */\r
     void LibInstanceToAutogenC(StringBuffer fileBuffer) throws BuildException {\r
-        int index;\r
-\r
-        String moduleType = SurfaceAreaQuery.getModuleType();\r
-        List<String> libConstructList = new ArrayList<String>();\r
-        List<String> libDestructList = new ArrayList<String>();\r
-\r
-        String libConstructName = null;\r
-        String libDestructName = null;\r
-        ModuleIdentification[] libraryIdList = SurfaceAreaQuery.getLibraryInstance(this.arch);\r
-\r
         try {\r
-            if (libraryIdList != null) {\r
-                //\r
-                // Reorder library instance sequence.\r
-                //\r
-                AutogenLibOrder libOrder = new AutogenLibOrder(libraryIdList, this.arch);\r
-                List<ModuleIdentification> orderList = libOrder.orderLibInstance();\r
-\r
-                if (orderList != null) {\r
-                    //\r
-                    // Process library instance one by one.\r
-                    //\r
-                    for (int i = 0; i < orderList.size(); i++) {\r
-\r
-                        //\r
-                        // Get library instance basename.\r
-                        //\r
-                        ModuleIdentification libInstanceId = orderList.get(i);\r
-\r
-                        //\r
-                        // Get override map\r
-                        //\r
-                        Map<String, XmlObject> libDoc = GlobalData\r
-                                .getDoc(libInstanceId, this.arch);\r
-                        SurfaceAreaQuery.push(libDoc);\r
-\r
-                        //\r
-                        // Get <PPis>, <Protocols>, <Guids> list of this library\r
-                        // instance.\r
-                        //\r
-                        String[] ppiList = SurfaceAreaQuery\r
-                                .getPpiArray(null);\r
-                        String[] ppiNotifyList = SurfaceAreaQuery\r
-                                .getPpiNotifyArray(null);\r
-                        String[] protocolList = SurfaceAreaQuery\r
-                                .getProtocolArray(null);\r
-                        String[] protocolNotifyList = SurfaceAreaQuery\r
-                                .getProtocolNotifyArray(null);\r
-                        String[] guidList = SurfaceAreaQuery\r
-                                .getGuidEntryArray(null);\r
-\r
-                        //\r
-                        // Add those ppi, protocol, guid in global ppi,\r
-                        // protocol, guid\r
-                        // list.\r
-                        //\r
-                        for (index = 0; index < ppiList.length; index++) {\r
-                            this.mPpiList.add(ppiList[index]);\r
-                        }\r
-                        \r
-                        for (index = 0; index < ppiNotifyList.length; index++) {\r
-                            this.mPpiList.add(ppiNotifyList[index]);\r
-                        }\r
-                        \r
-                        for (index = 0; index < protocolList.length; index++) {\r
-                            this.mProtocolList.add(protocolList[index]);\r
-                        }\r
-                        \r
-                        for (index = 0; index < protocolNotifyList.length; index++) {\r
-                            this.mProtocolList.add(protocolNotifyList[index]);\r
-                        }\r
-                        \r
-                        for (index = 0; index < guidList.length; index++) {\r
-                            this.mGuidList.add(guidList[index]);   \r
-                        }\r
-\r
-                        //\r
-                        // If not yet parse this library instance's constructor\r
-                        // element,parse it.\r
-                        //\r
-                        libConstructName = SurfaceAreaQuery\r
-                                    .getLibConstructorName();\r
-                        libDestructName = SurfaceAreaQuery\r
-                                    .getLibDestructorName();\r
-\r
-                        SurfaceAreaQuery.pop();\r
-                        //\r
-                        // Add dependent library instance constructor function.\r
-                        //\r
-                        if (libConstructName != null) {\r
-                            libConstructList.add(libConstructName);\r
-                        }\r
-                        //\r
-                        // Add dependent library instance destructor fuction.\r
-                        //\r
-                        if (libDestructName != null) {\r
-                            libDestructList.add(libDestructName);\r
-                        }\r
-                    }\r
-\r
-                }\r
-\r
-                //\r
-                // Add library constructor to AutoGen.c\r
-                //\r
-                LibConstructorToAutogenC(libConstructList, moduleType,\r
-                        fileBuffer/* autogenC */);\r
-                //\r
-                // Add library destructor to AutoGen.c\r
-                //\r
-                LibDestructorToAutogenC(libDestructList, moduleType, fileBuffer/* autogenC */);\r
-            }\r
-\r
+            String moduleType = this.moduleId.getModuleType();\r
+            //\r
+            // Add library constructor to AutoGen.c\r
+            //\r
+            LibConstructorToAutogenC(libConstructList, moduleType,\r
+                                     fileBuffer/* autogenC */);\r
+            //\r
+            // Add library destructor to AutoGen.c\r
+            //\r
+            LibDestructorToAutogenC(libDestructList, moduleType, fileBuffer/* autogenC */);\r
         } catch (Exception e) {\r
             throw new BuildException(e.getMessage());\r
         }\r
@@ -1397,10 +1381,10 @@ public class AutoGen {
 \r
     /**\r
      * LibConstructorToAutogenc\r
-     * \r
+     *\r
      * This function writes library constructor list to AutoGen.c. The library\r
      * constructor's parameter and return value depend on module type.\r
-     * \r
+     *\r
      * @param libInstanceList\r
      *            List of library construct name.\r
      * @param moduleType\r
@@ -1410,7 +1394,7 @@ public class AutoGen {
      * @throws Exception\r
      */\r
     void LibConstructorToAutogenC(List<String> libInstanceList,\r
-            String moduleType, StringBuffer fileBuffer) throws Exception {\r
+                                  String moduleType, StringBuffer fileBuffer) throws Exception {\r
         boolean isFirst = true;\r
 \r
         //\r
@@ -1421,6 +1405,7 @@ public class AutoGen {
             switch (CommonDefinition.getModuleType(moduleType)) {\r
             case CommonDefinition.ModuleTypeBase:\r
                 fileBuffer.append("RETURN_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append(libInstanceList.get(i));\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer.append("  VOID\r\n");\r
@@ -1430,12 +1415,13 @@ public class AutoGen {
             case CommonDefinition.ModuleTypePeiCore:\r
             case CommonDefinition.ModuleTypePeim:\r
                 fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append(libInstanceList.get(i));\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer\r
-                        .append("  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r\n");\r
+                .append("  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r\n");\r
                 fileBuffer\r
-                        .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");\r
+                .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");\r
                 fileBuffer.append("  );\r\n");\r
                 break;\r
 \r
@@ -1447,6 +1433,7 @@ public class AutoGen {
             case CommonDefinition.ModuleTypeUefiDriver:\r
             case CommonDefinition.ModuleTypeUefiApplication:\r
                 fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append(libInstanceList.get(i));\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
@@ -1460,6 +1447,7 @@ public class AutoGen {
         // Add ProcessLibraryConstructorList in AutoGen.c\r
         //\r
         fileBuffer.append("VOID\r\n");\r
+        fileBuffer.append("EFIAPI\r\n");\r
         fileBuffer.append("ProcessLibraryConstructorList (\r\n");\r
         switch (CommonDefinition.getModuleType(moduleType)) {\r
         case CommonDefinition.ModuleTypeBase:\r
@@ -1470,7 +1458,7 @@ public class AutoGen {
         case CommonDefinition.ModuleTypePeim:\r
             fileBuffer.append("  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r\n");\r
             fileBuffer\r
-                    .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");\r
+            .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");\r
             break;\r
 \r
         case CommonDefinition.ModuleTypeDxeCore:\r
@@ -1487,10 +1475,16 @@ public class AutoGen {
 \r
         fileBuffer.append("  )\r\n");\r
         fileBuffer.append("{\r\n");\r
-\r
+        //\r
+        // If no constructor function, return EFI_SUCCESS.\r
+        //\r
+        //if (libInstanceList.size() == 0){\r
+        //   fileBuffer.append("  return EFI_SUCCESS;\r\n");\r
+        //}\r
         for (int i = 0; i < libInstanceList.size(); i++) {\r
             if (isFirst) {\r
                 fileBuffer.append("  EFI_STATUS  Status;\r\n");\r
+                fileBuffer.append("  Status = EFI_SUCCESS;\r\n");\r
                 fileBuffer.append("\r\n");\r
                 isFirst = false;\r
             }\r
@@ -1518,6 +1512,8 @@ public class AutoGen {
                 fileBuffer.append(libInstanceList.get(i));\r
                 fileBuffer.append(" (ImageHandle, SystemTable);\r\n");\r
                 break;\r
+            default:\r
+                EdkLog.log(EdkLog.EDK_INFO,"Autogen doesn't know how to deal with module type - " + moduleType + "!");\r
             }\r
             fileBuffer.append("  ASSERT_EFI_ERROR (Status);\r\n");\r
         }\r
@@ -1526,10 +1522,10 @@ public class AutoGen {
 \r
     /**\r
      * LibDestructorToAutogenc\r
-     * \r
+     *\r
      * This function writes library destructor list to AutoGen.c. The library\r
      * destructor's parameter and return value depend on module type.\r
-     * \r
+     *\r
      * @param libInstanceList\r
      *            List of library destructor name.\r
      * @param moduleType\r
@@ -1539,12 +1535,13 @@ public class AutoGen {
      * @throws Exception\r
      */\r
     void LibDestructorToAutogenC(List<String> libInstanceList,\r
-            String moduleType, StringBuffer fileBuffer) throws Exception {\r
+                                 String moduleType, StringBuffer fileBuffer) throws Exception {\r
         boolean isFirst = true;\r
         for (int i = 0; i < libInstanceList.size(); i++) {\r
             switch (CommonDefinition.getModuleType(moduleType)) {\r
             case CommonDefinition.ModuleTypeBase:\r
-                fileBuffer.append("RETURN_STATUS\n");\r
+                fileBuffer.append("RETURN_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append(libInstanceList.get(i));\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer.append("  VOID\r\n");\r
@@ -1553,12 +1550,13 @@ public class AutoGen {
             case CommonDefinition.ModuleTypePeiCore:\r
             case CommonDefinition.ModuleTypePeim:\r
                 fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append(libInstanceList.get(i));\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer\r
-                        .append("  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r\n");\r
+                .append("  IN EFI_FFS_FILE_HEADER       *FfsHeader,\r\n");\r
                 fileBuffer\r
-                        .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");\r
+                .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");\r
                 fileBuffer.append("  );\r\n");\r
                 break;\r
             case CommonDefinition.ModuleTypeDxeCore:\r
@@ -1569,6 +1567,7 @@ public class AutoGen {
             case CommonDefinition.ModuleTypeUefiDriver:\r
             case CommonDefinition.ModuleTypeUefiApplication:\r
                 fileBuffer.append("EFI_STATUS\r\n");\r
+                fileBuffer.append("EFIAPI\r\n");\r
                 fileBuffer.append(libInstanceList.get(i));\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
@@ -1594,15 +1593,20 @@ public class AutoGen {
         case CommonDefinition.ModuleTypeUefiDriver:\r
         case CommonDefinition.ModuleTypeUefiApplication:\r
             fileBuffer.append("VOID\r\n");\r
+            fileBuffer.append("EFIAPI\r\n");\r
             fileBuffer.append("ProcessLibraryDestructorList (\r\n");\r
             fileBuffer.append("  IN EFI_HANDLE        ImageHandle,\r\n");\r
             fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
             fileBuffer.append("  )\r\n");\r
             fileBuffer.append("{\r\n");\r
+            //\r
+            // If no library destructor function, return EFI_SUCCESS.\r
+            //\r
 \r
             for (int i = 0; i < libInstanceList.size(); i++) {\r
                 if (isFirst) {\r
                     fileBuffer.append("  EFI_STATUS  Status;\r\n");\r
+                    fileBuffer.append("  Status = EFI_SUCCESS;\r\n");\r
                     fileBuffer.append("\r\n");\r
                     isFirst = false;\r
                 }\r
@@ -1618,15 +1622,15 @@ public class AutoGen {
 \r
     /**\r
      * ExternsDriverBindingToAutoGenC\r
-     * \r
+     *\r
      * This function is to write DRIVER_BINDING, COMPONENT_NAME,\r
      * DRIVER_CONFIGURATION, DRIVER_DIAGNOSTIC in AutoGen.c.\r
-     * \r
+     *\r
      * @param fileBuffer\r
      *            String buffer for AutoGen.c\r
      */\r
     void ExternsDriverBindingToAutoGenC(StringBuffer fileBuffer)\r
-            throws BuildException {\r
+    throws BuildException {\r
 \r
         //\r
         // Check what <extern> contains. And the number of following elements\r
@@ -1666,7 +1670,7 @@ public class AutoGen {
         if (compNamList != null && compNamList.length != 0) {\r
             if (drvBindList.length != compNamList.length) {\r
                 throw new BuildException(\r
-                        "Different number of Driver Binding and Component Name protocols!");\r
+                                        "Different number of Driver Binding and Component Name protocols!");\r
             }\r
 \r
             BitMask |= 0x01;\r
@@ -1683,7 +1687,7 @@ public class AutoGen {
         if (compConfList != null && compConfList.length != 0) {\r
             if (drvBindList.length != compConfList.length) {\r
                 throw new BuildException(\r
-                        "Different number of Driver Binding and Driver Configuration protocols!");\r
+                                        "Different number of Driver Binding and Driver Configuration protocols!");\r
             }\r
 \r
             BitMask |= 0x02;\r
@@ -1700,7 +1704,7 @@ public class AutoGen {
         if (compDiagList != null && compDiagList.length != 0) {\r
             if (drvBindList.length != compDiagList.length) {\r
                 throw new BuildException(\r
-                        "Different number of Driver Binding and Driver Configuration protocols!");\r
+                                        "Different number of Driver Binding and Driver Diagnosis protocols!");\r
             }\r
 \r
             BitMask |= 0x04;\r
@@ -1715,7 +1719,7 @@ public class AutoGen {
         // Write driver module protocol bitmask.\r
         //\r
         fileBuffer\r
-                .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverModelProtocolBitmask = ");\r
+        .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINT8  _gDriverModelProtocolBitmask = ");\r
         fileBuffer.append(Integer.toString(BitMask));\r
         fileBuffer.append(";\r\n");\r
 \r
@@ -1723,7 +1727,7 @@ public class AutoGen {
         // Write driver module protocol list entry\r
         //\r
         fileBuffer\r
-                .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINTN  _gDriverModelProtocolListEntries = ");\r
+        .append("GLOBAL_REMOVE_IF_UNREFERENCED const UINTN  _gDriverModelProtocolListEntries = ");\r
 \r
         fileBuffer.append(Integer.toString(drvBindList.length));\r
         fileBuffer.append(";\r\n");\r
@@ -1732,7 +1736,7 @@ public class AutoGen {
         // Write drive module protocol list to autogen.c\r
         //\r
         fileBuffer\r
-                .append("GLOBAL_REMOVE_IF_UNREFERENCED const EFI_DRIVER_MODEL_PROTOCOL_LIST  _gDriverModelProtocolList[] = {");\r
+        .append("GLOBAL_REMOVE_IF_UNREFERENCED const EFI_DRIVER_MODEL_PROTOCOL_LIST  _gDriverModelProtocolList[] = {");\r
         for (int i = 0; i < drvBindList.length; i++) {\r
             if (i != 0) {\r
                 fileBuffer.append(",");\r
@@ -1772,25 +1776,41 @@ public class AutoGen {
 \r
     /**\r
      * ExternCallBackToAutoGenC\r
-     * \r
+     *\r
      * This function adds <SetVirtualAddressMapCallBack> and\r
      * <ExitBootServicesCallBack> infomation to AutoGen.c\r
-     * \r
+     *\r
      * @param fileBuffer\r
      *            String buffer for AutoGen.c\r
      * @throws BuildException\r
      */\r
     void ExternCallBackToAutoGenC(StringBuffer fileBuffer)\r
-            throws BuildException {\r
-        String[] setVirtualList = SurfaceAreaQuery\r
-                .getSetVirtualAddressMapCallBackArray();\r
-        String[] exitBootList = SurfaceAreaQuery\r
-                .getExitBootServicesCallBackArray();\r
-        String moduleType = SurfaceAreaQuery.getModuleType();\r
+    throws BuildException {\r
+        //\r
+        // Collect module's <SetVirtualAddressMapCallBack> and\r
+        // <ExitBootServiceCallBack> and add to setVirtualAddList\r
+        //  exitBootServiceList.\r
+        //\r
+        String[] setVirtuals = SurfaceAreaQuery.getSetVirtualAddressMapCallBackArray();\r
+        String[] exitBoots = SurfaceAreaQuery.getExitBootServicesCallBackArray();\r
+        if (setVirtuals != null) {\r
+            for (int j = 0; j < setVirtuals.length; j++) {\r
+                this.setVirtalAddList.add(setVirtuals[j]);\r
+            }\r
+        }\r
+        if (exitBoots != null) {\r
+            for (int k = 0; k < exitBoots.length; k++) {\r
+                this.exitBootServiceList.add(exitBoots[k]);\r
+            }\r
+        }\r
+        //\r
+        //  Add c code in autogen.c which relate to <SetVirtualAddressMapCallBack>\r
+        //  and <ExitBootServicesCallBack>\r
+        //\r
+        String moduleType = this.moduleId.getModuleType();\r
         boolean UefiOrDxeModule = false;\r
         int Count = 0;\r
         int i;\r
-\r
         switch (CommonDefinition.getModuleType(moduleType)) {\r
         case CommonDefinition.ModuleTypeDxeDriver:\r
         case CommonDefinition.ModuleTypeDxeRuntimeDriver:\r
@@ -1803,16 +1823,16 @@ public class AutoGen {
             //\r
             UefiOrDxeModule = true;\r
             fileBuffer\r
-                    .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED  const UINTN _gDriverSetVirtualAddressMapEventCount = ");\r
+            .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED  const UINTN _gDriverSetVirtualAddressMapEventCount = ");\r
 \r
             //\r
             // If the list is not valid or has no entries set count to zero else\r
             // set count to the number of valid entries\r
             //\r
             Count = 0;\r
-            if (setVirtualList != null) {\r
-                for (i = 0; i < setVirtualList.length; i++) {\r
-                    if (setVirtualList[i].equalsIgnoreCase("")) {\r
+            if (this.setVirtalAddList != null) {\r
+                for (i = 0; i < this.setVirtalAddList.size(); i++) {\r
+                    if (this.setVirtalAddList.get(i).equalsIgnoreCase("")) {\r
                         break;\r
                     }\r
                 }\r
@@ -1826,13 +1846,13 @@ public class AutoGen {
             break;\r
         }\r
 \r
-        if (setVirtualList == null) {\r
+        if (this.setVirtalAddList == null || this.setVirtalAddList.size() == 0) {\r
             if (UefiOrDxeModule) {\r
                 //\r
                 // No data so make a NULL list\r
                 //\r
                 fileBuffer\r
-                        .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverSetVirtualAddressMapEvent[] = {\r\n");\r
+                .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverSetVirtualAddressMapEvent[] = {\r\n");\r
                 fileBuffer.append("  NULL\r\n");\r
                 fileBuffer.append("};\r\n\r\n");\r
             }\r
@@ -1840,13 +1860,13 @@ public class AutoGen {
             //\r
             // Write SetVirtualAddressMap function definition.\r
             //\r
-            for (i = 0; i < setVirtualList.length; i++) {\r
-                if (setVirtualList[i].equalsIgnoreCase("")) {\r
+            for (i = 0; i < this.setVirtalAddList.size(); i++) {\r
+                if (this.setVirtalAddList.get(i).equalsIgnoreCase("")) {\r
                     break;\r
                 }\r
                 fileBuffer.append("VOID\r\n");\r
-                fileBuffer.append("EFIAPI\n");\r
-                fileBuffer.append(setVirtualList[i]);\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append(this.setVirtalAddList.get(i));\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer.append("  IN EFI_EVENT  Event,\r\n");\r
                 fileBuffer.append("  IN VOID       *Context\r\n");\r
@@ -1857,9 +1877,9 @@ public class AutoGen {
             // Write SetVirtualAddressMap entry point array.\r
             //\r
             fileBuffer\r
-                    .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverSetVirtualAddressMapEvent[] = {");\r
-            for (i = 0; i < setVirtualList.length; i++) {\r
-                if (setVirtualList[i].equalsIgnoreCase("")) {\r
+            .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverSetVirtualAddressMapEvent[] = {");\r
+            for (i = 0; i < this.setVirtalAddList.size(); i++) {\r
+                if (this.setVirtalAddList.get(i).equalsIgnoreCase("")) {\r
                     break;\r
                 }\r
 \r
@@ -1869,10 +1889,15 @@ public class AutoGen {
                     fileBuffer.append(",\r\n  ");\r
                 }\r
 \r
-                fileBuffer.append(setVirtualList[i]);\r
+                fileBuffer.append(this.setVirtalAddList.get(i));\r
             }\r
-            if (Count == 0) {\r
-                fileBuffer.append("\r\n  NULL");\r
+            //\r
+            //  If module is not DXE_DRIVER, DXE_RUNTIME_DIRVER, UEFI_DRIVER\r
+            //  UEFI_APPLICATION and DXE_SAL_DRIVER add the NULL at the end of\r
+            //  _gDriverSetVirtualAddressMapEvent list.\r
+            //\r
+            if (!UefiOrDxeModule) {\r
+                fileBuffer.append(",\r\n  NULL");\r
             }\r
             fileBuffer.append("\r\n};\r\n\r\n");\r
         }\r
@@ -1882,34 +1907,32 @@ public class AutoGen {
             // Entry point lib for these module types needs to know the count.\r
             //\r
             fileBuffer\r
-                    .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED  const UINTN _gDriverExitBootServicesEventCount = ");\r
+            .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED  const UINTN _gDriverExitBootServicesEventCount = ");\r
 \r
             //\r
             // If the list is not valid or has no entries set count to zero else\r
             // set count to the number of valid entries.\r
             //\r
             Count = 0;\r
-            if (exitBootList != null) {\r
-                if (setVirtualList != null) {\r
-                    for (i = 0; i < exitBootList.length; i++) {\r
-                        if (exitBootList[i].equalsIgnoreCase("")) {\r
-                            break;\r
-                        }\r
+            if (this.exitBootServiceList != null) {\r
+                for (i = 0; i < this.exitBootServiceList.size(); i++) {\r
+                    if (this.exitBootServiceList.get(i).equalsIgnoreCase("")) {\r
+                        break;\r
                     }\r
-                    Count = i;\r
                 }\r
+                Count = i;\r
             }\r
             fileBuffer.append(Integer.toString(Count));\r
             fileBuffer.append(";\r\n\r\n");\r
         }\r
 \r
-        if (exitBootList == null) {\r
+        if (this.exitBootServiceList == null || this.exitBootServiceList.size() == 0) {\r
             if (UefiOrDxeModule) {\r
                 //\r
                 // No data so make a NULL list.\r
                 //\r
                 fileBuffer\r
-                        .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverExitBootServicesEvent[] = {\r\n");\r
+                .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverExitBootServicesEvent[] = {\r\n");\r
                 fileBuffer.append("  NULL\r\n");\r
                 fileBuffer.append("};\r\n\r\n");\r
             }\r
@@ -1917,14 +1940,14 @@ public class AutoGen {
             //\r
             // Write DriverExitBootServices function definition.\r
             //\r
-            for (i = 0; i < exitBootList.length; i++) {\r
-                if (exitBootList[i].equalsIgnoreCase("")) {\r
+            for (i = 0; i < this.exitBootServiceList.size(); i++) {\r
+                if (this.exitBootServiceList.get(i).equalsIgnoreCase("")) {\r
                     break;\r
                 }\r
 \r
                 fileBuffer.append("VOID\r\n");\r
-                fileBuffer.append("EFIAPI\n");\r
-                fileBuffer.append(exitBootList[i]);\r
+                fileBuffer.append("EFIAPI\r\n");\r
+                fileBuffer.append(this.exitBootServiceList.get(i));\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer.append("  IN EFI_EVENT  Event,\r\n");\r
                 fileBuffer.append("  IN VOID       *Context\r\n");\r
@@ -1935,9 +1958,9 @@ public class AutoGen {
             // Write DriverExitBootServices entry point array.\r
             //\r
             fileBuffer\r
-                    .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverExitBootServicesEvent[] = {");\r
-            for (i = 0; i < exitBootList.length; i++) {\r
-                if (exitBootList[i].equalsIgnoreCase("")) {\r
+            .append("\r\nGLOBAL_REMOVE_IF_UNREFERENCED const EFI_EVENT_NOTIFY _gDriverExitBootServicesEvent[] = {");\r
+            for (i = 0; i < this.exitBootServiceList.size(); i++) {\r
+                if (this.exitBootServiceList.get(i).equalsIgnoreCase("")) {\r
                     break;\r
                 }\r
 \r
@@ -1946,14 +1969,181 @@ public class AutoGen {
                 } else {\r
                     fileBuffer.append(",\r\n  ");\r
                 }\r
-                fileBuffer.append(exitBootList[i]);\r
+                fileBuffer.append(this.exitBootServiceList.get(i));\r
             }\r
-            if (Count == 0) {\r
-                fileBuffer.append("\r\n  NULL");\r
+            if (!UefiOrDxeModule) {\r
+                fileBuffer.append(",\r\n  NULL");\r
             }\r
             fileBuffer.append("\r\n};\r\n\r\n");\r
         }\r
 \r
     }\r
 \r
-}
\ No newline at end of file
+    private void copyFlashMapHToDebugDir() throws  AutoGenException{\r
+\r
+        File inFile = new File(fvDir + File.separatorChar + CommonDefinition.flashMapH);\r
+        int size = (int)inFile.length();\r
+        byte[] buffer = new byte[size];\r
+        File outFile = new File (this.outputPath + File.separatorChar + CommonDefinition.tianoR8FlashMapH);\r
+        //\r
+        //  If TianoR8FlashMap.h existed and the flashMap.h don't change,\r
+        //  do nothing.\r
+        //\r
+        if ((!outFile.exists()) ||(inFile.lastModified() - outFile.lastModified()) >= 0) {\r
+            try {\r
+                if (inFile.exists()) {\r
+                    FileInputStream fis = new FileInputStream (inFile);\r
+                    fis.read(buffer);\r
+                    FileOutputStream fos = new FileOutputStream(outFile);\r
+                    fos.write(buffer);\r
+                    fis.close();\r
+                    fos.close();\r
+                } else {\r
+                    throw new AutoGenException("The file, flashMap.h doesn't exist!");\r
+                }\r
+            } catch (Exception e) {\r
+                throw new AutoGenException(e.getMessage());\r
+            }\r
+        }\r
+    }\r
+\r
+    /**\r
+    *This function first order the library instances, then collect\r
+    *library instance 's PPI, Protocol, GUID,\r
+    *SetVirtalAddressMapCallBack, ExitBootServiceCallBack, and\r
+    *Destructor, Constructor.\r
+    *\r
+    **/\r
+    private void collectLibInstanceInfo(){\r
+        int index;\r
+\r
+        String moduleType = SurfaceAreaQuery.getModuleType();\r
+        String libConstructName = null;\r
+        String libDestructName = null;\r
+        String[] setVirtuals = null;\r
+        String[] exitBoots = null;\r
+\r
+        ModuleIdentification[] libraryIdList = SurfaceAreaQuery\r
+                                               .getLibraryInstance(this.arch);\r
+        try {\r
+            if (libraryIdList != null) {\r
+                //\r
+                // Reorder library instance sequence.\r
+                //\r
+                AutogenLibOrder libOrder = new AutogenLibOrder(libraryIdList,\r
+                                                               this.arch);\r
+                List<ModuleIdentification> orderList = libOrder\r
+                                                       .orderLibInstance();\r
+\r
+                if (orderList != null) {\r
+                    //\r
+                    // Process library instance one by one.\r
+                    //\r
+                    for (int i = 0; i < orderList.size(); i++) {\r
+\r
+                        //\r
+                        // Get library instance basename.\r
+                        //\r
+                        ModuleIdentification libInstanceId = orderList.get(i);\r
+\r
+                        //\r
+                        // Get override map\r
+                        //\r
+\r
+                        Map<String, XmlObject> libDoc = GlobalData.getDoc(\r
+                                                                         libInstanceId, this.arch);\r
+                        SurfaceAreaQuery.push(libDoc);\r
+                        //\r
+                        // Get <PPis>, <Protocols>, <Guids> list of this library\r
+                        // instance.\r
+                        //\r
+                        String[] ppiList = SurfaceAreaQuery.getPpiArray(this.arch);\r
+                        String[] ppiNotifyList = SurfaceAreaQuery\r
+                                                 .getPpiNotifyArray(this.arch);\r
+                        String[] protocolList = SurfaceAreaQuery\r
+                                                .getProtocolArray(this.arch);\r
+                        String[] protocolNotifyList = SurfaceAreaQuery\r
+                                                      .getProtocolNotifyArray(this.arch);\r
+                        String[] guidList = SurfaceAreaQuery\r
+                                            .getGuidEntryArray(this.arch);\r
+                        PackageIdentification[] pkgList = SurfaceAreaQuery.getDependencePkg(this.arch);\r
+\r
+                        //\r
+                        // Add those ppi, protocol, guid in global ppi,\r
+                        // protocol, guid\r
+                        // list.\r
+                        //\r
+                        for (index = 0; index < ppiList.length; index++) {\r
+                            this.mPpiList.add(ppiList[index]);\r
+                        }\r
+\r
+                        for (index = 0; index < ppiNotifyList.length; index++) {\r
+                            this.mPpiList.add(ppiNotifyList[index]);\r
+                        }\r
+\r
+                        for (index = 0; index < protocolList.length; index++) {\r
+                            this.mProtocolList.add(protocolList[index]);\r
+                        }\r
+\r
+                        for (index = 0; index < protocolNotifyList.length; index++) {\r
+                            this.mProtocolList.add(protocolNotifyList[index]);\r
+                        }\r
+\r
+                        for (index = 0; index < guidList.length; index++) {\r
+                            this.mGuidList.add(guidList[index]);\r
+                        }\r
+                        for (index = 0; index < pkgList.length; index++) {\r
+                            if (!this.mDepPkgList.contains(pkgList[index])) {\r
+                                this.mDepPkgList.add(pkgList[index]);\r
+                            }\r
+                        }\r
+\r
+                        //\r
+                        // If not yet parse this library instance's constructor\r
+                        // element,parse it.\r
+                        //\r
+                        libConstructName = SurfaceAreaQuery\r
+                                           .getLibConstructorName();\r
+                        libDestructName = SurfaceAreaQuery\r
+                                          .getLibDestructorName();\r
+\r
+                        //\r
+                        // Collect SetVirtualAddressMapCallBack and\r
+                        // ExitBootServiceCallBack.\r
+                        //\r
+                        setVirtuals = SurfaceAreaQuery.getSetVirtualAddressMapCallBackArray();\r
+                        exitBoots = SurfaceAreaQuery.getExitBootServicesCallBackArray();\r
+                        if (setVirtuals != null) {\r
+                            for (int j = 0; j < setVirtuals.length; j++) {\r
+                                this.setVirtalAddList.add(setVirtuals[j]);\r
+                            }\r
+                        }\r
+                        if (exitBoots != null) {\r
+                            for (int k = 0; k < exitBoots.length; k++) {\r
+                                this.exitBootServiceList.add(exitBoots[k]);\r
+                            }\r
+                        }\r
+                        SurfaceAreaQuery.pop();\r
+                        //\r
+                        // Add dependent library instance constructor function.\r
+                        //\r
+                        if (libConstructName != null) {\r
+                            this.libConstructList.add(libConstructName);\r
+                        }\r
+                        //\r
+                        // Add dependent library instance destructor fuction.\r
+                        //\r
+                        if (libDestructName != null) {\r
+                            this.libDestructList.add(libDestructName);\r
+                        }\r
+                    }\r
+                }\r
+\r
+            }\r
+\r
+        } catch (Exception e) {\r
+            System.out.println(e.getMessage());\r
+            System.out.println("Collect library instance failed!");\r
+        }\r
+    }\r
+}\r