BaseTools: Update --pcd parser to support flexible pcd format

This patch update --pcd parser to support flexible pcd format.

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

1 files changed, 20 insertions, 1 deletions

diff --git a/BaseTools/Source/Python/Common/Expression.py b/BaseTools/Source/Python/Common/Expression.py
index 5a0ade9e7e..79dc83efc3 100644
--- a/BaseTools/Source/Python/Common/Expression.py
+++ b/BaseTools/Source/Python/Common/Expression.py
@@ -15,7 +15,7 @@
 from Common.GlobalData import *

 from CommonDataClass.Exceptions import BadExpression

 from CommonDataClass.Exceptions import WrnExpression

-from Misc import GuidStringToGuidStructureString, ParseFieldValue

+from Misc import GuidStringToGuidStructureString, ParseFieldValue, IsFieldValueAnArray

 import Common.EdkLogger as EdkLogger

 import copy

 

@@ -125,6 +125,25 @@ def IsValidCString(Str):
         return False

     return True

 

+def BuildOptionValue(PcdValue, GuidDict):

+    IsArray = False

+    if PcdValue.startswith('H'):

+        InputValue = PcdValue[1:]

+    elif PcdValue.startswith("L'") or PcdValue.startswith("'"):

+        InputValue = PcdValue

+    elif PcdValue.startswith('L'):

+        InputValue = 'L"' + PcdValue[1:] + '"'

+    else:

+        InputValue = PcdValue

+    if IsFieldValueAnArray(InputValue):

+        IsArray = True

+    if IsArray:

+        try:

+            PcdValue = ValueExpressionEx(InputValue, 'VOID*', GuidDict)(True)

+        except:

+            pass

+    return PcdValue

+

 ## ReplaceExprMacro

 #

 def ReplaceExprMacro(String, Macros, ExceptionList = None):