]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/Common/Expression.py
BaseTools: Add missing spaces for PCD expression values in AutoGenC
[mirror_edk2.git] / BaseTools / Source / Python / Common / Expression.py
index e398f7a034319fa9765f75aa8898f9f5fa54ea28..b62efe6f9be681427f33d95d6503ed3c592e62c0 100644 (file)
@@ -2,13 +2,7 @@
 # This file is used to parse and evaluate expression in directive or PCD value.\r
 #\r
 # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
-# This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.    The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+# SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 ## Import Modules\r
 #\r
@@ -17,11 +11,13 @@ from __future__ import absolute_import
 from Common.GlobalData import *\r
 from CommonDataClass.Exceptions import BadExpression\r
 from CommonDataClass.Exceptions import WrnExpression\r
-from .Misc import GuidStringToGuidStructureString, ParseFieldValue\r
+from .Misc import GuidStringToGuidStructureString, ParseFieldValue,CopyDict\r
 import Common.EdkLogger as EdkLogger\r
 import copy\r
 from Common.DataType import *\r
 import sys\r
+from random import sample\r
+import string\r
 \r
 ERR_STRING_EXPR         = 'This operator cannot be used in string expression: [%s].'\r
 ERR_SNYTAX              = 'Syntax error, the rest of expression cannot be evaluated: [%s].'\r
@@ -47,7 +43,7 @@ ERR_IN_OPERAND          = 'Macro after IN operator can only be: $(FAMILY), $(ARC
 __ValidString = re.compile(r'[_a-zA-Z][_0-9a-zA-Z]*$')\r
 _ReLabel = re.compile('LABEL\((\w+)\)')\r
 _ReOffset = re.compile('OFFSET_OF\((\w+)\)')\r
-PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')\r
+PcdPattern = re.compile(r'^[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')\r
 \r
 ## SplitString\r
 #  Split string to list according double quote\r
@@ -55,6 +51,8 @@ PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')
 #\r
 def SplitString(String):\r
     # There might be escaped quote: "abc\"def\\\"ghi", 'abc\'def\\\'ghi'\r
+    RanStr = ''.join(sample(string.ascii_letters + string.digits, 8))\r
+    String = String.replace('\\\\', RanStr).strip()\r
     RetList = []\r
     InSingleQuote = False\r
     InDoubleQuote = False\r
@@ -87,11 +85,16 @@ def SplitString(String):
         raise BadExpression(ERR_STRING_TOKEN % Item)\r
     if Item:\r
         RetList.append(Item)\r
+    for i, ch in enumerate(RetList):\r
+        if RanStr in ch:\r
+            RetList[i] = ch.replace(RanStr,'\\\\')\r
     return RetList\r
 \r
 def SplitPcdValueString(String):\r
     # There might be escaped comma in GUID() or DEVICE_PATH() or " "\r
     # or ' ' or L' ' or L" "\r
+    RanStr = ''.join(sample(string.ascii_letters + string.digits, 8))\r
+    String = String.replace('\\\\', RanStr).strip()\r
     RetList = []\r
     InParenthesis = 0\r
     InSingleQuote = False\r
@@ -124,6 +127,9 @@ def SplitPcdValueString(String):
         raise BadExpression(ERR_STRING_TOKEN % Item)\r
     if Item:\r
         RetList.append(Item)\r
+    for i, ch in enumerate(RetList):\r
+        if RanStr in ch:\r
+            RetList[i] = ch.replace(RanStr,'\\\\')\r
     return RetList\r
 \r
 def IsValidCName(Str):\r
@@ -232,7 +238,7 @@ class ValueExpression(BaseExpression):
         'IN' : 'in'\r
     }\r
 \r
-    NonLetterOpLst = ['+', '-', '*', '/', '%', '&', '|', '^', '~', '<<', '>>', '!', '=', '>', '<', '?', ':']\r
+    NonLetterOpLst = ['+', '-', TAB_STAR, '/', '%', '&', '|', '^', '~', '<<', '>>', '!', '=', '>', '<', '?', ':']\r
 \r
 \r
     SymbolPattern = re.compile("("\r
@@ -297,8 +303,8 @@ class ValueExpression(BaseExpression):
                 else:\r
                     raise BadExpression(ERR_EXPR_TYPE)\r
             if isinstance(Oprand1, type('')) and isinstance(Oprand2, type('')):\r
-                if ((Oprand1.startswith('L"') or Oprand1.startswith('L')) and (not Oprand2.startswith('L"')) and (not Oprand2.startswith("L'"))) or \\r
-                        (((not Oprand1.startswith('L"')) and (not Oprand1.startswith("L'"))) and (Oprand2.startswith('L"') or Oprand2.startswith('L'))):\r
+                if ((Oprand1.startswith('L"') or Oprand1.startswith("L'")) and (not Oprand2.startswith('L"')) and (not Oprand2.startswith("L'"))) or \\r
+                        (((not Oprand1.startswith('L"')) and (not Oprand1.startswith("L'"))) and (Oprand2.startswith('L"') or Oprand2.startswith("L'"))):\r
                     raise BadExpression(ERR_STRING_CMP % (Oprand1, Operator, Oprand2))\r
             if 'in' in Operator and isinstance(Oprand2, type('')):\r
                 Oprand2 = Oprand2.split()\r
@@ -343,7 +349,7 @@ class ValueExpression(BaseExpression):
         #\r
         # The symbol table including PCD and macro mapping\r
         #\r
-        self._Symb = copy.deepcopy(SymbolTable)\r
+        self._Symb = CopyDict(SymbolTable)\r
         self._Symb.update(self.LogicalOperators)\r
         self._Idx = 0\r
         self._Len = len(self._Expr)\r
@@ -390,7 +396,7 @@ class ValueExpression(BaseExpression):
             elif not Val:\r
                 Val = False\r
                 RealVal = '""'\r
-            elif not Val.startswith('L"') and not Val.startswith('{') and not Val.startswith("L'"):\r
+            elif not Val.startswith('L"') and not Val.startswith('{') and not Val.startswith("L'") and not Val.startswith("'"):\r
                 Val = True\r
                 RealVal = '"' + RealVal + '"'\r
 \r
@@ -427,6 +433,13 @@ class ValueExpression(BaseExpression):
                 else:\r
                     Val = Val3\r
                 continue\r
+            #\r
+            # PEP 238 -- Changing the Division Operator\r
+            # x/y to return a reasonable approximation of the mathematical result of the division ("true division")\r
+            # x//y to return the floor ("floor division")\r
+            #\r
+            if Op == '/':\r
+                Op = '//'\r
             try:\r
                 Val = self.Eval(Op, Val, EvalFunc())\r
             except WrnExpression as Warn:\r
@@ -486,7 +499,7 @@ class ValueExpression(BaseExpression):
 \r
     # A [ * B]*\r
     def _MulExpr(self):\r
-        return self._ExprFuncTemplate(self._UnaryExpr, {"*", "/", "%"})\r
+        return self._ExprFuncTemplate(self._UnaryExpr, {TAB_STAR, "/", "%"})\r
 \r
     # [!]*A\r
     def _UnaryExpr(self):\r
@@ -808,221 +821,219 @@ class ValueExpressionEx(ValueExpression):
 \r
     def __call__(self, RealValue=False, Depth=0):\r
         PcdValue = self.PcdValue\r
-        try:\r
-            PcdValue = ValueExpression.__call__(self, RealValue, Depth)\r
-            if self.PcdType == TAB_VOID and (PcdValue.startswith("'") or PcdValue.startswith("L'")):\r
-                PcdValue, Size = ParseFieldValue(PcdValue)\r
-                PcdValueList = []\r
-                for I in range(Size):\r
-                    PcdValueList.append('0x%02X'%(PcdValue & 0xff))\r
-                    PcdValue = PcdValue >> 8\r
-                PcdValue = '{' + ','.join(PcdValueList) + '}'\r
-            elif self.PcdType in TAB_PCD_NUMERIC_TYPES and (PcdValue.startswith("'") or \\r
-                      PcdValue.startswith('"') or PcdValue.startswith("L'") or PcdValue.startswith('L"') or PcdValue.startswith('{')):\r
-                raise BadExpression\r
-        except WrnExpression as Value:\r
-            PcdValue = Value.result\r
-        except BadExpression as Value:\r
-            if self.PcdType in TAB_PCD_NUMERIC_TYPES:\r
-                PcdValue = PcdValue.strip()\r
-                if PcdValue.startswith('{') and PcdValue.endswith('}'):\r
-                    PcdValue = SplitPcdValueString(PcdValue[1:-1])\r
-                if ERR_STRING_CMP.split(':')[0] in Value.message:\r
-                    raise BadExpression("Type: %s, Value: %s, %s" % (self.PcdType, PcdValue, Value))\r
-                if isinstance(PcdValue, type([])):\r
-                    TmpValue = 0\r
-                    Size = 0\r
-                    ValueType = ''\r
-                    for Item in PcdValue:\r
-                        Item = Item.strip()\r
-                        if Item.startswith(TAB_UINT8):\r
-                            ItemSize = 1\r
-                            ValueType = TAB_UINT8\r
-                        elif Item.startswith(TAB_UINT16):\r
-                            ItemSize = 2\r
-                            ValueType = TAB_UINT16\r
-                        elif Item.startswith(TAB_UINT32):\r
-                            ItemSize = 4\r
-                            ValueType = TAB_UINT32\r
-                        elif Item.startswith(TAB_UINT64):\r
-                            ItemSize = 8\r
-                            ValueType = TAB_UINT64\r
-                        elif Item[0] in {'"', "'", 'L'}:\r
-                            ItemSize = 0\r
-                            ValueType = TAB_VOID\r
-                        else:\r
-                            ItemSize = 0\r
-                            ValueType = TAB_UINT8\r
-                        Item = ValueExpressionEx(Item, ValueType, self._Symb)(True)\r
-\r
-                        if ItemSize == 0:\r
-                            try:\r
-                                tmpValue = int(Item, 0)\r
-                                if tmpValue > 255:\r
-                                    raise BadExpression("Byte  array number %s should less than 0xFF." % Item)\r
-                            except BadExpression as Value:\r
-                                raise BadExpression(Value)\r
-                            except ValueError:\r
-                                pass\r
-                            ItemValue, ItemSize = ParseFieldValue(Item)\r
-                        else:\r
-                            ItemValue = ParseFieldValue(Item)[0]\r
-\r
-                        if isinstance(ItemValue, type('')):\r
-                            ItemValue = int(ItemValue, 0)\r
-\r
-                        TmpValue = (ItemValue << (Size * 8)) | TmpValue\r
-                        Size = Size + ItemSize\r
-                else:\r
-                    try:\r
-                        TmpValue, Size = ParseFieldValue(PcdValue)\r
-                    except BadExpression as Value:\r
-                        raise BadExpression("Type: %s, Value: %s, %s" % (self.PcdType, PcdValue, Value))\r
-                if isinstance(TmpValue, type('')):\r
-                    try:\r
-                        TmpValue = int(TmpValue)\r
-                    except:\r
-                        raise  BadExpression(Value)\r
-                else:\r
-                    PcdValue = '0x%0{}X'.format(Size) % (TmpValue)\r
-                if TmpValue < 0:\r
-                    raise  BadExpression('Type %s PCD Value is negative' % self.PcdType)\r
-                if self.PcdType == TAB_UINT8 and Size > 1:\r
-                    raise BadExpression('Type %s PCD Value Size is Larger than 1 byte' % self.PcdType)\r
-                if self.PcdType == TAB_UINT16 and Size > 2:\r
-                    raise BadExpression('Type %s PCD Value Size is Larger than 2 byte' % self.PcdType)\r
-                if self.PcdType == TAB_UINT32 and Size > 4:\r
-                    raise BadExpression('Type %s PCD Value Size is Larger than 4 byte' % self.PcdType)\r
-                if self.PcdType == TAB_UINT64 and Size > 8:\r
-                    raise BadExpression('Type %s PCD Value Size is Larger than 8 byte' % self.PcdType)\r
-            else:\r
-                try:\r
-                    TmpValue = int(PcdValue)\r
-                    TmpList = []\r
-                    if TmpValue.bit_length() == 0:\r
-                        PcdValue = '{0x00}'\r
-                    else:\r
-                        for I in range((TmpValue.bit_length() + 7) / 8):\r
-                            TmpList.append('0x%02x' % ((TmpValue >> I * 8) & 0xff))\r
-                        PcdValue = '{' + ', '.join(TmpList) + '}'\r
-                except:\r
-                    if PcdValue.strip().startswith('{'):\r
-                        PcdValueList = SplitPcdValueString(PcdValue.strip()[1:-1])\r
-                        LabelDict = {}\r
-                        NewPcdValueList = []\r
-                        LabelOffset = 0\r
-                        for Item in PcdValueList:\r
-                            # compute byte offset of every LABEL\r
-                            LabelList = _ReLabel.findall(Item)\r
-                            Item = _ReLabel.sub('', Item)\r
+        if "{CODE(" not in PcdValue:\r
+            try:\r
+                PcdValue = ValueExpression.__call__(self, RealValue, Depth)\r
+                if self.PcdType == TAB_VOID and (PcdValue.startswith("'") or PcdValue.startswith("L'")):\r
+                    PcdValue, Size = ParseFieldValue(PcdValue)\r
+                    PcdValueList = []\r
+                    for I in range(Size):\r
+                        PcdValueList.append('0x%02X'%(PcdValue & 0xff))\r
+                        PcdValue = PcdValue >> 8\r
+                    PcdValue = '{' + ','.join(PcdValueList) + '}'\r
+                elif self.PcdType in TAB_PCD_NUMERIC_TYPES and (PcdValue.startswith("'") or \\r
+                          PcdValue.startswith('"') or PcdValue.startswith("L'") or PcdValue.startswith('L"') or PcdValue.startswith('{')):\r
+                    raise BadExpression\r
+            except WrnExpression as Value:\r
+                PcdValue = Value.result\r
+            except BadExpression as Value:\r
+                if self.PcdType in TAB_PCD_NUMERIC_TYPES:\r
+                    PcdValue = PcdValue.strip()\r
+                    if PcdValue.startswith('{') and PcdValue.endswith('}'):\r
+                        PcdValue = SplitPcdValueString(PcdValue[1:-1])\r
+                    if isinstance(PcdValue, type([])):\r
+                        TmpValue = 0\r
+                        Size = 0\r
+                        ValueType = ''\r
+                        for Item in PcdValue:\r
                             Item = Item.strip()\r
-                            if LabelList:\r
-                                for Label in LabelList:\r
-                                    if not IsValidCName(Label):\r
-                                        raise BadExpression('%s is not a valid c variable name' % Label)\r
-                                    if Label not in LabelDict:\r
-                                        LabelDict[Label] = str(LabelOffset)\r
                             if Item.startswith(TAB_UINT8):\r
-                                LabelOffset = LabelOffset + 1\r
+                                ItemSize = 1\r
+                                ValueType = TAB_UINT8\r
                             elif Item.startswith(TAB_UINT16):\r
-                                LabelOffset = LabelOffset + 2\r
+                                ItemSize = 2\r
+                                ValueType = TAB_UINT16\r
                             elif Item.startswith(TAB_UINT32):\r
-                                LabelOffset = LabelOffset + 4\r
+                                ItemSize = 4\r
+                                ValueType = TAB_UINT32\r
                             elif Item.startswith(TAB_UINT64):\r
-                                LabelOffset = LabelOffset + 8\r
+                                ItemSize = 8\r
+                                ValueType = TAB_UINT64\r
+                            elif Item[0] in {'"', "'", 'L'}:\r
+                                ItemSize = 0\r
+                                ValueType = TAB_VOID\r
                             else:\r
+                                ItemSize = 0\r
+                                ValueType = TAB_UINT8\r
+                            Item = ValueExpressionEx(Item, ValueType, self._Symb)(True)\r
+                            if ItemSize == 0:\r
                                 try:\r
-                                    ItemValue, ItemSize = ParseFieldValue(Item)\r
-                                    LabelOffset = LabelOffset + ItemSize\r
-                                except:\r
-                                    LabelOffset = LabelOffset + 1\r
-\r
-                        for Item in PcdValueList:\r
-                            # for LABEL parse\r
-                            Item = Item.strip()\r
-                            try:\r
-                                Item = _ReLabel.sub('', Item)\r
-                            except:\r
-                                pass\r
-                            try:\r
-                                OffsetList = _ReOffset.findall(Item)\r
-                            except:\r
-                                pass\r
-                            # replace each offset, except errors\r
-                            for Offset in OffsetList:\r
-                                try:\r
-                                    Item = Item.replace('OFFSET_OF({})'.format(Offset), LabelDict[Offset])\r
-                                except:\r
-                                    raise BadExpression('%s not defined' % Offset)\r
-\r
-                            NewPcdValueList.append(Item)\r
-\r
-                        AllPcdValueList = []\r
-                        for Item in NewPcdValueList:\r
-                            Size = 0\r
-                            ValueStr = ''\r
-                            TokenSpaceGuidName = ''\r
-                            if Item.startswith(TAB_GUID) and Item.endswith(')'):\r
-                                try:\r
-                                    TokenSpaceGuidName = re.search('GUID\((\w+)\)', Item).group(1)\r
-                                except:\r
+                                    tmpValue = int(Item, 0)\r
+                                    if tmpValue > 255:\r
+                                        raise BadExpression("Byte  array number %s should less than 0xFF." % Item)\r
+                                except BadExpression as Value:\r
+                                    raise BadExpression(Value)\r
+                                except ValueError:\r
                                     pass\r
-                                if TokenSpaceGuidName and TokenSpaceGuidName in self._Symb:\r
-                                    Item = 'GUID(' + self._Symb[TokenSpaceGuidName] + ')'\r
-                                elif TokenSpaceGuidName:\r
-                                    raise BadExpression('%s not found in DEC file' % TokenSpaceGuidName)\r
-                                Item, Size = ParseFieldValue(Item)\r
-                                for Index in range(0, Size):\r
-                                    ValueStr = '0x%02X' % (int(Item) & 255)\r
-                                    Item >>= 8\r
-                                    AllPcdValueList.append(ValueStr)\r
-                                continue\r
-                            elif Item.startswith('DEVICE_PATH') and Item.endswith(')'):\r
-                                Item, Size = ParseFieldValue(Item)\r
-                                AllPcdValueList.append(Item[1:-1])\r
-                                continue\r
+                                ItemValue, ItemSize = ParseFieldValue(Item)\r
                             else:\r
-                                ValueType = ""\r
+                                ItemValue = ParseFieldValue(Item)[0]\r
+\r
+                            if isinstance(ItemValue, type('')):\r
+                                ItemValue = int(ItemValue, 0)\r
+\r
+                            TmpValue = (ItemValue << (Size * 8)) | TmpValue\r
+                            Size = Size + ItemSize\r
+                    else:\r
+                        try:\r
+                            TmpValue, Size = ParseFieldValue(PcdValue)\r
+                        except BadExpression as Value:\r
+                            raise BadExpression("Type: %s, Value: %s, %s" % (self.PcdType, PcdValue, Value))\r
+                    if isinstance(TmpValue, type('')):\r
+                        try:\r
+                            TmpValue = int(TmpValue)\r
+                        except:\r
+                            raise  BadExpression(Value)\r
+                    else:\r
+                        PcdValue = '0x%0{}X'.format(Size) % (TmpValue)\r
+                    if TmpValue < 0:\r
+                        raise  BadExpression('Type %s PCD Value is negative' % self.PcdType)\r
+                    if self.PcdType == TAB_UINT8 and Size > 1:\r
+                        raise BadExpression('Type %s PCD Value Size is Larger than 1 byte' % self.PcdType)\r
+                    if self.PcdType == TAB_UINT16 and Size > 2:\r
+                        raise BadExpression('Type %s PCD Value Size is Larger than 2 byte' % self.PcdType)\r
+                    if self.PcdType == TAB_UINT32 and Size > 4:\r
+                        raise BadExpression('Type %s PCD Value Size is Larger than 4 byte' % self.PcdType)\r
+                    if self.PcdType == TAB_UINT64 and Size > 8:\r
+                        raise BadExpression('Type %s PCD Value Size is Larger than 8 byte' % self.PcdType)\r
+                else:\r
+                    try:\r
+                        TmpValue = int(PcdValue)\r
+                        TmpList = []\r
+                        if TmpValue.bit_length() == 0:\r
+                            PcdValue = '{0x00}'\r
+                        else:\r
+                            for I in range((TmpValue.bit_length() + 7) // 8):\r
+                                TmpList.append('0x%02x' % ((TmpValue >> I * 8) & 0xff))\r
+                            PcdValue = '{' + ', '.join(TmpList) + '}'\r
+                    except:\r
+                        if PcdValue.strip().startswith('{'):\r
+                            PcdValueList = SplitPcdValueString(PcdValue.strip()[1:-1])\r
+                            LabelDict = {}\r
+                            NewPcdValueList = []\r
+                            LabelOffset = 0\r
+                            for Item in PcdValueList:\r
+                                # compute byte offset of every LABEL\r
+                                LabelList = _ReLabel.findall(Item)\r
+                                Item = _ReLabel.sub('', Item)\r
+                                Item = Item.strip()\r
+                                if LabelList:\r
+                                    for Label in LabelList:\r
+                                        if not IsValidCName(Label):\r
+                                            raise BadExpression('%s is not a valid c variable name' % Label)\r
+                                        if Label not in LabelDict:\r
+                                            LabelDict[Label] = str(LabelOffset)\r
                                 if Item.startswith(TAB_UINT8):\r
-                                    ItemSize = 1\r
-                                    ValueType = TAB_UINT8\r
+                                    LabelOffset = LabelOffset + 1\r
                                 elif Item.startswith(TAB_UINT16):\r
-                                    ItemSize = 2\r
-                                    ValueType = TAB_UINT16\r
+                                    LabelOffset = LabelOffset + 2\r
                                 elif Item.startswith(TAB_UINT32):\r
-                                    ItemSize = 4\r
-                                    ValueType = TAB_UINT32\r
+                                    LabelOffset = LabelOffset + 4\r
                                 elif Item.startswith(TAB_UINT64):\r
-                                    ItemSize = 8\r
-                                    ValueType = TAB_UINT64\r
-                                else:\r
-                                    ItemSize = 0\r
-                                if ValueType:\r
-                                    TmpValue = ValueExpressionEx(Item, ValueType, self._Symb)(True)\r
+                                    LabelOffset = LabelOffset + 8\r
                                 else:\r
-                                    TmpValue = ValueExpressionEx(Item, self.PcdType, self._Symb)(True)\r
-                                Item = '0x%x' % TmpValue if not isinstance(TmpValue, type('')) else TmpValue\r
-                                if ItemSize == 0:\r
-                                    ItemValue, ItemSize = ParseFieldValue(Item)\r
-                                    if Item[0] not in {'"', 'L', '{'} and ItemSize > 1:\r
-                                        raise BadExpression("Byte  array number %s should less than 0xFF." % Item)\r
+                                    try:\r
+                                        ItemValue, ItemSize = ParseFieldValue(Item)\r
+                                        LabelOffset = LabelOffset + ItemSize\r
+                                    except:\r
+                                        LabelOffset = LabelOffset + 1\r
+\r
+                            for Item in PcdValueList:\r
+                                # for LABEL parse\r
+                                Item = Item.strip()\r
+                                try:\r
+                                    Item = _ReLabel.sub('', Item)\r
+                                except:\r
+                                    pass\r
+                                try:\r
+                                    OffsetList = _ReOffset.findall(Item)\r
+                                except:\r
+                                    pass\r
+                                # replace each offset, except errors\r
+                                for Offset in OffsetList:\r
+                                    try:\r
+                                        Item = Item.replace('OFFSET_OF({})'.format(Offset), LabelDict[Offset])\r
+                                    except:\r
+                                        raise BadExpression('%s not defined' % Offset)\r
+\r
+                                NewPcdValueList.append(Item)\r
+\r
+                            AllPcdValueList = []\r
+                            for Item in NewPcdValueList:\r
+                                Size = 0\r
+                                ValueStr = ''\r
+                                TokenSpaceGuidName = ''\r
+                                if Item.startswith(TAB_GUID) and Item.endswith(')'):\r
+                                    try:\r
+                                        TokenSpaceGuidName = re.search('GUID\((\w+)\)', Item).group(1)\r
+                                    except:\r
+                                        pass\r
+                                    if TokenSpaceGuidName and TokenSpaceGuidName in self._Symb:\r
+                                        Item = 'GUID(' + self._Symb[TokenSpaceGuidName] + ')'\r
+                                    elif TokenSpaceGuidName:\r
+                                        raise BadExpression('%s not found in DEC file' % TokenSpaceGuidName)\r
+                                    Item, Size = ParseFieldValue(Item)\r
+                                    for Index in range(0, Size):\r
+                                        ValueStr = '0x%02X' % (int(Item) & 255)\r
+                                        Item >>= 8\r
+                                        AllPcdValueList.append(ValueStr)\r
+                                    continue\r
+                                elif Item.startswith('DEVICE_PATH') and Item.endswith(')'):\r
+                                    Item, Size = ParseFieldValue(Item)\r
+                                    AllPcdValueList.append(Item[1:-1])\r
+                                    continue\r
                                 else:\r
-                                    ItemValue = ParseFieldValue(Item)[0]\r
-                                for I in range(0, ItemSize):\r
-                                    ValueStr = '0x%02X' % (int(ItemValue) & 255)\r
-                                    ItemValue >>= 8\r
-                                    AllPcdValueList.append(ValueStr)\r
-                                Size += ItemSize\r
-\r
-                        if Size > 0:\r
-                            PcdValue = '{' + ','.join(AllPcdValueList) + '}'\r
-                    else:\r
-                        raise  BadExpression("Type: %s, Value: %s, %s"%(self.PcdType, PcdValue, Value))\r
+                                    ValueType = ""\r
+                                    if Item.startswith(TAB_UINT8):\r
+                                        ItemSize = 1\r
+                                        ValueType = TAB_UINT8\r
+                                    elif Item.startswith(TAB_UINT16):\r
+                                        ItemSize = 2\r
+                                        ValueType = TAB_UINT16\r
+                                    elif Item.startswith(TAB_UINT32):\r
+                                        ItemSize = 4\r
+                                        ValueType = TAB_UINT32\r
+                                    elif Item.startswith(TAB_UINT64):\r
+                                        ItemSize = 8\r
+                                        ValueType = TAB_UINT64\r
+                                    else:\r
+                                        ItemSize = 0\r
+                                    if ValueType:\r
+                                        TmpValue = ValueExpressionEx(Item, ValueType, self._Symb)(True)\r
+                                    else:\r
+                                        TmpValue = ValueExpressionEx(Item, self.PcdType, self._Symb)(True)\r
+                                    Item = '0x%x' % TmpValue if not isinstance(TmpValue, type('')) else TmpValue\r
+                                    if ItemSize == 0:\r
+                                        ItemValue, ItemSize = ParseFieldValue(Item)\r
+                                        if Item[0] not in {'"', 'L', '{'} and ItemSize > 1:\r
+                                            raise BadExpression("Byte  array number %s should less than 0xFF." % Item)\r
+                                    else:\r
+                                        ItemValue = ParseFieldValue(Item)[0]\r
+                                    for I in range(0, ItemSize):\r
+                                        ValueStr = '0x%02X' % (int(ItemValue) & 255)\r
+                                        ItemValue >>= 8\r
+                                        AllPcdValueList.append(ValueStr)\r
+                                    Size += ItemSize\r
+\r
+                            if Size > 0:\r
+                                PcdValue = '{' + ', '.join(AllPcdValueList) + '}'\r
+                        else:\r
+                            raise  BadExpression("Type: %s, Value: %s, %s"%(self.PcdType, PcdValue, Value))\r
 \r
-        if PcdValue == 'True':\r
-            PcdValue = '1'\r
-        if PcdValue == 'False':\r
-            PcdValue = '0'\r
+            if PcdValue == 'True':\r
+                PcdValue = '1'\r
+            if PcdValue == 'False':\r
+                PcdValue = '0'\r
 \r
         if RealValue:\r
             return PcdValue\r