Fixed EDKT318

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / autogen / AutoGen.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
index b6e2800765ca009d35a5bb70c7ff6e522f7f244a..5b6620b50dfc8d5f3672bcb012fe825a4fd482ed 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutoGen.java
@@ -41,6 +41,7 @@ import org.tianocore.build.id.ModuleIdentification;
 import org.tianocore.build.id.PackageIdentification;\r
 import org.tianocore.build.pcd.action.PCDAutoGenAction;\r
 import org.tianocore.common.definitions.ToolDefinitions;\r
+import org.tianocore.common.definitions.EdkDefinitions;\r
 import org.tianocore.common.exception.EdkException;\r
 import org.tianocore.common.logger.EdkLog;\r
 \r
@@ -106,10 +107,11 @@ public class AutoGen {
 \r
     ///\r
     ///  For non library module, add its library instance's construct and destructor to\r
-    ///  list.\r
+    ///  list. String[0] recode LibConstructor name, String[1] recode Lib instance \r
+       ///  module type.\r
     ///\r
-    private List<String> libConstructList = new ArrayList<String>();\r
-    private List<String> libDestructList = new ArrayList<String>();\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
@@ -1398,7 +1400,7 @@ public class AutoGen {
                  String buffer for AutoGen.c\r
       @throws Exception\r
     **/\r
-    void LibConstructorToAutogenC(List<String> libInstanceList,\r
+    void LibConstructorToAutogenC(List<String[]> libInstanceList,\r
                                   String moduleType, StringBuffer fileBuffer) throws EdkException {\r
         boolean isFirst = true;\r
 \r
@@ -1407,44 +1409,54 @@ public class AutoGen {
         // module type.\r
         //\r
         for (int i = 0; i < libInstanceList.size(); i++) {\r
-            switch (CommonDefinition.getModuleType(moduleType)) {\r
-            case CommonDefinition.ModuleTypeBase:\r
-                fileBuffer.append("RETURN_STATUS\r\n");\r
+                       if (libInstanceList.get(i)[1].equalsIgnoreCase(EdkDefinitions.MODULE_TYPE_BASE)) {\r
+                               fileBuffer.append("RETURN_STATUS\r\n");\r
                 fileBuffer.append("EFIAPI\r\n");\r
-                fileBuffer.append(libInstanceList.get(i));\r
+                fileBuffer.append(libInstanceList.get(i)[0]);\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer.append("  VOID\r\n");\r
                 fileBuffer.append("  );\r\n");\r
-                break;\r
-\r
-            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
-                fileBuffer\r
-                .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");\r
-                fileBuffer.append("  );\r\n");\r
-                break;\r
+                       } else {\r
+                               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)[0]);\r
+                    fileBuffer.append(" (\r\n");\r
+                    fileBuffer.append("  VOID\r\n");\r
+                    fileBuffer.append("  );\r\n");\r
+                    break;\r
 \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("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
-                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
-                fileBuffer.append("  );\r\n");\r
-                break;\r
+                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)[0]);\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
+                                       break;\r
+       \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("EFI_STATUS\r\n");\r
+                                       fileBuffer.append("EFIAPI\r\n");\r
+                                       fileBuffer.append(libInstanceList.get(i)[0]);\r
+                                       fileBuffer.append(" (\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
+                                       break;\r
+\r
+                           }\r
             }\r
         }\r
 \r
@@ -1493,32 +1505,40 @@ public class AutoGen {
                 fileBuffer.append("\r\n");\r
                 isFirst = false;\r
             }\r
-            switch (CommonDefinition.getModuleType(moduleType)) {\r
-            case CommonDefinition.ModuleTypeBase:\r
+                       if (libInstanceList.get(i)[1].equalsIgnoreCase(EdkDefinitions.MODULE_TYPE_BASE)) {\r
                 fileBuffer.append("  Status = ");\r
-                fileBuffer.append(libInstanceList.get(i));\r
+                fileBuffer.append(libInstanceList.get(i)[0]);\r
                 fileBuffer.append("();\r\n");\r
                 fileBuffer.append("  VOID\r\n");\r
-                break;\r
-            case CommonDefinition.ModuleTypePeiCore:\r
-            case CommonDefinition.ModuleTypePeim:\r
-                fileBuffer.append("  Status = ");\r
-                fileBuffer.append(libInstanceList.get(i));\r
-                fileBuffer.append(" (FfsHeader, PeiServices);\r\n");\r
-                break;\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("  Status = ");\r
-                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
+                       } else {\r
+                               switch (CommonDefinition.getModuleType(moduleType)) {\r
+                                       case CommonDefinition.ModuleTypeBase:\r
+                                               fileBuffer.append("  Status = ");\r
+                                               fileBuffer.append(libInstanceList.get(i)[0]);\r
+                                               fileBuffer.append("();\r\n");\r
+                                               fileBuffer.append("  VOID\r\n");\r
+                                               break;\r
+                                       case CommonDefinition.ModuleTypePeiCore:\r
+                                       case CommonDefinition.ModuleTypePeim:\r
+                                               fileBuffer.append("  Status = ");\r
+                                               fileBuffer.append(libInstanceList.get(i)[0]);\r
+                                               fileBuffer.append(" (FfsHeader, PeiServices);\r\n");\r
+                                               break;\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("  Status = ");\r
+                                               fileBuffer.append(libInstanceList.get(i)[0]);\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
+            \r
             }\r
             fileBuffer.append("  ASSERT_EFI_ERROR (Status);\r\n");\r
         }\r
@@ -1539,46 +1559,55 @@ public class AutoGen {
                  String buffer for AutoGen.c\r
       @throws Exception\r
     **/\r
-    void LibDestructorToAutogenC(List<String> libInstanceList,\r
+    void LibDestructorToAutogenC(List<String[]> libInstanceList,\r
                                  String moduleType, StringBuffer fileBuffer) throws EdkException {\r
         boolean isFirst = true;\r
         for (int i = 0; i < libInstanceList.size(); i++) {\r
-            switch (CommonDefinition.getModuleType(moduleType)) {\r
-            case CommonDefinition.ModuleTypeBase:\r
+                       if (libInstanceList.get(i)[1].equalsIgnoreCase(EdkDefinitions.MODULE_TYPE_BASE)) {\r
                 fileBuffer.append("RETURN_STATUS\r\n");\r
                 fileBuffer.append("EFIAPI\r\n");\r
-                fileBuffer.append(libInstanceList.get(i));\r
+                fileBuffer.append(libInstanceList.get(i)[0]);\r
                 fileBuffer.append(" (\r\n");\r
                 fileBuffer.append("  VOID\r\n");\r
                 fileBuffer.append("  );\r\n");\r
-                break;\r
-            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
-                fileBuffer\r
-                .append("  IN EFI_PEI_SERVICES          **PeiServices\r\n");\r
-                fileBuffer.append("  );\r\n");\r
-                break;\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("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
-                fileBuffer.append("  IN EFI_SYSTEM_TABLE  *SystemTable\r\n");\r
-                fileBuffer.append("  );\r\n");\r
-                break;\r
+                       } else {\r
+                               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)[0]);\r
+                                               fileBuffer.append(" (\r\n");\r
+                                               fileBuffer.append("  VOID\r\n");\r
+                                               fileBuffer.append("  );\r\n");\r
+                                               break;\r
+                                       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)[0]);\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
+                                               break;\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("EFI_STATUS\r\n");\r
+                                               fileBuffer.append("EFIAPI\r\n");\r
+                                               fileBuffer.append(libInstanceList.get(i)[0]);\r
+                                               fileBuffer.append(" (\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
+                                               break;\r
+                           }\r
             }\r
         }\r
 \r
@@ -1615,10 +1644,17 @@ public class AutoGen {
                     fileBuffer.append("\r\n");\r
                     isFirst = false;\r
                 }\r
-                fileBuffer.append("  Status = ");\r
-                fileBuffer.append(libInstanceList.get(i));\r
-                fileBuffer.append("(ImageHandle, SystemTable);\r\n");\r
-                fileBuffer.append("  ASSERT_EFI_ERROR (Status);\r\n");\r
+                               if (libInstanceList.get(i)[1].equalsIgnoreCase(EdkDefinitions.MODULE_TYPE_BASE)) {\r
+                    fileBuffer.append("  Status = ");\r
+                    fileBuffer.append(libInstanceList.get(i)[0]);\r
+                    fileBuffer.append("();\r\n");\r
+                    fileBuffer.append("  VOID\r\n");\r
+                               } else {\r
+                                       fileBuffer.append("  Status = ");\r
+                                       fileBuffer.append(libInstanceList.get(i)[0]);\r
+                                       fileBuffer.append("(ImageHandle, SystemTable);\r\n");\r
+                                       fileBuffer.append("  ASSERT_EFI_ERROR (Status);\r\n");\r
+                               }\r
             }\r
             fileBuffer.append("}\r\n");\r
             break;\r
@@ -1880,6 +1916,7 @@ public class AutoGen {
 \r
         String libConstructName = null;\r
         String libDestructName = null;\r
+               String libModuleType   = null;\r
         String[] setVirtuals = null;\r
         String[] exitBoots = null;\r
 \r
@@ -1958,6 +1995,7 @@ public class AutoGen {
                                        //\r
                                        libConstructName = saq.getLibConstructorName();\r
                                        libDestructName = saq.getLibDestructorName();\r
+                                       libModuleType = saq.getModuleType();\r
 \r
                                        //\r
                                        // Collect SetVirtualAddressMapCallBack and\r
@@ -1980,13 +2018,13 @@ public class AutoGen {
                                        // Add dependent library instance constructor function.\r
                                        //\r
                                        if (libConstructName != null) {\r
-                                               this.libConstructList.add(libConstructName);\r
+                                               this.libConstructList.add(new String[] {libConstructName, libModuleType});\r
                                        }\r
                                        //\r
                                        // Add dependent library instance destructor fuction.\r
                                        //\r
                                        if (libDestructName != null) {\r
-                                               this.libDestructList.add(libDestructName);\r
+                                               this.libDestructList.add(new String[] {libDestructName, libModuleType});\r
                                        }\r
                                }\r
                        }\r