Virtualization
/
edk2
mirror of https://gitlab.com/qemu-project/edk2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
BaseTools/Source/Python/AutoGen/GenC.py
View File

@ -1032,10 +1032,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
try: try:
if Value.upper().endswith('L'): if Value.upper().endswith('L'):
Value = Value[:-1] Value = Value[:-1]
if Value.upper().startswith('0X'): ValueNumber = int (Value, 0)
ValueNumber = int (Value, 16)
else:
ValueNumber = int (Value)
except: except:
EdkLogger.error("build", AUTOGEN_ERROR, EdkLogger.error("build", AUTOGEN_ERROR,
"PCD value is not valid dec or hex number for datum type [%s] of PCD %s.%s" % (Pcd.DatumType, Pcd.TokenSpaceGuidCName, TokenCName), "PCD value is not valid dec or hex number for datum type [%s] of PCD %s.%s" % (Pcd.DatumType, Pcd.TokenSpaceGuidCName, TokenCName),

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

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

5
BaseTools/Source/Python/GenFds/FdfParser.py
View File

@ -1146,10 +1146,7 @@ class FdfParser:
if Scope in ['UINT64', 'UINT8']: if Scope in ['UINT64', 'UINT8']:
ValueNumber = 0 ValueNumber = 0
try: try:
if Value.upper().startswith('0X'): ValueNumber = int (Value, 0)
ValueNumber = int (Value, 16)
else:
ValueNumber = int (Value)
except: except:
EdkLogger.error("FdfParser", FORMAT_INVALID, "The value is not valid dec or hex number for %s." % Name) EdkLogger.error("FdfParser", FORMAT_INVALID, "The value is not valid dec or hex number for %s." % Name)
if ValueNumber < 0: if ValueNumber < 0:

10
BaseTools/Source/Python/PatchPcdValue/PatchPcdValue.py
View File

@ -110,10 +110,7 @@ def PatchBinaryFile(FileName, ValueOffset, TypeName, ValueString, MaxSize=0):
ValueNumber = 1 ValueNumber = 1
elif ValueString == 'FALSE': elif ValueString == 'FALSE':
ValueNumber = 0 ValueNumber = 0
elif ValueString.startswith('0X'): ValueNumber = int (ValueString, 0)
ValueNumber = int (ValueString, 16)
else:
ValueNumber = int (ValueString)
if ValueNumber != 0: if ValueNumber != 0:
ValueNumber = 1 ValueNumber = 1
except: except:
@ -127,10 +124,7 @@ def PatchBinaryFile(FileName, ValueOffset, TypeName, ValueString, MaxSize=0):
# Get PCD value for UINT* data type # Get PCD value for UINT* data type
# #
try: try:
if ValueString.startswith('0X'): ValueNumber = int (ValueString, 0)
ValueNumber = int (ValueString, 16)
else:
ValueNumber = int (ValueString)
except: except:
return PARAMETER_INVALID, "PCD Value %s is not valid dec or hex string." % (ValueString) return PARAMETER_INVALID, "PCD Value %s is not valid dec or hex string." % (ValueString)
# #