diff options
author | Benjamin Kramer <benny.kra@googlemail.com> | 2013-05-24 10:54:58 +0000 |
---|---|---|
committer | Benjamin Kramer <benny.kra@googlemail.com> | 2013-05-24 10:54:58 +0000 |
commit | 49a6a8d8f2994249c81b7914b07015714748a55c (patch) | |
tree | c14f72e8279f110e51baad10fbe21e62776a5e47 /lib/Support/StreamableMemoryObject.cpp | |
parent | 35b2a7a54588e17e4de655bfb29c57d072f19904 (diff) | |
download | external_llvm-49a6a8d8f2994249c81b7914b07015714748a55c.tar.gz external_llvm-49a6a8d8f2994249c81b7914b07015714748a55c.tar.bz2 external_llvm-49a6a8d8f2994249c81b7914b07015714748a55c.zip |
Remove the Copied parameter from MemoryObject::readBytes.
There was exactly one caller using this API right, the others were relying on
specific behavior of the default implementation. Since it's too hard to use it
right just remove it and standardize on the default behavior.
Defines away PR16132.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@182636 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Support/StreamableMemoryObject.cpp')
-rw-r--r-- | lib/Support/StreamableMemoryObject.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/lib/Support/StreamableMemoryObject.cpp b/lib/Support/StreamableMemoryObject.cpp index 59e27a263e..2ed7c5c100 100644 --- a/lib/Support/StreamableMemoryObject.cpp +++ b/lib/Support/StreamableMemoryObject.cpp @@ -31,8 +31,7 @@ public: virtual int readByte(uint64_t address, uint8_t* ptr) const LLVM_OVERRIDE; virtual int readBytes(uint64_t address, uint64_t size, - uint8_t* buf, - uint64_t* copied) const LLVM_OVERRIDE; + uint8_t *buf) const LLVM_OVERRIDE; virtual const uint8_t *getPointer(uint64_t address, uint64_t size) const LLVM_OVERRIDE; virtual bool isValidAddress(uint64_t address) const LLVM_OVERRIDE { @@ -67,11 +66,9 @@ int RawMemoryObject::readByte(uint64_t address, uint8_t* ptr) const { int RawMemoryObject::readBytes(uint64_t address, uint64_t size, - uint8_t* buf, - uint64_t* copied) const { + uint8_t *buf) const { if (!validAddress(address) || !validAddress(address + size - 1)) return -1; memcpy(buf, (uint8_t *)(uintptr_t)(address + FirstChar), size); - if (copied) *copied = size; return size; } @@ -111,11 +108,9 @@ int StreamingMemoryObject::readByte(uint64_t address, uint8_t* ptr) const { int StreamingMemoryObject::readBytes(uint64_t address, uint64_t size, - uint8_t* buf, - uint64_t* copied) const { + uint8_t *buf) const { if (!fetchToPos(address + size - 1)) return -1; memcpy(buf, &Bytes[address + BytesSkipped], size); - if (copied) *copied = size; return 0; } |