diff options
| author | Derek Schuff <dschuff@google.com> | 2012-02-29 01:09:06 +0000 |
|---|---|---|
| committer | Derek Schuff <dschuff@google.com> | 2012-02-29 01:09:06 +0000 |
| commit | adef06a71458ded0716935a61b3d43d164d4df12 (patch) | |
| tree | d56aeec7dde89874b58254175d112ba1e5fddcb5 /tools | |
| parent | 95fe7b9b7251d33ad4128603087edac70cec7c72 (diff) | |
| download | llvm-adef06a71458ded0716935a61b3d43d164d4df12.tar.gz llvm-adef06a71458ded0716935a61b3d43d164d4df12.tar.bz2 llvm-adef06a71458ded0716935a61b3d43d164d4df12.tar.xz | |
Make MemoryObject accessor members const again
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151687 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/llvm-mc/Disassembler.cpp | 5 | ||||
| -rw-r--r-- | tools/llvm-objdump/MCFunction.cpp | 2 | ||||
| -rw-r--r-- | tools/llvm-objdump/MCFunction.h | 2 | ||||
| -rw-r--r-- | tools/llvm-objdump/llvm-objdump.h | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/tools/llvm-mc/Disassembler.cpp b/tools/llvm-mc/Disassembler.cpp index 32fc2ba57d..8114580cb9 100644 --- a/tools/llvm-mc/Disassembler.cpp +++ b/tools/llvm-mc/Disassembler.cpp @@ -42,9 +42,9 @@ public: VectorMemoryObject(const ByteArrayTy &bytes) : Bytes(bytes) {} uint64_t getBase() const { return 0; } - uint64_t getExtent() { return Bytes.size(); } + uint64_t getExtent() const { return Bytes.size(); } - int readByte(uint64_t Addr, uint8_t *Byte) { + int readByte(uint64_t Addr, uint8_t *Byte) const { if (Addr >= getExtent()) return -1; *Byte = Bytes[Addr].first; @@ -365,4 +365,3 @@ int Disassembler::disassembleEnhanced(const std::string &TS, return 0; } - diff --git a/tools/llvm-objdump/MCFunction.cpp b/tools/llvm-objdump/MCFunction.cpp index 9a9edda753..5c67f1b70a 100644 --- a/tools/llvm-objdump/MCFunction.cpp +++ b/tools/llvm-objdump/MCFunction.cpp @@ -28,7 +28,7 @@ using namespace llvm; MCFunction MCFunction::createFunctionFromMC(StringRef Name, const MCDisassembler *DisAsm, - MemoryObject &Region, uint64_t Start, + const MemoryObject &Region, uint64_t Start, uint64_t End, const MCInstrAnalysis *Ana, raw_ostream &DebugOut, SmallVectorImpl<uint64_t> &Calls) { diff --git a/tools/llvm-objdump/MCFunction.h b/tools/llvm-objdump/MCFunction.h index c0362d3a43..6d3a548d48 100644 --- a/tools/llvm-objdump/MCFunction.h +++ b/tools/llvm-objdump/MCFunction.h @@ -79,7 +79,7 @@ public: // Create an MCFunction from a region of binary machine code. static MCFunction createFunctionFromMC(StringRef Name, const MCDisassembler *DisAsm, - MemoryObject &Region, uint64_t Start, uint64_t End, + const MemoryObject &Region, uint64_t Start, uint64_t End, const MCInstrAnalysis *Ana, raw_ostream &DebugOut, SmallVectorImpl<uint64_t> &Calls); diff --git a/tools/llvm-objdump/llvm-objdump.h b/tools/llvm-objdump/llvm-objdump.h index 1611516ab7..aa71b77c8a 100644 --- a/tools/llvm-objdump/llvm-objdump.h +++ b/tools/llvm-objdump/llvm-objdump.h @@ -31,9 +31,9 @@ public: StringRefMemoryObject(StringRef bytes) : Bytes(bytes) {} uint64_t getBase() const { return 0; } - uint64_t getExtent() { return Bytes.size(); } + uint64_t getExtent() const { return Bytes.size(); } - int readByte(uint64_t Addr, uint8_t *Byte) { + int readByte(uint64_t Addr, uint8_t *Byte) const { if (Addr >= getExtent()) return -1; *Byte = Bytes[Addr]; |