6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-25 13:24:46 +00:00
Code Issues Projects Releases Wiki Activity

Return the number of read bytes in MemoryObject::readBytes.

Browse Source 
Returning more information will allow BitstreamReader to be simplified a bit
and changed to read 64 bits at a time.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@221794 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola
2014-11-12 17:11:16 +00:00
parent 86a3cdff6b
commit d0ab58245f
5 changed files with 38 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
lib/Support/StreamingMemoryObject.cpp
View File

@@ -28,8 +28,8 @@ public:
uint64_t getExtent() const override {
return LastChar - FirstChar;
}
int readBytes(uint64_t address, uint64_t size,
uint8_t *buf) const override;
uint64_t readBytes(uint8_t *Buf, uint64_t Size,
uint64_t Address) const override;
const uint8_t *getPointer(uint64_t address, uint64_t size) const override;
bool isValidAddress(uint64_t address) const override {
return validAddress(address);
@@ -55,12 +55,20 @@ private:
void operator=(const RawMemoryObject&) LLVM_DELETED_FUNCTION;
};
int RawMemoryObject::readBytes(uint64_t address,
uint64_t size,
uint8_t *buf) const {
if (!validAddress(address) || !validAddress(address + size - 1)) return -1;
memcpy(buf, (uint8_t *)(uintptr_t)(address + FirstChar), size);
return size;
uint64_t RawMemoryObject::readBytes(uint8_t *Buf, uint64_t Size,
uint64_t Address) const {
uint64_t BufferSize = LastChar - FirstChar;
if (Address >= BufferSize)
return 0;
uint64_t End = Address + Size;
if (End > BufferSize)
End = BufferSize;
Size = End - Address;
assert(Size >= 0);
memcpy(Buf, (uint8_t *)(Address + FirstChar), Size);
return Size;
}
const uint8_t *RawMemoryObject::getPointer(uint64_t address,
@@ -91,12 +99,20 @@ uint64_t StreamingMemoryObject::getExtent() const {
return ObjectSize;
}
int StreamingMemoryObject::readBytes(uint64_t address,
uint64_t size,
uint8_t *buf) const {
if (!fetchToPos(address + size - 1)) return -1;
memcpy(buf, &Bytes[address + BytesSkipped], size);
return 0;
uint64_t StreamingMemoryObject::readBytes(uint8_t *Buf, uint64_t Size,
uint64_t Address) const {
fetchToPos(Address + Size - 1);
uint64_t BufferSize = Bytes.size() - BytesSkipped;
if (Address >= BufferSize)
return 0;
uint64_t End = Address + Size;
if (End > BufferSize)
End = BufferSize;
Size = End - Address;
assert(Size >= 0);
memcpy(Buf, &Bytes[Address + BytesSkipped], Size);
return Size;
}
bool StreamingMemoryObject::dropLeadingBytes(size_t s) {