BaseTools: Similar to octal data rectification

[mirror_edk2.git] / BaseTools / Source / Python / AutoGen / GenC.py

diff --git a/BaseTools/Source/Python/AutoGen/GenC.py b/BaseTools/Source/Python/AutoGen/GenC.py
index 500a78f0581abd805a2ab68de14b3049a72872de..f1f3b6f359c55b94b35acafecaa07322a3ce2603 100644 (file)
--- 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:\r
                 if Value.upper().endswith('L'):\r
                     Value = Value[:-1]\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
                 EdkLogger.error("build", AUTOGEN_ERROR,\r
@@ -1051,7 +1053,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
                     else:\r
                         NewValue = NewValue + str(ord(Value[Index]) % 0x100) + ', '\r
                 if Unicode:\r
-                    ArraySize = ArraySize / 2\r
+                    ArraySize = ArraySize // 2\r
                 Value = NewValue + '0 }'\r
             if ArraySize < ValueSize:\r
                 if Pcd.MaxSizeUserSet:\r
@@ -1061,7 +1063,7 @@ def CreateModulePcdCode(Info, AutoGenC, AutoGenH, Pcd):
                 else:\r
                     ArraySize = Pcd.GetPcdSize()\r
                     if Unicode:\r
-                        ArraySize = ArraySize / 2\r
+                        ArraySize = ArraySize // 2\r
             Array = '[%d]' % ArraySize\r
         #\r
         # skip casting for fixed at build since it breaks ARM assembly.\r
@@ -1904,7 +1906,7 @@ def BmpImageDecoder(File, Buffer, PaletteIndex, TransParent):
         else:\r
             ImageBuffer = pack('B', EFI_HII_IIBT_IMAGE_1BIT)\r
         ImageBuffer += pack('B', PaletteIndex)\r
-        Width = (BmpHeader.biWidth + 7)/8\r
+        Width = (BmpHeader.biWidth + 7)//8\r
         if BmpHeader.bfOffBits > BMP_IMAGE_HEADER_STRUCT.size + 2:\r
             PaletteBuffer = Buffer[BMP_IMAGE_HEADER_STRUCT.size + 2 : BmpHeader.bfOffBits]\r
     elif BmpHeader.biBitCount == 4:\r
@@ -1913,7 +1915,7 @@ def BmpImageDecoder(File, Buffer, PaletteIndex, TransParent):
         else:\r
             ImageBuffer = pack('B', EFI_HII_IIBT_IMAGE_4BIT)\r
         ImageBuffer += pack('B', PaletteIndex)\r
-        Width = (BmpHeader.biWidth + 1)/2\r
+        Width = (BmpHeader.biWidth + 1)//2\r
         if BmpHeader.bfOffBits > BMP_IMAGE_HEADER_STRUCT.size + 2:\r
             PaletteBuffer = Buffer[BMP_IMAGE_HEADER_STRUCT.size + 2 : BmpHeader.bfOffBits]\r
     elif BmpHeader.biBitCount == 8:\r