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>

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index e46942a3e2662be9ebf89b0d485283f9923f0425..f1f3b6f359c55b94b35acafecaa07322a3ce2603 100644 (file)
--- a/BaseTools/Source/Python/AutoGen/GenC.py
+++ b/BaseTools/Source/Python/AutoGen/GenC.py
@@ -1010,7 +1010,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
             try:\r
                 if Value.upper().endswith('L'):\r
                     Value = Value[:-1]\r
             try:\r
                 if Value.upper().endswith('L'):\r
                     Value = Value[:-1]\r

-                if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 2:\r
+                if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 1 and Value.lstrip('0'):\r

                     Value = Value.lstrip('0')\r
                 ValueNumber = int (Value, 0)\r
             except:\r
                     Value = Value.lstrip('0')\r
                 ValueNumber = int (Value, 0)\r
             except:\r

diff --git a/BaseTools/Source/Python/Common/Misc.py b/BaseTools/Source/Python/Common/Misc.py
index bd7c2812e89f939ab3e36b0a38d5a7289a8ac0a4..e0e355286b811c65b42bb0edaba0a1d43a93be68 100644 (file)
--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -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"\\r
                           ", FALSE, False, false, 0x0, 0x00, 0" % (Value, Type)\r
     elif Type in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64]:\r
             return False, "Invalid value [%s] of type [%s]; must be one of TRUE, True, true, 0x1, 0x01, 1"\\r
                           ", FALSE, False, false, 0x0, 0x00, 0" % (Value, Type)\r
     elif Type in [TAB_UINT8, TAB_UINT16, TAB_UINT32, TAB_UINT64]:\r

-        if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 2:\r
+        if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 1 and Value.lstrip('0'):\r

             Value = Value.lstrip('0')\r
         try:\r
             if Value and int(Value, 0) < 0:\r
             Value = Value.lstrip('0')\r
         try:\r
             if Value and int(Value, 0) < 0:\r

diff --git a/BaseTools/Source/Python/build/BuildReport.py b/BaseTools/Source/Python/build/BuildReport.py
index ff632b6759b2303c608875579a78e2537e45ce86..9483262dd154e18a1304c0dfae98ed7f850d3410 100644 (file)
--- a/BaseTools/Source/Python/build/BuildReport.py
+++ b/BaseTools/Source/Python/build/BuildReport.py
@@ -1026,13 +1026,15 @@ class PcdReport(object):
 \r
 \r
                 if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:\r
 \r
 \r
                 if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:\r

-                    if PcdValue.startswith('0') and not PcdValue.lower().startswith('0x') and len(PcdValue) > 2:\r
+                    if PcdValue.startswith('0') and not PcdValue.lower().startswith('0x') and \\r
+                            len(PcdValue) > 1 and PcdValue.lstrip('0'):\r

                         PcdValue = PcdValue.lstrip('0')\r
                     PcdValueNumber = int(PcdValue.strip(), 0)\r
                     if DecDefaultValue is None:\r
                         DecMatch = True\r
                     else:\r
                         PcdValue = PcdValue.lstrip('0')\r
                     PcdValueNumber = int(PcdValue.strip(), 0)\r
                     if DecDefaultValue is None:\r
                         DecMatch = True\r
                     else:\r

-                        if DecDefaultValue.startswith('0') and not DecDefaultValue.lower().startswith('0x') and len(DecDefaultValue) > 2:\r
+                        if DecDefaultValue.startswith('0') and not DecDefaultValue.lower().startswith('0x') and \\r
+                                len(DecDefaultValue) > 1 and DecDefaultValue.lstrip('0'):\r

                             DecDefaultValue = DecDefaultValue.lstrip('0')\r
                         DecDefaultValueNumber = int(DecDefaultValue.strip(), 0)\r
                         DecMatch = (DecDefaultValueNumber == PcdValueNumber)\r
                             DecDefaultValue = DecDefaultValue.lstrip('0')\r
                         DecDefaultValueNumber = int(DecDefaultValue.strip(), 0)\r
                         DecMatch = (DecDefaultValueNumber == PcdValueNumber)\r


@@ -1040,7 +1042,8 @@ class PcdReport(object):
                     if InfDefaultValue is None:\r
                         InfMatch = True\r
                     else:\r
                     if InfDefaultValue is None:\r
                         InfMatch = True\r
                     else:\r

-                        if InfDefaultValue.startswith('0') and not InfDefaultValue.lower().startswith('0x') and len(InfDefaultValue) > 2:\r
+                        if InfDefaultValue.startswith('0') and not InfDefaultValue.lower().startswith('0x') and \\r
+                                len(InfDefaultValue) > 1 and InfDefaultValue.lstrip('0'):\r

                             InfDefaultValue = InfDefaultValue.lstrip('0')\r
                         InfDefaultValueNumber = int(InfDefaultValue.strip(), 0)\r
                         InfMatch = (InfDefaultValueNumber == PcdValueNumber)\r
                             InfDefaultValue = InfDefaultValue.lstrip('0')\r
                         InfDefaultValueNumber = int(InfDefaultValue.strip(), 0)\r
                         InfMatch = (InfDefaultValueNumber == PcdValueNumber)\r


@@ -1048,7 +1051,8 @@ class PcdReport(object):
                     if DscDefaultValue is None:\r
                         DscMatch = True\r
                     else:\r
                     if DscDefaultValue is None:\r
                         DscMatch = True\r
                     else:\r

-                        if DscDefaultValue.startswith('0') and not DscDefaultValue.lower().startswith('0x') and len(DscDefaultValue) > 2:\r
+                        if DscDefaultValue.startswith('0') and not DscDefaultValue.lower().startswith('0x') and \\r
+                                len(DscDefaultValue) > 1 and DscDefaultValue.lstrip('0'):\r

                             DscDefaultValue = DscDefaultValue.lstrip('0')\r
                         DscDefaultValueNumber = int(DscDefaultValue.strip(), 0)\r
                         DscMatch = (DscDefaultValueNumber == PcdValueNumber)\r
                             DscDefaultValue = DscDefaultValue.lstrip('0')\r
                         DscDefaultValueNumber = int(DscDefaultValue.strip(), 0)\r
                         DscMatch = (DscDefaultValueNumber == PcdValueNumber)\r


@@ -1171,7 +1175,8 @@ class PcdReport(object):
                         for ModulePath in ModuleOverride:\r
                             ModuleDefault = ModuleOverride[ModulePath]\r
                             if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:\r
                         for ModulePath in ModuleOverride:\r
                             ModuleDefault = ModuleOverride[ModulePath]\r
                             if Pcd.DatumType in TAB_PCD_NUMERIC_TYPES:\r

-                                if ModuleDefault.startswith('0') and not ModuleDefault.lower().startswith('0x') and len(ModuleDefault) > 2:\r
+                                if ModuleDefault.startswith('0') and not ModuleDefault.lower().startswith('0x') and \\r
+                                        len(ModuleDefault) > 1 and ModuleDefault.lstrip('0'):\r

                                     ModuleDefault = ModuleDefault.lstrip('0')\r
                                 ModulePcdDefaultValueNumber = int(ModuleDefault.strip(), 0)\r
                                 Match = (ModulePcdDefaultValueNumber == PcdValueNumber)\r
                                     ModuleDefault = ModuleDefault.lstrip('0')\r
                                 ModulePcdDefaultValueNumber = int(ModuleDefault.strip(), 0)\r
                                 Match = (ModulePcdDefaultValueNumber == PcdValueNumber)\r


@@ -1274,7 +1279,7 @@ class PcdReport(object):
                     FileWrite(File, Array)\r
             else:\r
                 if Pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES:\r
                     FileWrite(File, Array)\r
             else:\r
                 if Pcd.DatumType in TAB_PCD_CLEAN_NUMERIC_TYPES:\r

-                    if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 2:\r
+                    if Value.startswith('0') and not Value.lower().startswith('0x') and len(Value) > 1 and Value.lstrip('0'):\r

                         Value = Value.lstrip('0')\r
                     if Value.startswith(('0x', '0X')):\r
                         Value = '{} ({:d})'.format(Value, int(Value, 0))\r
                         Value = Value.lstrip('0')\r
                     if Value.startswith(('0x', '0X')):\r
                         Value = '{} ({:d})'.format(Value, int(Value, 0))\r