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>

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
@@ -1010,6 +1010,8 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
             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,

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index 1b8a4bef2e..d23a075f43 100644
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1310,9 +1310,11 @@ def CheckPcdDatum(Type, Value):
             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)

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
@@ -39,6 +39,7 @@ 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

@@ -1928,7 +1929,7 @@ class DscBuildData(PlatformBuildClassObject):
         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:

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index 6c9a20b373..b940de1c90 100644
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1026,22 +1026,30 @@ class PcdReport(object):
 

 

                 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:

@@ -1163,6 +1171,8 @@ class PcdReport(object):
                         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':

@@ -1264,6 +1274,8 @@ class PcdReport(object):
                     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: