From: Zhijux Fan <zhijux....@intel.com>
In python3, if Value is octal data, the int(Value, 0) report an error
Cc: Bob Feng <bob.c.f...@intel.com>
Cc: Liming Gao <liming....@intel.com>
Cc: Yonghong Zhu <yonghong....@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Zhiju.Fan <zhijux....@intel.com>
---
BaseTools/Source/Python/AutoGen/GenC.py | 2 ++
BaseTools/Source/Python/Common/Misc.py | 6 ++++--
BaseTools/Source/Python/Workspace/DscBuildData.py | 3 ++-
BaseTools/Source/Python/build/BuildReport.py | 12 ++++++++++++
4 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/GenC.py
b/BaseTools/Source/Python/AutoGen/GenC.py
index 500a78f058..915ba2e235 100644
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -1008,10 +1008,12 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
if Pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES:
try:
if Value.upper().endswith('L'):
Value = Value[:-1]
+ if Value.startswith('0') and not
Value.lower().startswith('0x') and len(Value) > 2:
+ Value = Value.lstrip('0')
ValueNumber = int (Value, 0)
except:
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),
ExtraData="[%s]" % str(Info))
diff --git a/BaseTools/Source/Python/Common/Misc.py
b/BaseTools/Source/Python/Common/Misc.py
index 83dabc9393..4c7eb449ca 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1373,13 +1373,15 @@ def CheckPcdDatum(Type, Value):
elif Type == 'BOOLEAN':
if Value not in ['TRUE', 'True', 'true', '0x1', '0x01', '1', 'FALSE',
'False', 'false', '0x0', '0x00', '0']:
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)
elif Type in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64]:
- if Value and int(Value, 0) < 0:
- return False, "PCD can't be set to negative value[%s] for datum
type [%s]" % (Value, Type)
+ if Value.startswith('0') and not Value.lower().startswith('0x') and
len(Value) > 2:
+ Value = Value.lstrip('0')
try:
+ if Value and int(Value, 0) < 0:
+ return False, "PCD can't be set to negative value[%s] for
datum type [%s]" % (Value, Type)
Value = int(Value, 0)
if Value > MAX_VAL_TYPE[Type]:
return False, "Too large PCD value[%s] for datum type [%s]" %
(Value, Type)
except:
return False, "Invalid value [%s] of type [%s];"\
diff --git a/BaseTools/Source/Python/Workspace/DscBuildData.py
b/BaseTools/Source/Python/Workspace/DscBuildData.py
index 9c5596927f..c2bc705091 100644
--- a/BaseTools/Source/Python/Workspace/DscBuildData.py
+++ b/BaseTools/Source/Python/Workspace/DscBuildData.py
@@ -37,10 +37,11 @@ from Common.Misc import ProcessDuplicatedInf,RemoveCComments
import re
from Common.Parsing import IsValidWord
from Common.VariableAttributes import VariableAttributes
import Common.GlobalData as GlobalData
import subprocess
+from functools import reduce
from Common.Misc import SaveFileOnChange
from Workspace.BuildClassObject import PlatformBuildClassObject, StructurePcd,
PcdClassObject, ModuleBuildClassObject
from collections import OrderedDict, defaultdict
from .BuildClassObject import ArrayIndex
@@ -1926,11 +1927,11 @@ class DscBuildData(PlatformBuildClassObject):
index_elements = ArrayIndex.findall(index)
pcd_capacity = Pcd.Capacity
if index:
indicator = "(Pcd"
if len(pcd_capacity)>2:
- for i in xrange(0,len(index_elements)):
+ for i in range(0,len(index_elements)):
index_ele = index_elements[i]
index_num = index_ele.strip("[").strip("]").strip()
if i == len(index_elements) -2:
indicator += "+ %d*Size/sizeof(%s)/%d + %s)"
%(int(cleanupindex(index_elements[i+1])),Pcd.BaseDatumType,reduce(lambda x,y:
int(x)*int(y),pcd_capacity[:-1]), cleanupindex(index_elements[i]))
break
diff --git a/BaseTools/Source/Python/build/BuildReport.py
b/BaseTools/Source/Python/build/BuildReport.py
index ae37a6ce0e..2f2c3b2d83 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1024,26 +1024,34 @@ class PcdReport(object):
FileWrite(File, Key)
First = False
if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:
+ if PcdValue.startswith('0') and not
PcdValue.lower().startswith('0x') and len(PcdValue) > 2:
+ PcdValue = PcdValue.lstrip('0')
PcdValueNumber = int(PcdValue.strip(), 0)
if DecDefaultValue is None:
DecMatch = True
else:
+ if DecDefaultValue.startswith('0') and not
DecDefaultValue.lower().startswith('0x') and len(DecDefaultValue) > 2:
+ DecDefaultValue = DecDefaultValue.lstrip('0')
DecDefaultValueNumber = int(DecDefaultValue.strip(), 0)
DecMatch = (DecDefaultValueNumber == PcdValueNumber)
if InfDefaultValue is None:
InfMatch = True
else:
+ if InfDefaultValue.startswith('0') and not
InfDefaultValue.lower().startswith('0x') and len(InfDefaultValue) > 2:
+ InfDefaultValue = InfDefaultValue.lstrip('0')
InfDefaultValueNumber = int(InfDefaultValue.strip(), 0)
InfMatch = (InfDefaultValueNumber == PcdValueNumber)
if DscDefaultValue is None:
DscMatch = True
else:
+ if DscDefaultValue.startswith('0') and not
DscDefaultValue.lower().startswith('0x') and len(DscDefaultValue) > 2:
+ DscDefaultValue = DscDefaultValue.lstrip('0')
DscDefaultValueNumber = int(DscDefaultValue.strip(), 0)
DscMatch = (DscDefaultValueNumber == PcdValueNumber)
else:
if DecDefaultValue is None:
DecMatch = True
@@ -1161,10 +1169,12 @@ class PcdReport(object):
if not BuildOptionMatch:
ModuleOverride =
self.ModulePcdOverride.get((Pcd.TokenCName, Pcd.TokenSpaceGuidCName), {})
for ModulePath in ModuleOverride:
ModuleDefault = ModuleOverride[ModulePath]
if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:
+ if ModuleDefault.startswith('0') and not
ModuleDefault.lower().startswith('0x') and len(ModuleDefault) > 2:
+ ModuleDefault = ModuleDefault.lstrip('0')
ModulePcdDefaultValueNumber =
int(ModuleDefault.strip(), 0)
Match = (ModulePcdDefaultValueNumber ==
PcdValueNumber)
if Pcd.DatumType == 'BOOLEAN':
ModuleDefault =
str(ModulePcdDefaultValueNumber)
else:
@@ -1259,10 +1269,12 @@ class PcdReport(object):
FileWrite(File, ' %-*s : %6s %10s = %s' % (self.MaxLen, Flag
+ ' ' + PcdTokenCName, TypeName, '(' + Pcd.DatumType + ')', '{'))
for Array in ArrayList:
FileWrite(File, Array)
else:
if Pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES:
+ if Value.startswith('0') and not
Value.lower().startswith('0x') and len(Value) > 2:
+ Value = Value.lstrip('0')
if Value.startswith(('0x', '0X')):
Value = '{} ({:d})'.format(Value, int(Value, 0))
else:
Value = "0x{:X} ({})".format(int(Value, 0), Value)
FileWrite(File, ' %-*s : %6s %10s = %s' % (self.MaxLen, Flag
+ ' ' + PcdTokenCName, TypeName, '(' + Pcd.DatumType + ')', Value))
--
2.20.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
