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
This commit is contained in:
Benjamin Kramer
2013-05-24 10:54:58 +00:00
parent 35b2a7a545
commit 49a6a8d8f2
14 changed files with 35 additions and 61 deletions

View File

@ -20,15 +20,10 @@ int StringRefMemoryObject::readByte(uint64_t Addr, uint8_t *Byte) const {
int StringRefMemoryObject::readBytes(uint64_t Addr,
uint64_t Size,
uint8_t *Buf,
uint64_t *Copied) const {
if (Addr >= Base + getExtent() || Addr < Base)
return -1;
uint8_t *Buf) const {
uint64_t Offset = Addr - Base;
if (Size > getExtent() - Offset)
Size = getExtent() - Offset;
if (Addr >= Base + getExtent() || Offset + Size > getExtent() || Addr < Base)
return -1;
memcpy(Buf, Bytes.data() + Offset, Size);
if (Copied)
*Copied = Size;
return 0;
}