BaseTools: replace long by int

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

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 3bcfd2d42a46a51036680160fb8fb2261eb8377f..69cb7de8e5bde6dc7805da31eed71b49f579a24b 100644 (file)
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -1562,7 +1562,7 @@ class FdfParser:
                 self.SetPcdLocalation(pcdPair)\r
                 FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
                 self.Profile.PcdFileLineDict[pcdPair] = FileLineTuple\r
-            Obj.Size = long(Size, 0)\r
+            Obj.Size = int(Size, 0)\r
             return True\r
 \r
         if self._IsKeyword("ErasePolarity"):\r
@@ -1597,7 +1597,7 @@ class FdfParser:
             if not self._GetNextDecimalNumber() and not self._GetNextHexNumber():\r
                 raise Warning.Expected("address", self.FileName, self.CurrentLineNumber)\r
 \r
-            BsAddress = long(self._Token, 0)\r
+            BsAddress = int(self._Token, 0)\r
             Obj.BsBaseAddress = BsAddress\r
 \r
         if self._IsKeyword("RtBaseAddress"):\r
@@ -1607,7 +1607,7 @@ class FdfParser:
             if not self._GetNextDecimalNumber() and not self._GetNextHexNumber():\r
                 raise Warning.Expected("address", self.FileName, self.CurrentLineNumber)\r
 \r
-            RtAddress = long(self._Token, 0)\r
+            RtAddress = int(self._Token, 0)\r
             Obj.RtBaseAddress = RtAddress\r
 \r
     ## _GetBlockStatements() method\r
@@ -1655,7 +1655,7 @@ class FdfParser:
             self.SetPcdLocalation(PcdPair)\r
             FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
             self.Profile.PcdFileLineDict[PcdPair] = FileLineTuple\r
-        BlockSize = long(BlockSize, 0)\r
+        BlockSize = int(BlockSize, 0)\r
 \r
         BlockNumber = None\r
         if self._IsKeyword("NumBlocks"):\r
@@ -1665,7 +1665,7 @@ class FdfParser:
             if not self._GetNextDecimalNumber() and not self._GetNextHexNumber():\r
                 raise Warning.Expected("block numbers", self.FileName, self.CurrentLineNumber)\r
 \r
-            BlockNumber = long(self._Token, 0)\r
+            BlockNumber = int(self._Token, 0)\r
 \r
         Obj.BlockSizeList.append((BlockSize, BlockNumber, BlockSizePcd))\r
         return True\r
@@ -1774,7 +1774,7 @@ class FdfParser:
             Expr += CurCh\r
             self._GetOneChar()\r
         try:\r
-            return long(\r
+            return int(\r
                 ValueExpression(Expr,\r
                                 self._CollectMacroPcd()\r
                                 )(True), 0)\r
@@ -1822,7 +1822,7 @@ class FdfParser:
                            RegionOffsetPcdPattern.match(self._CurrentLine()[self.CurrentOffsetWithinLine:]))\r
             if IsRegionPcd:\r
                 RegionObj.PcdOffset = self._GetNextPcdSettings()\r
-                self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + long(theFd.BaseAddress, 0))\r
+                self.Profile.PcdDict[RegionObj.PcdOffset] = "0x%08X" % (RegionObj.Offset + int(theFd.BaseAddress, 0))\r
                 self.SetPcdLocalation(RegionObj.PcdOffset)\r
                 self._PcdDict['%s.%s' % (RegionObj.PcdOffset[1], RegionObj.PcdOffset[0])] = "0x%x" % RegionObj.Offset\r
                 FileLineTuple = GetRealFileLine(self.FileName, self.CurrentLineNumber)\r
@@ -3134,9 +3134,9 @@ class FdfParser:
                     if FdfParser._Verify(Name, Value, 'UINT64'):\r
                         FmpData.MonotonicCount = Value\r
                         if FmpData.MonotonicCount.upper().startswith('0X'):\r
-                            FmpData.MonotonicCount = (long)(FmpData.MonotonicCount, 16)\r
+                            FmpData.MonotonicCount = int(FmpData.MonotonicCount, 16)\r
                         else:\r
-                            FmpData.MonotonicCount = (long)(FmpData.MonotonicCount)\r
+                            FmpData.MonotonicCount = int(FmpData.MonotonicCount)\r
             if not self._GetNextToken():\r
                 break\r
         else:\r