BaseTools: Define and use a set for common list

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenC.py

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 73d7699ad01bfe60d68545f672399a1a43bd1754..89cf8e5b8b0c2c766cb227c2e8607032f5928c10 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -649,7 +649,7 @@ ${END}
 ]\r
 \r
 gLibraryStructorPrototype = {\r
-'BASE'  : TemplateString("""${BEGIN}\r
+SUP_MODULE_BASE  : TemplateString("""${BEGIN}\r
 RETURN_STATUS\r
 EFIAPI\r
 ${Function} (\r
@@ -686,7 +686,7 @@ ${Function} (
 }\r
 \r
 gLibraryStructorCall = {\r
-'BASE'  : TemplateString("""${BEGIN}\r
+SUP_MODULE_BASE  : TemplateString("""${BEGIN}\r
   Status = ${Function} ();\r
   ASSERT_EFI_ERROR (Status);${END}\r
 """),\r
@@ -709,7 +709,7 @@ gLibraryStructorCall = {
 \r
 ## Library Constructor and Destructor Templates\r
 gLibraryString = {\r
-'BASE'  :   TemplateString("""\r
+SUP_MODULE_BASE  :   TemplateString("""\r
 ${BEGIN}${FunctionPrototype}${END}\r
 \r
 VOID\r
@@ -772,21 +772,21 @@ ${FunctionCall}${END}
 gBasicHeaderFile = "Base.h"\r
 \r
 gModuleTypeHeaderFile = {\r
-    "BASE"              :   [gBasicHeaderFile],\r
-    "SEC"               :   ["PiPei.h", "Library/DebugLib.h"],\r
-    "PEI_CORE"          :   ["PiPei.h", "Library/DebugLib.h", "Library/PeiCoreEntryPoint.h"],\r
-    "PEIM"              :   ["PiPei.h", "Library/DebugLib.h", "Library/PeimEntryPoint.h"],\r
-    "DXE_CORE"          :   ["PiDxe.h", "Library/DebugLib.h", "Library/DxeCoreEntryPoint.h"],\r
-    "DXE_DRIVER"        :   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
-    "DXE_SMM_DRIVER"    :   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
-    "DXE_RUNTIME_DRIVER":   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
-    "DXE_SAL_DRIVER"    :   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
-    "UEFI_DRIVER"       :   ["Uefi.h",  "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
-    "UEFI_APPLICATION"  :   ["Uefi.h",  "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiApplicationEntryPoint.h"],\r
-    "SMM_CORE"          :   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiDriverEntryPoint.h"],\r
-    "MM_STANDALONE"     :   ["PiSmm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/SmmDriverStandaloneEntryPoint.h"],\r
-    "MM_CORE_STANDALONE" :  ["PiSmm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/SmmCoreStandaloneEntryPoint.h"],\r
-    "USER_DEFINED"      :   [gBasicHeaderFile]\r
+    SUP_MODULE_BASE              :   [gBasicHeaderFile],\r
+    SUP_MODULE_SEC               :   ["PiPei.h", "Library/DebugLib.h"],\r
+    SUP_MODULE_PEI_CORE          :   ["PiPei.h", "Library/DebugLib.h", "Library/PeiCoreEntryPoint.h"],\r
+    SUP_MODULE_PEIM              :   ["PiPei.h", "Library/DebugLib.h", "Library/PeimEntryPoint.h"],\r
+    SUP_MODULE_DXE_CORE          :   ["PiDxe.h", "Library/DebugLib.h", "Library/DxeCoreEntryPoint.h"],\r
+    SUP_MODULE_DXE_DRIVER        :   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
+    SUP_MODULE_DXE_SMM_DRIVER    :   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
+    SUP_MODULE_DXE_RUNTIME_DRIVER:   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
+    SUP_MODULE_DXE_SAL_DRIVER    :   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
+    SUP_MODULE_UEFI_DRIVER       :   ["Uefi.h",  "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiDriverEntryPoint.h"],\r
+    SUP_MODULE_UEFI_APPLICATION  :   ["Uefi.h",  "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiBootServicesTableLib.h", "Library/UefiApplicationEntryPoint.h"],\r
+    SUP_MODULE_SMM_CORE          :   ["PiDxe.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/UefiDriverEntryPoint.h"],\r
+    SUP_MODULE_MM_STANDALONE     :   ["PiSmm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/SmmDriverStandaloneEntryPoint.h"],\r
+    SUP_MODULE_MM_CORE_STANDALONE :  ["PiSmm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/SmmCoreStandaloneEntryPoint.h"],\r
+    SUP_MODULE_USER_DEFINED      :   [gBasicHeaderFile]\r
 }\r
 \r
 ## Autogen internal worker macro to define DynamicEx PCD name includes both the TokenSpaceGuidName \r
@@ -1406,17 +1406,17 @@ def CreateLibraryConstructorCode(Info, AutoGenC, AutoGenH):
         if len(Lib.ConstructorList) <= 0:\r
             continue\r
         Dict = {'Function':Lib.ConstructorList}\r
-        if Lib.ModuleType in ['BASE', 'SEC']:\r
-            ConstructorPrototypeString.Append(gLibraryStructorPrototype['BASE'].Replace(Dict))\r
-            ConstructorCallingString.Append(gLibraryStructorCall['BASE'].Replace(Dict))\r
-        elif Lib.ModuleType in ['PEI_CORE','PEIM']:\r
+        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_SET_PEI:\r
             ConstructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))\r
             ConstructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))\r
-        elif Lib.ModuleType in ['DXE_CORE','DXE_DRIVER','DXE_SMM_DRIVER','DXE_RUNTIME_DRIVER',\r
-                                'DXE_SAL_DRIVER','UEFI_DRIVER','UEFI_APPLICATION','SMM_CORE']:\r
+        elif Lib.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
             ConstructorPrototypeString.Append(gLibraryStructorPrototype['DXE'].Replace(Dict))\r
             ConstructorCallingString.Append(gLibraryStructorCall['DXE'].Replace(Dict))\r
-        elif Lib.ModuleType in ['MM_STANDALONE','MM_CORE_STANDALONE']:\r
+        elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE,SUP_MODULE_MM_CORE_STANDALONE]:\r
             ConstructorPrototypeString.Append(gLibraryStructorPrototype['MM'].Replace(Dict))\r
             ConstructorCallingString.Append(gLibraryStructorCall['MM'].Replace(Dict))\r
 \r
@@ -1437,14 +1437,14 @@ def CreateLibraryConstructorCode(Info, AutoGenC, AutoGenH):
     if Info.IsLibrary:\r
         AutoGenH.Append("${BEGIN}${FunctionPrototype}${END}", Dict)\r
     else:\r
-        if Info.ModuleType in ['BASE', 'SEC']:\r
-            AutoGenC.Append(gLibraryString['BASE'].Replace(Dict))\r
-        elif Info.ModuleType in ['PEI_CORE','PEIM']:\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_SET_PEI:\r
             AutoGenC.Append(gLibraryString['PEI'].Replace(Dict))\r
-        elif Info.ModuleType in ['DXE_CORE','DXE_DRIVER','DXE_SMM_DRIVER','DXE_RUNTIME_DRIVER',\r
-                                 'DXE_SAL_DRIVER','UEFI_DRIVER','UEFI_APPLICATION','SMM_CORE']:\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
             AutoGenC.Append(gLibraryString['DXE'].Replace(Dict))\r
-        elif Info.ModuleType in ['MM_STANDALONE','MM_CORE_STANDALONE']:\r
+        elif Info.ModuleType in [SUP_MODULE_MM_STANDALONE,SUP_MODULE_MM_CORE_STANDALONE]:\r
             AutoGenC.Append(gLibraryString['MM'].Replace(Dict))\r
 \r
 ## Create code for library destructor\r
@@ -1468,17 +1468,17 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoGenH):
         if len(Lib.DestructorList) <= 0:\r
             continue\r
         Dict = {'Function':Lib.DestructorList}\r
-        if Lib.ModuleType in ['BASE', 'SEC']:\r
-            DestructorPrototypeString.Append(gLibraryStructorPrototype['BASE'].Replace(Dict))\r
-            DestructorCallingString.Append(gLibraryStructorCall['BASE'].Replace(Dict))\r
-        elif Lib.ModuleType in ['PEI_CORE','PEIM']:\r
+        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_SET_PEI:\r
             DestructorPrototypeString.Append(gLibraryStructorPrototype['PEI'].Replace(Dict))\r
             DestructorCallingString.Append(gLibraryStructorCall['PEI'].Replace(Dict))\r
-        elif Lib.ModuleType in ['DXE_CORE','DXE_DRIVER','DXE_SMM_DRIVER','DXE_RUNTIME_DRIVER',\r
-                                'DXE_SAL_DRIVER','UEFI_DRIVER','UEFI_APPLICATION', 'SMM_CORE']:\r
+        elif Lib.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
             DestructorPrototypeString.Append(gLibraryStructorPrototype['DXE'].Replace(Dict))\r
             DestructorCallingString.Append(gLibraryStructorCall['DXE'].Replace(Dict))\r
-        elif Lib.ModuleType in ['MM_STANDALONE','MM_CORE_STANDALONE']:\r
+        elif Lib.ModuleType in [SUP_MODULE_MM_STANDALONE,SUP_MODULE_MM_CORE_STANDALONE]:\r
             DestructorPrototypeString.Append(gLibraryStructorPrototype['MM'].Replace(Dict))\r
             DestructorCallingString.Append(gLibraryStructorCall['MM'].Replace(Dict))\r
 \r
@@ -1499,14 +1499,14 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoGenH):
     if Info.IsLibrary:\r
         AutoGenH.Append("${BEGIN}${FunctionPrototype}${END}", Dict)\r
     else:\r
-        if Info.ModuleType in ['BASE', 'SEC']:\r
-            AutoGenC.Append(gLibraryString['BASE'].Replace(Dict))\r
-        elif Info.ModuleType in ['PEI_CORE','PEIM']:\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_SET_PEI:\r
             AutoGenC.Append(gLibraryString['PEI'].Replace(Dict))\r
-        elif Info.ModuleType in ['DXE_CORE','DXE_DRIVER','DXE_SMM_DRIVER','DXE_RUNTIME_DRIVER',\r
-                                 'DXE_SAL_DRIVER','UEFI_DRIVER','UEFI_APPLICATION','SMM_CORE']:\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
             AutoGenC.Append(gLibraryString['DXE'].Replace(Dict))\r
-        elif Info.ModuleType in ['MM_STANDALONE','MM_CORE_STANDALONE']:\r
+        elif Info.ModuleType in [SUP_MODULE_MM_STANDALONE,SUP_MODULE_MM_CORE_STANDALONE]:\r
             AutoGenC.Append(gLibraryString['MM'].Replace(Dict))\r
 \r
 \r
@@ -1517,7 +1517,7 @@ def CreateLibraryDestructorCode(Info, AutoGenC, AutoGenH):
 #   @param      AutoGenH    The TemplateString object for header file\r
 #\r
 def CreateModuleEntryPointCode(Info, AutoGenC, AutoGenH):\r
-    if Info.IsLibrary or Info.ModuleType in ['USER_DEFINED', 'SEC']:\r
+    if Info.IsLibrary or Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_SEC]:\r
         return\r
     #\r
     # Module Entry Points\r
@@ -1537,7 +1537,7 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGenH):
         'UefiSpecVersion':   UefiSpecVersion + 'U'\r
     }\r
 \r
-    if Info.ModuleType in ['PEI_CORE', 'DXE_CORE', 'SMM_CORE', 'MM_CORE_STANDALONE']:\r
+    if Info.ModuleType in [SUP_MODULE_PEI_CORE, SUP_MODULE_DXE_CORE, SUP_MODULE_SMM_CORE, SUP_MODULE_MM_CORE_STANDALONE]:\r
         if Info.SourceFileList:\r
           if NumEntryPoints != 1:\r
               EdkLogger.error(\r
@@ -1547,43 +1547,43 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGenH):
                   File=str(Info),\r
                   ExtraData= ", ".join(Info.Module.ModuleEntryPointList)\r
                   )\r
-    if Info.ModuleType == 'PEI_CORE':\r
+    if Info.ModuleType == SUP_MODULE_PEI_CORE:\r
         AutoGenC.Append(gPeiCoreEntryPointString.Replace(Dict))\r
         AutoGenH.Append(gPeiCoreEntryPointPrototype.Replace(Dict))\r
-    elif Info.ModuleType == 'DXE_CORE':\r
+    elif Info.ModuleType == SUP_MODULE_DXE_CORE:\r
         AutoGenC.Append(gDxeCoreEntryPointString.Replace(Dict))\r
         AutoGenH.Append(gDxeCoreEntryPointPrototype.Replace(Dict))\r
-    elif Info.ModuleType == 'SMM_CORE':\r
+    elif Info.ModuleType == SUP_MODULE_SMM_CORE:\r
         AutoGenC.Append(gSmmCoreEntryPointString.Replace(Dict))\r
         AutoGenH.Append(gSmmCoreEntryPointPrototype.Replace(Dict))\r
-    elif Info.ModuleType == 'MM_CORE_STANDALONE':\r
+    elif Info.ModuleType == SUP_MODULE_MM_CORE_STANDALONE:\r
         AutoGenC.Append(gMmCoreStandaloneEntryPointString.Replace(Dict))\r
         AutoGenH.Append(gMmCoreStandaloneEntryPointPrototype.Replace(Dict))\r
-    elif Info.ModuleType == 'PEIM':\r
+    elif Info.ModuleType == SUP_MODULE_PEIM:\r
         if NumEntryPoints < 2:\r
             AutoGenC.Append(gPeimEntryPointString[NumEntryPoints].Replace(Dict))\r
         else:\r
             AutoGenC.Append(gPeimEntryPointString[2].Replace(Dict))\r
         AutoGenH.Append(gPeimEntryPointPrototype.Replace(Dict))\r
-    elif Info.ModuleType in ['DXE_RUNTIME_DRIVER','DXE_DRIVER','DXE_SAL_DRIVER','UEFI_DRIVER']:\r
+    elif Info.ModuleType in [SUP_MODULE_DXE_RUNTIME_DRIVER,SUP_MODULE_DXE_DRIVER,SUP_MODULE_DXE_SAL_DRIVER,SUP_MODULE_UEFI_DRIVER]:\r
         if NumEntryPoints < 2:\r
             AutoGenC.Append(gUefiDriverEntryPointString[NumEntryPoints].Replace(Dict))\r
         else:\r
             AutoGenC.Append(gUefiDriverEntryPointString[2].Replace(Dict))\r
         AutoGenH.Append(gUefiDriverEntryPointPrototype.Replace(Dict))\r
-    elif Info.ModuleType == 'DXE_SMM_DRIVER':\r
+    elif Info.ModuleType == SUP_MODULE_DXE_SMM_DRIVER:\r
         if NumEntryPoints == 0:\r
             AutoGenC.Append(gDxeSmmEntryPointString[0].Replace(Dict))\r
         else:\r
             AutoGenC.Append(gDxeSmmEntryPointString[1].Replace(Dict))\r
         AutoGenH.Append(gDxeSmmEntryPointPrototype.Replace(Dict))\r
-    elif Info.ModuleType == 'MM_STANDALONE':\r
+    elif Info.ModuleType == SUP_MODULE_MM_STANDALONE:\r
         if NumEntryPoints < 2:\r
             AutoGenC.Append(gMmStandaloneEntryPointString[NumEntryPoints].Replace(Dict))\r
         else:\r
             AutoGenC.Append(gMmStandaloneEntryPointString[2].Replace(Dict))\r
         AutoGenH.Append(gMmStandaloneEntryPointPrototype.Replace(Dict))\r
-    elif Info.ModuleType == 'UEFI_APPLICATION':\r
+    elif Info.ModuleType == SUP_MODULE_UEFI_APPLICATION:\r
         if NumEntryPoints < 2:\r
             AutoGenC.Append(gUefiApplicationEntryPointString[NumEntryPoints].Replace(Dict))\r
         else:\r
@@ -1597,7 +1597,7 @@ def CreateModuleEntryPointCode(Info, AutoGenC, AutoGenH):
 #   @param      AutoGenH    The TemplateString object for header file\r
 #\r
 def CreateModuleUnloadImageCode(Info, AutoGenC, AutoGenH):\r
-    if Info.IsLibrary or Info.ModuleType in ['USER_DEFINED', 'SEC']:\r
+    if Info.IsLibrary or Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_SEC]:\r
         return\r
     #\r
     # Unload Image Handlers\r
@@ -1617,7 +1617,7 @@ def CreateModuleUnloadImageCode(Info, AutoGenC, AutoGenH):
 #   @param      AutoGenH    The TemplateString object for header file\r
 #\r
 def CreateGuidDefinitionCode(Info, AutoGenC, AutoGenH):\r
-    if Info.ModuleType in ["USER_DEFINED", "BASE"]:\r
+    if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:\r
         GuidType = "GUID"\r
     else:\r
         GuidType = "EFI_GUID"\r
@@ -1641,7 +1641,7 @@ def CreateGuidDefinitionCode(Info, AutoGenC, AutoGenH):
 #   @param      AutoGenH    The TemplateString object for header file\r
 #\r
 def CreateProtocolDefinitionCode(Info, AutoGenC, AutoGenH):\r
-    if Info.ModuleType in ["USER_DEFINED", "BASE"]:\r
+    if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:\r
         GuidType = "GUID"\r
     else:\r
         GuidType = "EFI_GUID"\r
@@ -1665,7 +1665,7 @@ def CreateProtocolDefinitionCode(Info, AutoGenC, AutoGenH):
 #   @param      AutoGenH    The TemplateString object for header file\r
 #\r
 def CreatePpiDefinitionCode(Info, AutoGenC, AutoGenH):\r
-    if Info.ModuleType in ["USER_DEFINED", "BASE"]:\r
+    if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:\r
         GuidType = "GUID"\r
     else:\r
         GuidType = "EFI_GUID"\r
@@ -1702,7 +1702,7 @@ def CreatePcdCode(Info, AutoGenC, AutoGenH):
     # Add extern declarations to AutoGen.h if one or more Token Space GUIDs were found\r
     if TokenSpaceList:\r
         AutoGenH.Append("\n// Definition of PCD Token Space GUIDs used in this module\n\n")\r
-        if Info.ModuleType in ["USER_DEFINED", "BASE"]:\r
+        if Info.ModuleType in [SUP_MODULE_USER_DEFINED, SUP_MODULE_BASE]:\r
             GuidType = "GUID"\r
         else:\r
             GuidType = "EFI_GUID"              \r