Add Feature Flag PcdDxePcdDatabaseTraverseEnabled and PcdPeiPcdDatabaseTraverseEnabled

[mirror_edk2.git] / EdkModulePkg / Universal / PCD / Dxe / Pcd.c

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
index 115b1ac93837fc3d89abab856c55115a27fe033b..437006f05caa132c100abf23304f98399698d07b 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.c
@@ -200,9 +200,15 @@ DxePcdGetSize (
   // \r
   TmpTokenNumber = TokenNumber;\r
 \r
-  ASSERT (TokenNumber < PCD_TOTAL_TOKEN_NUMBER);\r
-\r
-  IsPeiDb = (BOOLEAN) (TokenNumber < PEI_LOCAL_TOKEN_NUMBER);\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  ASSERT (TokenNumber + 1 < PCD_TOTAL_TOKEN_NUMBER + 1);\r
+\r
+  // EBC compiler is very choosy. It may report warning about comparison\r
+  // between UINTN and 0 . So we add 1 in each size of the \r
+  // comparison.\r
+  IsPeiDb = (BOOLEAN) (TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1);\r
   \r
   TokenNumber = IsPeiDb ? TokenNumber : \r
                           (TokenNumber - PEI_LOCAL_TOKEN_NUMBER);\r
@@ -501,25 +507,32 @@ DxePcdGetNextToken (
 {\r
   EFI_STATUS          Status;\r
 \r
+  if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
   Status = EFI_NOT_FOUND;\r
   //\r
   // Scan the local token space\r
   //\r
   if (Guid == NULL) {\r
-    if (((*TokenNumber > PEI_NEX_TOKEN_NUMBER) && (*TokenNumber < PEI_LOCAL_TOKEN_NUMBER)) ||\r
-        ((*TokenNumber > (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER)))) {\r
+    // EBC compiler is very choosy. It may report warning about comparison\r
+    // between UINTN and 0 . So we add 1 in each size of the \r
+    // comparison.\r
+    if (((*TokenNumber + 1 > PEI_NEX_TOKEN_NUMBER + 1) && (*TokenNumber + 1 < PEI_LOCAL_TOKEN_NUMBER + 1)) ||\r
+        ((*TokenNumber + 1 > (PEI_LOCAL_TOKEN_NUMBER + DXE_NEX_TOKEN_NUMBER + 1)))) {\r
         return EFI_NOT_FOUND;\r
     }\r
     \r
     (*TokenNumber)++;\r
-    if (*TokenNumber > PEI_NEX_TOKEN_NUMBER &&\r
-        *TokenNumber <= PEI_LOCAL_TOKEN_NUMBER) {\r
+    if ((*TokenNumber + 1 > PEI_NEX_TOKEN_NUMBER + 1) &&\r
+        (*TokenNumber <= PEI_LOCAL_TOKEN_NUMBER)) {\r
       //\r
       // The first Non-Ex type Token Number for DXE PCD \r
       // database is PEI_LOCAL_TOKEN_NUMBER\r
       //\r
       *TokenNumber = PEI_LOCAL_TOKEN_NUMBER;\r
-    } else if (*TokenNumber > DXE_NEX_TOKEN_NUMBER + PEI_LOCAL_TOKEN_NUMBER) {\r
+    } else if (*TokenNumber + 1 > DXE_NEX_TOKEN_NUMBER + PEI_LOCAL_TOKEN_NUMBER + 1) {\r
       *TokenNumber = PCD_INVALID_TOKEN_NUMBER;\r
     }\r
     return EFI_SUCCESS;\r
@@ -618,6 +631,10 @@ DxePcdGetNextTokenSpace (
   EFI_GUID            **DxeTokenSpaceTable;\r
   BOOLEAN             Match;\r
 \r
+  if (!FeaturePcdGet (PcdDxePcdDatabaseTraverseEnabled)) {\r
+    return EFI_UNSUPPORTED;\r
+  }\r
+\r
   ASSERT (Guid != NULL);\r
   \r
   if (PEI_EXMAP_TABLE_EMPTY && DXE_EXMAP_TABLE_EMPTY) {\r