tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Similar to octal data rectification 

In python3, if Value is octal data, the int(Value, 0) report an error

Cc: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
Zhijux Fan 2019-01-16 20:22:11 +08:00 committed by Feng, Bob C
parent 30e65c4e19
commit 94c912950c
3 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1010,7 +1010,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.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 2: if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 1 and Value.lstrip('0'):
Value = Value.lstrip('0') Value = Value.lstrip('0')
ValueNumber = int (Value, 0) ValueNumber = int (Value, 0)
except: except:

2
BaseTools/Source/Python/Common/Misc.py
View File

@ -1310,7 +1310,7 @@ def CheckPcdDatum(Type, Value):
return False, "Invalid value [%s] of type [%s]; must be one of TRUE, True, true, 0x1, 0x01, 1"\ return False, "Invalid value [%s] of type [%s]; must be one of TRUE, True, true, 0x1, 0x01, 1"\
", FALSE, False, false, 0x0, 0x00, 0" % (Value, Type) ", FALSE, False, false, 0x0, 0x00, 0" % (Value, Type)
elif Type in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64]: elif Type in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64]:
if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 2: if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 1 and Value.lstrip('0'):
Value = Value.lstrip('0') Value = Value.lstrip('0')
try: try:
if Value and int(Value, 0) < 0: if Value and int(Value, 0) < 0:

17
BaseTools/Source/Python/build/BuildReport.py
View File

@ -1026,13 +1026,15 @@ class PcdReport(object):
if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES: if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:
if PcdValue.startswith('0') and not PcdValue.lower().startswith('0x') and len(PcdValue) > 2: if PcdValue.startswith('0') and not PcdValue.lower().startswith('0x') and \
len(PcdValue) > 1 and PcdValue.lstrip('0'):
PcdValue = PcdValue.lstrip('0') PcdValue = PcdValue.lstrip('0')
PcdValueNumber = int(PcdValue.strip(), 0) PcdValueNumber = int(PcdValue.strip(), 0)
if DecDefaultValue is None: if DecDefaultValue is None:
DecMatch = True DecMatch = True
else: else:
if DecDefaultValue.startswith('0') and not DecDefaultValue.lower().startswith('0x') and len(DecDefaultValue) > 2: if DecDefaultValue.startswith('0') and not DecDefaultValue.lower().startswith('0x') and \
len(DecDefaultValue) > 1 and DecDefaultValue.lstrip('0'):
DecDefaultValue = DecDefaultValue.lstrip('0') DecDefaultValue = DecDefaultValue.lstrip('0')
DecDefaultValueNumber = int(DecDefaultValue.strip(), 0) DecDefaultValueNumber = int(DecDefaultValue.strip(), 0)
DecMatch = (DecDefaultValueNumber == PcdValueNumber) DecMatch = (DecDefaultValueNumber == PcdValueNumber)
@ -1040,7 +1042,8 @@ class PcdReport(object):
if InfDefaultValue is None: if InfDefaultValue is None:
InfMatch = True InfMatch = True
else: else:
if InfDefaultValue.startswith('0') and not InfDefaultValue.lower().startswith('0x') and len(InfDefaultValue) > 2: if InfDefaultValue.startswith('0') and not InfDefaultValue.lower().startswith('0x') and \
len(InfDefaultValue) > 1 and InfDefaultValue.lstrip('0'):
InfDefaultValue = InfDefaultValue.lstrip('0') InfDefaultValue = InfDefaultValue.lstrip('0')
InfDefaultValueNumber = int(InfDefaultValue.strip(), 0) InfDefaultValueNumber = int(InfDefaultValue.strip(), 0)
InfMatch = (InfDefaultValueNumber == PcdValueNumber) InfMatch = (InfDefaultValueNumber == PcdValueNumber)
@ -1048,7 +1051,8 @@ class PcdReport(object):
if DscDefaultValue is None: if DscDefaultValue is None:
DscMatch = True DscMatch = True
else: else:
if DscDefaultValue.startswith('0') and not DscDefaultValue.lower().startswith('0x') and len(DscDefaultValue) > 2: if DscDefaultValue.startswith('0') and not DscDefaultValue.lower().startswith('0x') and \
len(DscDefaultValue) > 1 and DscDefaultValue.lstrip('0'):
DscDefaultValue = DscDefaultValue.lstrip('0') DscDefaultValue = DscDefaultValue.lstrip('0')
DscDefaultValueNumber = int(DscDefaultValue.strip(), 0) DscDefaultValueNumber = int(DscDefaultValue.strip(), 0)
DscMatch = (DscDefaultValueNumber == PcdValueNumber) DscMatch = (DscDefaultValueNumber == PcdValueNumber)
@ -1171,7 +1175,8 @@ class PcdReport(object):
for ModulePath in ModuleOverride: for ModulePath in ModuleOverride:
ModuleDefault = ModuleOverride[ModulePath] ModuleDefault = ModuleOverride[ModulePath]
if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES: if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:
if ModuleDefault.startswith('0') and not ModuleDefault.lower().startswith('0x') and len(ModuleDefault) > 2: if ModuleDefault.startswith('0') and not ModuleDefault.lower().startswith('0x') and \
len(ModuleDefault) > 1 and ModuleDefault.lstrip('0'):
ModuleDefault = ModuleDefault.lstrip('0') ModuleDefault = ModuleDefault.lstrip('0')
ModulePcdDefaultValueNumber = int(ModuleDefault.strip(), 0) ModulePcdDefaultValueNumber = int(ModuleDefault.strip(), 0)
Match = (ModulePcdDefaultValueNumber == PcdValueNumber) Match = (ModulePcdDefaultValueNumber == PcdValueNumber)
@ -1274,7 +1279,7 @@ class PcdReport(object):
FileWrite(File, Array) FileWrite(File, Array)
else: else:
if Pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES: if Pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES:
if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 2: if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 1 and Value.lstrip('0'):
Value = Value.lstrip('0') Value = Value.lstrip('0')
if Value.startswith(('0x', '0X')): if Value.startswith(('0x', '0X')):
Value = '{} ({:d})'.format(Value, int(Value, 0)) Value = '{} ({:d})'.format(Value, int(Value, 0))