BaseTools: change the Division Operator in the expression

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / Region.py

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index 44f122a712168b4153919f1164843a99aa150975..31c65a32a12431e30e1433e10b4a6fc158cfc5cb 100644 (file)
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -16,8 +16,8 @@
 # Import Modules\r
 #\r
 from struct import *\r
-from GenFdsGlobalVariable import GenFdsGlobalVariable\r
-import StringIO\r
+from .GenFdsGlobalVariable import GenFdsGlobalVariable\r
+from io import BytesIO\r
 import string\r
 from CommonDataClass.FdfClass import RegionClassObject\r
 import Common.LongFilePathOs as os\r
@@ -26,6 +26,7 @@ from Common import EdkLogger
 from Common.BuildToolError import *\r
 from Common.LongFilePathSupport import OpenLongFilePath as open\r
 from Common.MultipleWorkspace import MultipleWorkspace as mws\r
+from Common.DataType import BINARY_FILE_TYPE_FV\r
 \r
 ## generate Region\r
 #\r
@@ -56,8 +57,8 @@ class Region(RegionClassObject):
                 PadByte = pack('B', 0xFF)\r
             else:\r
                 PadByte = pack('B', 0)\r
-            PadData = ''.join(PadByte for i in xrange(0, Size))\r
-            Buffer.write(PadData)\r
+            for i in range(0, Size):\r
+                Buffer.write(PadByte)\r
 \r
     ## AddToBuffer()\r
     #\r
@@ -80,10 +81,10 @@ class Region(RegionClassObject):
             GenFdsGlobalVariable.InfLogger('\nGenerate Region at Offset 0x%X' % self.Offset)\r
             GenFdsGlobalVariable.InfLogger("   Region Size = 0x%X" % Size)\r
         GenFdsGlobalVariable.SharpCounter = 0\r
-        if Flag and (self.RegionType != 'FV'):\r
+        if Flag and (self.RegionType != BINARY_FILE_TYPE_FV):\r
             return\r
 \r
-        if self.RegionType == 'FV':\r
+        if self.RegionType == BINARY_FILE_TYPE_FV:\r
             #\r
             # Get Fv from FvDict\r
             #\r
@@ -122,11 +123,11 @@ class Region(RegionClassObject):
                         #\r
                         self.BlockInfoOfRegion(BlockSizeList, FvObj)\r
                         self.FvAddress = self.FvAddress + FvOffset\r
-                        FvAlignValue = self.GetFvAlignValue(FvObj.FvAlignment)\r
+                        FvAlignValue = GenFdsGlobalVariable.GetAlignment(FvObj.FvAlignment)\r
                         if self.FvAddress % FvAlignValue != 0:\r
                             EdkLogger.error("GenFds", GENFDS_ERROR,\r
                                             "FV (%s) is NOT %s Aligned!" % (FvObj.UiFvName, FvObj.FvAlignment))\r
-                        FvBuffer = StringIO.StringIO('')\r
+                        FvBuffer = BytesIO()\r
                         FvBaseAddress = '0x%X' % self.FvAddress\r
                         BlockSize = None\r
                         BlockNum = None\r
@@ -134,7 +135,8 @@ class Region(RegionClassObject):
                         if Flag:\r
                             continue\r
 \r
-                        if FvBuffer.len > Size:\r
+                        FvBufferLen = len(FvBuffer.getvalue())\r
+                        if FvBufferLen > Size:\r
                             FvBuffer.close()\r
                             EdkLogger.error("GenFds", GENFDS_ERROR,\r
                                             "Size of FV (%s) is larger than Region Size 0x%X specified." % (RegionData, Size))\r
@@ -143,8 +145,8 @@ class Region(RegionClassObject):
                         #\r
                         Buffer.write(FvBuffer.getvalue())\r
                         FvBuffer.close()\r
-                        FvOffset = FvOffset + FvBuffer.len\r
-                        Size = Size - FvBuffer.len\r
+                        FvOffset = FvOffset + FvBufferLen\r
+                        Size = Size - FvBufferLen\r
                         continue\r
                     else:\r
                         EdkLogger.error("GenFds", GENFDS_ERROR, "FV (%s) is NOT described in FDF file!" % (RegionData))\r
@@ -274,25 +276,6 @@ class Region(RegionClassObject):
             GenFdsGlobalVariable.InfLogger('   Region Name = None')\r
             self.PadBuffer(Buffer, ErasePolarity, Size)\r
 \r
-    def GetFvAlignValue(self, Str):\r
-        AlignValue = 1\r
-        Granu = 1\r
-        Str = Str.strip().upper()\r
-        if Str.endswith('K'):\r
-            Granu = 1024\r
-            Str = Str[:-1]\r
-        elif Str.endswith('M'):\r
-            Granu = 1024 * 1024\r
-            Str = Str[:-1]\r
-        elif Str.endswith('G'):\r
-            Granu = 1024 * 1024 * 1024\r
-            Str = Str[:-1]\r
-        else:\r
-            pass\r
-\r
-        AlignValue = int(Str) * Granu\r
-        return AlignValue\r
-\r
     ## BlockSizeOfRegion()\r
     #\r
     #   @param  BlockSizeList        List of block information\r
@@ -309,11 +292,11 @@ class Region(RegionClassObject):
             if self.Offset >= End:\r
                 Start = End\r
                 continue\r
-            # region located in current blocks \r
+            # region located in current blocks\r
             else:\r
                 # region ended within current blocks\r
                 if self.Offset + self.Size <= End:\r
-                    ExpectedList.append((BlockSize, (RemindingSize + BlockSize - 1) / BlockSize))\r
+                    ExpectedList.append((BlockSize, (RemindingSize + BlockSize - 1) // BlockSize))\r
                     break\r
                 # region not ended yet\r
                 else:\r
@@ -322,7 +305,7 @@ class Region(RegionClassObject):
                         UsedBlockNum = BlockNum\r
                     # region started in middle of current blocks\r
                     else:\r
-                        UsedBlockNum = (End - self.Offset) / BlockSize\r
+                        UsedBlockNum = (End - self.Offset) // BlockSize\r
                     Start = End\r
                     ExpectedList.append((BlockSize, UsedBlockNum))\r
                     RemindingSize -= BlockSize * UsedBlockNum\r
@@ -361,5 +344,5 @@ class Region(RegionClassObject):
                 else:\r
                     Index += 1\r
 \r
-            \r
+\r
 \r