BaseTools: Fix the different token with the same PCD

[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 eac41ed9bf81a7b8910b9a95ea679efc0ec818b8..8946e419a009b3a4119243e6d741f56820dd0741 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -13,6 +13,7 @@
 \r
 ## Import Modules\r
 #\r
+from __future__ import absolute_import\r
 import string\r
 import collections\r
 import struct\r
@@ -22,9 +23,9 @@ from Common.BuildToolError import *
 from Common.DataType import *\r
 from Common.Misc import *\r
 from Common.StringUtils import StringToArray\r
-from StrGather import *\r
-from GenPcdDb import CreatePcdDatabaseCode\r
-from IdfClassObject import *\r
+from .StrGather import *\r
+from .GenPcdDb import CreatePcdDatabaseCode\r
+from .IdfClassObject import *\r
 \r
 ## PCD type string\r
 gItemTypeStringDatabase  = {\r
@@ -265,7 +266,7 @@ EFI_STATUS
 EFIAPI\r
 ${Function} (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2 *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   );\r
 ${END}\r
 """)\r
@@ -278,7 +279,7 @@ EFI_STATUS
 EFIAPI\r
 ProcessModuleEntryPointList (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2 *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   )\r
 \r
 {\r
@@ -292,7 +293,7 @@ EFI_STATUS
 EFIAPI\r
 ProcessModuleEntryPointList (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2 *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   )\r
 \r
 {\r
@@ -307,7 +308,7 @@ EFI_STATUS
 EFIAPI\r
 ProcessModuleEntryPointList (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2 *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   )\r
 \r
 {\r
@@ -675,7 +676,7 @@ EFI_STATUS
 EFIAPI\r
 ${Function} (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2  *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   );${END}\r
 """),\r
 }\r
@@ -755,7 +756,7 @@ VOID
 EFIAPI\r
 ProcessLibrary${Type}List (\r
   IN EFI_HANDLE            ImageHandle,\r
-  IN EFI_SMM_SYSTEM_TABLE2  *MmSystemTable\r
+  IN EFI_MM_SYSTEM_TABLE   *MmSystemTable\r
   )\r
 {\r
 ${BEGIN}  EFI_STATUS  Status;\r
@@ -779,8 +780,8 @@ gModuleTypeHeaderFile = {
     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_MM_STANDALONE     :   ["PiMm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/StandaloneMmDriverEntryPoint.h"],\r
+    SUP_MODULE_MM_CORE_STANDALONE :  ["PiMm.h", "Library/BaseLib.h", "Library/DebugLib.h", "Library/StandaloneMmCoreEntryPoint.h"],\r
     SUP_MODULE_USER_DEFINED      :   [gBasicHeaderFile]\r
 }\r
 \r
@@ -890,6 +891,8 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
 \r
     if Pcd.PcdValueFromComm:\r
         Pcd.DefaultValue = Pcd.PcdValueFromComm\r
+    elif Pcd.PcdValueFromFdf:\r
+        Pcd.DefaultValue = Pcd.PcdValueFromFdf\r
 \r
     if Pcd.Type in PCD_DYNAMIC_EX_TYPE_SET:\r
         TokenNumber = int(Pcd.TokenValue, 0)\r
@@ -934,7 +937,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
         if Info.IsLibrary:\r
             PcdList = Info.LibraryPcdList\r
         else:\r
-            PcdList = Info.ModulePcdList\r
+            PcdList = Info.ModulePcdList + Info.LibraryPcdList\r
         PcdExCNameTest = 0\r
         for PcdModule in PcdList:\r
             if PcdModule.Type in PCD_DYNAMIC_EX_TYPE_SET and Pcd.TokenCName == PcdModule.TokenCName:\r
@@ -1183,6 +1186,8 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd):
 \r
     if Pcd.PcdValueFromComm:\r
         Pcd.DefaultValue = Pcd.PcdValueFromComm\r
+    elif Pcd.PcdValueFromFdf:\r
+        Pcd.DefaultValue = Pcd.PcdValueFromFdf\r
     #\r
     # Write PCDs\r
     #\r
@@ -1288,7 +1293,6 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd):
                 AutoGenH.Append('#define %s(Value)  LibPcdSet%s(%s, (Value))\n' % (SetModeName, DatumSizeLib, PcdTokenName))\r
                 AutoGenH.Append('#define %s(Value)  LibPcdSet%sS(%s, (Value))\n' % (SetModeStatusName, DatumSizeLib, PcdTokenName))\r
     if PcdItemType == TAB_PCDS_PATCHABLE_IN_MODULE:\r
-        GetModeMaxSizeName = '_PCD_GET_MODE_MAXSIZE' + '_' + TokenCName\r
         PcdVariableName = '_gPcd_' + gItemTypeStringDatabase[TAB_PCDS_PATCHABLE_IN_MODULE] + '_' + TokenCName\r
         if DatumType not in TAB_PCD_NUMERIC_TYPES:\r
             if DatumType == TAB_VOID and Array == '[]':\r
@@ -1303,7 +1307,7 @@ def CreateLibraryPcdCode(Info, AutoGenC, AutoGenH, Pcd):
         if Pcd.DatumType not in TAB_PCD_NUMERIC_TYPES:\r
             AutoGenH.Append('#define %s(SizeOfBuffer, Buffer)  LibPatchPcdSetPtrAndSize((VOID *)_gPcd_BinaryPatch_%s, &%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeName, TokenCName, PatchPcdSizeVariableName, PatchPcdMaxSizeVariable))\r
             AutoGenH.Append('#define %s(SizeOfBuffer, Buffer)  LibPatchPcdSetPtrAndSizeS((VOID *)_gPcd_BinaryPatch_%s, &%s, %s, (SizeOfBuffer), (Buffer))\n' % (SetModeStatusName, TokenCName, PatchPcdSizeVariableName, PatchPcdMaxSizeVariable))\r
-            AutoGenH.Append('#define %s %s\n' % (GetModeMaxSizeName, PatchPcdMaxSizeVariable))\r
+            AutoGenH.Append('#define %s %s\n' % (PatchPcdSizeTokenName, PatchPcdMaxSizeVariable))\r
             AutoGenH.Append('extern const UINTN %s; \n' % PatchPcdMaxSizeVariable)\r
         else:\r
             AutoGenH.Append('#define %s(Value)  (%s = (Value))\n' % (SetModeName, PcdVariableName))\r