diff options
| author | Igor Kudrin <ikudrin@accesssoftek.com> | 2019-08-06 10:49:40 +0000 |
|---|---|---|
| committer | Igor Kudrin <ikudrin@accesssoftek.com> | 2019-08-06 10:49:40 +0000 |
| commit | f26a70a5e7b7b8715eadcb6dec3ff39a267fc666 (patch) | |
| tree | d178246aab19aded049ff79111d90654bdbfe497 /llvm/lib/XRay/FileHeaderReader.cpp | |
| parent | f5f35c5cd110e22c4b216ec1dc53255e32adc011 (diff) | |
| download | bcm5719-llvm-f26a70a5e7b7b8715eadcb6dec3ff39a267fc666.tar.gz bcm5719-llvm-f26a70a5e7b7b8715eadcb6dec3ff39a267fc666.zip | |
Switch LLVM to use 64-bit offsets (2/5)
This updates all libraries and tools in LLVM Core to use 64-bit offsets
which directly or indirectly come to DataExtractor.
Differential Revision: https://reviews.llvm.org/D65638
llvm-svn: 368014
Diffstat (limited to 'llvm/lib/XRay/FileHeaderReader.cpp')
| -rw-r--r-- | llvm/lib/XRay/FileHeaderReader.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/llvm/lib/XRay/FileHeaderReader.cpp b/llvm/lib/XRay/FileHeaderReader.cpp index 3fb021906a6..6b6daf9deba 100644 --- a/llvm/lib/XRay/FileHeaderReader.cpp +++ b/llvm/lib/XRay/FileHeaderReader.cpp @@ -12,7 +12,7 @@ namespace xray { // Populates the FileHeader reference by reading the first 32 bytes of the file. Expected<XRayFileHeader> readBinaryFormatHeader(DataExtractor &HeaderExtractor, - uint32_t &OffsetPtr) { + uint64_t &OffsetPtr) { // FIXME: Maybe deduce whether the data is little or big-endian using some // magic bytes in the beginning of the file? @@ -30,21 +30,24 @@ Expected<XRayFileHeader> readBinaryFormatHeader(DataExtractor &HeaderExtractor, if (OffsetPtr == PreReadOffset) return createStringError( std::make_error_code(std::errc::invalid_argument), - "Failed reading version from file header at offset %d.", OffsetPtr); + "Failed reading version from file header at offset %" PRId64 ".", + OffsetPtr); PreReadOffset = OffsetPtr; FileHeader.Type = HeaderExtractor.getU16(&OffsetPtr); if (OffsetPtr == PreReadOffset) return createStringError( std::make_error_code(std::errc::invalid_argument), - "Failed reading file type from file header at offset %d.", OffsetPtr); + "Failed reading file type from file header at offset %" PRId64 ".", + OffsetPtr); PreReadOffset = OffsetPtr; uint32_t Bitfield = HeaderExtractor.getU32(&OffsetPtr); if (OffsetPtr == PreReadOffset) return createStringError( std::make_error_code(std::errc::invalid_argument), - "Failed reading flag bits from file header at offset %d.", OffsetPtr); + "Failed reading flag bits from file header at offset %" PRId64 ".", + OffsetPtr); FileHeader.ConstantTSC = Bitfield & 1uL; FileHeader.NonstopTSC = Bitfield & 1uL << 1; @@ -53,7 +56,8 @@ Expected<XRayFileHeader> readBinaryFormatHeader(DataExtractor &HeaderExtractor, if (OffsetPtr == PreReadOffset) return createStringError( std::make_error_code(std::errc::invalid_argument), - "Failed reading cycle frequency from file header at offset %d.", + "Failed reading cycle frequency from file header at offset %" PRId64 + ".", OffsetPtr); std::memcpy(&FileHeader.FreeFormData, |
