BaseTools: Define and use a set for common list

share a set for both PEI module types

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>

diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 2811952fe1d36bf814f0782ef9436dedfb425b9c..73ab60d25312067aeeb7e6a996d60546ce1aab59 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -1430,7 +1430,7 @@ class PlatformAutoGen(AutoGen):
                     # used by DXE module, it should be stored in DXE PCD database.\r
                     # The default Phase is DXE\r
                     #\r
-                    if M.ModuleType in [SUP_MODULE_PEIM, SUP_MODULE_PEI_CORE]:\r
+                    if M.ModuleType in SUP_MODULE_SET_PEI:\r
                         PcdFromModule.Phase = "PEI"\r
                     if PcdFromModule not in self._DynaPcdList_:\r
                         self._DynaPcdList_.append(PcdFromModule)\r
@@ -1472,7 +1472,7 @@ class PlatformAutoGen(AutoGen):
                     # make sure that the "VOID*" kind of datum has MaxDatumSize set\r
                     if PcdFromModule.DatumType == TAB_VOID and PcdFromModule.MaxDatumSize in [None, '']:\r
                         NoDatumTypePcdList.add("%s.%s [%s]" % (PcdFromModule.TokenSpaceGuidCName, PcdFromModule.TokenCName, InfName))\r
-                    if M.ModuleType in [SUP_MODULE_PEIM, SUP_MODULE_PEI_CORE]:\r
+                    if M.ModuleType in SUP_MODULE_SET_PEI:\r
                         PcdFromModule.Phase = "PEI"\r
                     if PcdFromModule not in self._DynaPcdList_ and PcdFromModule.Type in GenC.gDynamicExPcd:\r
                         self._DynaPcdList_.append(PcdFromModule)\r

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 26f6aca0e63ffbc5fc5eb94f1d9f2d5a1f7064a1..89cf8e5b8b0c2c766cb227c2e8607032f5928c10 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -1409,7 +1409,7 @@ def CreateLibraryConstructorCode(Info, AutoGenC, AutoGenH):
         if Lib.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:\r
             ConstructorPrototypeString.Append(gLibraryStructorPrototype[SUP_MODULE_BASE].Replace(Dict))\r
             ConstructorCallingString.Append(gLibraryStructorCall[SUP_MODULE_BASE].Replace(Dict))\r
-        elif Lib.ModuleType in [SUP_MODULE_PEI_CORE,SUP_MODULE_PEIM]:\r
+        elif Lib.ModuleType in SUP_MODULE_SET_PEI:\r
             ConstructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))\r
             ConstructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))\r
         elif Lib.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER,\r
@@ -1439,7 +1439,7 @@ def CreateLibraryConstructorCode(Info, AutoGenC, AutoGenH):
     else:\r
         if Info.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:\r
             AutoGenC.Append(gLibraryString[SUP_MODULE_BASE].Replace(Dict))\r
-        elif Info.ModuleType in [SUP_MODULE_PEI_CORE,SUP_MODULE_PEIM]:\r
+        elif Info.ModuleType in SUP_MODULE_SET_PEI:\r
             AutoGenC.Append(gLibraryString['PEI'].Replace(Dict))\r
         elif Info.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER,\r
                                  SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI_DRIVER,SUP_MODULE_UEFI_APPLICATION,SUP_MODULE_SMM_CORE]:\r
@@ -1471,7 +1471,7 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoGenH):
         if Lib.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:\r
             DestructorPrototypeString.Append(gLibraryStructorPrototype[SUP_MODULE_BASE].Replace(Dict))\r
             DestructorCallingString.Append(gLibraryStructorCall[SUP_MODULE_BASE].Replace(Dict))\r
-        elif Lib.ModuleType in [SUP_MODULE_PEI_CORE,SUP_MODULE_PEIM]:\r
+        elif Lib.ModuleType in SUP_MODULE_SET_PEI:\r
             DestructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))\r
             DestructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))\r
         elif Lib.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER,\r
@@ -1501,7 +1501,7 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoGenH):
     else:\r
         if Info.ModuleType in [SUP_MODULE_BASE, SUP_MODULE_SEC]:\r
             AutoGenC.Append(gLibraryString[SUP_MODULE_BASE].Replace(Dict))\r
-        elif Info.ModuleType in [SUP_MODULE_PEI_CORE,SUP_MODULE_PEIM]:\r
+        elif Info.ModuleType in SUP_MODULE_SET_PEI:\r
             AutoGenC.Append(gLibraryString['PEI'].Replace(Dict))\r
         elif Info.ModuleType in [SUP_MODULE_DXE_CORE,SUP_MODULE_DXE_DRIVER,SUP_MODULE_DXE_SMM_DRIVER,SUP_MODULE_DXE_RUNTIME_DRIVER,\r
                                  SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI_DRIVER,SUP_MODULE_UEFI_APPLICATION,SUP_MODULE_SMM_CORE]:\r

diff --git a/BaseTools/Source/Python/Common/DataType.py b/BaseTools/Source/Python/Common/DataType.py
index ea2eafb94477b670a6e4859041e1af67bc341f6e..7ef0ab6da983d069b6a325490fd63381ff8a098a 100644 (file)
--- a/BaseTools/Source/Python/Common/DataType.py
+++ b/BaseTools/Source/Python/Common/DataType.py
@@ -81,6 +81,7 @@ SUP_MODULE_LIST = [SUP_MODULE_BASE, SUP_MODULE_SEC, SUP_MODULE_PEI_CORE, SUP_MOD
                    SUP_MODULE_DXE_RUNTIME_DRIVER, SUP_MODULE_DXE_SAL_DRIVER, SUP_MODULE_DXE_SMM_DRIVER, SUP_MODULE_UEFI_DRIVER, \\r
                    SUP_MODULE_UEFI_APPLICATION, SUP_MODULE_USER_DEFINED, SUP_MODULE_SMM_CORE, SUP_MODULE_MM_STANDALONE, SUP_MODULE_MM_CORE_STANDALONE]\r
 SUP_MODULE_LIST_STRING = TAB_VALUE_SPLIT.join(SUP_MODULE_LIST)\r
+SUP_MODULE_SET_PEI = {SUP_MODULE_PEIM, SUP_MODULE_PEI_CORE}\r
 \r
 EDK_COMPONENT_TYPE_LIBRARY = 'LIBRARY'\r
 EDK_COMPONENT_TYPE_SECUARITY_CORE = 'SECUARITY_CORE'\r