itemIndex += 1\r
realLength += 5\r
for v_data in item.data:\r
- if type(v_data) in (int, long):\r
+ if isinstance(v_data, int):\r
realLength += item.StorageWidth\r
else:\r
realLength += item.StorageWidth\r
Buffer += b\r
realLength += 1\r
for v_data in item.data:\r
- if type(v_data) in (int, long):\r
+ if isinstance(v_data, int):\r
b = pack(PACK_CODE_BY_SIZE[item.StorageWidth], v_data)\r
Buffer += b\r
realLength += item.StorageWidth\r
if Value and int(Value, 0) < 0:\r
return False, "PCD can't be set to negative value[%s] for datum type [%s]" % (Value, Type)\r
try:\r
- Value = long(Value, 0)\r
+ Value = int(Value, 0)\r
if Value > MAX_VAL_TYPE[Type]:\r
return False, "Too large PCD value[%s] for datum type [%s]" % (Value, Type)\r
except:\r
% (InfFileName, GenFdsGlobalVariable.ArchList))\r
\r
GuidPart = Guid.split('-')\r
- Buffer.write(pack('I', long(GuidPart[0], 16)))\r
+ Buffer.write(pack('I', int(GuidPart[0], 16)))\r
Buffer.write(pack('H', int(GuidPart[1], 16)))\r
Buffer.write(pack('H', int(GuidPart[2], 16)))\r
\r
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
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
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
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
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
Expr += CurCh\r
self._GetOneChar()\r
try:\r
- return long(\r
+ return int(\r
ValueExpression(Expr,\r
self._CollectMacroPcd()\r
)(True), 0)\r
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
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
GenFdsGlobalVariable.InfLogger('\nFV Space Information')\r
for FvSpaceInfo in FvSpaceInfoList:\r
Name = FvSpaceInfo[0]\r
- TotalSizeValue = long(FvSpaceInfo[1], 0)\r
- UsedSizeValue = long(FvSpaceInfo[2], 0)\r
- FreeSizeValue = long(FvSpaceInfo[3], 0)\r
+ TotalSizeValue = int(FvSpaceInfo[1], 0)\r
+ UsedSizeValue = int(FvSpaceInfo[2], 0)\r
+ FreeSizeValue = int(FvSpaceInfo[3], 0)\r
if UsedSizeValue == TotalSizeValue:\r
Percentage = '100'\r
else:\r
if PcdValue == '':\r
return\r
\r
- Int64PcdValue = long(PcdValue, 0)\r
+ Int64PcdValue = int(PcdValue, 0)\r
if Int64PcdValue == 0 or Int64PcdValue < -1:\r
return\r
\r
\r
try:\r
if args.MonotonicCountStr.upper().startswith('0X'):\r
- args.MonotonicCountValue = (long)(args.MonotonicCountStr, 16)\r
+ args.MonotonicCountValue = int(args.MonotonicCountStr, 16)\r
else:\r
- args.MonotonicCountValue = (long)(args.MonotonicCountStr)\r
+ args.MonotonicCountValue = int(args.MonotonicCountStr)\r
except:\r
- args.MonotonicCountValue = (long)(0)\r
+ args.MonotonicCountValue = int(0)\r
\r
if args.Encode:\r
#\r
sys.exit(1)\r
else:\r
if args.SignatureSizeStr.upper().startswith('0X'):\r
- SignatureSize = (long)(args.SignatureSizeStr, 16)\r
+ SignatureSize = int(args.SignatureSizeStr, 16)\r
else:\r
- SignatureSize = (long)(args.SignatureSizeStr)\r
+ SignatureSize = int(args.SignatureSizeStr)\r
if SignatureSize < 0:\r
print("ERROR: The value of option --signature-size can't be set to negative value!")\r
sys.exit(1)\r
if args.MonotonicCountStr:\r
try:\r
if args.MonotonicCountStr.upper().startswith('0X'):\r
- args.MonotonicCountValue = (long)(args.MonotonicCountStr, 16)\r
+ args.MonotonicCountValue = int(args.MonotonicCountStr, 16)\r
else:\r
- args.MonotonicCountValue = (long)(args.MonotonicCountStr)\r
+ args.MonotonicCountValue = int(args.MonotonicCountStr)\r
except:\r
pass\r
\r
if not IsValidToken(PCD_TOKEN_PATTERN, Token):\r
self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN % Token)\r
elif not Token.startswith('0x') and not Token.startswith('0X'):\r
- if long(Token) > 4294967295:\r
+ if int(Token) > 4294967295:\r
self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN_INT % Token)\r
- Token = hex(long(Token))[:-1]\r
+ Token = hex(int(Token))[:-1]\r
\r
- IntToken = long(Token, 0)\r
+ IntToken = int(Token, 0)\r
if (Guid, IntToken) in self.TokenMap:\r
if self.TokenMap[Guid, IntToken] != CName:\r
self._LoggerError(ST.ERR_DECPARSE_PCD_TOKEN_UNIQUE%(Token))\r