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, IsFieldValueAnArray\r
import Common.EdkLogger as EdkLogger\r
import copy\r
+from Common.DataType import *\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
ERR_EMPTY_EXPR = 'Empty expression is not allowed.'\r
ERR_IN_OPERAND = 'Macro after IN operator can only be: $(FAMILY), $(ARCH), $(TOOL_CHAIN_TAG) and $(TARGET).'\r
\r
+__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
+\r
## SplitString\r
# Split string to list according double quote\r
# For example: abc"de\"f"ghi"jkl"mn will be: ['abc', '"de\"f"', 'ghi', '"jkl"', 'mn']\r
#\r
def SplitString(String):\r
- # There might be escaped quote: "abc\"def\\\"ghi"\r
- Str = String.replace('\\\\', '//').replace('\\\"', '\\\'')\r
+ # There might be escaped quote: "abc\"def\\\"ghi", 'abc\'def\\\'ghi'\r
RetList = []\r
- InQuote = False\r
+ InSingleQuote = False\r
+ InDoubleQuote = False\r
Item = ''\r
- for i, ch in enumerate(Str):\r
- if ch == '"':\r
- InQuote = not InQuote\r
- if not InQuote:\r
+ for i, ch in enumerate(String):\r
+ if ch == '"' and not InSingleQuote:\r
+ if String[i - 1] != '\\':\r
+ InDoubleQuote = not InDoubleQuote\r
+ if not InDoubleQuote:\r
+ Item += String[i]\r
+ RetList.append(Item)\r
+ Item = ''\r
+ continue\r
+ if Item:\r
+ RetList.append(Item)\r
+ Item = ''\r
+ elif ch == "'" and not InDoubleQuote:\r
+ if String[i - 1] != '\\':\r
+ InSingleQuote = not InSingleQuote\r
+ if not InSingleQuote:\r
Item += String[i]\r
RetList.append(Item)\r
Item = ''\r
RetList.append(Item)\r
Item = ''\r
Item += String[i]\r
- if InQuote:\r
+ if InSingleQuote or InDoubleQuote:\r
raise BadExpression(ERR_STRING_TOKEN % Item)\r
if Item:\r
RetList.append(Item)\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
+ RetList = []\r
+ InParenthesis = 0\r
+ InSingleQuote = False\r
+ InDoubleQuote = False\r
+ Item = ''\r
+ for i, ch in enumerate(String):\r
+ if ch == '(':\r
+ InParenthesis += 1\r
+ elif ch == ')':\r
+ if InParenthesis:\r
+ InParenthesis -= 1\r
+ else:\r
+ raise BadExpression(ERR_STRING_TOKEN % Item)\r
+ elif ch == '"' and not InSingleQuote:\r
+ if String[i-1] != '\\':\r
+ InDoubleQuote = not InDoubleQuote\r
+ elif ch == "'" and not InDoubleQuote:\r
+ if String[i-1] != '\\':\r
+ InSingleQuote = not InSingleQuote\r
+ elif ch == ',':\r
+ if InParenthesis or InSingleQuote or InDoubleQuote:\r
+ Item += String[i]\r
+ continue\r
+ elif Item:\r
+ RetList.append(Item)\r
+ Item = ''\r
+ continue\r
+ Item += String[i]\r
+ if InSingleQuote or InDoubleQuote or InParenthesis:\r
+ raise BadExpression(ERR_STRING_TOKEN % Item)\r
+ if Item:\r
+ RetList.append(Item)\r
+ return RetList\r
+\r
+def IsValidCName(Str):\r
+ return True if __ValidString.match(Str) else False\r
+\r
+def BuildOptionValue(PcdValue, GuidDict):\r
+ if PcdValue.startswith('H'):\r
+ InputValue = PcdValue[1:]\r
+ elif PcdValue.startswith("L'") or PcdValue.startswith("'"):\r
+ InputValue = PcdValue\r
+ elif PcdValue.startswith('L'):\r
+ InputValue = 'L"' + PcdValue[1:] + '"'\r
+ else:\r
+ InputValue = PcdValue\r
+ if IsFieldValueAnArray(InputValue):\r
+ try:\r
+ PcdValue = ValueExpressionEx(InputValue, TAB_VOID, GuidDict)(True)\r
+ except:\r
+ pass\r
+ return PcdValue\r
+\r
## ReplaceExprMacro\r
#\r
def ReplaceExprMacro(String, Macros, ExceptionList = None):\r
InQuote = True\r
MacroStartPos = String.find('$(')\r
if MacroStartPos < 0:\r
- for Pcd in gPlatformPcds.keys():\r
+ for Pcd in gPlatformPcds:\r
if Pcd in String:\r
if Pcd not in gConditionalPcds:\r
gConditionalPcds.append(Pcd)\r
\r
NonLetterOpLst = ['+', '-', '*', '/', '%', '&', '|', '^', '~', '<<', '>>', '!', '=', '>', '<', '?', ':']\r
\r
- PcdPattern = re.compile(r'[_a-zA-Z][0-9A-Za-z_]*\.[_a-zA-Z][0-9A-Za-z_]*$')\r
- HexPattern = re.compile(r'0[xX][0-9a-fA-F]+$')\r
- RegGuidPattern = re.compile(r'[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}')\r
\r
SymbolPattern = re.compile("("\r
"\$\([A-Z][A-Z0-9_]*\)|\$\(\w+\.\w+\)|\w+\.\w+|"\r
def Eval(Operator, Oprand1, Oprand2 = None):\r
WrnExp = None\r
\r
- if Operator not in ["in", "not in"] and (type(Oprand1) == type('') or type(Oprand2) == type('')):\r
- if type(Oprand1) == type(''):\r
- if Oprand1[0] in ['"', "'"] or Oprand1.startswith('L"') or Oprand1.startswith("L'")or Oprand1.startswith('UINT'):\r
- Oprand1, Size = ParseFieldValue(Oprand1)\r
- else:\r
- Oprand1,Size = ParseFieldValue('"' + Oprand1 + '"')\r
- if type(Oprand2) == type(''):\r
- if Oprand2[0] in ['"', "'"] or Oprand2.startswith('L"') or Oprand2.startswith("L'") or Oprand2.startswith('UINT'):\r
- Oprand2, Size = ParseFieldValue(Oprand2)\r
- else:\r
- Oprand2, Size = ParseFieldValue('"' + Oprand2 + '"')\r
- if type(Oprand1) == type('') or type(Oprand2) == type(''):\r
- raise BadExpression(ERR_STRING_EXPR % Operator)\r
+ if Operator not in ["==", "!=", ">=", "<=", ">", "<", "in", "not in"] and \\r
+ (type(Oprand1) == type('') or type(Oprand2) == type('')):\r
+ raise BadExpression(ERR_STRING_EXPR % Operator)\r
if Operator in ['in', 'not in']:\r
if type(Oprand1) != type(''):\r
Oprand1 = IntToStr(Oprand1)\r
except BadExpression:\r
pass\r
if type(Token) == type('') and Token.startswith('{') and Token.endswith('}') and self._Idx >= self._Len:\r
- if len(Token) != len(self._Expr.replace(' ', '')):\r
- raise BadExpression\r
return self._Expr\r
\r
self._Idx = 0\r
Flag = 0\r
for Index in range(len(self._Token)):\r
if self._Token[Index] in ['"']:\r
+ if self._Token[Index - 1] == '\\':\r
+ continue\r
Flag += 1\r
if Flag == 2 and self._Token.endswith('"'):\r
- self._Token = ParseFieldValue(self._Token)[0]\r
return True\r
if self._Token.startswith("'") or self._Token.startswith("L'"):\r
Flag = 0\r
for Index in range(len(self._Token)):\r
if self._Token[Index] in ["'"]:\r
+ if self._Token[Index - 1] == '\\':\r
+ continue\r
Flag += 1\r
if Flag == 2 and self._Token.endswith("'"):\r
- self._Token = ParseFieldValue(self._Token)[0]\r
return True\r
try:\r
self._Token = int(self._Token, Radix)\r
self._Idx += 1\r
\r
# Replace escape \\\", \"\r
- Expr = self._Expr[self._Idx:].replace('\\\\', '//').replace('\\\"', '\\\'')\r
- for Ch in Expr:\r
- self._Idx += 1\r
- if Ch == '"' or Ch == "'":\r
- break\r
- self._Token = self._LiteralToken = self._Expr[Idx:self._Idx]\r
- if self._Token.startswith('"') and not self._Token.endswith('"'):\r
- raise BadExpression(ERR_STRING_TOKEN % self._Token)\r
- if self._Token.startswith("'") and not self._Token.endswith("'"):\r
- raise BadExpression(ERR_STRING_TOKEN % self._Token)\r
+ if self._Expr[Idx] == '"':\r
+ Expr = self._Expr[self._Idx:].replace('\\\\', '//').replace('\\\"', '\\\'')\r
+ for Ch in Expr:\r
+ self._Idx += 1\r
+ if Ch == '"':\r
+ break\r
+ self._Token = self._LiteralToken = self._Expr[Idx:self._Idx]\r
+ if not self._Token.endswith('"'):\r
+ raise BadExpression(ERR_STRING_TOKEN % self._Token)\r
+ #Replace escape \\\', \'\r
+ elif self._Expr[Idx] == "'":\r
+ Expr = self._Expr[self._Idx:].replace('\\\\', '//').replace("\\\'", "\\\"")\r
+ for Ch in Expr:\r
+ self._Idx += 1\r
+ if Ch == "'":\r
+ break\r
+ self._Token = self._LiteralToken = self._Expr[Idx:self._Idx]\r
+ if not self._Token.endswith("'"):\r
+ raise BadExpression(ERR_STRING_TOKEN % self._Token)\r
self._Token = self._Token[1:-1]\r
return self._Token\r
\r
raise BadExpression(ERR_EMPTY_TOKEN)\r
\r
# PCD token\r
- if self.PcdPattern.match(self._Token):\r
+ if PcdPattern.match(self._Token):\r
if self._Token not in self._Symb:\r
Ex = BadExpression(ERR_PCD_RESOLVE % self._Token)\r
Ex.Pcd = self._Token\r
self._LiteralToken.endswith('}'):\r
return True\r
\r
- if self.HexPattern.match(self._LiteralToken):\r
+ if gHexPattern.match(self._LiteralToken):\r
Token = self._LiteralToken[2:]\r
if not Token:\r
self._LiteralToken = '0x0'\r
self._Idx += 1\r
UStr = self.__GetString()\r
self._Token = 'L"' + UStr + '"'\r
- self._Token, Size = ParseFieldValue(self._Token)\r
return self._Token\r
elif Expr.startswith("L'"):\r
# Skip L\r
self._Idx += 1\r
UStr = self.__GetString()\r
self._Token = "L'" + UStr + "'"\r
- self._Token, Size = ParseFieldValue(self._Token)\r
- return self._Token\r
- elif Expr.startswith('"'):\r
- UStr = self.__GetString()\r
- self._Token = '"' + UStr + '"'\r
- self._Token, Size = ParseFieldValue(self._Token)\r
return self._Token\r
elif Expr.startswith("'"):\r
UStr = self.__GetString()\r
self._Token = "'" + UStr + "'"\r
- self._Token, Size = ParseFieldValue(self._Token)\r
return self._Token\r
elif Expr.startswith('UINT'):\r
Re = re.compile('(?:UINT8|UINT16|UINT32|UINT64)\((.+)\)')\r
self._Token = ''\r
if Expr:\r
Ch = Expr[0]\r
- Match = self.RegGuidPattern.match(Expr)\r
+ Match = gGuidPattern.match(Expr)\r
if Match and not Expr[Match.end():Match.end()+1].isalnum() \\r
and Expr[Match.end():Match.end()+1] != '_':\r
self._Idx += Match.end()\r
PcdValue = self.PcdValue\r
try:\r
PcdValue = ValueExpression.__call__(self, RealValue, Depth)\r
- if self.PcdType == 'VOID*' and (PcdValue.startswith("'") or PcdValue.startswith("L'")):\r
- raise BadExpression\r
- elif self.PcdType in ['UINT8', 'UINT16', 'UINT32', 'UINT64', 'BOOLEAN'] and (PcdValue.startswith("'") or \\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, Value:\r
PcdValue = Value.result\r
- except BadExpression:\r
- if self.PcdType in ['UINT8', 'UINT16', 'UINT32', 'UINT64', 'BOOLEAN']:\r
+ except BadExpression, Value:\r
+ if self.PcdType in TAB_PCD_NUMERIC_TYPES:\r
PcdValue = PcdValue.strip()\r
if type(PcdValue) == type('') and PcdValue.startswith('{') and PcdValue.endswith('}'):\r
- PcdValue = PcdValue[1:-1].split(',')\r
+ PcdValue = SplitPcdValueString(PcdValue[1:-1])\r
if type(PcdValue) == type([]):\r
TmpValue = 0\r
Size = 0\r
+ ValueType = ''\r
for Item in PcdValue:\r
- if Item.startswith('UINT16'):\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
- elif Item.startswith('UINT32'):\r
+ ValueType = TAB_UINT16\r
+ elif Item.startswith(TAB_UINT32):\r
ItemSize = 4\r
- elif Item.startswith('UINT64'):\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
- Item = ValueExpressionEx(Item, self.PcdType, self._Symb)(True)\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, 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 type(ItemValue) == type(''):\r
- ItemValue = int(ItemValue, 16) if ItemValue.startswith('0x') else int(ItemValue)\r
+ ItemValue = int(ItemValue, 0)\r
\r
TmpValue = (ItemValue << (Size * 8)) | TmpValue\r
Size = Size + ItemSize\r
else:\r
- TmpValue, Size = ParseFieldValue(PcdValue)\r
+ try:\r
+ TmpValue, Size = ParseFieldValue(PcdValue)\r
+ except BadExpression, Value:\r
+ raise BadExpression("Type: %s, Value: %s, %s" % (self.PcdType, PcdValue, Value))\r
if type(TmpValue) == type(''):\r
- TmpValue = int(TmpValue)\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 == 'UINT8' and Size > 1:\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 == 'UINT16' and Size > 2:\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 == 'UINT32' and Size > 4:\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 == 'UINT64' and Size > 8:\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
- if self.PcdType in ['VOID*']:\r
+ else:\r
try:\r
TmpValue = long(PcdValue)\r
TmpList = []\r
PcdValue = '{' + ', '.join(TmpList) + '}'\r
except:\r
if PcdValue.strip().startswith('{'):\r
- PcdValue = PcdValue.strip()[1:-1].strip()\r
- Size = 0\r
- ValueStr = ''\r
- TokenSpaceGuidName = ''\r
- if PcdValue.startswith('GUID') and PcdValue.endswith(')'):\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
+ LabelOffset = LabelOffset + 1\r
+ elif Item.startswith(TAB_UINT16):\r
+ LabelOffset = LabelOffset + 2\r
+ elif Item.startswith(TAB_UINT32):\r
+ LabelOffset = LabelOffset + 4\r
+ elif Item.startswith(TAB_UINT64):\r
+ LabelOffset = LabelOffset + 8\r
+ else:\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
- TokenSpaceGuidName = re.search('GUID\((\w+)\)', PcdValue).group(1)\r
+ Item = _ReLabel.sub('', Item)\r
except:\r
pass\r
- if TokenSpaceGuidName and TokenSpaceGuidName in self._Symb:\r
- PcdValue = 'GUID(' + self._Symb[TokenSpaceGuidName] + ')'\r
- elif TokenSpaceGuidName:\r
- raise BadExpression('%s not found in DEC file' % TokenSpaceGuidName)\r
-\r
- ListItem, Size = ParseFieldValue(PcdValue)\r
- elif PcdValue.startswith('DEVICE_PATH') and PcdValue.endswith(')'):\r
- ListItem, Size = ParseFieldValue(PcdValue)\r
- else:\r
- ListItem = PcdValue.split(',')\r
-\r
- if type(ListItem) == type(0) or type(ListItem) == type(0L):\r
- for Index in range(0, Size):\r
- ValueStr += '0x%02X' % (int(ListItem) & 255)\r
- ListItem >>= 8\r
- ValueStr += ', '\r
- PcdValue = '{' + ValueStr[:-2] + '}'\r
- elif type(ListItem) == type(''):\r
- if ListItem.startswith('{') and ListItem.endswith('}'):\r
- PcdValue = ListItem\r
- else:\r
- LabelDict = {}\r
- ReLabel = re.compile('LABEL\((\w+)\)')\r
- ReOffset = re.compile('OFFSET_OF\((\w+)\)')\r
- for Index, Item in enumerate(ListItem):\r
- # for LABEL parse\r
- Item = Item.strip()\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
- LabelList = ReLabel.findall(Item)\r
- for Label in LabelList:\r
- if Label not in LabelDict.keys():\r
- LabelDict[Label] = str(Index)\r
- Item = ReLabel.sub('', Item)\r
+ Item = Item.replace('OFFSET_OF({})'.format(Offset),LabelDict[Offset])\r
except:\r
- pass\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('GUID') and Item.endswith(')'):\r
try:\r
- OffsetList = ReOffset.findall(Item)\r
+ TokenSpaceGuidName = re.search('GUID\((\w+)\)', Item).group(1)\r
except:\r
pass\r
- for Offset in OffsetList:\r
- if Offset in LabelDict.keys():\r
- Re = re.compile('OFFSET_OF\(%s\)'% Offset)\r
- Item = Re.sub(LabelDict[Offset], Item)\r
- else:\r
- raise BadExpression('%s not defined before use' % Offset)\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
ValueType = ""\r
- if Item.startswith('UINT16'):\r
+ if Item.startswith(TAB_UINT8):\r
ItemSize = 1\r
- ValueType = "UINT8"\r
- elif Item.startswith('UINT16'):\r
+ ValueType = TAB_UINT8\r
+ elif Item.startswith(TAB_UINT16):\r
ItemSize = 2\r
- ValueType = "UINT16"\r
- elif Item.startswith('UINT32'):\r
+ ValueType = TAB_UINT16\r
+ elif Item.startswith(TAB_UINT32):\r
ItemSize = 4\r
- elif Item.startswith('UINT64'):\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
Item = '0x%x' % TmpValue if type(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
+ ValueStr = '0x%02X' % (int(ItemValue) & 255)\r
ItemValue >>= 8\r
- ValueStr += ', '\r
+ AllPcdValueList.append(ValueStr)\r
Size += ItemSize\r
\r
- if Size > 0:\r
- PcdValue = '{' + ValueStr[:-2] + '}'\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