sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: no need to do int() API work for it

Browse Source 
int() with base=0 will already auto determine base from preceeding 0x/0X

Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
This commit is contained in:
Carsey, Jaben
2018-03-29 08:02:17 +08:00
committed by Yonghong Zhu
parent 4231a8193e
commit 0944818a19
4 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BaseTools/Source/Python/Common/Expression.py
View File

@ -845,7 +845,7 @@ class ValueExpressionEx(ValueExpression):
if ItemSize == 0:
try:
tmpValue = int(Item, 16) if Item.upper().startswith('0X') else int(Item, 0)
tmpValue = int(Item, 0)
if tmpValue > 255:
raise BadExpression("Byte array number %s should less than 0xFF." % Item)
except BadExpression, Value:
@ -857,7 +857,7 @@ class ValueExpressionEx(ValueExpression):
ItemValue = ParseFieldValue(Item)[0]
if type(ItemValue) == type(''):
ItemValue = int(ItemValue, 16) if ItemValue.startswith('0x') else int(ItemValue)
ItemValue = int(ItemValue, 0)
TmpValue = (ItemValue << (Size * 8)) | TmpValue
Size = Size + ItemSize