BaseTools: change the Division Operator in the expression

PEP 238 -- Changing the Division Operator
x/y to return a reasonable approximation of the mathematical result
    of the division ("true division")
x//y to return the floor ("floor division")

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

7 files changed, 18 insertions, 18 deletions

diff --git a/BaseTools/Source/Python/GenFds/DataSection.py b/BaseTools/Source/Python/GenFds/DataSection.py
index 182ea4f..3302c14 100644
--- a/BaseTools/Source/Python/GenFds/DataSection.py
+++ b/BaseTools/Source/Python/GenFds/DataSection.py
@@ -87,9 +87,9 @@ class DataSection (DataSectionClassObject):
             if ImageObj.SectionAlignment < 0x400:

                 self.Alignment = str (ImageObj.SectionAlignment)

             elif ImageObj.SectionAlignment < 0x100000:

-                self.Alignment = str (ImageObj.SectionAlignment / 0x400) + 'K'

+                self.Alignment = str (ImageObj.SectionAlignment // 0x400) + 'K'

             else:

-                self.Alignment = str (ImageObj.SectionAlignment / 0x100000) + 'M'

+                self.Alignment = str (ImageObj.SectionAlignment // 0x100000) + 'M'

 

         NoStrip = True

         if self.SecType in (BINARY_FILE_TYPE_TE, BINARY_FILE_TYPE_PE32):

diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Source/Python/GenFds/EfiSection.py
index fa2148e..9fe7db3 100644
--- a/BaseTools/Source/Python/GenFds/EfiSection.py
+++ b/BaseTools/Source/Python/GenFds/EfiSection.py
@@ -247,9 +247,9 @@ class EfiSection (EfiSectionClassObject):
                         if ImageObj.SectionAlignment < 0x400:

                             Align = str (ImageObj.SectionAlignment)

                         elif ImageObj.SectionAlignment < 0x100000:

-                            Align = str (ImageObj.SectionAlignment / 0x400) + 'K'

+                            Align = str (ImageObj.SectionAlignment // 0x400) + 'K'

                         else:

-                            Align = str (ImageObj.SectionAlignment / 0x100000) + 'M'

+                            Align = str (ImageObj.SectionAlignment // 0x100000) + 'M'

 

                     if File[(len(File)-4):] == '.efi':

                         MapFile = File.replace('.efi', '.map')

diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
index e9dd5bc..9ef03ed 100644
--- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py
+++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py
@@ -770,9 +770,9 @@ class FfsInfStatement(FfsInfStatementClassObject):
                     if ImageObj.SectionAlignment < 0x400:

                         self.Alignment = str (ImageObj.SectionAlignment)

                     elif ImageObj.SectionAlignment < 0x100000:

-                        self.Alignment = str (ImageObj.SectionAlignment / 0x400) + 'K'

+                        self.Alignment = str (ImageObj.SectionAlignment // 0x400) + 'K'

                     else:

-                        self.Alignment = str (ImageObj.SectionAlignment / 0x100000) + 'M'

+                        self.Alignment = str (ImageObj.SectionAlignment // 0x100000) + 'M'

 

                 if not NoStrip:

                     FileBeforeStrip = os.path.join(self.OutputPath, ModuleName + '.reloc')

@@ -812,9 +812,9 @@ class FfsInfStatement(FfsInfStatementClassObject):
                 if ImageObj.SectionAlignment < 0x400:

                     self.Alignment = str (ImageObj.SectionAlignment)

                 elif ImageObj.SectionAlignment < 0x100000:

-                    self.Alignment = str (ImageObj.SectionAlignment / 0x400) + 'K'

+                    self.Alignment = str (ImageObj.SectionAlignment // 0x400) + 'K'

                 else:

-                    self.Alignment = str (ImageObj.SectionAlignment / 0x100000) + 'M'

+                    self.Alignment = str (ImageObj.SectionAlignment // 0x100000) + 'M'

 

             if not NoStrip:

                 FileBeforeStrip = os.path.join(self.OutputPath, ModuleName + '.reloc')

diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python/GenFds/Fv.py
index 7653cf6..3c3cd0b 100644
--- a/BaseTools/Source/Python/GenFds/Fv.py
+++ b/BaseTools/Source/Python/GenFds/Fv.py
@@ -212,9 +212,9 @@ class FV (FvClassObject):
                         #The max alignment supported by FFS is 16M.

                             self.FvAlignment = "16M"

                         else:

-                            self.FvAlignment = str(FvAlignmentValue / 0x100000) + "M"

+                            self.FvAlignment = str(FvAlignmentValue // 0x100000) + "M"

                     else:

-                        self.FvAlignment = str(FvAlignmentValue / 0x400) + "K"

+                        self.FvAlignment = str(FvAlignmentValue // 0x400) + "K"

                 else:

                     # FvAlignmentValue is less than 1K

                     self.FvAlignment = str (FvAlignmentValue)

diff --git a/BaseTools/Source/Python/GenFds/FvImageSection.py b/BaseTools/Source/Python/GenFds/FvImageSection.py
index 5f1b42b..5cc5b96 100644
--- a/BaseTools/Source/Python/GenFds/FvImageSection.py
+++ b/BaseTools/Source/Python/GenFds/FvImageSection.py
@@ -70,7 +70,7 @@ class FvImageSection(FvImageSectionClassObject):
                     # PI FvHeader is 0x48 byte

                     FvHeaderBuffer = FvFileObj.read(0x48)

                     # FV alignment position.

-                    FvAlignmentValue = 1 << (ord (FvHeaderBuffer[0x2E]) & 0x1F)

+                    FvAlignmentValue = 1 << (FvHeaderBuffer[0x2E] & 0x1F)

                     FvFileObj.close()

                 if FvAlignmentValue > MaxFvAlignment:

                     MaxFvAlignment = FvAlignmentValue

@@ -86,9 +86,9 @@ class FvImageSection(FvImageSectionClassObject):
                     if MaxFvAlignment >= 0x1000000:

                         self.Alignment = "16M"

                     else:

-                        self.Alignment = str(MaxFvAlignment / 0x100000) + "M"

+                        self.Alignment = str(MaxFvAlignment // 0x100000) + "M"

                 else:

-                    self.Alignment = str (MaxFvAlignment / 0x400) + "K"

+                    self.Alignment = str (MaxFvAlignment // 0x400) + "K"

             else:

                 # MaxFvAlignment is less than 1K

                 self.Alignment = str (MaxFvAlignment)

@@ -126,9 +126,9 @@ class FvImageSection(FvImageSectionClassObject):
                                 if FvAlignmentValue >= 0x1000000:

                                     self.Alignment = "16M"

                                 else:

-                                    self.Alignment = str(FvAlignmentValue / 0x100000) + "M"

+                                    self.Alignment = str(FvAlignmentValue // 0x100000) + "M"

                             else:

-                                self.Alignment = str (FvAlignmentValue / 0x400) + "K"

+                                self.Alignment = str (FvAlignmentValue // 0x400) + "K"

                         else:

                             # FvAlignmentValue is less than 1K

                             self.Alignment = str (FvAlignmentValue)

diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index e135139..ed1bd33 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -684,7 +684,7 @@ class GenFds :
                                     F.read()

                                     length = F.tell()

                                     F.seek(4)

-                                    TmpStr = unpack('%dh' % ((length - 4) / 2), F.read())

+                                    TmpStr = unpack('%dh' % ((length - 4) // 2), F.read())

                                     Name = ''.join(chr(c) for c in TmpStr[:-1])

                         else:

                             FileList = []

diff --git a/BaseTools/Source/Python/GenFds/Region.py b/BaseTools/Source/Python/GenFds/Region.py
index cd81c6d..31c65a3 100644
--- a/BaseTools/Source/Python/GenFds/Region.py
+++ b/BaseTools/Source/Python/GenFds/Region.py
@@ -296,7 +296,7 @@ class Region(RegionClassObject):
             else:

                 # region ended within current blocks

                 if self.Offset + self.Size <= End:

-                    ExpectedList.append((BlockSize, (RemindingSize + BlockSize - 1) / BlockSize))

+                    ExpectedList.append((BlockSize, (RemindingSize + BlockSize - 1) // BlockSize))

                     break

                 # region not ended yet

                 else:

@@ -305,7 +305,7 @@ class Region(RegionClassObject):
                         UsedBlockNum = BlockNum

                     # region started in middle of current blocks

                     else:

-                        UsedBlockNum = (End - self.Offset) / BlockSize

+                        UsedBlockNum = (End - self.Offset) // BlockSize

                     Start = End

                     ExpectedList.append((BlockSize, UsedBlockNum))

                     RemindingSize -= BlockSize * UsedBlockNum