RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-12-12 14:17:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[MCJIT] More endianness fixes for RuntimeDyldMachO.

Browse Source 
http://llvm.org/PR20640



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@216567 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Lang Hames 2014-08-27 17:41:06 +00:00
parent 70d2d3cd45
commit 644e3c077c
2 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
View File

@ -703,15 +703,18 @@ uint64_t RuntimeDyldCheckerImpl::readMemoryAtAddr(uint64_t SrcAddr,
unsigned Size) const {
uintptr_t PtrSizedAddr = static_cast<uintptr_t>(SrcAddr);
assert(PtrSizedAddr == SrcAddr && "Linker memory pointer out-of-range.");
uint8_t *Src = reinterpret_cast<uint8_t *>(PtrSizedAddr);
uint64_t Result = 0;
uint8_t *Src = reinterpret_cast<uint8_t*>(PtrSizedAddr);
uint8_t *Dst = reinterpret_cast<uint8_t*>(&Result);
// If host and target endianness match use memcpy, otherwise copy in reverse
// order.
if (getRTDyld().IsTargetLittleEndian == sys::IsLittleEndianHost)
memcpy(&Result, Src, Size);
else {
uint8_t *Dst = reinterpret_cast<uint8_t*>(&Result) + Size - 1;
if (getRTDyld().IsTargetLittleEndian == sys::IsLittleEndianHost) {
if (!sys::IsLittleEndianHost)
Dst += sizeof(Result) - Size;
memcpy(Dst, Src, Size);
} else {
Dst += Size - 1;
for (unsigned i = 0; i < Size; ++i)
*Dst-- = *Src++;
}

27
lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
View File

@ -29,10 +29,21 @@ namespace llvm {
int64_t RuntimeDyldMachO::memcpyAddend(const RelocationEntry &RE) const {
const SectionEntry &Section = Sections[RE.SectionID];
uint8_t *LocalAddress = Section.Address + RE.Offset;
unsigned NumBytes = 1 << RE.Size;
int64_t Addend = 0;
memcpy(&Addend, LocalAddress, NumBytes);
uint8_t *LocalAddress = Section.Address + RE.Offset;
uint8_t *Dst = reinterpret_cast<uint8_t*>(&Addend);
if (IsTargetLittleEndian == sys::IsLittleEndianHost) {
if (!sys::IsLittleEndianHost)
Dst += sizeof(Addend) - NumBytes;
memcpy(Dst, LocalAddress, NumBytes);
} else {
Dst += NumBytes - 1;
for (unsigned i = 0; i < NumBytes; ++i)
*Dst-- = *LocalAddress++;
}
return Addend;
}
@ -113,13 +124,15 @@ void RuntimeDyldMachO::dumpRelocationToResolve(const RelocationEntry &RE,
bool RuntimeDyldMachO::writeBytesUnaligned(uint8_t *Dst, uint64_t Value,
unsigned Size) {
uint8_t *Src = reinterpret_cast<uint8_t*>(&Value);
// If host and target endianness match use memcpy, otherwise copy in reverse
// order.
if (IsTargetLittleEndian == sys::IsLittleEndianHost)
memcpy(Dst, &Value, Size);
else {
uint8_t *Src = reinterpret_cast<uint8_t*>(&Value) + Size - 1;
if (IsTargetLittleEndian == sys::IsLittleEndianHost) {
if (!sys::IsLittleEndianHost)
Src += sizeof(Value) - Size;
memcpy(Dst, Src, Size);
} else {
Src += Size - 1;
for (unsigned i = 0; i < Size; ++i)
*Dst++ = *Src--;
}